--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/control/PopoverTreeList.java	2015-09-03 14:42:20.476393300 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/control/PopoverTreeList.java	2015-09-03 14:42:19.826356100 -0700
@@ -32,8 +32,8 @@
 package com.javafx.experiments.scheduleapp.control;
 
 import static com.javafx.experiments.scheduleapp.Theme.*;
-import com.sun.javafx.scene.control.skin.ListCellSkin;
-import com.sun.javafx.scene.control.skin.ListViewSkin;
+import javafx.scene.control.skin.ListCellSkin;
+import javafx.scene.control.skin.ListViewSkin;
 import javafx.event.EventHandler;
 import javafx.geometry.Bounds;
 import javafx.scene.control.ListCell;
--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/control/ScrollPaneSkin3.java	2015-09-03 14:42:27.852815200 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/control/ScrollPaneSkin3.java	2015-09-03 14:42:27.227779500 -0700
@@ -31,7 +31,7 @@
  */
 package com.javafx.experiments.scheduleapp.control;
 
-import com.sun.javafx.scene.control.skin.ScrollPaneSkin;
+import javafx.scene.control.skin.ScrollPaneSkin;
 import java.lang.reflect.Field;
 import javafx.event.EventHandler;
 import javafx.scene.control.ScrollPane;
@@ -99,14 +99,4 @@
         }
         return 0;
     }
-
-    protected void startContentsToViewport() {
-        if (IS_BEAGLE) return;
-        super.startContentsToViewport();
-    }
-
-    protected void startSBReleasedAnimation() {
-        if (IS_BEAGLE) return;
-        super.startSBReleasedAnimation();
-    }
 }
--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/control/SearchBox.java	2015-09-03 14:42:35.097229600 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/control/SearchBox.java	2015-09-03 14:42:34.485194600 -0700
@@ -32,7 +32,7 @@
 package com.javafx.experiments.scheduleapp.control;
 
 import com.javafx.experiments.scheduleapp.Theme;
-import com.sun.javafx.scene.control.skin.ButtonSkin;
+import javafx.scene.control.skin.ButtonSkin;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/CatalogPage.java	2015-09-03 14:42:41.895618400 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/CatalogPage.java	2015-09-03 14:42:41.314585200 -0700
@@ -190,7 +190,7 @@
         list = new ListView<Row>(){
             {
                 getStyleClass().setAll("twitter-list-view");
-                skinClassNameProperty().set("com.sun.javafx.scene.control.skin.ListViewSkin");
+                skinClassNameProperty().set("javafx.scene.control.skin.ListViewSkin");
                 setCellFactory(CatalogPage.this);
             }
         };
--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/SocialPage.java	2015-09-03 14:42:49.310042500 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/SocialPage.java	2015-09-03 14:42:48.727009100 -0700
@@ -185,7 +185,7 @@
     private static class TwitterList extends ListView<Tweet> implements Callback<ListView<Tweet>, ListCell<Tweet>>{
         public TwitterList(){
             getStyleClass().setAll("twitter-list-view");
-            skinClassNameProperty().set("com.sun.javafx.scene.control.skin.ListViewSkin");
+            skinClassNameProperty().set("javafx.scene.control.skin.ListViewSkin");
             setCellFactory(this);
             setMinHeight(100);
         }
--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/SpeakersPage.java	2015-09-03 14:42:57.014483200 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/SpeakersPage.java	2015-09-03 14:42:56.400448000 -0700
@@ -61,6 +61,7 @@
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.Skin;
+import javafx.scene.control.skin.ListViewSkin;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
@@ -89,16 +90,9 @@
 
 import static com.javafx.experiments.scheduleapp.ConferenceScheduleApp.*;
 import static com.javafx.experiments.scheduleapp.Theme.*;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.net.URL;
+
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javafx.embed.swing.SwingFXUtils;
-import javafx.scene.image.WritableImage;
-import javax.imageio.ImageIO;
 
 /**
  * Page showing searchable list of all speakers at the conference
@@ -262,8 +256,8 @@
     private class SpeakerList extends ListView<Speaker> implements Callback<ListView<Speaker>, ListCell<Speaker>>{
         public SpeakerList(){
             getStyleClass().setAll("twitter-list-view");
-//            skinClassNameProperty().set("com.sun.javafx.scene.control.skin.ListViewSkin");
-            setSkin(new com.sun.javafx.scene.control.skin.ListViewSkin(this));
+//            skinClassNameProperty().set("javafx.scene.control.skin.ListViewSkin");
+            setSkin(new ListViewSkin(this));
             setCellFactory(this);
             // hack workaround for cell sizing
             Node node = lookup(".clipped-container");
--- old/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/TimelinePage.java	2015-09-03 14:43:04.536913400 -0700
+++ new/apps/experiments/ConferenceScheduleApp/src/main/java/com/javafx/experiments/scheduleapp/pages/TimelinePage.java	2015-09-03 14:43:03.965880800 -0700
@@ -71,7 +71,7 @@
 import com.javafx.experiments.scheduleapp.model.Event;
 import com.javafx.experiments.scheduleapp.model.Session;
 import com.javafx.experiments.scheduleapp.model.Track;
-import com.sun.javafx.scene.control.skin.ListViewSkin;
+import javafx.scene.control.skin.ListViewSkin;
 
 import static com.javafx.experiments.scheduleapp.ConferenceScheduleApp.*;
 import static com.javafx.experiments.scheduleapp.Theme.*;
--- old/apps/experiments/DukePad/modules/calculator/src/main/java/com/javafx/experiments/dukepad/calculator/CalculatorTheme.java	2015-09-03 14:43:12.038342500 -0700
+++ new/apps/experiments/DukePad/modules/calculator/src/main/java/com/javafx/experiments/dukepad/calculator/CalculatorTheme.java	2015-09-03 14:43:11.453309000 -0700
@@ -27,13 +27,12 @@
 
 import com.javafx.experiments.dukepad.core.Fonts;
 import com.sun.javafx.util.Utils;
-import com.sun.javafx.scene.control.skin.ButtonSkin;
-import com.sun.javafx.scene.control.skin.TextFieldSkin;
+import javafx.scene.control.skin.ButtonSkin;
+import javafx.scene.control.skin.TextFieldSkin;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.TextField;
--- old/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/AppPlatform.java	2015-09-03 14:43:19.429765200 -0700
+++ new/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/AppPlatform.java	2015-09-03 14:43:18.842731700 -0700
@@ -96,15 +96,15 @@
             AppNotificationHandler notificationHandler, Application.Parameters parameters)  
     throws IOException {
         if (IS_MAC) {
-            return requestStartMac(notificationHandler, parameters);
+            Platform.setImplicitExit(false);
+        }
+
+        if (EditorPlatform.isAssertionEnabled()) {
+            // Development mode : we do not delegate to the existing instance
+            notificationHandler.handleLaunch(parameters.getUnnamed());
+            return true;
         } else {
-            if (EditorPlatform.isAssertionEnabled()) {
-                // Development mode : we do not delegate to the existing instance
-                notificationHandler.handleLaunch(parameters.getUnnamed());
-                return true;
-            } else {
-                return requestStartGeneric(notificationHandler, parameters);
-            }
+            return requestStartGeneric(notificationHandler, parameters);
         }
     }
     
@@ -193,102 +193,4 @@
         }
         
     } 
-    
-    
-    
-    /*
-     * Private (requestStartMac)
-     */
-    
-    private static boolean requestStartMac(
-            AppNotificationHandler notificationHandler, Application.Parameters parameters) {
-        
-        Platform.setImplicitExit(false);
-        notificationHandler.handleLaunch(Collections.emptyList());
-        Deprecation.setPlatformEventHandler(new MacEventHandler(notificationHandler,
-                Deprecation.getPlatformEventHandler()));
-        
-        return true;
-    }
-    
-    private static class MacEventHandler extends com.sun.glass.ui.Application.EventHandler {
-        
-        private final AppNotificationHandler notificationHandler;
-        private final com.sun.glass.ui.Application.EventHandler oldEventHandler;
-        private int openFilesCount;
-        
-        public MacEventHandler(AppNotificationHandler notificationHandler,
-                com.sun.glass.ui.Application.EventHandler oldEventHandler) {
-            assert notificationHandler != null;
-            this.notificationHandler = notificationHandler;
-            this.oldEventHandler = oldEventHandler;
-        }
-        
-        /*
-         * com.sun.glass.ui.Application.AppNotificationHandler
-         */
-        @Override
-        public void handleDidFinishLaunchingAction(com.sun.glass.ui.Application app, long time) {
-            if (oldEventHandler != null) {
-                oldEventHandler.handleDidFinishLaunchingAction(app, time);
-            }
-        }
-
-        @Override
-        public void handleDidBecomeActiveAction(com.sun.glass.ui.Application app, long time) {
-            if (oldEventHandler != null) {
-                oldEventHandler.handleDidBecomeActiveAction(app, time);
-            }
-        }
-
-        @Override
-        public void handleOpenFilesAction(com.sun.glass.ui.Application app, long time, final String[] files) {
-            if (oldEventHandler != null) {
-                oldEventHandler.handleOpenFilesAction(app, time, files);
-            }
-            
-            /*
-             * When SB is started from NB or test environment on Mac OS, this 
-             * method is called a first time with dummy parameter like this:
-             * files[0] == "com.oracle.javafx.scenebuilder.app.SceneBuilderApp". //NOI18N
-             * We ignore this call here.
-             * 
-             * With Eclipse on Mac, files[0] == System.getProperty("java.class.path") (!) //NOI18N
-             */
-            final boolean openRejected;
-            if (startingFromTestBed) {
-                openRejected = true;
-            } else if (openFilesCount++ == 0) {
-                openRejected = (files.length == 1) 
-                        && ( files[0].equals(SceneBuilderApp.class.getName()) || //NOI18N
-                             files[0].equals(System.getProperty("java.class.path"))); //NOI18N
-            } else {
-                openRejected = false;
-            }
-            
-            if (openRejected == false) {
-                notificationHandler.handleOpenFilesAction(Arrays.asList(files));
-            }
-        }
-
-        @Override
-        public void handleQuitAction(com.sun.glass.ui.Application app, long time) {
-            if (oldEventHandler != null) {
-                oldEventHandler.handleQuitAction(app, time);
-            }
-            notificationHandler.handleQuitAction();
-        }  
-    } 
-    
-    
-    /*
-     * Some code to help starting Scene Builder application from SQE java code.
-     * This is relevant on Mac only.
-     */
-    
-    private static boolean startingFromTestBed;
-    
-    public static void setStartingFromTestBed(boolean macWorkaroundEnabled) {
-        AppPlatform.startingFromTestBed = macWorkaroundEnabled;
-    }
 }
--- old/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java	2015-09-03 14:43:27.260213100 -0700
+++ new/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/DocumentWindowController.java	2015-09-03 14:43:26.703181300 -0700
@@ -70,7 +70,6 @@
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMObject;
 import com.oracle.javafx.scenebuilder.kit.library.Library;
 import com.oracle.javafx.scenebuilder.kit.library.user.UserLibrary;
-import com.sun.javafx.scene.control.behavior.KeyBinding;
 
 import java.io.File;
 import java.io.IOException;
@@ -237,7 +236,7 @@
     private static List<String> videoExtensions;
     private static List<String> mediaExtensions;
 
-    private final EventHandler<KeyEvent> mainKeyEventFilter = event -> {
+    private final EventHandler<KeyEvent> mainKeyEventFilter = (KeyEvent event) -> {
         //------------------------------------------------------------------
         // TEXT INPUT CONTROL
         //------------------------------------------------------------------
@@ -258,19 +257,20 @@
         final KeyCombination accelerator = getAccelerator(event);
         if (isTextInputControlEditing(focusOwner) == true 
                 && accelerator != null) {
-            for (KeyBinding binding : SBTextInputControlBindings.getBindings()) {
-                // The event is handled natively
-                if (binding.getSpecificity(null, event) > 0) {
-                    // 
-                    // When using system menu bar, the event is handled natively 
-                    // before the application receives it : we just consume the event 
-                    // so the editing action is not performed a second time by the app.
-                    if (menuBarController.getMenuBar().isUseSystemMenuBar()) {
-                        event.consume();
-                    }
-                    break;
-                }
-            }
+
+//            focusOwner.getInputMap()
+//                      .lookupMapping(KeyBinding.toKeyBinding(event))
+//                      .ifPresent(mapping -> {
+//                          // The event is handled natively
+//                          if (mapping.getSpecificity(event) > 0) {
+//                              // When using system menu bar, the event is handled natively
+//                              // before the application receives it : we just consume the event
+//                              // so the editing action is not performed a second time by the app.
+//                              if (menuBarController.getMenuBar().isUseSystemMenuBar()) {
+//                                  event.consume();
+//                              }
+//                          }
+//                      });
         }
 
         //------------------------------------------------------------------
@@ -2155,17 +2155,17 @@
     }
 }
 
-/**
- * This class setup key bindings for the TextInputControl type classes and
- * provide a way to access the key binding list.
- */
-class SBTextInputControlBindings extends com.sun.javafx.scene.control.behavior.TextInputControlBindings {
-
-    private SBTextInputControlBindings() {
-        assert false;
-    }
-
-    public static List<KeyBinding> getBindings() {
-        return BINDINGS;
-    }
-}
+///**
+// * This class setup key bindings for the TextInputControl type classes and
+// * provide a way to access the key binding list.
+// */
+//class SBTextInputControlBindings extends TextInputControlBindings {
+//
+//    private SBTextInputControlBindings() {
+//        assert false;
+//    }
+//
+//    public static List<KeyBinding> getBindings() {
+//        return BINDINGS;
+//    }
+//}
--- old/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/SceneBuilderTest.java	2015-09-03 14:43:34.728640300 -0700
+++ new/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/SceneBuilderTest.java	2015-09-03 14:43:34.197609900 -0700
@@ -410,7 +410,6 @@
      * @param args arguments to SceneBuilderApp.main()
      */
     public static void startApplication(String[] args) {
-        AppPlatform.setStartingFromTestBed(true);
         SceneBuilderApp.main(args);
     }
     
--- old/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/about/AboutWindowController.java	2015-09-03 14:43:41.944053000 -0700
+++ new/apps/scenebuilder/SceneBuilderApp/src/com/oracle/javafx/scenebuilder/app/about/AboutWindowController.java	2015-09-03 14:43:41.366019900 -0700
@@ -34,8 +34,6 @@
 import com.oracle.javafx.scenebuilder.app.SceneBuilderApp;
 import com.oracle.javafx.scenebuilder.app.i18n.I18N;
 import com.oracle.javafx.scenebuilder.kit.editor.panel.util.AbstractFxmlWindowController;
-import com.sun.javafx.tk.Toolkit;
-import com.sun.prism.GraphicsPipeline;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -121,7 +119,6 @@
         StringBuilder text = getVersionParagraph()
                 .append(getBuildInfoParagraph())
                 .append(getLoggingParagraph())
-                .append(getFxParagraph())
                 .append(getJavaParagraph())
                 .append(getOsParagraph())
                 .append(I18N.getString(sbAboutCopyrightKeyName));
@@ -178,33 +175,6 @@
         return sb;
     }
     
-    private StringBuilder getFxParagraph() {
-        boolean hwAccelerated = false;
-        String tk = Toolkit.getToolkit().getClass().getSimpleName();
-        StringBuilder fxtra = new StringBuilder("JavaFX\n"); //NOI18N
-        fxtra.append(I18N.getString("about.fx.toolkit"))
-                .append(" = ").append(tk).append("\n"); //NOI18N
-
-        if ("GlassToolkit".equals(tk) || "PrismToolkit".equals(tk) //NOI18N
-                || "QuantumToolkit".equals(tk)) { //NOI18N
-            String ppl = GraphicsPipeline.getPipeline().getClass().getSimpleName();
-            fxtra.append(I18N.getString("about.fx.pipeline"))
-                    .append(" = ").append(ppl).append("\n"); //NOI18N
-            if (ppl.trim().equals("D3DPipeline") //NOI18N
-                    || ppl.trim().equals("ES1Pipeline") //NOI18N
-                    || ppl.trim().equals("ES2Pipeline")) { //NOI18N
-                hwAccelerated = true;
-            }
-        }
-        fxtra.append(I18N.getString("about.fx.hardware.acceleration"))
-                .append(" ") //NOI18N
-                .append(hwAccelerated ? I18N.getString("about.fx.hardware.acceleration.enabled")
-                        : I18N.getString("about.fx.hardware.acceleration.disabled"))
-                .append("\n\n"); //NOI18N
-
-        return fxtra;
-    }
-    
     private StringBuilder getJavaParagraph() {
         StringBuilder sb = new StringBuilder("Java\n"); //NOI18N
         sb.append(System.getProperty("java.runtime.version")).append(", ") //NOI18N
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TabPaneDesignInfoX.java	2015-09-03 14:43:48.998456500 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TabPaneDesignInfoX.java	2015-09-03 14:43:48.409422800 -0700
@@ -32,7 +32,7 @@
 package com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver;
 
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.scene.control.skin.TabPaneSkin;
+import javafx.scene.control.skin.TabPaneSkin;
 import java.util.Iterator;
 import java.util.Set;
 import javafx.geometry.BoundingBox;
@@ -87,13 +87,20 @@
      */
     public Node getContentNode(TabPane tabPane) {
         assert tabPane != null;
-        
+
         final Node result;
        
-        if (tabPane.getSkin() != null) {
-            assert tabPane.getSkin() instanceof TabPaneSkin;
-            final TabPaneSkin tabPaneSkin = (TabPaneSkin) tabPane.getSkin();
-            result = tabPaneSkin.getSelectedTabContentRegion();
+//        if (tabPane.getSkin() != null) {
+//            assert tabPane.getSkin() instanceof TabPaneSkin;
+//            final TabPaneSkin tabPaneSkin = (TabPaneSkin) tabPane.getSkin();
+//            result = tabPaneSkin.getSelectedTabContentRegion();
+//        } else {
+//            result = null;
+//        }
+
+        Tab selectedTab = tabPane.getSelectionModel().getSelectedItem();
+        if (selectedTab != null) {
+            result = selectedTab.getContent();
         } else {
             result = null;
         }
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TableViewDesignInfoX.java	2015-09-03 14:43:56.746899700 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TableViewDesignInfoX.java	2015-09-03 14:43:56.109863200 -0700
@@ -32,7 +32,7 @@
 package com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver;
 
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TreeTableViewDesignInfoX.java	2015-09-03 14:44:04.548345900 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/content/driver/TreeTableViewDesignInfoX.java	2015-09-03 14:44:03.915309700 -0700
@@ -32,7 +32,7 @@
 package com.oracle.javafx.scenebuilder.kit.editor.panel.content.driver;
 
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssContentMaker.java	2015-09-03 14:44:12.198783500 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssContentMaker.java	2015-09-03 14:44:11.557746800 -0700
@@ -41,9 +41,8 @@
 import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName;
 import com.oracle.javafx.scenebuilder.kit.util.CssInternal;
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.css.ParsedValueImpl;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Style;
+import javafx.css.Rule;
+import javafx.css.Style;
 import javafx.css.StyleOrigin;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -289,9 +288,7 @@
     protected static CssStyle retrieveStyle(List<Style> styles, Style style) {
         CssStyle st = new CssStyle(style);
         ParsedValue parsedValue = style.getDeclaration().getParsedValue();
-        assert parsedValue instanceof ParsedValueImpl;
-        ParsedValueImpl parsedValueImpl = (ParsedValueImpl) parsedValue;
-        if (parsedValueImpl.isContainsLookups() || parsedValueImpl.isLookup()) {
+        if (parsedValue.isContainsLookups() || parsedValue.isLookup()) {
             retrieveStylesFromParsedValue(styles, st, style.getDeclaration().getParsedValue());
         }
         return st;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssPanelController.java	2015-09-03 14:44:19.604207000 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssPanelController.java	2015-09-03 14:44:19.038174700 -0700
@@ -55,8 +55,8 @@
 import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName;
 import com.oracle.javafx.scenebuilder.kit.util.CssInternal;
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.css.ParsedValueImpl;
-import com.sun.javafx.css.Rule;
+
+import javafx.css.Rule;
 
 import java.io.File;
 import java.io.IOException;
@@ -1981,7 +1981,7 @@
                     boolean lookup = false;
                     if (parsedValues != null) {
                         ParsedValue<?, ?> pv = parsedValues[i];
-                        lookup = ((ParsedValueImpl<?, ?>) pv).isContainsLookups();
+                        lookup = pv.isContainsLookups();
                     }
                     if (lookup) {
                         assert style != null;
@@ -2034,7 +2034,7 @@
                         boolean lookup = false;
                         if (parsedValues != null) {
                             ParsedValue<?, ?> pv = parsedValues[index];
-                            lookup = ((ParsedValueImpl<?, ?>) pv).isContainsLookups();
+                            lookup = pv.isContainsLookups();
                         }
                         if (lookup) {
                             CssStyle lookupRoot = null;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java	2015-09-03 14:44:27.105636100 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssUtils.java	2015-09-03 14:44:26.495601200 -0700
@@ -383,7 +383,7 @@
 //    
 //    static {
 //        try {
-//            STYLE_SHEET_TOOL_CSS = CSSParser.getInstance().parse(new URL(TOOL_ROOT_CSS));
+//            STYLE_SHEET_TOOL_CSS = new CssParser().parse(new URL(TOOL_ROOT_CSS));
 //        } catch (IOException ex) {
 //            Utils.println("Failed to parse " + TOOL_ROOT_CSS, ex); //NOI18N
 //        }
@@ -455,7 +455,7 @@
 //        Set<String> styleClasses = new HashSet<>();
 //        Stylesheet s;
 //        try {
-//            s = CSSParser.getInstance().parse(url);
+//            s = new CssParser().parse(url);
 //        } catch (IOException ex) {
 //            Utils.println("Invalid Stylesheet " + url);
 //            return styleClasses;
@@ -1023,7 +1023,7 @@
 //
 //    private static final CssParsingListener cssListener = new CssParsingListener();
 //    static {
-//        StyleManager.errorsProperty().addListener(cssListener);
+//        CssParser.errorsProperty().addListener(cssListener);
 //    }
 //    
 //    public static void updateStylesheets(Project project, Parent parent, File file) {
@@ -1151,11 +1151,11 @@
 //        // Synchronous listener to get errors synchronously.
 //        // Required for synchronous validation
 //        CssInlineStyleListener listener = new CssInlineStyleListener();
-//        StyleManager.errorsProperty().addListener(listener);
+//        CssParser.errorsProperty().addListener(listener);
 //        startListeningToCssErrors(project);
 //        try {
 //            try {
-//                s = CSSParser.getInstance().parseInlineStyle(new StyleableStub(style));
+//                s = new CssParser().parseInlineStyle(new StyleableStub(style));
 //            }catch(final RuntimeException ex){
 //                // Parser exception that has not been tracked by the listener.
 //                // Bug in CSS RT
@@ -1163,7 +1163,7 @@
 //            }
 //        } finally {
 //            stopListeningToCssErrors(project);
-//            StyleManager.errorsProperty().removeListener(listener);
+//            CssParser.errorsProperty().removeListener(listener);
 //        }
 //        
 //        return s != null && listener.getErrors().isEmpty();
@@ -1253,7 +1253,7 @@
 //    public static Set<String> lookupImagesInStyle(String style) {
 //        if (style != null) {
 //            try {
-//                Stylesheet s = CSSParser.getInstance().parseInlineStyle(new StyleableStub(style));
+//                Stylesheet s = new CssParser().parseInlineStyle(new StyleableStub(style));
 //                return lookupImagesInStylesheet(s);
 //            } catch (RuntimeException ex) {
 //                Utils.println(ex.getMessage());
@@ -1268,7 +1268,7 @@
 //                startListeningToCssErrors(project);
 //            }
 //            try {
-//                Stylesheet s = CSSParser.getInstance().parse(uri.toURL());
+//                Stylesheet s = new CssParser().parse(uri.toURL());
 //                return lookupImagesInStylesheet(s);
 //            } catch (Exception ex) {
 //                Utils.println(ex.getMessage());
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java	2015-09-03 14:44:34.742072900 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/CssValueConverter.java	2015-09-03 14:44:34.137038300 -0700
@@ -35,14 +35,14 @@
 import com.oracle.javafx.scenebuilder.kit.metadata.util.ColorEncoder;
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
 import com.oracle.javafx.scenebuilder.kit.util.MathUtils;
-import com.sun.javafx.css.Declaration;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.PaintConverter.LinearGradientConverter;
-import com.sun.javafx.css.parser.DeriveColorConverter;
-import com.sun.javafx.css.parser.DeriveSizeConverter;
-import com.sun.javafx.css.parser.LadderConverter;
+import javafx.css.Declaration;
+import javafx.css.Rule;
+import javafx.css.Size;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.PaintConverter.LinearGradientConverter;
+import javafx.css.converter.DeriveColorConverter;
+import javafx.css.converter.DeriveSizeConverter;
+import javafx.css.converter.LadderConverter;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/NodeCssState.java	2015-09-03 14:44:42.043490500 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/css/NodeCssState.java	2015-09-03 14:44:41.494459100 -0700
@@ -35,8 +35,8 @@
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMObject;
 import com.oracle.javafx.scenebuilder.kit.util.CssInternal;
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Style;
+import javafx.css.Rule;
+import javafx.css.Style;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/hierarchy/treeview/HierarchyTreeCell.java	2015-09-03 14:44:49.704928700 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/hierarchy/treeview/HierarchyTreeCell.java	2015-09-03 14:44:48.975887000 -0700
@@ -65,7 +65,6 @@
 import com.oracle.javafx.scenebuilder.kit.metadata.util.DesignHierarchyMask;
 import com.oracle.javafx.scenebuilder.kit.metadata.util.DesignHierarchyMask.Accessory;
 import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName;
-import com.sun.javafx.css.CssError;
 
 import java.net.URL;
 import java.util.List;
@@ -74,6 +73,7 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ObservableList;
+import javafx.css.CssParser;
 import javafx.event.EventHandler;
 import javafx.scene.control.TreeCell;
 import javafx.scene.control.TreeItem;
@@ -908,9 +908,9 @@
         if (r.getIOException() != null) {
             result.append(r.getIOException());
         } else {
-            assert r.getCssErrors().isEmpty() == false;
+            assert r.getParseErrors().isEmpty() == false;
             int errorCount = 0;
-            for (CssError e : r.getCssErrors()) {
+            for (CssParser.ParseError e : r.getParseErrors()) {
                 result.append(e.getMessage());
                 errorCount++;
                 if (errorCount < 5) {
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleEditor.java	2015-09-03 14:44:56.991345400 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/panel/inspector/editors/StyleEditor.java	2015-09-03 14:44:56.379310400 -0700
@@ -35,9 +35,7 @@
 import com.oracle.javafx.scenebuilder.kit.editor.i18n.I18N;
 import com.oracle.javafx.scenebuilder.kit.metadata.property.ValuePropertyMetadata;
 import com.oracle.javafx.scenebuilder.kit.util.CssInternal;
-import com.sun.javafx.css.CssError;
-import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CssParser;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -235,7 +233,7 @@
         private String currentValue;
         private EditorItemDelegate editor;
         private boolean parsingError = false;
-        private ListChangeListener<CssError> errorListener;
+        private ListChangeListener<CssParser.ParseError> errorListener;
 
         public StyleItem(EditorItemDelegate editor, List<String> suggestedList) {
 //            System.out.println("New StyleItem.");
@@ -309,8 +307,8 @@
             errorListener = change -> {
                 while (change.next()) {
                     if (change.wasAdded()) {
-                        for (CssError error : change.getAddedSubList()) {
-                            if (error instanceof CssError.InlineStyleParsingError) {
+                        for (CssParser.ParseError error : change.getAddedSubList()) {
+                            if ("InlineStyleParsingError".equals(error.getClass().getSimpleName())) {
                                 parsingError = true;
                                 break;
                             }
@@ -339,9 +337,9 @@
 
             // Parse the style, and set the parsingError boolean if any error
             parsingError = false;
-            StyleManager.errorsProperty().addListener(errorListener);
-            new CSSParser().parseInlineStyle(new StyleableStub(value));
-            StyleManager.errorsProperty().removeListener(errorListener);
+            CssParser.errorsProperty().addListener(errorListener);
+            new CssParser().parseInlineStyle(new StyleableStub(value));
+            CssParser.errorsProperty().removeListener(errorListener);
 
             return value;
         }
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/report/CSSParsingReport.java	2015-09-03 14:45:04.844794600 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/editor/report/CSSParsingReport.java	2015-09-03 14:45:04.261761300 -0700
@@ -32,9 +32,7 @@
 
 package com.oracle.javafx.scenebuilder.kit.editor.report;
 
-import com.sun.javafx.css.CssError;
-import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CssParser;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -49,22 +47,22 @@
 public class CSSParsingReport {
     private final Path stylesheetPath;
     private IOException ioException;
-    private final List<CssError> cssErrors = new ArrayList<>();
+    private final List<CssParser.ParseError> parseErrors = new ArrayList<>();
     
     public CSSParsingReport(Path stylesheetPath) {
         assert stylesheetPath != null;
         
         this.stylesheetPath = stylesheetPath;
-        final Set<CssError> previousErrors = new HashSet<>(StyleManager.errorsProperty());
+        final Set<CssParser.ParseError> previousErrors = new HashSet<>(CssParser.errorsProperty());
         try {
-            new CSSParser().parse(stylesheetPath.toUri().toURL());
+            new CssParser().parse(stylesheetPath.toUri().toURL());
             // Leave this.ioException to null
-            cssErrors.addAll(StyleManager.errorsProperty());
-            cssErrors.removeAll(previousErrors);
+            parseErrors.addAll(CssParser.errorsProperty());
+            parseErrors.removeAll(previousErrors);
         } catch(IOException x) {
             this.ioException = x;
         } finally {
-            StyleManager.errorsProperty().removeAll(cssErrors);
+            CssParser.errorsProperty().removeAll(parseErrors);
         }
     }
 
@@ -73,14 +71,14 @@
     }
     
     public boolean isEmpty() {
-        return (ioException == null) && cssErrors.isEmpty();
+        return (ioException == null) && parseErrors.isEmpty();
     }
     
     public IOException getIOException() {
         return ioException;
     }
     
-    public List<CssError> getCssErrors() {
-        return Collections.unmodifiableList(cssErrors);
+    public List<CssParser.ParseError> getParseErrors() {
+        return Collections.unmodifiableList(parseErrors);
     }
 }
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java	2015-09-03 14:45:12.174213900 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java	2015-09-03 14:45:11.627182600 -0700
@@ -33,7 +33,7 @@
 
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
 import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName;
-import com.sun.javafx.fxml.LoadListener;
+import javafx.fxml.LoadListener;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -76,10 +76,9 @@
         fxmlLoader.setLocation(document.getLocation());
         fxmlLoader.setResources(new ResourceKeyCollector(document.getResources()));
         fxmlLoader.setClassLoader(new TransientClassLoader(classLoader));
-        fxmlLoader.setBuilderFactory(new FXOMBuilderFactory(classLoader));
+        fxmlLoader.setLoadListener(this);
         Deprecation.setStaticLoad(fxmlLoader, true);
-        Deprecation.setLoadListener(fxmlLoader, this);
-        
+
         final Charset utf8 = Charset.forName("UTF-8");
         try (final InputStream is = new ByteArrayInputStream(fxmlText.getBytes(utf8))) {
             glueCursor = new GlueCursor(document.getGlue());
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java	2015-09-03 14:45:19.968659700 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/CssInternal.java	2015-09-03 14:45:19.315622300 -0700
@@ -59,13 +59,13 @@
 import com.oracle.javafx.scenebuilder.kit.editor.EditorPlatform.Theme;
 import com.oracle.javafx.scenebuilder.kit.fxom.FXOMInstance;
 import com.oracle.javafx.scenebuilder.kit.metadata.property.ValuePropertyMetadata;
-import com.sun.javafx.css.CompoundSelector;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Selector;
-import com.sun.javafx.css.SimpleSelector;
-import com.sun.javafx.css.Style;
-import com.sun.javafx.css.Stylesheet;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CompoundSelector;
+import javafx.css.Rule;
+import javafx.css.Selector;
+import javafx.css.SimpleSelector;
+import javafx.css.Style;
+import javafx.css.Stylesheet;
+import javafx.css.CssParser;
 
 /**
  *
@@ -237,7 +237,7 @@
         Set<String> styleClasses = new HashSet<>();
         Stylesheet s;
         try {
-            s = new CSSParser().parse(url);
+            s = new CssParser().parse(url);
         } catch (IOException ex) {
             System.out.println("Warning: Invalid Stylesheet " + url); //NOI18N
             return styleClasses;
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java	2015-09-03 14:45:27.501090500 -0700
+++ new/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/util/Deprecation.java	2015-09-03 14:45:26.856053600 -0700
@@ -31,12 +31,8 @@
  */
 package com.oracle.javafx.scenebuilder.kit.util;
 
-import com.sun.glass.ui.Application;
-import com.sun.glass.ui.Application.EventHandler;
-import com.sun.javafx.css.Style;
-import com.sun.javafx.geom.PickRay;
-import com.sun.javafx.scene.control.skin.MenuBarSkin;
-import com.sun.javafx.scene.input.PickResultChooser;
+import javafx.css.Style;
+import javafx.scene.control.skin.MenuBarSkin;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -49,7 +45,6 @@
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
 import javafx.fxml.FXMLLoader;
-import javafx.fxml.JavaFXBuilderFactory;
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.scene.Group;
@@ -100,7 +95,7 @@
     }
 
 //    // RT-21096 : Promote impl_getStyleMap / impl_setStyleMap to public API
-    public static void setStyleMap(Node node, ObservableMap<StyleableProperty<?>, List<com.sun.javafx.css.Style>> map) {
+    public static void setStyleMap(Node node, ObservableMap<StyleableProperty<?>, List<javafx.css.Style>> map) {
         node.impl_setStyleMap(map);
     }
 
@@ -184,18 +179,35 @@
         loader.impl_setStaticLoad(staticLoad);
     }
 
-    // RT-21228 : Promote setLoadListener to public API
-    public static void setLoadListener(FXMLLoader loader, com.sun.javafx.fxml.LoadListener loadListener) {
-        loader.impl_setLoadListener(loadListener);
-    }
-
     // RT-20184 : FX should provide a Parent.pick() routine
     public static Node pick(Node node, double sceneX, double sceneY) {
-        final Point2D p = node.sceneToLocal(sceneX, sceneY, true /* rootScene */);
-        final PickRay pickRay = new PickRay(p.getX(), p.getY(), 1.0, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
-        final PickResultChooser prc = new PickResultChooser();
-        node.impl_pickNode(pickRay, prc);
-        return prc.getIntersectedNode();
+        Point2D p = node.sceneToLocal(sceneX, sceneY, true /* rootScene */);
+
+        // check if the given node has the point inside it, or else we drop out
+        if (!node.contains(p)) return null;
+
+        // at this point we know that _at least_ the given node is a valid
+        // answer to the given point, so we will return that if we don't find
+        // a better child option
+        if (node instanceof Parent) {
+            // we iterate through all children (recursively). We don't stop
+            // iteration when we hit the first child that also contains the bounds,
+            // as we know that later nodes have a higher z-ordering, so they
+            // should be picked before the earlier nodes.
+            Node bestMatchingChild = null;
+            for (Node child : ((Parent)node).getChildrenUnmodifiable()) {
+                p = child.sceneToLocal(sceneX, sceneY, true /* rootScene */);
+                if (child.contains(p)) {
+                    bestMatchingChild = child;
+                }
+            }
+
+            if (bestMatchingChild != null) {
+                return pick(bestMatchingChild, sceneX, sceneY);
+            }
+        }
+
+        return node;
     }
 
     // RT-19857 : Keeping menu in the Mac menu bar when there is no more stage
@@ -208,14 +220,6 @@
 //        return loader.getParseTrace();
 //    }
 
-    public static void setPlatformEventHandler(EventHandler eventHandler) {
-        Application.GetApplication().setEventHandler(eventHandler);
-    }
-
-    public static EventHandler getPlatformEventHandler() {
-        return Application.GetApplication().getEventHandler();
-    }
-
     public static int getGridPaneColumnCount(GridPane gridPane) {
         return gridPane.impl_getColumnCount();
     }
@@ -245,10 +249,6 @@
         }
     }
 
-    public static JavaFXBuilderFactory newJavaFXBuilderFactory(ClassLoader classLoader) {
-        return new JavaFXBuilderFactory(classLoader);
-    }
-    
     // Deprecated as of FX 8 u20, and replaced by new method getTreeItemLevel:
     // using it would break ability to compile over JDK 8 GA, not an option for now.
     public static int getNodeLevel(TreeItem<?> item) {
--- old/apps/toys/Hello/src/main/java/hello/HelloButton.java	2015-09-03 14:45:34.864511700 -0700
+++ new/apps/toys/Hello/src/main/java/hello/HelloButton.java	2015-09-03 14:45:34.275478000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -30,7 +30,7 @@
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
-import javafx.scene.input.KeyEvent;
+
 import javafx.stage.Stage;
 
 public class HelloButton extends Application {
@@ -51,7 +51,54 @@
 
         button1.setOnAction(e -> System.out.println("Event: " + e));
 
-        button1.addEventHandler(KeyEvent.KEY_RELEASED, e -> System.out.println("Event: " + e));
+//        // add new mappings
+//        // The J key should fire the button
+//        button1.getInputMap().getMappings().add(new KeyMapping(J, e -> button1.fire()));
+//
+//        // The SPACE key should no longer fire the button (and instead just print text to console)
+//        button1.getInputMap().getMappings().add(new KeyMapping(SPACE, e -> {
+//            System.out.println("This should replace the default action event!");
+//        }));
+//
+//        // The degenerate case where we accept all input - a null KeyCombination matches anything
+//        // and results in firing the button
+//        button1.getInputMap().getMappings().add(new KeyMapping(new KeyBinding(KEY_PRESSED), e -> {
+//            System.out.println("catch-all mapping caught event: " + e);
+//            button1.fire();
+//        }));
+//
+//
+//        // test one: lookup the J mapping and disable it
+//        button1.getInputMap().lookupMapping(new KeyBinding(J)).ifPresent(mapping -> {
+//            System.out.println("disabling J key mapping");
+//            mapping.setDisabled(true);
+//        });
+//
+//        // test two: the degenerate case - we need to iterate through the mappings
+//        // to find the null keyCombination, so that we may install an interceptor
+//        // to block the tab key. This means all keys except tab will work.
+////        button1.getInputMap().lookupMapping(new KeyBinding(KEY_TYPED)).ifPresent(mapping -> {
+////            System.out.println("adding interceptor for Tab key mapping");
+////            mapping.getInterceptors().add(event -> {
+////                if (! (event instanceof KeyEvent)) return true;
+////                return KeyCode.TAB != ((KeyEvent)event).getCode();
+////            });
+////        });
+////        button1.getInputMap().getInterceptors().add(event -> {
+////            if (! (event instanceof KeyEvent)) return true;
+////            return KeyCode.X != ((KeyEvent)event).getCode();
+////        });
+//
+//        button1.getInputMap().getInterceptors().add(new KeyMappingInterceptor(new KeyBinding(SPACE)));
+//
+//        // test three: remove a mapping
+//        button1.getInputMap().lookupMapping(new KeyBinding(J)).ifPresent(mapping -> {
+//            System.out.println("removing J key mapping");
+//            button1.getInputMap().getMappings().remove(mapping);
+//        });
+//
+//        scene.getRoot().addEventHandler(KeyEvent.ANY, e -> System.out.println("e = " + e));
+
 
         ((Group)scene.getRoot()).getChildren().add(button1);
 
@@ -60,12 +107,12 @@
         button2.setLayoutX(25);
         button2.layoutYProperty().bind(button1.heightProperty().add(button1.layoutYProperty()));
         ((Group)scene.getRoot()).getChildren().add(button2);
-
-        Button button3 = new Button();
-        button3.setText("Click Me Three");
-        button3.setLayoutX(25);
-        button3.layoutYProperty().bind(button2.heightProperty().add(button2.layoutYProperty()));
-        ((Group)scene.getRoot()).getChildren().add(button3);
+//
+//        Button button3 = new Button();
+//        button3.setText("Click Me Three");
+//        button3.setLayoutX(25);
+//        button3.layoutYProperty().bind(button2.heightProperty().add(button2.layoutYProperty()));
+//        ((Group)scene.getRoot()).getChildren().add(button3);
 
         stage.setScene(scene);
         stage.show();
--- old/apps/toys/Hello/src/main/java/hello/HelloHighContrast.java	2015-09-03 14:45:42.622955400 -0700
+++ new/apps/toys/Hello/src/main/java/hello/HelloHighContrast.java	2015-09-03 14:45:42.065923600 -0700
@@ -25,7 +25,6 @@
 
 package hello;
 
-import com.sun.javafx.css.StyleManager;
 import javafx.application.Application;
 import javafx.geometry.Insets;
 import javafx.scene.Scene;
@@ -34,10 +33,10 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
-public class HelloHighContrast extends Application {
+import com.sun.javafx.application.PlatformImpl;
+import com.sun.javafx.css.StyleManager;
 
-    private static final String MODENA_PATH = "com/sun/javafx/scene/control/skin/modena/";
-    private String lastStyleUsed = null;
+public class HelloHighContrast extends Application {
 
     public static void main(String[] args) {
         Application.launch(args);
@@ -46,18 +45,13 @@
     @Override public void start(Stage stage) {
         final ToggleGroup group = new ToggleGroup();
         group.selectedToggleProperty().addListener(ov -> {
-            // remove old style
-            if (lastStyleUsed != null) {
-                StyleManager.getInstance().removeUserAgentStylesheet(MODENA_PATH + lastStyleUsed);
-                lastStyleUsed = null;
-            }
-
-            // install new style
             String userData = (String) (group.getSelectedToggle() != null ? group.getSelectedToggle().getUserData() : null);
             if (userData != null) {
-                lastStyleUsed = userData;
-                StyleManager.getInstance().addUserAgentStylesheet(MODENA_PATH + userData);
+                System.setProperty("com.sun.javafx.highContrastTheme", userData);
+            } else {
+                System.clearProperty("com.sun.javafx.highContrastTheme");
             }
+            PlatformImpl.setAccessibilityTheme(null); // Reads the system property
         });
         
         ToggleButton disableHighContrast = new ToggleButton("Disable High Contrast");
@@ -68,17 +62,17 @@
 
         ToggleButton whiteOnBlackBtn = new ToggleButton("White on black");
         whiteOnBlackBtn.setMaxWidth(Double.MAX_VALUE);
-        whiteOnBlackBtn.setUserData("whiteOnBlack.css");
+        whiteOnBlackBtn.setUserData("WHITEONBLACK");
         whiteOnBlackBtn.setToggleGroup(group);
 
         ToggleButton blackOnWhiteBtn = new ToggleButton("Black on white");
         blackOnWhiteBtn.setMaxWidth(Double.MAX_VALUE);
-        blackOnWhiteBtn.setUserData("blackOnWhite.css");
+        blackOnWhiteBtn.setUserData("BLACKONWHITE");
         blackOnWhiteBtn.setToggleGroup(group);
 
         ToggleButton yellowOnBlackBtn = new ToggleButton("Yellow on black");
         yellowOnBlackBtn.setMaxWidth(Double.MAX_VALUE);
-        yellowOnBlackBtn.setUserData("yellowOnBlack.css");
+        yellowOnBlackBtn.setUserData("YELLOWONBLACK");
         yellowOnBlackBtn.setToggleGroup(group);
 
         VBox vbox = new VBox(10, disableHighContrast, whiteOnBlackBtn, blackOnWhiteBtn, yellowOnBlackBtn);
@@ -91,4 +85,4 @@
         stage.setHeight(200);
         stage.show();
     }
-}
\ No newline at end of file
+}
--- old/apps/toys/Hello/src/main/java/hello/HelloToggleButton.java	2015-09-03 14:45:49.691359700 -0700
+++ new/apps/toys/Hello/src/main/java/hello/HelloToggleButton.java	2015-09-03 14:45:49.062323700 -0700
@@ -33,6 +33,7 @@
 import javafx.scene.Scene;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
 
 /**
@@ -45,7 +46,7 @@
     }
 
     @Override public void start(Stage stage) {
-        Scene scene = newScene();
+//        Scene scene = newScene();
         
         final ToggleGroup group = new ToggleGroup();
         group.selectedToggleProperty().addListener(ov -> System.out.println("UserData for selected Toggle: " +
@@ -61,27 +62,41 @@
         button2.setUserData("Button 2");
         button2.setLayoutY(40);
         button2.setToggleGroup(group);
-        
 
-        ObservableList<Node> content = ((Group)scene.getRoot()).getChildren();
-        content.add(button1);
-        content.add(button2);
+        ToggleButton button3 = new ToggleButton("No, *I* am your father");
+//        button1.setUserData("Button 1");
+        button3.setToggleGroup(group);
+//        button1.setSelected(true);
+
+        ToggleButton button4 = new ToggleButton("Nooooooooo!");
+//        button2.setUserData("Button 2");
+//        button2.setLayoutY(40);
+        button4.setToggleGroup(group);
+
+        VBox vbox = new VBox(10, button1, button2, button3, button4);
+
+        Scene scene = new Scene(vbox);
+//        ObservableList<Node> content = ((Group)scene.getRoot()).getChildren();
+//        content.add(button1);
+//        content.add(button2);
+//        content.add(button3);
+//        content.add(button4);
 
         stage.setScene(scene);
         stage.show();
     }
 
-    private static Stage newStage() {
-        Stage stage = new Stage();
-        stage.setTitle("Hello ToggleButton");
-        stage.setWidth(600);
-        stage.setHeight(450);
-        return stage;
-    }
+//    private static Stage newStage() {
+//        Stage stage = new Stage();
+//        stage.setTitle("Hello ToggleButton");
+//        stage.setWidth(600);
+//        stage.setHeight(450);
+//        return stage;
+//    }
     
-    private static Scene newScene() {
-        Scene scene = new Scene(new Group());
-        scene.setFill(GHOSTWHITE);
-        return scene;
-    }
+//    private static Scene newScene() {
+//        Scene scene = new Scene(new Group());
+//        scene.setFill(GHOSTWHITE);
+//        return scene;
+//    }
 }
--- old/apps/toys/Hello/src/main/java/hello/dialog/dialogs/CommandLinksDialog.java	2015-09-03 14:45:56.918773100 -0700
+++ new/apps/toys/Hello/src/main/java/hello/dialog/dialogs/CommandLinksDialog.java	2015-09-03 14:45:56.313738500 -0700
@@ -28,7 +28,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.sun.javafx.scene.control.skin.AccordionSkin;
+import javafx.scene.control.skin.AccordionSkin;
 import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import hello.HelloAccordion;
 import javafx.beans.binding.DoubleBinding;
--- old/apps/toys/Hello/src/main/java/hello/dialog/dialogs/ExceptionDialog.java	2015-09-03 14:46:04.013178900 -0700
+++ new/apps/toys/Hello/src/main/java/hello/dialog/dialogs/ExceptionDialog.java	2015-09-03 14:46:03.465147500 -0700
@@ -27,7 +27,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import com.sun.javafx.scene.control.skin.AccordionSkin;
+import javafx.scene.control.skin.AccordionSkin;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
--- old/apps/toys/Hello/src/main/java/hello/dialog/dialogs/FontSelectorDialog.java	2015-09-03 14:46:11.543609600 -0700
+++ new/apps/toys/Hello/src/main/java/hello/dialog/dialogs/FontSelectorDialog.java	2015-09-03 14:46:10.930574500 -0700
@@ -31,7 +31,7 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import com.sun.javafx.scene.control.skin.AccordionSkin;
+import javafx.scene.control.skin.AccordionSkin;
 
 import javafx.application.Platform;
 import javafx.beans.binding.DoubleBinding;
--- old/apps/toys/Hello/src/main/java/hello/dialog/wizard/Wizard.java	2015-09-03 14:46:18.613013900 -0700
+++ new/apps/toys/Hello/src/main/java/hello/dialog/wizard/Wizard.java	2015-09-03 14:46:18.008979400 -0700
@@ -29,7 +29,7 @@
 import java.util.Optional;
 import java.util.Stack;
 
-import com.sun.javafx.scene.control.skin.AccordionSkin;
+import javafx.scene.control.skin.AccordionSkin;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
--- old/modules/controls/src/android/java/com/sun/javafx/scene/control/skin/TextAreaSkinAndroid.java	2015-09-03 14:46:25.986435700 -0700
+++ new/modules/controls/src/android/java/com/sun/javafx/scene/control/skin/TextAreaSkinAndroid.java	2015-09-03 14:46:25.411402800 -0700
@@ -28,6 +28,7 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.TextArea;
+import javafx.scene.control.skin.TextAreaSkin;
 
 public class TextAreaSkinAndroid extends TextAreaSkin {
 
--- old/modules/controls/src/android/java/com/sun/javafx/scene/control/skin/TextFieldSkinAndroid.java	2015-09-03 14:46:33.131844400 -0700
+++ new/modules/controls/src/android/java/com/sun/javafx/scene/control/skin/TextFieldSkinAndroid.java	2015-09-03 14:46:32.498808200 -0700
@@ -30,6 +30,7 @@
 import javafx.scene.control.TextField;
 
 import com.sun.javafx.scene.control.behavior.TextFieldBehavior;
+import javafx.scene.control.skin.TextFieldSkin;
 
 public class TextFieldSkinAndroid extends TextFieldSkin {
 
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/AccordionBehavior.java	2015-09-03 14:46:41.004294600 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/AccordionBehavior.java	2015-09-03 14:46:40.492265400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -30,23 +30,51 @@
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.geometry.NodeOrientation;
 import javafx.scene.control.Accordion;
 import javafx.scene.control.FocusModel;
 import javafx.scene.control.TitledPane;
-import javafx.scene.input.KeyCode;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
 
+import static javafx.scene.input.KeyCode.*;
 
 public class AccordionBehavior extends BehaviorBase<Accordion> {
 
+    private final InputMap<Accordion> inputMap;
     private AccordionFocusModel focusModel;
     
     public AccordionBehavior(Accordion accordion) {
-        super(accordion, ACCORDION_BINDINGS);
+        super(accordion);
         focusModel = new AccordionFocusModel(accordion);
+
+        // create a map for accordion-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        inputMap = createInputMap();
+
+        // accordion-specific mappings for key and mouse input
+        addDefaultMapping(inputMap,
+                new InputMap.KeyMapping(UP, e -> pageUp(false)),
+                new InputMap.KeyMapping(DOWN, e -> pageDown(false)),
+                new InputMap.KeyMapping(LEFT, e -> {
+                    if (isRTL(accordion)) pageDown(false);
+                    else pageUp(false);
+                }),
+                new InputMap.KeyMapping(RIGHT, e -> {
+                    if (isRTL(accordion)) pageUp(false);
+                    else pageDown(false);
+                }),
+                new InputMap.KeyMapping(HOME, this::home),
+                new InputMap.KeyMapping(END, this::end),
+                new InputMap.KeyMapping(PAGE_UP, e -> pageUp(true)),
+                new InputMap.KeyMapping(PAGE_DOWN, e -> pageDown(true)),
+                new InputMap.KeyMapping(new KeyBinding(PAGE_UP).ctrl(), this::moveBackward),
+                new InputMap.KeyMapping(new KeyBinding(PAGE_DOWN).ctrl(), this::moveForward),
+                new InputMap.KeyMapping(new KeyBinding(TAB).ctrl(), this::moveForward),
+                new InputMap.KeyMapping(new KeyBinding(TAB).ctrl().shift(), this::moveBackward),
+                new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
     }
 
     @Override public void dispose() {
@@ -54,93 +82,143 @@
         super.dispose();
     }
 
+    @Override public InputMap<Accordion> getInputMap() {
+        return inputMap;
+    }
+
     /***************************************************************************
      *                                                                         *
      * Key event handling                                                      *
      *                                                                         *
      **************************************************************************/
 
-    private static final String HOME = "Home";
-    private static final String END = "End";
-    private static final String PAGE_UP = "Page_Up";
-    private static final String PAGE_DOWN = "Page_Down";
-    private static final String CTRL_PAGE_UP = "Ctrl_Page_Up";
-    private static final String CTRL_PAGE_DOWN = "Ctrl_Page_Down";
-    private static final String CTRL_TAB = "Ctrl_Tab";
-    private static final String CTRL_SHIFT_TAB = "Ctrl_Shift_Tab";
-
-    protected static final List<KeyBinding> ACCORDION_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.UP, "TraverseUp"));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.DOWN, "TraverseDown"));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.LEFT, "TraverseLeft"));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.RIGHT, "TraverseRight"));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.HOME, HOME));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.END, END));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_UP, PAGE_UP));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_DOWN, PAGE_DOWN));
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_UP, CTRL_PAGE_UP).ctrl());
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_DOWN, CTRL_PAGE_DOWN).ctrl());
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.TAB, CTRL_TAB).ctrl());
-        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.TAB, CTRL_SHIFT_TAB).shift().ctrl());
-    }
-
-    @Override protected void callAction(String name) {   
-        Accordion accordion = getControl();
-        boolean rtl = (accordion.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
-
-        if (("TraverseLeft".equals(name) && !rtl) ||
-            ("TraverseRight".equals(name) && rtl) ||
-            "TraverseUp".equals(name) || PAGE_UP.equals(name)) {
-
-            if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
-                focusModel.focusPrevious();
-                int next = focusModel.getFocusedIndex();
-                accordion.getPanes().get(next).requestFocus();
-                if (PAGE_UP.equals(name)) {
-                    accordion.getPanes().get(next).setExpanded(true);
-                }
-            }
-        } else if (("TraverseRight".equals(name) && !rtl) || 
-                   ("TraverseLeft".equals(name) && rtl) ||
-                   "TraverseDown".equals(name) || PAGE_DOWN.equals(name)) {
-
-            if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
-                focusModel.focusNext();
-                int next = focusModel.getFocusedIndex();
-                accordion.getPanes().get(next).requestFocus();
-                if (PAGE_DOWN.equals(name)) {
-                    accordion.getPanes().get(next).setExpanded(true);
-                }
-            }            
-        } else if (CTRL_TAB.equals(name) || CTRL_PAGE_DOWN.equals(name)) {
-            focusModel.focusNext();
-            if (focusModel.getFocusedIndex() != -1) {
-                int next = focusModel.getFocusedIndex();
-                accordion.getPanes().get(next).requestFocus();
-                accordion.getPanes().get(next).setExpanded(true);
-            }
-        } else if (CTRL_SHIFT_TAB.equals(name) || CTRL_PAGE_UP.equals(name)) {
+//    private static final String HOME = "Home";
+//    private static final String END = "End";
+//    private static final String PAGE_UP = "Page_Up";
+//    private static final String PAGE_DOWN = "Page_Down";
+//    private static final String CTRL_PAGE_UP = "Ctrl_Page_Up";
+//    private static final String CTRL_PAGE_DOWN = "Ctrl_Page_Down";
+//    private static final String CTRL_TAB = "Ctrl_Tab";
+//    private static final String CTRL_SHIFT_TAB = "Ctrl_Shift_Tab";
+//
+//    protected static final List<KeyBinding> ACCORDION_BINDINGS = new ArrayList<KeyBinding>();
+//    static {
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.UP, "TraverseUp"));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.DOWN, "TraverseDown"));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.LEFT, "TraverseLeft"));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.RIGHT, "TraverseRight"));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.HOME, HOME));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.END, END));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_UP, PAGE_UP));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_DOWN, PAGE_DOWN));
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_UP, CTRL_PAGE_UP).ctrl());
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.PAGE_DOWN, CTRL_PAGE_DOWN).ctrl());
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.TAB, CTRL_TAB).ctrl());
+//        ACCORDION_BINDINGS.add(new KeyBinding(KeyCode.TAB, CTRL_SHIFT_TAB).shift().ctrl());
+//    }
+
+//    @Override protected void callAction(String name) {
+//        Accordion accordion = getNode();
+//        boolean rtl = (accordion.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
+//
+//        if (("TraverseLeft".equals(name) && !rtl) ||
+//            ("TraverseRight".equals(name) && rtl) ||
+//            "TraverseUp".equals(name) ||
+//                PAGE_UP.equals(name)) {
+//
+//            if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
+//                focusModel.focusPrevious();
+//                int next = focusModel.getFocusedIndex();
+//                accordion.getPanes().get(next).requestFocus();
+//                if (PAGE_UP.equals(name)) {
+//                    accordion.getPanes().get(next).setExpanded(true);
+//                }
+//            }
+//        } else if (("TraverseRight".equals(name) && !rtl) ||
+//                   ("TraverseLeft".equals(name) && rtl) ||
+//                   "TraverseDown".equals(name) ||
+//                PAGE_DOWN.equals(name)) {
+//
+//            if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
+//                focusModel.focusNext();
+//                int next = focusModel.getFocusedIndex();
+//                accordion.getPanes().get(next).requestFocus();
+//                if (PAGE_DOWN.equals(name)) {
+//                    accordion.getPanes().get(next).setExpanded(true);
+//                }
+//            }
+//        } else if (CTRL_TAB.equals(name) || CTRL_PAGE_DOWN.equals(name)) {
+////            moveForward();
+//        } else if (CTRL_SHIFT_TAB.equals(name) || CTRL_PAGE_UP.equals(name)) {
+////            moveBackward();
+//        } else if (HOME.equals(name)) {
+////            home();
+//        } else if (END.equals(name)) {
+////            end();
+//        } else {
+//            super.callAction(name);
+//        }
+//    }
+
+    private void pageUp(boolean doExpand) {
+        Accordion accordion = getNode();
+        if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
             focusModel.focusPrevious();
-            if (focusModel.getFocusedIndex() != -1) {
-                int next = focusModel.getFocusedIndex();            
-                accordion.getPanes().get(next).requestFocus();
+            int next = focusModel.getFocusedIndex();
+            accordion.getPanes().get(next).requestFocus();
+            if (doExpand) {
                 accordion.getPanes().get(next).setExpanded(true);
             }
-        } else if (HOME.equals(name)) {
-            if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
-                TitledPane tp = accordion.getPanes().get(0);
-                tp.requestFocus();
-                tp.setExpanded(!tp.isExpanded());
-            }
-        } else if (END.equals(name)) {
-            if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
-                TitledPane tp = accordion.getPanes().get(accordion.getPanes().size() - 1);
-                tp.requestFocus();
-                tp.setExpanded(!tp.isExpanded());
+        }
+    }
+
+    private void pageDown(boolean doExpand) {
+        Accordion accordion = getNode();
+        if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
+            focusModel.focusNext();
+            int next = focusModel.getFocusedIndex();
+            accordion.getPanes().get(next).requestFocus();
+            if (doExpand) {
+                accordion.getPanes().get(next).setExpanded(true);
             }
-        } else {
-            super.callAction(name);
+        }
+    }
+
+    private void moveBackward(KeyEvent e) {
+        Accordion accordion = getNode();
+        focusModel.focusPrevious();
+        if (focusModel.getFocusedIndex() != -1) {
+            int next = focusModel.getFocusedIndex();
+            accordion.getPanes().get(next).requestFocus();
+            accordion.getPanes().get(next).setExpanded(true);
+        }
+    }
+
+    private void moveForward(KeyEvent e) {
+        Accordion accordion = getNode();
+        focusModel.focusNext();
+        if (focusModel.getFocusedIndex() != -1) {
+            int next = focusModel.getFocusedIndex();
+            accordion.getPanes().get(next).requestFocus();
+            accordion.getPanes().get(next).setExpanded(true);
+        }
+    }
+
+    private void home(KeyEvent e) {
+        Accordion accordion = getNode();
+        if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
+            TitledPane tp = accordion.getPanes().get(0);
+            tp.requestFocus();
+            tp.setExpanded(!tp.isExpanded());
+        }
+    }
+
+    private void end(KeyEvent e) {
+        Accordion accordion = getNode();
+        if (focusModel.getFocusedIndex() != -1 && accordion.getPanes().get(focusModel.getFocusedIndex()).isFocused()) {
+            TitledPane tp = accordion.getPanes().get(accordion.getPanes().size() - 1);
+            tp.requestFocus();
+            tp.setExpanded(!tp.isExpanded());
         }
     }
 
@@ -152,7 +230,7 @@
      * none present
      */
     public void mousePressed(MouseEvent e) {
-        Accordion accordion = getControl();
+        Accordion accordion = getNode();
         if (accordion.getPanes().size() > 0) {
             TitledPane lastTitledPane = accordion.getPanes().get(accordion.getPanes().size() - 1);
             lastTitledPane.requestFocus();
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/BehaviorBase.java	2015-09-03 14:46:48.355715100 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/BehaviorBase.java	2015-09-03 14:46:47.785682500 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -22,387 +22,125 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.sun.javafx.scene.control.behavior;
 
-import javafx.application.ConditionalFeature;
-import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.event.EventHandler;
 import javafx.scene.Node;
-import javafx.scene.control.Control;
-import javafx.scene.input.ContextMenuEvent;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.InputMap.Mapping;
+
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import com.sun.javafx.scene.traversal.Direction;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.LEFT;
-import static javafx.scene.input.KeyCode.RIGHT;
-import static javafx.scene.input.KeyCode.TAB;
-import static javafx.scene.input.KeyCode.UP;
-
-/**
- * A convenient base class from which all our built-in behaviors extend. The
- * main functionality in BehaviorBase revolves around infrastructure for
- * resolving key events into function calls. The differences between platforms
- * can be subtle, and we attempt to build sufficient infrastructure into
- * BehaviorBase to minimize the amount of code and the complexity of code
- * necessary to support multiple platforms sufficiently well.
- *
- * <p>Although BehaviorBase is typically used as a base class, it is not abstract and
- * several skins instantiate an instance of BehaviorBase directly.</p>
- *
- * <p>BehaviorBase also implements the hooks for focus traversal. This
- * implementation is sufficient for most subclasses of BehaviorBase. The
- * following action names are registered in the keyMap for handling focus
- * traversal. Subclasses which need to invoke focus traversal using non-standard
- * key strokes should map key strokes to these action names:</p>
- * <ul>
- *  <li>TraverseUp</li>
- *  <li>TraverseDown</li>
- *  <li>TraverseLeft</li>
- *  <li>TraverseRight</li>
- *  <li>TraverseNext</li>
- *  <li>TraversePrevious</li>
- * </ul>
- *
- * <p>Note that by convention, action names are camel case with the first letter
- * uppercase, matching class naming conventions.</p>
- */
-public class BehaviorBase<C extends Control> {
-    /**
-     * A static final reference to whether the platform we are on supports touch.
-     */
-    protected final static boolean IS_TOUCH_SUPPORTED = Platform.isSupported(ConditionalFeature.INPUT_TOUCH);
-
-    /**
-     * The default key bindings for focus traversal. For many behavior
-     * implementations, you may be able to use this directly. The built in names
-     * for these traversal actions are:
-     * <ul>
-     *  <li>TraverseUp</li>
-     *  <li>TraverseDown</li>
-     *  <li>TraverseLeft</li>
-     *  <li>TraverseRight</li>
-     *  <li>TraverseNext</li>
-     *  <li>TraversePrevious</li>
-     * </ul>
-     */
-    protected static final List<KeyBinding> TRAVERSAL_BINDINGS = new ArrayList<>();
-    static final String TRAVERSE_UP = "TraverseUp";
-    static final String TRAVERSE_DOWN = "TraverseDown";
-    static final String TRAVERSE_LEFT = "TraverseLeft";
-    static final String TRAVERSE_RIGHT = "TraverseRight";
-    static final String TRAVERSE_NEXT = "TraverseNext";
-    static final String TRAVERSE_PREVIOUS = "TraversePrevious";
-
-    static {
-        TRAVERSAL_BINDINGS.add(new KeyBinding(UP, TRAVERSE_UP));
-        TRAVERSAL_BINDINGS.add(new KeyBinding(DOWN, TRAVERSE_DOWN));
-        TRAVERSAL_BINDINGS.add(new KeyBinding(LEFT, TRAVERSE_LEFT));
-        TRAVERSAL_BINDINGS.add(new KeyBinding(RIGHT, TRAVERSE_RIGHT));
-        TRAVERSAL_BINDINGS.add(new KeyBinding(TAB, TRAVERSE_NEXT));
-        TRAVERSAL_BINDINGS.add(new KeyBinding(TAB, TRAVERSE_PREVIOUS).shift());
-
-        TRAVERSAL_BINDINGS.add(new KeyBinding(UP, TRAVERSE_UP).shift().alt().ctrl());
-        TRAVERSAL_BINDINGS.add(new KeyBinding(DOWN, TRAVERSE_DOWN).shift().alt().ctrl());
-        TRAVERSAL_BINDINGS.add(new KeyBinding(LEFT, TRAVERSE_LEFT).shift().alt().ctrl());
-        TRAVERSAL_BINDINGS.add(new KeyBinding(RIGHT, TRAVERSE_RIGHT).shift().alt().ctrl());
-        TRAVERSAL_BINDINGS.add(new KeyBinding(TAB, TRAVERSE_NEXT).shift().alt().ctrl());
-        TRAVERSAL_BINDINGS.add(new KeyBinding(TAB, TRAVERSE_PREVIOUS).alt().ctrl());
-    }
-
-    /**
-     * The Control with which this Behavior is used. This must be specified in
-     * the constructor and must not be null.
-     */
-    private final C control;
-
-    /**
-     * The key bindings for this Behavior.
-     */
-    private final List<KeyBinding> keyBindings;
-
-    /**
-     * Listens to any key events on the Control and responds to them
-     */
-    private final EventHandler<KeyEvent> keyEventListener = e -> {
-        if (!e.isConsumed()) {
-            callActionForEvent(e);
-        }
-    };
+import java.util.function.Consumer;
 
-    /**
-     * Listens to any focus events on the Control and calls protected methods as a result
-     */
-    private final InvalidationListener focusListener = property -> {
-        focusChanged();
-    };
-
-    /**
-     * Create a new BehaviorBase for the given control. The Control must not
-     * be null.
-     *
-     * @param control The control. Must not be null.
-     * @param keyBindings The key bindings that should be used with this behavior.
-     *                    Null is treated as an empty list.
-     */
-    public BehaviorBase(final C control, final List<KeyBinding> keyBindings) {
-        // Don't need to explicitly check for null because Collections.unmodifiableList
-        // will die on null, as will the adding of listeners
-        this.control = control;
-        this.keyBindings = keyBindings == null ? Collections.emptyList()
-                : Collections.unmodifiableList(new ArrayList<>(keyBindings));
-        control.addEventHandler(KeyEvent.ANY, keyEventListener);
-        control.focusedProperty().addListener(focusListener);
-    }
-
-    /**
-     * Called by a Skin when the Skin is disposed. This method
-     * allows a Behavior to implement any logic necessary to clean up itself after
-     * the Behavior is no longer needed. Calling dispose twice has no effect. This
-     * method is intended to be overridden by subclasses, although all subclasses
-     * must call super.dispose() or a potential memory leak will result.
-     */
-    public void dispose() {
-        control.removeEventHandler(KeyEvent.ANY, keyEventListener);
-        control.focusedProperty().removeListener(focusListener);
+public abstract class BehaviorBase<N extends Node> {
+
+    private final N node;
+    private final List<Mapping<?>> installedDefaultMappings;
+    private final List<Runnable> childInputMapDisposalHandlers;
+
+
+    public BehaviorBase(N node) {
+        this.node = node;
+        this.installedDefaultMappings = new ArrayList<>();
+        this.childInputMapDisposalHandlers = new ArrayList<>();
+    }
+
+    public abstract InputMap<N> getInputMap();
+
+    public final N getNode() {
+        return node;
     }
 
-    /***************************************************************************
-     * Implementation of the Behavior "interface"                              *
-     *                                                                         *
-     * One of the specialized duties of the behavior is to react to key        *
-     * events. The behavior breaks the handling of a key event down into a few *
-     * distinct stages. First, the BehaviorBase will analyze the key event and *
-     * find the String name of a matching action to invoke, if any. If an      *
-     * action exists for this event, the name is then fed to                   *
-     * callActionForEvent(name), which will then invoke an actual method on    *
-     * the behavior that is the implementation of that action.                 *
-     *                                                                         *
-     * The reason for returning the intermediate action name as a String is    *
-     * twofold. First, the matching is done by analyzing a set of key bindings *
-     * which are *statically declared* on each behavior class. The fact that   *
-     * they are static means that we cannot refer to an actual instance method *
-     * to invoke (such as with lambda's). It is also important that these are  *
-     * static to reduce the memory footprint of a control (since having        *
-     * per-instance key bindings would add a lot to memory footprint). We      *
-     * could have used something other than String as the intermediate token,  *
-     * however String is useful if we ever want to expose to developers a way  *
-     * to alter the action map from a property file or XML file etc.           *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Gets the control associated with this behavior. Even after the BehaviorBase is
-     * disposed, this reference will be non-null.
-     *
-     * @return The control for this Behavior.
-     */
-    public final C getControl() { return control; }
-
-    /**
-     * Invokes the appropriate action for this key event. This is the main entry point where
-     * key events are passed when they occur. This method is responsible for invoking
-     * matchActionForEvent, callAction, and consuming the event if it was handled by this control.
-     *
-     * @param e The key event. Must not be null.
-     */
-    protected void callActionForEvent(KeyEvent e) {
-        String action = matchActionForEvent(e);
-        if (action != null) {
-            callAction(action);
-            e.consume();
+    public void dispose() {
+        // when we dispose a behavior, we do NOT want to dispose the InputMap,
+        // as that can remove input mappings that were not installed by the
+        // behavior. Instead, we want to only remove mappings that the behavior
+        // itself installed. This can be done by removing all input mappings that
+        // were installed via the 'addDefaultMapping' method.
+
+        // remove default mappings only
+        for (Mapping<?> mapping : installedDefaultMappings) {
+            getInputMap().getMappings().remove(mapping);
+        }
+
+        // Remove all default child mappings
+        for (Runnable r : childInputMapDisposalHandlers) {
+            r.run();
         }
+
+//        InputMap<N> inputMap = getInputMap();
+//        if (inputMap != null) {
+//            inputMap.dispose();
+//        }
     }
 
-    /**
-     * Given a key event, this method will find the matching action name, or null if there
-     * is not one.
-     *
-     * @param e The key event. Must not be null.
-     * @return The name of the action to invoke, or null if there is not one.
-     */
-    protected String matchActionForEvent(final KeyEvent e) {
-        if (e == null) throw new NullPointerException("KeyEvent must not be null");
-        KeyBinding match = null;
-        int specificity = 0;
-        int maxBindings = keyBindings.size();
-        for (int i = 0; i < maxBindings; i++) {
-            KeyBinding binding = keyBindings.get(i);
-            int s = binding.getSpecificity(control, e);
-            if (s > specificity) {
-                specificity = s;
-                match = binding;
-            }
+    protected void addDefaultMapping(List<Mapping<?>> newMapping) {
+        addDefaultMapping(getInputMap(), newMapping.toArray(new Mapping[newMapping.size()]));
+    }
+
+    protected void addDefaultMapping(Mapping<?>... newMapping) {
+        addDefaultMapping(getInputMap(), newMapping);
+    }
+
+    protected void addDefaultMapping(InputMap<N> inputMap, Mapping<?>... newMapping) {
+        // make a copy of the existing mappings, so we only check against those
+        List<Mapping<?>> existingMappings = new ArrayList<>(inputMap.getMappings());
+
+        for (Mapping<?> mapping : newMapping) {
+            // check if a mapping already exists, and if so, do not add this mapping
+            // TODO this is insufficient as we need to check entire InputMap hierarchy
+//            for (Mapping<?> existingMapping : existingMappings) {
+//                if (existingMapping != null && existingMapping.equals(mapping)) {
+//                    return;
+//                }
+//            }
+            if (existingMappings.contains(mapping)) continue;
+
+            inputMap.getMappings().add(mapping);
+            installedDefaultMappings.add(mapping);
         }
-        String action = null;
-        if (match != null) {
-            action = match.getAction();
+    }
+
+    protected <T extends Node> void addDefaultChildMap(InputMap<T> parentInputMap, InputMap<T> newChildInputMap) {
+        parentInputMap.getChildInputMaps().add(newChildInputMap);
+
+        childInputMapDisposalHandlers.add(() -> parentInputMap.getChildInputMaps().remove(newChildInputMap));
+    }
+
+    protected InputMap<N> createInputMap() {
+        // TODO re-enable when InputMap moves back to Node / Control
+//        return node.getInputMap() != null ?
+//                (InputMap<N>)node.getInputMap() :
+//                new InputMap<>(node);
+        return new InputMap<>(node);
+    }
+
+    protected void removeMapping(Object key) {
+        InputMap<?> inputMap = getInputMap();
+        inputMap.lookupMapping(key).ifPresent(mapping -> {
+            inputMap.getMappings().remove(mapping);
+            installedDefaultMappings.remove(mapping);
+        });
+    }
+
+    void rtl(Node node, Runnable rtlMethod, Runnable nonRtlMethod) {
+        switch(node.getEffectiveNodeOrientation()) {
+            case RIGHT_TO_LEFT: rtlMethod.run(); break;
+            default: nonRtlMethod.run(); break;
         }
-        return action;
     }
 
-    /**
-     * Called to invoke the action associated with the given name.
-     *
-     * <p>When a KeyEvent is handled, it is first passed through
-     * callActionForEvent which resolves which "action" should be executed
-     * based on the key event. This action is indicated by name. This name is
-     * then passed to this function which is responsible for invoking the right
-     * function based on the name.</p>
-     */
-    protected void callAction(String name) {
-        switch (name) {
-            case TRAVERSE_UP: traverseUp(); break;
-            case TRAVERSE_DOWN: traverseDown(); break;
-            case TRAVERSE_LEFT: traverseLeft(); break;
-            case TRAVERSE_RIGHT: traverseRight(); break;
-            case TRAVERSE_NEXT: traverseNext(); break;
-            case TRAVERSE_PREVIOUS: traversePrevious(); break;
+    <T> void rtl(Node node, T object, Consumer<T> rtlMethod, Consumer<T> nonRtlMethod) {
+        switch(node.getEffectiveNodeOrientation()) {
+            case RIGHT_TO_LEFT: rtlMethod.accept(object); break;
+            default: nonRtlMethod.accept(object); break;
         }
     }
 
-    /***************************************************************************
-     * Focus Traversal methods                                                 *
-     **************************************************************************/
-
-    /**
-     * Called by any of the BehaviorBase traverse methods to actually effect a
-     * traversal of the focus. The default behavior of this method is to simply
-     * call impl_traverse on the given node, passing the given direction. A
-     * subclass may override this method.
-     *
-     * @param node The node to call impl_traverse on
-     * @param dir The direction to traverse
-     */
-    protected void traverse(final Node node, final Direction dir) {
-        node.impl_traverse(dir);
-    }
-
-    /**
-     * Calls the focus traversal engine and indicates that traversal should
-     * go the next focusTraversable Node above the current one.
-     */
-    public final void traverseUp() {
-        traverse(control, com.sun.javafx.scene.traversal.Direction.UP);
-    }
-
-    /**
-     * Calls the focus traversal engine and indicates that traversal should
-     * go the next focusTraversable Node below the current one.
-     */
-    public final void traverseDown() {
-        traverse(control, com.sun.javafx.scene.traversal.Direction.DOWN);
-    }
-
-    /**
-     * Calls the focus traversal engine and indicates that traversal should
-     * go the next focusTraversable Node left of the current one.
-     */
-    public final void traverseLeft() {
-        traverse(control, com.sun.javafx.scene.traversal.Direction.LEFT);
-    }
-
-    /**
-     * Calls the focus traversal engine and indicates that traversal should
-     * go the next focusTraversable Node right of the current one.
-     */
-    public final void traverseRight() {
-        traverse(control, com.sun.javafx.scene.traversal.Direction.RIGHT);
-    }
-
-    /**
-     * Calls the focus traversal engine and indicates that traversal should
-     * go the next focusTraversable Node in the focus traversal cycle.
-     */
-    public final void traverseNext() {
-        traverse(control, com.sun.javafx.scene.traversal.Direction.NEXT);
-    }
-
-    /**
-     * Calls the focus traversal engine and indicates that traversal should
-     * go the previous focusTraversable Node in the focus traversal cycle.
-     */
-    public final void traversePrevious() {
-        traverse(control, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
-    }
-
-    /***************************************************************************
-     * Event handler methods.                                                  *
-     *                                                                         *
-     * I'm not sure why only mouse events are here. What about drag and        *
-     * drop events for instance? What about touch events? What about the       *
-     * other mouse events? It does seem like these need to be here, because    *
-     * for example mouse interaction logic might differ from platform to       *
-     * platform, and the Behavior is supposed to implement all the user        *
-     * interaction logic (not just key handling). So it seems like             *
-     * BehaviorBase should have methods for handling all forms of input events,*
-     * and not just these four mouse events.                                   *
-     **************************************************************************/
-
-    /**
-     * Called whenever the focus on the control has changed. This method is
-     * intended to be overridden by subclasses that are interested in focus
-     * change events.
-     */
-    protected void focusChanged() { }
-
-    /**
-     * Invoked by a Skin when the body of the control has been pressed by
-     * the mouse. Subclasses should be sure to call super unless they intend
-     * to disable any built-in support.
-     *
-     * @param e the mouse event
-     */
-    public void mousePressed(MouseEvent e) { }
-
-    /**
-     * Invoked by a Skin when the body of the control has been dragged by
-     * the mouse. Subclasses should be sure to call super unless they intend
-     * to disable any built-in support (for example, for tooltips).
-     *
-     * @param e the mouse event
-     */
-    public void mouseDragged(MouseEvent e) { }
-
-    /**
-     * Invoked by a Skin when the body of the control has been released by
-     * the mouse. Subclasses should be sure to call super unless they intend
-     * to disable any built-in support (for example, for tooltips).
-     *
-     * @param e the mouse event
-     */
-    public void mouseReleased(MouseEvent e) { }
-
-    /**
-     * Invoked by a Skin when the body of the control has been entered by
-     * the mouse. Subclasses should be sure to call super unless they intend
-     * to disable any built-in support.
-     *
-     * @param e the mouse event
-     */
-    public void mouseEntered(MouseEvent e) { }
-
-    /**
-     * Invoked by a Skin when the body of the control has been exited by
-     * the mouse. Subclasses should be sure to call super unless they intend
-     * to disable any built-in support.
-     *
-     * @param e the mouse event
-     */
-    public void mouseExited(MouseEvent e) { }
-
-    /**
-     * Invoked by a Skin when the control has had its context menu requested,
-     * most commonly by right-clicking on the control. Subclasses should be sure
-     * to call super unless they intend to disable any built-in support.
-     *
-     * @param e the context menu event
-     */
-    public void contextMenuRequested(ContextMenuEvent e) { }
+    boolean isRTL(Node n) {
+        switch(n.getEffectiveNodeOrientation()) {
+            case RIGHT_TO_LEFT: return true;
+            default: return false;
+        }
+    }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java	2015-09-03 14:46:55.824142300 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java	2015-09-03 14:46:55.252109600 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -22,19 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.sun.javafx.scene.control.behavior;
 
+import javafx.beans.Observable;
 import javafx.scene.control.ButtonBase;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import static javafx.scene.input.KeyCode.SPACE;
-import static javafx.scene.input.KeyCode.TAB;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
-import static javafx.scene.input.KeyEvent.KEY_RELEASED;
 
+import static com.sun.javafx.scene.control.inputmap.InputMap.*;
+import static javafx.scene.input.KeyCode.SPACE;
 
 /**
  * All of the "button" types (CheckBox, RadioButton, ToggleButton, and Button)
@@ -45,6 +43,17 @@
  *
  */
 public class ButtonBehavior<C extends ButtonBase> extends BehaviorBase<C> {
+    private final InputMap<C> buttonInputMap;
+
+    /**
+     * Indicates that a keyboard key has been pressed which represents the
+     * event (this could be space bar for example). As long as keyDown is true,
+     * we are also armed, and will ignore mouse events related to arming.
+     * Note this is made package private solely for the sake of testing.
+     */
+    private boolean keyDown;
+
+
 
     /***************************************************************************
      *                                                                         *
@@ -52,30 +61,69 @@
      *                                                                         *
      **************************************************************************/
 
-    public ButtonBehavior(final C button) {
-        super(button, BUTTON_BINDINGS);
+    public ButtonBehavior(C control) {
+        super(control);
+
+        // create a map for button-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        buttonInputMap = createInputMap();
+
+        // add focus traversal mappings
+        addDefaultMapping(buttonInputMap, FocusTraversalInputMap.getFocusTraversalMappings());
+
+        // then button-specific mappings for key and mouse input
+        addDefaultMapping(buttonInputMap,
+            new KeyMapping(SPACE, KeyEvent.KEY_PRESSED, this::keyPressed),
+            new KeyMapping(SPACE, KeyEvent.KEY_RELEASED, this::keyReleased),
+            new MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed),
+            new MouseMapping(MouseEvent.MOUSE_RELEASED, this::mouseReleased),
+            new MouseMapping(MouseEvent.MOUSE_ENTERED, this::mouseEntered),
+            new MouseMapping(MouseEvent.MOUSE_EXITED, this::mouseExited)
+        );
+
+        // Button also cares about focus
+        control.focusedProperty().addListener(this::focusChanged);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Implementation of BehaviorBase API                                      *
+     *                                                                         *
+     **************************************************************************/
+
+    @Override public InputMap<C> getInputMap() {
+        return buttonInputMap;
     }
 
-    public ButtonBehavior(final C button, final List<KeyBinding> bindings) {
-        super(button, bindings);
+    @Override public void dispose() {
+        super.dispose();
+
+        // TODO
+        getNode().focusedProperty().removeListener(this::focusChanged);
     }
 
+
+
     /***************************************************************************
      *                                                                         *
      * Focus change handling                                                   *
      *                                                                         *
      **************************************************************************/
 
-    @Override protected void focusChanged() {
+    private void focusChanged(Observable o) {
         // If we did have the key down, but are now not focused, then we must
         // disarm the button.
-        final ButtonBase button = getControl();
+        final ButtonBase button = getNode();
         if (keyDown && !button.isFocused()) {
             keyDown = false;
             button.disarm();
         }
     }
 
+
+
     /***************************************************************************
      *                                                                         *
      * Key event handling                                                      *
@@ -83,47 +131,14 @@
      **************************************************************************/
 
     /**
-     * Indicates that a keyboard key has been pressed which represents the
-     * event (this could be space bar for example). As long as keyDown is true,
-     * we are also armed, and will ignore mouse events related to arming.
-     * Note this is made package private solely for the sake of testing.
-     */
-    private boolean keyDown;
-
-    private static final String PRESS_ACTION = "Press";
-    private static final String RELEASE_ACTION = "Release";
-
-    protected static final List<KeyBinding> BUTTON_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-            BUTTON_BINDINGS.add(new KeyBinding(TAB, "TraverseNext"));
-            BUTTON_BINDINGS.add(new KeyBinding(TAB, "TraversePrevious").shift());
-
-            BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, PRESS_ACTION));
-            BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_RELEASED, RELEASE_ACTION));
-    }
-
-    @Override protected void callAction(String name) {
-        if (!getControl().isDisabled()) {
-            if (PRESS_ACTION.equals(name)) {
-                keyPressed();
-            } else if (RELEASE_ACTION.equals(name)) {
-                keyReleased();
-            } else {
-                super.callAction(name);
-            }
-        }
-    }
-
-    /**
      * This function is invoked when an appropriate keystroke occurs which
      * causes this button to be armed if it is not already armed by a mouse
      * press.
      */
-    private void keyPressed() {
-        final ButtonBase button = getControl();
-        if (! button.isPressed() && ! button.isArmed()) {
+    protected void keyPressed(KeyEvent e) {
+        if (! getNode().isPressed() && ! getNode().isArmed()) {
             keyDown = true;
-            button.arm();
+            getNode().arm();
         }
     }
 
@@ -131,17 +146,18 @@
      * Invoked when a valid keystroke release occurs which causes the button
      * to fire if it was armed by a keyPress.
      */
-    private void keyReleased() {
-        final ButtonBase button = getControl();
+    protected void keyReleased(KeyEvent e) {
         if (keyDown) {
             keyDown = false;
-            if (button.isArmed()) {
-                button.disarm();
-                button.fire();
+            if (getNode().isArmed()) {
+                getNode().disarm();
+                getNode().fire();
             }
         }
     }
 
+
+
     /***************************************************************************
      *                                                                         *
      * Mouse event handling                                                    *
@@ -152,12 +168,10 @@
      * Invoked when a mouse press has occurred over the button. In addition to
      * potentially arming the Button, this will transfer focus to the button
      */
-    @Override public void mousePressed(MouseEvent e) {
-        final ButtonBase button = getControl();
-        super.mousePressed(e);
+    protected void mousePressed(MouseEvent e) {
         // if the button is not already focused, then request the focus
-        if (! button.isFocused() && button.isFocusTraversable()) {
-            button.requestFocus();
+        if (! getNode().isFocused() && getNode().isFocusTraversable()) {
+            getNode().requestFocus();
         }
 
         // arm the button if it is a valid mouse event
@@ -166,11 +180,11 @@
         // has a release clickCount of 1. So here I'll check clickCount <= 1,
         // though it should really be == 1 I think.
         boolean valid = (e.getButton() == MouseButton.PRIMARY &&
-            ! (e.isMiddleButtonDown() || e.isSecondaryButtonDown() ||
-             e.isShiftDown() || e.isControlDown() || e.isAltDown() || e.isMetaDown()));
+                ! (e.isMiddleButtonDown() || e.isSecondaryButtonDown() ||
+                        e.isShiftDown() || e.isControlDown() || e.isAltDown() || e.isMetaDown()));
 
-        if (! button.isArmed() && valid) {
-            button.arm();
+        if (! getNode().isArmed() && valid) {
+            getNode().arm();
         }
     }
 
@@ -179,12 +193,11 @@
      * was done in a manner that would fire the button's action. This happens
      * only if the button was armed by a corresponding mouse press.
      */
-    @Override public void mouseReleased(MouseEvent e) {
+    protected void mouseReleased(MouseEvent e) {
         // if armed by a mouse press instead of key press, then fire!
-        final ButtonBase button = getControl();
-        if (! keyDown && button.isArmed()) {
-            button.fire();
-            button.disarm();
+        if (! keyDown && getNode().isArmed()) {
+            getNode().fire();
+            getNode().disarm();
         }
     }
 
@@ -193,12 +206,10 @@
      * by a mouse press and the mouse is still pressed, then this will cause
      * the button to be rearmed.
      */
-    @Override public void mouseEntered(MouseEvent e) {
+    protected void mouseEntered(MouseEvent e) {
         // rearm if necessary
-        final ButtonBase button = getControl();
-        super.mouseEntered(e);
-        if (! keyDown && button.isPressed()) {
-            button.arm();
+        if (! keyDown && getNode().isPressed()) {
+            getNode().arm();
         }
     }
 
@@ -207,12 +218,10 @@
      * a mouse press, then this function will disarm the button upon the mouse
      * exiting it.
      */
-    @Override public void mouseExited(MouseEvent e) {
+    protected void mouseExited(MouseEvent e) {
         // Disarm if necessary
-        final ButtonBase button = getControl();
-        super.mouseExited(e);
-        if (! keyDown && button.isArmed()) {
-            button.disarm();
+        if (! keyDown && getNode().isArmed()) {
+            getNode().disarm();
         }
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/CellBehaviorBase.java	2015-09-03 14:47:03.325571400 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/CellBehaviorBase.java	2015-09-03 14:47:02.642532300 -0700
@@ -31,7 +31,7 @@
 import javafx.scene.control.IndexedCell;
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.SelectionMode;
-import javafx.scene.input.ContextMenuEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 
@@ -101,6 +101,8 @@
      *                                                                         *
      **************************************************************************/
 
+    private final InputMap<T> cellInputMap;
+
     // To support touch devices, we have to slightly modify this behavior, such
     // that selection only happens on mouse release, if only minimal dragging
     // has occurred.
@@ -114,8 +116,21 @@
      *                                                                         *
      **************************************************************************/
 
-    public CellBehaviorBase(T control, List<KeyBinding> bindings) {
-        super(control, bindings);
+    public CellBehaviorBase(T control) {
+        super(control);
+
+        // create a map for cell-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        cellInputMap = createInputMap();
+
+        // TODO add focus traversal mappings (?)
+        // addDefaultMapping(cellInputMap, FocusTraversalInputMap.getFocusTraversalMappings());
+
+        addDefaultMapping(
+            new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed),
+            new InputMap.MouseMapping(MouseEvent.MOUSE_RELEASED, this::mouseReleased),
+            new InputMap.MouseMapping(MouseEvent.MOUSE_DRAGGED, this::mouseDragged)
+        );
     }
 
 
@@ -131,17 +146,23 @@
     }
 
 
+
     /***************************************************************************
      *                                                                         *
      * Public API                                                              *
      *                                                                         *
      **************************************************************************/
 
+    /** {@inheritDoc} */
+    @Override public InputMap<T> getInputMap() {
+        return cellInputMap;
+    }
+
     protected int getIndex() {
-        return getControl() instanceof IndexedCell ? ((IndexedCell<?>)getControl()).getIndex() : -1;
+        return getNode() instanceof IndexedCell ? ((IndexedCell<?>)getNode()).getIndex() : -1;
     }
 
-    @Override public void mousePressed(MouseEvent e) {
+    public void mousePressed(MouseEvent e) {
         if (e.isSynthesized()) {
             latePress = true;
         } else {
@@ -153,7 +174,7 @@
         }
     }
 
-    @Override public void mouseReleased(MouseEvent e) {
+    public void mouseReleased(MouseEvent e) {
         if (latePress) {
             latePress = false;
             doSelect(e.getX(), e.getY(), e.getButton(), e.getClickCount(),
@@ -161,7 +182,7 @@
         }
     }
 
-    @Override public void mouseDragged(MouseEvent e) {
+    public void mouseDragged(MouseEvent e) {
         latePress = false;
     }
 
@@ -176,7 +197,7 @@
     protected void doSelect(final double x, final double y, final MouseButton button,
                             final int clickCount, final boolean shiftDown, final boolean shortcutDown) {
         // we update the cell to point to the new tree node
-        final T cell = getControl();
+        final T cell = getNode();
 
         final Control cellContainer = getCellContainer();
 
@@ -263,12 +284,12 @@
         // handle editing, which only occurs with the primary mouse button
         if (button == MouseButton.PRIMARY) {
             if (clickCount == 1 && isAlreadySelected) {
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount == 1) {
                 // cancel editing
                 edit(null);
-            } else if (clickCount == 2 && getControl().isEditable()) {
-                edit(getControl());
+            } else if (clickCount == 2 && getNode().isEditable()) {
+                edit(getNode());
             }
         }
     }
@@ -311,6 +332,6 @@
     }
 
     protected boolean isSelected() {
-        return getControl().isSelected();
+        return getNode().isSelected();
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ChoiceBoxBehavior.java	2015-09-03 14:47:10.408976500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ChoiceBoxBehavior.java	2015-09-03 14:47:09.706936300 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -27,96 +27,90 @@
 
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.SelectionModel;
+import com.sun.javafx.scene.control.skin.Utils;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import com.sun.javafx.scene.control.skin.Utils;
-import static javafx.scene.input.KeyCode.CANCEL;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.ENTER;
-import static javafx.scene.input.KeyCode.ESCAPE;
-import static javafx.scene.input.KeyCode.SPACE;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
-import static javafx.scene.input.KeyEvent.KEY_RELEASED;
+import static javafx.scene.input.KeyCode.*;
+
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 
 /**
  * ChoiceBoxBehavior - default implementation
- *
- * @profile common
  */
 public class ChoiceBoxBehavior<T> extends BehaviorBase<ChoiceBox<T>> {
-    /**
-     * The key bindings for the ChoiceBox. It seems this should really be the
-     * same as with the ButtonBehavior super class, but it doesn't handle ENTER
-     * events on desktop, whereas this does. It may be a proper analysis of the
-     * interaction logic would allow us to share bindings, but for now, we simply
-     * build it up specially here.
-     */
-    protected static final List<KeyBinding> CHOICE_BUTTON_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        CHOICE_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, "Press"));
-        CHOICE_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_RELEASED, "Release"));
-
-        if (Utils.isTwoLevelFocus()) {
-            CHOICE_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED, "Press"));
-            CHOICE_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_RELEASED, "Release"));
-        }
-
-        CHOICE_BUTTON_BINDINGS.add(new KeyBinding(ESCAPE, KEY_RELEASED, "Cancel"));
-        CHOICE_BUTTON_BINDINGS.add(new KeyBinding(DOWN, KEY_RELEASED, "Down"));
-        CHOICE_BUTTON_BINDINGS.add(new KeyBinding(CANCEL, KEY_RELEASED, "Cancel"));
 
-    }
+    private final InputMap<ChoiceBox<T>> choiceBoxInputMap;
 
     private TwoLevelFocusComboBehavior tlFocus;
 
     /**************************************************************************
      *                          Setup KeyBindings                             *
      *************************************************************************/
-    @Override protected void callAction(String name) {
-        if (name.equals("Cancel")) cancel();
-        else if (name.equals("Press")) keyPressed();
-        else if (name.equals("Release")) keyReleased();
-        else if (name.equals("Down")) showPopup();
-        else super.callAction(name);
-    }
 
     public ChoiceBoxBehavior(ChoiceBox<T> control) {
-        super(control, CHOICE_BUTTON_BINDINGS);
+        super(control);
+
+        // create a map for choiceBox-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        choiceBoxInputMap = createInputMap();
+
+        // choiceBox-specific mappings for key and mouse input
+        addDefaultMapping(choiceBoxInputMap,
+            new KeyMapping(SPACE, KeyEvent.KEY_PRESSED, this::keyPressed),
+            new KeyMapping(SPACE, KeyEvent.KEY_RELEASED, this::keyReleased),
+
+            new KeyMapping(ESCAPE, KeyEvent.KEY_RELEASED, e -> cancel()),
+            new KeyMapping(DOWN, KeyEvent.KEY_RELEASED, e -> showPopup()),
+            new KeyMapping(CANCEL, KeyEvent.KEY_RELEASED, e -> cancel())
+        );
+
+        // add some special two-level focus mappings
+        InputMap<ChoiceBox<T>> twoLevelFocusInputMap = new InputMap<>(control);
+        twoLevelFocusInputMap.setInterceptor(e -> !Utils.isTwoLevelFocus());
+        twoLevelFocusInputMap.getMappings().addAll(
+            new KeyMapping(ENTER, KeyEvent.KEY_PRESSED, this::keyPressed),
+            new KeyMapping(ENTER, KeyEvent.KEY_RELEASED, this::keyReleased)
+        );
+        addDefaultChildMap(choiceBoxInputMap, twoLevelFocusInputMap);
+
         // Only add this if we're on an embedded platform that supports 5-button navigation
         if (Utils.isTwoLevelFocus()) {
             tlFocus = new TwoLevelFocusComboBehavior(control); // needs to be last.
         }
     }
 
+    @Override public InputMap<ChoiceBox<T>> getInputMap() {
+        return choiceBoxInputMap;
+    }
+
     @Override public void dispose() {
         if (tlFocus != null) tlFocus.dispose();
         super.dispose();
     }
 
     public void select(int index) {
-        SelectionModel<T> sm = getControl().getSelectionModel();
+        SelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
         sm.select(index);
     }
 
     public void close() {
-        getControl().hide();
+        getNode().hide();
     }
 
     public void showPopup() {
-        getControl().show();
+        getNode().show();
     }
 
     /**
      * Invoked when a mouse press has occurred over the box. In addition to
      * potentially arming the Button, this will transfer focus to the box
      */
-    @Override public void mousePressed(MouseEvent e) {
-        ChoiceBox<T> choiceButton = getControl();
-        super.mousePressed(e);
+    public void mousePressed(MouseEvent e) {
+        ChoiceBox<T> choiceButton = getNode();
         if (choiceButton.isFocusTraversable()) choiceButton.requestFocus();
     }
 
@@ -125,9 +119,8 @@
      * was done in a manner that would fire the box's action. This happens
      * only if the box was armed by a corresponding mouse press.
      */
-    @Override public void mouseReleased(MouseEvent e) {
-        ChoiceBox<T> choiceButton = getControl();
-        super.mouseReleased(e);
+    public void mouseReleased(MouseEvent e) {
+        ChoiceBox<T> choiceButton = getNode();
         if (choiceButton.isShowing() || !choiceButton.contains(e.getX(), e.getY())) {
             choiceButton.hide(); // hide if already showing 
         }
@@ -141,8 +134,8 @@
      * causes this box to be armed if it is not already armed by a mouse
      * press.
      */
-    private void keyPressed() {
-        ChoiceBox<T> choiceButton = getControl();
+    private void keyPressed(KeyEvent e) {
+        ChoiceBox<T> choiceButton = getNode();
         if (!choiceButton.isShowing()) {
             choiceButton.show();
         }
@@ -152,7 +145,7 @@
      * Invoked when a valid keystroke release occurs which causes the box
      * to fire if it was armed by a keyPress.
      */
-    private void keyReleased() {
+    private void keyReleased(KeyEvent e) {
     }
 
     // no-op
@@ -160,7 +153,7 @@
      * Invoked when "escape" key is released
      */
     public void cancel() {
-        ChoiceBox<T> choiceButton = getControl();
+        ChoiceBox<T> choiceButton = getNode();
         choiceButton.hide();
     }
 
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ColorPickerBehavior.java	2015-09-03 14:47:17.843401700 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ColorPickerBehavior.java	2015-09-03 14:47:17.301370700 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -25,14 +25,8 @@
 
 package com.sun.javafx.scene.control.behavior;
 
-import static javafx.scene.input.KeyCode.*;
-import static javafx.scene.input.KeyEvent.*;
-
-
-import java.util.ArrayList;
-import java.util.List;
 import javafx.scene.control.ColorPicker;
-import com.sun.javafx.scene.control.skin.ColorPickerSkin;
+import javafx.scene.control.PopupControl;
 
 import javafx.scene.paint.Color;
 
@@ -48,59 +42,28 @@
      * 
      */
     public ColorPickerBehavior(final ColorPicker colorPicker) {
-        super(colorPicker, COLOR_PICKER_BINDINGS);
+        super(colorPicker);
     }
 
-    /***************************************************************************
-     *                                                                         *
-     * Key event handling                                                      *
-     *                                                                         *
-     **************************************************************************/
-    
-    /**
-     * Opens the Color Picker Palette.
-     */
-    protected static final String OPEN_ACTION = "Open";
-
-    /**
-     * Closes the Color Picker Palette.
-     */
-    protected static final String CLOSE_ACTION = "Close";
-    
-
-    protected static final List<KeyBinding> COLOR_PICKER_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-//        COLOR_PICKER_BINDINGS.addAll(COMBO_BOX_BASE_BINDINGS);
-        COLOR_PICKER_BINDINGS.add(new KeyBinding(ESCAPE, KEY_PRESSED, CLOSE_ACTION));
-        COLOR_PICKER_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, OPEN_ACTION));
-        COLOR_PICKER_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED, OPEN_ACTION));
-        
-    }
-
-    @Override protected void callAction(String name) {
-        if (OPEN_ACTION.equals(name)) {
-            show();
-        } else if(CLOSE_ACTION.equals(name)) {
-            hide();
-        }
-        else super.callAction(name);
-    }
-    
      /**************************************************************************
      *                                                                        *
      * Mouse Events                                                           *
      *                                                                        *
      *************************************************************************/
 
-    @Override public void onAutoHide() {
+    @Override public void onAutoHide(PopupControl popup) {
         // when we click on some non  interactive part of the 
         // Color Palette - we do not want to hide.
-        ColorPicker colorPicker = (ColorPicker)getControl();
-        ColorPickerSkin cpSkin = (ColorPickerSkin)colorPicker.getSkin();
-        cpSkin.syncWithAutoUpdate();
+        if (!popup.isShowing() && getNode().isShowing()) {
+            // Popup was dismissed. Maybe user clicked outside or typed ESCAPE.
+            // Make sure DatePicker button is in sync.
+            getNode().hide();
+        }
         // if the ColorPicker is no longer showing, then invoke the super method
         // to keep its show/hide state in sync.
-        if (!colorPicker.isShowing()) super.onAutoHide();
+        if (!getNode().isShowing()) {
+            super.onAutoHide(popup);
+        }
     }
 
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ComboBoxBaseBehavior.java	2015-09-03 14:47:25.190822000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ComboBoxBaseBehavior.java	2015-09-03 14:47:24.589787600 -0700
@@ -25,29 +25,29 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import javafx.beans.Observable;
+import javafx.event.EventHandler;
 import javafx.event.EventTarget;
 import javafx.scene.Node;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ComboBoxBase;
 import javafx.scene.control.DatePicker;
+import javafx.scene.control.PopupControl;
 import javafx.scene.control.TextField;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.ENTER;
-import static javafx.scene.input.KeyCode.ESCAPE;
-import static javafx.scene.input.KeyCode.F4;
-import static javafx.scene.input.KeyCode.F10;
-import static javafx.scene.input.KeyCode.SPACE;
-import static javafx.scene.input.KeyCode.UP;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
-import static javafx.scene.input.KeyEvent.KEY_RELEASED;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.scene.input.*;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+
+import static javafx.scene.input.KeyCode.*;
+import static javafx.scene.input.KeyEvent.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import static com.sun.javafx.scene.control.inputmap.InputMap.MouseMapping;
 
 public class ComboBoxBaseBehavior<T> extends BehaviorBase<ComboBoxBase<T>> {
 
+    private final InputMap<ComboBoxBase<T>> inputMap;
+
     /***************************************************************************
      *                                                                         *
      * Constructors                                                            *
@@ -57,38 +57,74 @@
     private TwoLevelFocusComboBehavior tlFocus;
     
     /**
-     * Used to keep track of the most recent key event. This is used when
-     * the event needs to be forwarded to the parent for bubbling up.
-     */
-    private KeyEvent lastEvent;
-
-    /**
      * 
      */
-    public ComboBoxBaseBehavior(final ComboBoxBase<T> comboBox, final List<KeyBinding> bindings) {
-        super(comboBox, bindings);
+    public ComboBoxBaseBehavior(final ComboBoxBase<T> comboBox) {
+        super(comboBox);
+
+        // create a map for comboBox-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        inputMap = createInputMap();
+
+        final EventHandler<KeyEvent> togglePopup = e -> {
+            // If popup is shown, KeyEvent causes popup to close
+            showPopupOnMouseRelease = true;
+
+            if (getNode().isShowing()) hide();
+            else show();
+        };
+
+        // comboBox-specific mappings for key and mouse input
+        addDefaultMapping(inputMap,
+            new KeyMapping(F4, KEY_RELEASED, togglePopup),
+            new KeyMapping(new KeyBinding(UP).alt(), togglePopup),
+            new KeyMapping(new KeyBinding(DOWN).alt(), togglePopup),
+
+            new KeyMapping(SPACE, KEY_PRESSED, this::keyPressed),
+            new KeyMapping(SPACE, KEY_RELEASED, this::keyReleased),
+
+            new KeyMapping(ENTER, KEY_PRESSED, this::keyPressed),
+            new KeyMapping(ENTER, KEY_RELEASED, this::keyReleased),
+
+            // The following keys are forwarded to the parent container
+            new KeyMapping(ESCAPE, KEY_PRESSED, this::cancelEdit),
+            new KeyMapping(F10,    KEY_PRESSED, this::forwardToParent),
+
+            new MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed),
+            new MouseMapping(MouseEvent.MOUSE_RELEASED, this::mouseReleased),
+            new MouseMapping(MouseEvent.MOUSE_ENTERED, this::mouseEntered),
+            new MouseMapping(MouseEvent.MOUSE_EXITED, this::mouseExited)
+        );
+
+        // ComboBoxBase also cares about focus
+        comboBox.focusedProperty().addListener(this::focusChanged);
 
         // Only add this if we're on an embedded platform that supports 5-button navigation
-        if (com.sun.javafx.scene.control.skin.Utils.isTwoLevelFocus()) {
+        if (Utils.isTwoLevelFocus()) {
             tlFocus = new TwoLevelFocusComboBehavior(comboBox); // needs to be last.
         }
     }
 
     @Override public void dispose() {
         if (tlFocus != null) tlFocus.dispose();
+        getNode().focusedProperty().removeListener(this::focusChanged);
         super.dispose();
     }
 
+    @Override public InputMap<ComboBoxBase<T>> getInputMap() {
+        return inputMap;
+    }
+
     /***************************************************************************
      *                                                                         *
      * Focus change handling                                                   *
      *                                                                         *
      **************************************************************************/
 
-    @Override protected void focusChanged() {
+    protected void focusChanged(Observable o) {
         // If we did have the key down, but are now not focused, then we must
         // disarm the box.
-        final ComboBoxBase<T> box = getControl();
+        final ComboBoxBase<T> box = getNode();
         if (keyDown && !box.isFocused()) {
             keyDown = false;
             box.disarm();
@@ -109,68 +145,25 @@
      */
     private boolean keyDown;
 
-    private static final String PRESS_ACTION = "Press";
-    private static final String RELEASE_ACTION = "Release";
-
-    protected static final List<KeyBinding> COMBO_BOX_BASE_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(F4, KEY_RELEASED, "togglePopup"));
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(UP, "togglePopup").alt());
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(DOWN, "togglePopup").alt());
-
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, PRESS_ACTION));
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(SPACE, KEY_RELEASED, RELEASE_ACTION));
-
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED, PRESS_ACTION));
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(ENTER, KEY_RELEASED, RELEASE_ACTION));
-
-        // The following keys are forwarded to the parent container
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(ESCAPE, "Cancel"));
-        COMBO_BOX_BASE_BINDINGS.add(new KeyBinding(F10, "ToParent"));
-    }
-
-    @Override protected void callActionForEvent(KeyEvent e) {
-        // If popup is shown, KeyEvent causes popup to close
-        lastEvent = e;
-        showPopupOnMouseRelease = true;
-        super.callActionForEvent(e);
-    }
-
-    @Override protected void callAction(String name) {
-        if (PRESS_ACTION.equals(name)) {
-            keyPressed();
-        } else if (RELEASE_ACTION.equals(name)) {
-            keyReleased();
-        } else if ("showPopup".equals(name)) {
-            show();
-        } else if ("togglePopup".equals(name)) {
-            if (getControl().isShowing()) hide();
-            else show();
-        } else if ("Cancel".equals(name)) {
-            cancelEdit(lastEvent);
-        } else if ("ToParent".equals(name)) {
-            forwardToParent(lastEvent);
-        } else {
-            super.callAction(name);
-        }
-    }
-
     /**
      * This function is invoked when an appropriate keystroke occurs which
      * causes this button to be armed if it is not already armed by a mouse
      * press.
      */
-    private void keyPressed() {
-        if (com.sun.javafx.scene.control.skin.Utils.isTwoLevelFocus()) {
+    private void keyPressed(KeyEvent e) {
+        // If popup is shown, KeyEvent causes popup to close
+        showPopupOnMouseRelease = true;
+
+        if (Utils.isTwoLevelFocus()) {
             show();
             if (tlFocus != null) {
                 tlFocus.setExternalFocus(false);
             }
         }
         else {
-            if (! getControl().isPressed() && ! getControl().isArmed()) {
+            if (! getNode().isPressed() && ! getNode().isArmed()) {
                 keyDown = true;
-                getControl().arm();
+                getNode().arm();
             }
         }
     }
@@ -179,29 +172,32 @@
      * Invoked when a valid keystroke release occurs which causes the button
      * to fire if it was armed by a keyPress.
      */
-    private void keyReleased() {
-        if (!com.sun.javafx.scene.control.skin.Utils.isTwoLevelFocus()) {
+    private void keyReleased(KeyEvent e) {
+        // If popup is shown, KeyEvent causes popup to close
+        showPopupOnMouseRelease = true;
+
+        if (!Utils.isTwoLevelFocus()) {
             if (keyDown) {
                 keyDown = false;
-                if (getControl().isArmed()) {
-                    getControl().disarm();
+                if (getNode().isArmed()) {
+                    getNode().disarm();
                 }
             }
         }
     }
     
-    protected void forwardToParent(KeyEvent event) {
-        if (getControl().getParent() != null) {
-            getControl().getParent().fireEvent(event);
+    private void forwardToParent(KeyEvent event) {
+        if (getNode().getParent() != null) {
+            getNode().getParent().fireEvent(event);
         }
     }
 
-    protected void cancelEdit(KeyEvent event) {
+    private void cancelEdit(KeyEvent event) {
         /**
          * This can be cleaned up if the editor property is moved up
          * to ComboBoxBase.
          */
-        ComboBoxBase comboBoxBase = getControl();
+        ComboBoxBase comboBoxBase = getNode();
         TextField textField = null;
         if (comboBoxBase instanceof DatePicker) {
             textField = ((DatePicker)comboBoxBase).getEditor();
@@ -215,21 +211,19 @@
             forwardToParent(event);
         }
     }
-
+    
+    
     /**************************************************************************
      *                                                                        *
      * Mouse Events                                                           *
      *                                                                        *
      *************************************************************************/
 
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
+    public void mousePressed(MouseEvent e) {
         arm(e);
     }
 
-    @Override public void mouseReleased(MouseEvent e) {
-        super.mouseReleased(e);
-
+    public void mouseReleased(MouseEvent e) {
         disarm();
 
         // The showPopupOnMouseRelease boolean was added to resolve
@@ -245,10 +239,8 @@
         }
     }
 
-    @Override public void mouseEntered(MouseEvent e) {
-        super.mouseEntered(e);
-
-        if (!getControl().isEditable()) {
+    public void mouseEntered(MouseEvent e) {
+        if (!getNode().isEditable()) {
             mouseInsideButton = true;
         } else {
             // This is strongly tied to ComboBoxBaseSkin
@@ -258,44 +250,43 @@
         arm();
     }
 
-    @Override public void mouseExited(MouseEvent e) {
-        super.mouseExited(e);
+    public void mouseExited(MouseEvent e) {
         mouseInsideButton = false;
         disarm();
     }
     
-    private void getFocus() {
-        if (! getControl().isFocused() && getControl().isFocusTraversable()) {
-            getControl().requestFocus();
-        }
-    }
+//    private void getFocus() {
+//        if (! getNode().isFocused() && getNode().isFocusTraversable()) {
+//            getNode().requestFocus();
+//        }
+//    }
     
     private void arm(MouseEvent e) {
         boolean valid = (e.getButton() == MouseButton.PRIMARY &&
             ! (e.isMiddleButtonDown() || e.isSecondaryButtonDown() ||
              e.isShiftDown() || e.isControlDown() || e.isAltDown() || e.isMetaDown()));
         
-        if (! getControl().isArmed() && valid) {
-            getControl().arm();
+        if (! getNode().isArmed() && valid) {
+            getNode().arm();
         }
     }
     
     public void show() {
-        if (! getControl().isShowing()) {
-            getControl().requestFocus();
-            getControl().show();
+        if (! getNode().isShowing()) {
+            getNode().requestFocus();
+            getNode().show();
         }
     }
     
     public void hide() {
-        if (getControl().isShowing()) {
-            getControl().hide();
+        if (getNode().isShowing()) {
+            getNode().hide();
         }
     }
 
     private boolean showPopupOnMouseRelease = true;
     private boolean mouseInsideButton = false;
-    public void onAutoHide() {
+    public void onAutoHide(PopupControl popup) {
         // RT-18151: if the ComboBox button was clicked, and it was this that forced the
         // popup to disappear, we don't want the popup to immediately reappear.
         // If the mouse was not within the comboBox button at the time of the auto-hide occurring,
@@ -306,14 +297,14 @@
     }
 
     public void arm() {
-        if (getControl().isPressed()) {
-            getControl().arm();
+        if (getNode().isPressed()) {
+            getNode().arm();
         }
     }
     
     public void disarm() {
-        if (! keyDown && getControl().isArmed()) {
-            getControl().disarm();
+        if (! keyDown && getNode().isArmed()) {
+            getNode().disarm();
         }
     }
 
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ComboBoxListViewBehavior.java	2015-09-03 14:47:32.636247800 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ComboBoxListViewBehavior.java	2015-09-03 14:47:32.060214900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -26,12 +26,12 @@
 package com.sun.javafx.scene.control.behavior;
 
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.ComboBoxBase;
 import javafx.scene.control.SelectionModel;
-import java.util.ArrayList;
-import java.util.List;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+
 import static javafx.scene.input.KeyCode.DOWN;
 import static javafx.scene.input.KeyCode.UP;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
 
 public class ComboBoxListViewBehavior<T> extends ComboBoxBaseBehavior<T> {
 
@@ -45,7 +45,15 @@
      * 
      */
     public ComboBoxListViewBehavior(final ComboBox<T> comboBox) {
-        super(comboBox, COMBO_BOX_BINDINGS);
+        super(comboBox);
+
+        // Add these bindings as a child input map, so they take precedence
+        InputMap<ComboBoxBase<T>> comboBoxListViewInputMap = new InputMap<>(comboBox);
+        comboBoxListViewInputMap.getMappings().addAll(
+            new InputMap.KeyMapping(UP, e -> selectPrevious()),
+            new InputMap.KeyMapping(DOWN, e -> selectNext())
+        );
+        addDefaultChildMap(getInputMap(), comboBoxListViewInputMap);
     }
 
     /***************************************************************************
@@ -54,25 +62,8 @@
      *                                                                         *
      **************************************************************************/
 
-    protected static final List<KeyBinding> COMBO_BOX_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        COMBO_BOX_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "selectPrevious"));
-        COMBO_BOX_BINDINGS.add(new KeyBinding(DOWN, "selectNext"));
-        COMBO_BOX_BINDINGS.addAll(COMBO_BOX_BASE_BINDINGS);
-    }
-
-    @Override protected void callAction(String name) {
-        if ("selectPrevious".equals(name)) {
-            selectPrevious();
-        } else if ("selectNext".equals(name)) {
-            selectNext();
-        } else {
-            super.callAction(name);
-        }
-    }
-    
     private ComboBox<T> getComboBox() {
-        return (ComboBox<T>) getControl();
+        return (ComboBox<T>) getNode();
     }
 
     private void selectPrevious() {
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DateCellBehavior.java	2015-09-03 14:47:40.528699200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DateCellBehavior.java	2015-09-03 14:47:39.909663800 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -25,15 +25,16 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.traversal.Direction;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Node;
 import javafx.scene.control.DateCell;
-import java.util.ArrayList;
-import java.util.List;
-import com.sun.javafx.scene.control.skin.DatePickerContent;
-import com.sun.javafx.scene.traversal.Direction;
-import static java.time.temporal.ChronoUnit.DAYS;
-import static java.time.temporal.ChronoUnit.WEEKS;
+
+import com.sun.javafx.scene.control.DatePickerContent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+
+import java.time.temporal.ChronoUnit;
+
 import static javafx.scene.input.KeyCode.DOWN;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.LEFT;
@@ -49,61 +50,43 @@
  */
 public class DateCellBehavior extends BehaviorBase<DateCell> {
 
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    protected static final List<KeyBinding> DATE_CELL_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        DATE_CELL_BINDINGS.add(new KeyBinding(UP, "TraverseUp"));
-        DATE_CELL_BINDINGS.add(new KeyBinding(DOWN, "TraverseDown"));
-        DATE_CELL_BINDINGS.add(new KeyBinding(LEFT, "TraverseLeft"));
-        DATE_CELL_BINDINGS.add(new KeyBinding(RIGHT, "TraverseRight"));
-        DATE_CELL_BINDINGS.add(new KeyBinding(ENTER, KEY_RELEASED, "SelectDate"));
-        DATE_CELL_BINDINGS.add(new KeyBinding(SPACE, KEY_RELEASED, "SelectDate"));
-    }
-
+    private final InputMap<DateCell> inputMap;
 
     public DateCellBehavior(DateCell dateCell) {
-        super(dateCell, DATE_CELL_BINDINGS);
+        super(dateCell);
+
+        inputMap = createInputMap();
+        addDefaultMapping(inputMap,
+            new InputMap.KeyMapping(UP,    e -> traverse(dateCell, Direction.UP)),
+            new InputMap.KeyMapping(DOWN,  e -> traverse(dateCell, Direction.DOWN)),
+            new InputMap.KeyMapping(LEFT,  e -> traverse(dateCell, Direction.LEFT)),
+            new InputMap.KeyMapping(RIGHT, e -> traverse(dateCell, Direction.RIGHT)),
+            new InputMap.KeyMapping(ENTER, KEY_RELEASED, e -> selectDate()),
+            new InputMap.KeyMapping(SPACE, KEY_RELEASED, e -> selectDate())
+        );
     }
 
-    @Override public void callAction(String name) {
-        DateCell cell = getControl();
+    @Override public InputMap<DateCell> getInputMap() {
+        return inputMap;
+    }
+
+    private void selectDate() {
+        DateCell cell = getNode();
         DatePickerContent dpc = findDatePickerContent(cell);
+        dpc.selectDayCell(cell);
+    }
 
+    public void traverse(final DateCell cell, final Direction dir) {
+        boolean rtl = (cell.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
+        DatePickerContent dpc = findDatePickerContent(cell);
         if (dpc != null) {
-            switch (name) {
-              case "SelectDate":    dpc.selectDayCell(cell); break;
-              default: super.callAction(name);
+            switch (dir) {
+                case UP:    dpc.goToDayCell(cell, -1, ChronoUnit.WEEKS, true); break;
+                case DOWN:  dpc.goToDayCell(cell, +1, ChronoUnit.WEEKS, true); break;
+                case LEFT:  dpc.goToDayCell(cell, rtl ? +1 : -1, ChronoUnit.DAYS,  true); break;
+                case RIGHT: dpc.goToDayCell(cell, rtl ? -1 : +1, ChronoUnit.DAYS,  true); break;
             }
-            return;
-        }
-        super.callAction(name);
-    }
-
-    @Override public void traverse(final Node node, final Direction dir) {
-        boolean rtl = (node.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
-
-        switch (dir) {
-          case UP:
-          case DOWN:
-          case LEFT:
-          case RIGHT:
-              if (node instanceof DateCell) {
-                  DatePickerContent dpc = findDatePickerContent(node);
-                  if (dpc != null) {
-                      DateCell cell = (DateCell)node;
-                      switch (dir) {
-                        case UP:    dpc.goToDayCell(cell, -1, WEEKS, true); break;
-                        case DOWN:  dpc.goToDayCell(cell, +1, WEEKS, true); break;
-                        case LEFT:  dpc.goToDayCell(cell, rtl ? +1 : -1, DAYS,  true); break;
-                        case RIGHT: dpc.goToDayCell(cell, rtl ? -1 : +1, DAYS,  true); break;
-                      }
-                      return;
-                  }
-              }
         }
-        super.traverse(node, dir);
     }
 
     protected DatePickerContent findDatePickerContent(Node node) {
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DatePickerBehavior.java	2015-09-03 14:47:48.441151800 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/DatePickerBehavior.java	2015-09-03 14:47:47.914121700 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -26,14 +26,9 @@
 package com.sun.javafx.scene.control.behavior;
 
 import javafx.scene.control.DatePicker;
+import javafx.scene.control.PopupControl;
+
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import com.sun.javafx.scene.control.skin.DatePickerSkin;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.F4;
-import static javafx.scene.input.KeyCode.UP;
-import static javafx.scene.input.KeyEvent.KEY_RELEASED;
 
 
 public class DatePickerBehavior extends ComboBoxBaseBehavior<LocalDate> {
@@ -48,7 +43,7 @@
      *
      */
     public DatePickerBehavior(final DatePicker datePicker) {
-        super(datePicker, DATE_PICKER_BINDINGS);
+        super(datePicker);
     }
 
     /***************************************************************************
@@ -57,20 +52,20 @@
      *                                                                         *
      **************************************************************************/
 
-    protected static final List<KeyBinding> DATE_PICKER_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        DATE_PICKER_BINDINGS.addAll(COMBO_BOX_BASE_BINDINGS);
-    }
-
-    @Override public void onAutoHide() {
+    /** {@inheritDoc} */
+    @Override public void onAutoHide(PopupControl popup) {
         // when we click on some non-interactive part of the
         // calendar - we do not want to hide.
-        DatePicker datePicker = (DatePicker)getControl();
-        DatePickerSkin cpSkin = (DatePickerSkin)datePicker.getSkin();
-        cpSkin.syncWithAutoUpdate();
+        if (!popup.isShowing() && getNode().isShowing()) {
+            // Popup was dismissed. Maybe user clicked outside or typed ESCAPE.
+            // Make sure DatePicker button is in sync.
+            getNode().hide();
+        }
         // if the DatePicker is no longer showing, then invoke the super method
         // to keep its show/hide state in sync.
-        if (!datePicker.isShowing()) super.onAutoHide();
+        if (!getNode().isShowing()) {
+            super.onAutoHide(popup);
+        }
     }
 
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListCellBehavior.java	2015-09-03 14:47:55.597561100 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListCellBehavior.java	2015-09-03 14:47:55.052530000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -30,8 +30,6 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.MultipleSelectionModel;
 
-import java.util.Collections;
-
 public class ListCellBehavior<T> extends CellBehaviorBase<ListCell<T>> {
 
     /***************************************************************************
@@ -41,7 +39,7 @@
      **************************************************************************/
 
     public ListCellBehavior(ListCell<T> control) {
-        super(control, Collections.emptyList());
+        super(control);
     }
 
 
@@ -61,7 +59,7 @@
     }
 
     @Override protected ListView<T> getCellContainer() {
-        return getControl().getListView();
+        return getNode().getListView();
     }
 
     @Override protected void edit(ListCell<T> cell) {
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java	2015-09-03 14:48:02.838975300 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ListViewBehavior.java	2015-09-03 14:48:02.263942400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -22,7 +22,6 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.PlatformUtil;
@@ -33,15 +32,14 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.WeakListChangeListener;
-import javafx.event.EventType;
-import javafx.geometry.NodeOrientation;
+import javafx.event.EventHandler;
 import javafx.geometry.Orientation;
-import javafx.scene.control.Control;
 import javafx.scene.control.FocusModel;
 import javafx.scene.control.ListView;
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.SelectionMode;
-import javafx.scene.input.KeyCode;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
@@ -49,180 +47,197 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.sun.javafx.scene.control.inputmap.InputMap.*;
 import static javafx.scene.input.KeyCode.*;
 
-/**
- *
- */
 public class ListViewBehavior<T> extends BehaviorBase<ListView<T>> {
+    private final InputMap<ListView<T>> listViewInputMap;
 
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    protected static final List<KeyBinding> LIST_VIEW_BINDINGS = new ArrayList<KeyBinding>();
-
-    static {
-        LIST_VIEW_BINDINGS.add(new KeyBinding(HOME, "SelectFirstRow"));
-        LIST_VIEW_BINDINGS.add(new KeyBinding(END, "SelectLastRow"));
-        LIST_VIEW_BINDINGS.add(new KeyBinding(HOME, "SelectAllToFirstRow").shift());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(END, "SelectAllToLastRow").shift());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "SelectAllPageUp").shift());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "SelectAllPageDown").shift());
-        
-        LIST_VIEW_BINDINGS.add(new KeyBinding(SPACE, "SelectAllToFocus").shift());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(SPACE, "SelectAllToFocusAndSetAnchor").shortcut().shift());
-        
-        LIST_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "ScrollUp"));
-        LIST_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "ScrollDown"));
-
-        LIST_VIEW_BINDINGS.add(new KeyBinding(ENTER, "Activate"));
-        LIST_VIEW_BINDINGS.add(new KeyBinding(SPACE, "Activate"));
-        LIST_VIEW_BINDINGS.add(new KeyBinding(F2, "Activate"));
-        LIST_VIEW_BINDINGS.add(new KeyBinding(ESCAPE, "CancelEdit"));
-
-        LIST_VIEW_BINDINGS.add(new KeyBinding(A, "SelectAll").shortcut());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(HOME, "FocusFirstRow").shortcut());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(END, "FocusLastRow").shortcut());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "FocusPageUp").shortcut());
-        LIST_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "FocusPageDown").shortcut());
-            
-        if (PlatformUtil.isMac()) {
-            LIST_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection").ctrl().shortcut());
-        } else {
-            LIST_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection").ctrl());
+    /**
+     * Indicates that a keyboard key has been pressed which represents the
+     * event (this could be space bar for example). As long as keyDown is true,
+     * we are also armed, and will ignore mouse events related to arming.
+     * Note this is made package private solely for the sake of testing.
+     */
+    private boolean keyDown;
+
+    private final EventHandler<KeyEvent> keyEventListener = e -> {
+        if (!e.isConsumed()) {
+            // RT-12751: we want to keep an eye on the user holding down the shift key,
+            // so that we know when they enter/leave multiple selection mode. This
+            // changes what happens when certain key combinations are pressed.
+            isShiftDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShiftDown();
+            isShortcutDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShortcutDown();
         }
+    };
 
-        // if listView is vertical...
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(UP, "SelectPreviousRow").vertical());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_UP, "SelectPreviousRow").vertical());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(DOWN, "SelectNextRow").vertical());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_DOWN, "SelectNextRow").vertical());
-
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(UP, "AlsoSelectPreviousRow").vertical().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_UP, "AlsoSelectPreviousRow").vertical().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(DOWN, "AlsoSelectNextRow").vertical().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_DOWN, "AlsoSelectNextRow").vertical().shift());
-
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(UP, "FocusPreviousRow").vertical().shortcut());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(DOWN, "FocusNextRow").vertical().shortcut());
-
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(UP, "DiscontinuousSelectPreviousRow").vertical().shortcut().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(DOWN, "DiscontinuousSelectNextRow").vertical().shortcut().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(PAGE_UP, "DiscontinuousSelectPageUp").vertical().shortcut().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(PAGE_DOWN, "DiscontinuousSelectPageDown").vertical().shortcut().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(HOME, "DiscontinuousSelectAllToFirstRow").vertical().shortcut().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(END, "DiscontinuousSelectAllToLastRow").vertical().shortcut().shift());
-        // --- end of vertical
 
 
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
 
-        // if listView is horizontal...
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(LEFT, "SelectPreviousRow"));
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_LEFT, "SelectPreviousRow"));
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(RIGHT, "SelectNextRow"));
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_RIGHT, "SelectNextRow"));
-
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(LEFT, "AlsoSelectPreviousRow").shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_LEFT, "AlsoSelectPreviousRow").shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(RIGHT, "AlsoSelectNextRow").shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(KP_RIGHT, "AlsoSelectNextRow").shift());
-
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(LEFT, "FocusPreviousRow").shortcut());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(RIGHT, "FocusNextRow").shortcut());
-
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(LEFT, "DiscontinuousSelectPreviousRow").shortcut().shift());
-        LIST_VIEW_BINDINGS.add(new ListViewKeyBinding(RIGHT, "DiscontinuousSelectNextRow").shortcut().shift());
-        // --- end of horizontal
-
-        LIST_VIEW_BINDINGS.add(new KeyBinding(BACK_SLASH, "ClearSelection").shortcut());
-    }
-    
-    protected /*final*/ String matchActionForEvent(KeyEvent e) {
-        String action = super.matchActionForEvent(e);
-        if (action != null) {
-            if (e.getCode() == LEFT || e.getCode() == KP_LEFT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    if (e.isShiftDown()) {
-                        action = "AlsoSelectNextRow";
-                    } else {
-                        if (e.isShortcutDown()) {
-                            action = "FocusNextRow";
-                        } else {
-                            action = getControl().getOrientation() == Orientation.HORIZONTAL ? "SelectNextRow" : "TraverseRight";
-                        }
-                    }
-                }
-            } else if (e.getCode() == RIGHT || e.getCode() == KP_RIGHT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    if (e.isShiftDown()) {
-                        action = "AlsoSelectPreviousRow";
-                    } else {
-                        if (e.isShortcutDown()) {
-                            action = "FocusPreviousRow";
-                        } else {
-                            action = getControl().getOrientation() == Orientation.HORIZONTAL ? "SelectPreviousRow" : "TraverseLeft";
-                        }
-                    }
-                }
-            }
+    public ListViewBehavior(ListView<T> control) {
+        super(control);
+
+        // create a map for listView-specific mappings
+        listViewInputMap = createInputMap();
+
+        // add focus traversal mappings
+        addDefaultMapping(listViewInputMap, FocusTraversalInputMap.getFocusTraversalMappings());
+        addDefaultMapping(listViewInputMap,
+            new KeyMapping(HOME, e -> selectFirstRow()),
+            new KeyMapping(END, e -> selectLastRow()),
+            new KeyMapping(new KeyBinding(HOME).shift(), e -> selectAllToFirstRow()),
+            new KeyMapping(new KeyBinding(END).shift(), e -> selectAllToLastRow()),
+            new KeyMapping(new KeyBinding(PAGE_UP).shift(), e -> selectAllPageUp()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).shift(), e -> selectAllPageDown()),
+
+            new KeyMapping(new KeyBinding(SPACE).shift(), e -> selectAllToFocus(false)),
+            new KeyMapping(new KeyBinding(SPACE).shortcut().shift(), e -> selectAllToFocus(true)),
+
+            new KeyMapping(PAGE_UP, e -> scrollPageUp()),
+            new KeyMapping(PAGE_DOWN, e -> scrollPageDown()),
+
+            new KeyMapping(ENTER, e -> activate()),
+            new KeyMapping(SPACE, e -> activate()),
+            new KeyMapping(F2, e -> activate()),
+            new KeyMapping(ESCAPE, e -> cancelEdit()),
+
+            new KeyMapping(new KeyBinding(A).shortcut(), e -> selectAll()),
+            new KeyMapping(new KeyBinding(HOME).shortcut(), e -> focusFirstRow()),
+            new KeyMapping(new KeyBinding(END).shortcut(), e -> focusLastRow()),
+            new KeyMapping(new KeyBinding(PAGE_UP).shortcut(), e -> focusPageUp()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).shortcut(), e -> focusPageDown()),
+
+            new KeyMapping(new KeyBinding(BACK_SLASH).shortcut(), e -> clearSelection()),
+
+            new MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
+
+        // create OS-specific child mappings
+        // --- mac OS
+        InputMap<ListView<T>> macInputMap = new InputMap<>(control);
+        macInputMap.setInterceptor(event -> !PlatformUtil.isMac());
+        addDefaultMapping(macInputMap, new KeyMapping(new KeyBinding(SPACE).shortcut().ctrl(), e -> toggleFocusOwnerSelection()));
+        addDefaultChildMap(listViewInputMap, macInputMap);
+
+        // --- all other platforms
+        InputMap<ListView<T>> otherOsInputMap = new InputMap<>(control);
+        otherOsInputMap.setInterceptor(event -> PlatformUtil.isMac());
+        addDefaultMapping(otherOsInputMap, new KeyMapping(new KeyBinding(SPACE).ctrl(), e -> toggleFocusOwnerSelection()));
+        addDefaultChildMap(listViewInputMap, otherOsInputMap);
+
+        // create two more child maps, one for vertical listview and one for horizontal listview
+        // --- vertical listview
+        InputMap<ListView<T>> verticalListInputMap = new InputMap<>(control);
+        verticalListInputMap.setInterceptor(event -> control.getOrientation() != Orientation.VERTICAL);
+
+        addDefaultMapping(verticalListInputMap,
+            new KeyMapping(UP, e -> selectPreviousRow()),
+            new KeyMapping(KP_UP, e -> selectPreviousRow()),
+            new KeyMapping(DOWN, e -> selectNextRow()),
+            new KeyMapping(KP_DOWN, e -> selectNextRow()),
+
+            new KeyMapping(new KeyBinding(UP).shift(), e -> alsoSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(KP_UP).shift(), e -> alsoSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(DOWN).shift(), e -> alsoSelectNextRow()),
+            new KeyMapping(new KeyBinding(KP_DOWN).shift(), e -> alsoSelectNextRow()),
+
+            new KeyMapping(new KeyBinding(UP).shortcut(), e -> focusPreviousRow()),
+            new KeyMapping(new KeyBinding(DOWN).shortcut(), e -> focusNextRow()),
+
+            new KeyMapping(new KeyBinding(UP).shortcut().shift(), e -> discontinuousSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(DOWN).shortcut().shift(), e -> discontinuousSelectNextRow()),
+            new KeyMapping(new KeyBinding(PAGE_UP).shortcut().shift(), e -> discontinuousSelectPageUp()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).shortcut().shift(), e -> discontinuousSelectPageDown()),
+            new KeyMapping(new KeyBinding(HOME).shortcut().shift(), e -> discontinuousSelectAllToFirstRow()),
+            new KeyMapping(new KeyBinding(END).shortcut().shift(), e -> discontinuousSelectAllToLastRow())
+        );
+
+        addDefaultChildMap(listViewInputMap, verticalListInputMap);
+
+        // --- horizontal listview
+        InputMap<ListView<T>> horizontalListInputMap = new InputMap<>(control);
+        horizontalListInputMap.setInterceptor(event -> control.getOrientation() != Orientation.HORIZONTAL);
+
+        addDefaultMapping(horizontalListInputMap,
+            new KeyMapping(LEFT, e -> selectPreviousRow()),
+            new KeyMapping(KP_LEFT, e -> selectPreviousRow()),
+            new KeyMapping(RIGHT, e -> selectNextRow()),
+            new KeyMapping(KP_RIGHT, e -> selectNextRow()),
+
+            new KeyMapping(new KeyBinding(LEFT).shift(), e -> alsoSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(KP_LEFT).shift(), e -> alsoSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(RIGHT).shift(), e -> alsoSelectNextRow()),
+            new KeyMapping(new KeyBinding(KP_RIGHT).shift(), e -> alsoSelectNextRow()),
+
+            new KeyMapping(new KeyBinding(LEFT).shortcut(), e -> focusPreviousRow()),
+            new KeyMapping(new KeyBinding(RIGHT).shortcut(), e -> focusNextRow()),
+
+            new KeyMapping(new KeyBinding(LEFT).shortcut().shift(), e -> discontinuousSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(RIGHT).shortcut().shift(), e -> discontinuousSelectNextRow())
+        );
+
+        addDefaultChildMap(listViewInputMap, horizontalListInputMap);
+
+        // set up other listeners
+        // We make this an event _filter_ so that we can determine the state
+        // of the shift key before the event handlers get a shot at the event.
+        control.addEventFilter(KeyEvent.ANY, keyEventListener);
+
+        control.itemsProperty().addListener(weakItemsListener);
+        if (control.getItems() != null) {
+            control.getItems().addListener(weakItemsListListener);
+        }
+
+        // Fix for RT-16565
+        control.selectionModelProperty().addListener(weakSelectionModelListener);
+        if (control.getSelectionModel() != null) {
+            control.getSelectionModel().getSelectedIndices().addListener(weakSelectedIndicesListener);
+        }
+
+        // Only add this if we're on an embedded platform that supports 5-button navigation
+        if (Utils.isTwoLevelFocus()) {
+            tlFocus = new TwoLevelFocusListBehavior(control); // needs to be last.
         }
-        return action;
     }
 
-    @Override protected void callAction(String name) {
-        if ("SelectPreviousRow".equals(name)) selectPreviousRow();
-        else if ("SelectNextRow".equals(name)) selectNextRow();
-        else if ("SelectFirstRow".equals(name)) selectFirstRow();
-        else if ("SelectLastRow".equals(name)) selectLastRow();
-        else if ("SelectAllToFirstRow".equals(name)) selectAllToFirstRow();
-        else if ("SelectAllToLastRow".equals(name)) selectAllToLastRow();
-        else if ("SelectAllPageUp".equals(name)) selectAllPageUp();
-        else if ("SelectAllPageDown".equals(name)) selectAllPageDown();
-        else if ("AlsoSelectNextRow".equals(name)) alsoSelectNextRow();
-        else if ("AlsoSelectPreviousRow".equals(name)) alsoSelectPreviousRow();
-        else if ("ClearSelection".equals(name)) clearSelection();
-        else if ("SelectAll".equals(name)) selectAll();
-        else if ("ScrollUp".equals(name)) scrollPageUp();
-        else if ("ScrollDown".equals(name)) scrollPageDown();
-        else if ("FocusPreviousRow".equals(name)) focusPreviousRow();
-        else if ("FocusNextRow".equals(name)) focusNextRow();
-        else if ("FocusPageUp".equals(name)) focusPageUp();
-        else if ("FocusPageDown".equals(name)) focusPageDown();
-        else if ("Activate".equals(name)) activate();
-        else if ("CancelEdit".equals(name)) cancelEdit();
-        else if ("FocusFirstRow".equals(name)) focusFirstRow();
-        else if ("FocusLastRow".equals(name)) focusLastRow();
-        else if ("toggleFocusOwnerSelection".equals(name)) toggleFocusOwnerSelection();
-
-        else if ("SelectAllToFocus".equals(name)) selectAllToFocus(false);
-        else if ("SelectAllToFocusAndSetAnchor".equals(name)) selectAllToFocus(true);
-
-        else if ("DiscontinuousSelectNextRow".equals(name)) discontinuousSelectNextRow();
-        else if ("DiscontinuousSelectPreviousRow".equals(name)) discontinuousSelectPreviousRow();
-        else if ("DiscontinuousSelectPageUp".equals(name)) discontinuousSelectPageUp();
-        else if ("DiscontinuousSelectPageDown".equals(name)) discontinuousSelectPageDown();
-        else if ("DiscontinuousSelectAllToLastRow".equals(name)) discontinuousSelectAllToLastRow();
-        else if ("DiscontinuousSelectAllToFirstRow".equals(name)) discontinuousSelectAllToFirstRow();
-        else super.callAction(name);
-    }
-
-    @Override protected void callActionForEvent(KeyEvent e) {
-        // RT-12751: we want to keep an eye on the user holding down the shift key, 
-        // so that we know when they enter/leave multiple selection mode. This
-        // changes what happens when certain key combinations are pressed.
-        isShiftDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShiftDown();
-        isShortcutDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShortcutDown();
 
-        super.callActionForEvent(e);
+
+    /***************************************************************************
+     *                                                                         *
+     * Implementation of BehaviorBase API                                      *
+     *                                                                         *
+     **************************************************************************/
+
+    @Override public InputMap<ListView<T>> getInputMap() {
+        return listViewInputMap;
     }
 
+    @Override public void dispose() {
+        ListView<T> control = getNode();
+
+        ListCellBehavior.removeAnchor(control);
+        if (tlFocus != null) tlFocus.dispose();
+        super.dispose();
+
+        control.removeEventHandler(KeyEvent.ANY, keyEventListener);
+    }
+
+
+
+
+
     /**************************************************************************
      *                         State and Functions                            *
      *************************************************************************/
-    
+
     private boolean isShiftDown = false;
     private boolean isShortcutDown = false;
-    
+
     private Callback<Boolean, Integer> onScrollPageUp;
     private Callback<Boolean, Integer> onScrollPageDown;
     private Runnable onFocusPreviousRow;
@@ -240,20 +255,20 @@
     public void setOnSelectNextRow(Runnable r) { onSelectNextRow = r; }
     public void setOnMoveToFirstCell(Runnable r) { onMoveToFirstCell = r; }
     public void setOnMoveToLastCell(Runnable r) { onMoveToLastCell = r; }
-    
+
     private boolean selectionChanging = false;
-    
+
     private final ListChangeListener<Integer> selectedIndicesListener = c -> {
         while (c.next()) {
             if (c.wasReplaced()) {
-                if (ListCellBehavior.hasDefaultAnchor(getControl())) {
-                    ListCellBehavior.removeAnchor(getControl());
+                if (ListCellBehavior.hasDefaultAnchor(getNode())) {
+                    ListCellBehavior.removeAnchor(getNode());
                 }
             }
 
             final int shift = c.wasPermutated() ? c.getTo() - c.getFrom() : 0;
 
-            MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+            MultipleSelectionModel<T> sm = getNode().getSelectionModel();
 
             // there are no selected items, so lets clear out the anchor
             if (! selectionChanging) {
@@ -272,7 +287,7 @@
             }
         }
     };
-    
+
     private final ListChangeListener<T> itemsListListener = c -> {
         while (c.next()) {
             if (c.wasAdded() && c.getFrom() <= getAnchor()) {
@@ -282,25 +297,25 @@
             }
         }
     };
-    
+
     private final ChangeListener<ObservableList<T>> itemsListener = new ChangeListener<ObservableList<T>>() {
         @Override
         public void changed(
                 ObservableValue<? extends ObservableList<T>> observable,
                 ObservableList<T> oldValue, ObservableList<T> newValue) {
             if (oldValue != null) {
-                 oldValue.removeListener(weakItemsListListener);
-             } if (newValue != null) {
-                 newValue.addListener(weakItemsListListener);
-             }
+                oldValue.removeListener(weakItemsListListener);
+            } if (newValue != null) {
+                newValue.addListener(weakItemsListListener);
+            }
         }
     };
-    
+
     private final ChangeListener<MultipleSelectionModel<T>> selectionModelListener = new ChangeListener<MultipleSelectionModel<T>>() {
         @Override public void changed(
-                    ObservableValue<? extends MultipleSelectionModel<T>> observable, 
-                    MultipleSelectionModel<T> oldValue, 
-                    MultipleSelectionModel<T> newValue) {
+                ObservableValue<? extends MultipleSelectionModel<T>> observable,
+                MultipleSelectionModel<T> oldValue,
+                MultipleSelectionModel<T> newValue) {
             if (oldValue != null) {
                 oldValue.getSelectedIndices().removeListener(weakSelectedIndicesListener);
             }
@@ -309,75 +324,47 @@
             }
         }
     };
-    
-    private final WeakChangeListener<ObservableList<T>> weakItemsListener = 
+
+    private final WeakChangeListener<ObservableList<T>> weakItemsListener =
             new WeakChangeListener<ObservableList<T>>(itemsListener);
-    private final WeakListChangeListener<Integer> weakSelectedIndicesListener = 
+    private final WeakListChangeListener<Integer> weakSelectedIndicesListener =
             new WeakListChangeListener<Integer>(selectedIndicesListener);
-    private final WeakListChangeListener<T> weakItemsListListener = 
+    private final WeakListChangeListener<T> weakItemsListListener =
             new WeakListChangeListener<>(itemsListListener);
-    private final WeakChangeListener<MultipleSelectionModel<T>> weakSelectionModelListener = 
+    private final WeakChangeListener<MultipleSelectionModel<T>> weakSelectionModelListener =
             new WeakChangeListener<MultipleSelectionModel<T>>(selectionModelListener);
-    
-    private TwoLevelFocusListBehavior tlFocus;
-
-    public ListViewBehavior(ListView<T> control) {
-        super(control, LIST_VIEW_BINDINGS);
-        
-        control.itemsProperty().addListener(weakItemsListener);
-        if (control.getItems() != null) {
-            control.getItems().addListener(weakItemsListListener);
-        }
-        
-        // Fix for RT-16565
-        getControl().selectionModelProperty().addListener(weakSelectionModelListener);
-        if (control.getSelectionModel() != null) {
-            control.getSelectionModel().getSelectedIndices().addListener(weakSelectedIndicesListener);
-        }
 
-        // Only add this if we're on an embedded platform that supports 5-button navigation
-        if (Utils.isTwoLevelFocus()) {
-            tlFocus = new TwoLevelFocusListBehavior(control); // needs to be last.
-        }
-    }
-    
-    @Override public void dispose() {
-        ListCellBehavior.removeAnchor(getControl());
-        if (tlFocus != null) tlFocus.dispose();
-        super.dispose();
-    }
+    private TwoLevelFocusListBehavior tlFocus;
 
     private void setAnchor(int anchor) {
-        ListCellBehavior.setAnchor(getControl(), anchor < 0 ? null : anchor, false);
+        ListCellBehavior.setAnchor(getNode(), anchor < 0 ? null : anchor, false);
     }
-    
+
     private int getAnchor() {
-        return ListCellBehavior.getAnchor(getControl(), getControl().getFocusModel().getFocusedIndex());
+        return ListCellBehavior.getAnchor(getNode(), getNode().getFocusModel().getFocusedIndex());
     }
-    
+
     private boolean hasAnchor() {
-        return ListCellBehavior.hasNonDefaultAnchor(getControl());
+        return ListCellBehavior.hasNonDefaultAnchor(getNode());
     }
 
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        
+    private void mousePressed(MouseEvent e) {
         if (! e.isShiftDown() && ! e.isSynthesized()) {
-            int index = getControl().getSelectionModel().getSelectedIndex();
+            int index = getNode().getSelectionModel().getSelectedIndex();
             setAnchor(index);
         }
-        
-        if (! getControl().isFocused() && getControl().isFocusTraversable()) {
-            getControl().requestFocus();
+
+        if (! getNode().isFocused() && getNode().isFocusTraversable()) {
+            getNode().requestFocus();
         }
     }
-    
+
     private int getRowCount() {
-        return getControl().getItems() == null ? 0 : getControl().getItems().size();
+        return getNode().getItems() == null ? 0 : getNode().getItems().size();
     }
 
     private void clearSelection() {
-        getControl().getSelectionModel().clearSelection();
+        getNode().getSelectionModel().clearSelection();
     }
 
     private void scrollPageUp() {
@@ -386,8 +373,8 @@
             newSelectedIndex = onScrollPageUp.call(false);
         }
         if (newSelectedIndex == -1) return;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
         sm.clearAndSelect(newSelectedIndex);
     }
@@ -398,89 +385,89 @@
             newSelectedIndex = onScrollPageDown.call(false);
         }
         if (newSelectedIndex == -1) return;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
         sm.clearAndSelect(newSelectedIndex);
     }
-    
+
     private void focusFirstRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(0);
-        
+
         if (onMoveToFirstCell != null) onMoveToFirstCell.run();
     }
-    
+
     private void focusLastRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(getRowCount() - 1);
-        
+
         if (onMoveToLastCell != null) onMoveToLastCell.run();
     }
 
     private void focusPreviousRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
+
         fm.focusPrevious();
-        
+
         if (! isShortcutDown || getAnchor() == -1) {
             setAnchor(fm.getFocusedIndex());
         }
-        
+
         if (onFocusPreviousRow != null) onFocusPreviousRow.run();
     }
 
     private void focusNextRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
+
         fm.focusNext();
-        
+
         if (! isShortcutDown || getAnchor() == -1) {
             setAnchor(fm.getFocusedIndex());
         }
-        
+
         if (onFocusNextRow != null) onFocusNextRow.run();
     }
-    
+
     private void focusPageUp() {
         int newFocusIndex = onScrollPageUp.call(true);
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(newFocusIndex);
     }
-    
+
     private void focusPageDown() {
         int newFocusIndex = onScrollPageDown.call(true);
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(newFocusIndex);
     }
 
     private void alsoSelectPreviousRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
+
         if (isShiftDown && getAnchor() != -1) {
             int newRow = fm.getFocusedIndex() - 1;
             if (newRow < 0) return;
 
             int anchor = getAnchor();
-            
+
             if (! hasAnchor()) {
                 setAnchor(fm.getFocusedIndex());
             }
@@ -497,24 +484,24 @@
         } else {
             sm.selectPrevious();
         }
-        
+
         onSelectPreviousRow.run();
     }
 
     private void alsoSelectNextRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
+
         if (isShiftDown && getAnchor() != -1) {
             int newRow = fm.getFocusedIndex() + 1;
             int anchor = getAnchor();
-            
+
             if (! hasAnchor()) {
                 setAnchor(fm.getFocusedIndex());
-            } 
+            }
 
             if (sm.getSelectedIndices().size() > 1) {
                 clearSelectionOutsideRange(anchor, newRow);
@@ -528,19 +515,19 @@
         } else {
             sm.selectNext();
         }
-        
+
         onSelectNextRow.run();
     }
-    
+
     private void clearSelectionOutsideRange(int start, int end) {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
+
         int min = Math.min(start, end);
         int max = Math.max(start, end);
-        
+
         List<Integer> indices = new ArrayList<>(sm.getSelectedIndices());
-        
+
         selectionChanging = true;
         for (int i = 0; i < indices.size(); i++) {
             int index = indices.get(i);
@@ -552,7 +539,7 @@
     }
 
     private void selectPreviousRow() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusIndex = fm.getFocusedIndex();
@@ -561,23 +548,23 @@
         }
 
         setAnchor(focusIndex - 1);
-        getControl().getSelectionModel().clearAndSelect(focusIndex - 1);
+        getNode().getSelectionModel().clearAndSelect(focusIndex - 1);
         onSelectPreviousRow.run();
     }
 
     private void selectNextRow() {
-        ListView<T> listView = getControl();
+        ListView<T> listView = getNode();
         FocusModel<T> fm = listView.getFocusModel();
         if (fm == null) return;
-        
+
         int focusIndex = fm.getFocusedIndex();
         if (focusIndex == getRowCount() - 1) {
             return;
         }
-        
+
         MultipleSelectionModel<T> sm = listView.getSelectionModel();
         if (sm == null) return;
-        
+
         setAnchor(focusIndex + 1);
         sm.clearAndSelect(focusIndex + 1);
         if (onSelectNextRow != null) onSelectNextRow.run();
@@ -585,18 +572,18 @@
 
     private void selectFirstRow() {
         if (getRowCount() > 0) {
-            getControl().getSelectionModel().clearAndSelect(0);
+            getNode().getSelectionModel().clearAndSelect(0);
             if (onMoveToFirstCell != null) onMoveToFirstCell.run();
         }
     }
 
     private void selectLastRow() {
-        getControl().getSelectionModel().clearAndSelect(getRowCount() - 1);
+        getNode().getSelectionModel().clearAndSelect(getRowCount() - 1);
         if (onMoveToLastCell != null) onMoveToLastCell.run();
     }
-    
+
     private void selectAllPageUp() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int leadIndex = fm.getFocusedIndex();
@@ -604,15 +591,15 @@
             leadIndex = getAnchor() == -1 ? leadIndex : getAnchor();
             setAnchor(leadIndex);
         }
-        
+
         int leadSelectedIndex = onScrollPageUp.call(false);
 
         // fix for RT-34407
         int adjust = leadIndex < leadSelectedIndex ? 1 : -1;
 
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
+
         selectionChanging = true;
         if (sm.getSelectionMode() == SelectionMode.SINGLE) {
             sm.select(leadSelectedIndex);
@@ -622,23 +609,23 @@
         }
         selectionChanging = false;
     }
-    
+
     private void selectAllPageDown() {
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
+
         int leadIndex = fm.getFocusedIndex();
         if (isShiftDown) {
             leadIndex = getAnchor() == -1 ? leadIndex : getAnchor();
             setAnchor(leadIndex);
         }
-        
+
         int leadSelectedIndex = onScrollPageDown.call(false);
 
         // fix for RT-34407
         int adjust = leadIndex < leadSelectedIndex ? 1 : -1;
-        
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
         selectionChanging = true;
@@ -652,14 +639,14 @@
     }
 
     private void selectAllToFirstRow() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
+
         int leadIndex = fm.getFocusedIndex();
-        
+
         if (isShiftDown) {
             leadIndex = hasAnchor() ? getAnchor() : leadIndex;
         }
@@ -673,26 +660,27 @@
         if (isShiftDown) {
             setAnchor(leadIndex);
         }
-        
+
         if (onMoveToFirstCell != null) onMoveToFirstCell.run();
     }
 
     private void selectAllToLastRow() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int leadIndex = fm.getFocusedIndex();
 
+        System.out.println("isShiftDown: " + isShiftDown);
         if (isShiftDown) {
             leadIndex = hasAnchor() ? getAnchor() : leadIndex;
         }
-        
+
         sm.clearSelection();
         sm.selectRange(leadIndex, getRowCount());
-        
+
         if (isShiftDown) {
             setAnchor(leadIndex);
         }
@@ -701,14 +689,14 @@
     }
 
     private void selectAll() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
         sm.selectAll();
     }
-    
+
     private void selectAllToFocus(boolean setAnchorToFocusIndex) {
         // Fix for RT-31241
-        final ListView<T> listView = getControl();
+        final ListView<T> listView = getNode();
         if (listView.getEditingIndex() >= 0) return;
 
         MultipleSelectionModel<T> sm = listView.getSelectionModel();
@@ -719,64 +707,64 @@
 
         int focusIndex = fm.getFocusedIndex();
         int anchor = getAnchor();
-        
+
         sm.clearSelection();
         int startPos = anchor;
         int endPos = anchor > focusIndex ? focusIndex - 1 : focusIndex + 1;
         sm.selectRange(startPos, endPos);
         setAnchor(setAnchorToFocusIndex ? focusIndex : anchor);
     }
-    
+
     private void cancelEdit() {
-        getControl().edit(-1);
+        getNode().edit(-1);
     }
 
     private void activate() {
-        int focusedIndex = getControl().getFocusModel().getFocusedIndex();
-        getControl().getSelectionModel().select(focusedIndex);
+        int focusedIndex = getNode().getFocusModel().getFocusedIndex();
+        getNode().getSelectionModel().select(focusedIndex);
         setAnchor(focusedIndex);
 
         // edit this row also
         if (focusedIndex >= 0) {
-            getControl().edit(focusedIndex);
+            getNode().edit(focusedIndex);
         }
     }
-    
+
     private void toggleFocusOwnerSelection() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
-        FocusModel<T> fm = getControl().getFocusModel();
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusedIndex = fm.getFocusedIndex();
-        
+
         if (sm.isSelected(focusedIndex)) {
             sm.clearSelection(focusedIndex);
             fm.focus(focusedIndex);
         } else {
             sm.select(focusedIndex);
         }
-        
+
         setAnchor(focusedIndex);
     }
-    
+
     /**************************************************************************
      * Discontinuous Selection                                                *
      *************************************************************************/
-    
+
     private void discontinuousSelectPreviousRow() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
         if (sm.getSelectionMode() != SelectionMode.MULTIPLE) {
             selectPreviousRow();
             return;
         }
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
+
         int focusIndex = fm.getFocusedIndex();
         final int newFocusIndex = focusIndex - 1;
         if (newFocusIndex < 0) return;
@@ -791,17 +779,17 @@
 
         if (onFocusPreviousRow != null) onFocusPreviousRow.run();
     }
-    
+
     private void discontinuousSelectNextRow() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
         if (sm.getSelectionMode() != SelectionMode.MULTIPLE) {
             selectNextRow();
             return;
         }
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusIndex = fm.getFocusedIndex();
@@ -818,36 +806,36 @@
 
         if (onFocusNextRow != null) onFocusNextRow.run();
     }
-    
+
     private void discontinuousSelectPageUp() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int anchor = getAnchor();
         int leadSelectedIndex = onScrollPageUp.call(false);
         sm.selectRange(anchor, leadSelectedIndex - 1);
     }
-    
+
     private void discontinuousSelectPageDown() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
-        
+
         int anchor = getAnchor();
         int leadSelectedIndex = onScrollPageDown.call(false);
         sm.selectRange(anchor, leadSelectedIndex + 1);
     }
-    
+
     private void discontinuousSelectAllToFirstRow() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int index = fm.getFocusedIndex();
@@ -856,12 +844,12 @@
 
         if (onMoveToFirstCell != null) onMoveToFirstCell.run();
     }
-    
+
     private void discontinuousSelectAllToLastRow() {
-        MultipleSelectionModel<T> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<T> sm = getNode().getSelectionModel();
         if (sm == null) return;
-        
-        FocusModel<T> fm = getControl().getFocusModel();
+
+        FocusModel<T> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int index = fm.getFocusedIndex() + 1;
@@ -869,20 +857,4 @@
 
         if (onMoveToLastCell != null) onMoveToLastCell.run();
     }
-
-    private static class ListViewKeyBinding extends OrientedKeyBinding {
-
-        public ListViewKeyBinding(KeyCode code, String action) {
-            super(code, action);
-        }
-
-        public ListViewKeyBinding(KeyCode code, EventType<KeyEvent> type, String action) {
-            super(code, type, action);
-        }
-
-        @Override public boolean getVertical(Control control) {
-            return ((ListView<?>)control).getOrientation() == Orientation.VERTICAL;
-        }
-    }
-
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/MenuButtonBehavior.java	2015-09-03 14:48:10.470411800 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/MenuButtonBehavior.java	2015-09-03 14:48:09.858376800 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -26,11 +26,10 @@
 package com.sun.javafx.scene.control.behavior;
 
 import javafx.scene.control.MenuButton;
-import java.util.ArrayList;
-import java.util.List;
+
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.SPACE;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
 
 /**
  * Behavior for MenuButton.
@@ -49,22 +48,12 @@
      * @param menuButton the MenuButton
      */
     public MenuButtonBehavior(final MenuButton menuButton) {
-        super(menuButton, MENU_BUTTON_BINDINGS);
-    }
+        super(menuButton);
 
-    /***************************************************************************
-     *                                                                         *
-     * Key event handling                                                      *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * The key bindings for the MenuButton. Sets up the keys to open the menu.
-     */
-    protected static final List<KeyBinding> MENU_BUTTON_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        MENU_BUTTON_BINDINGS.addAll(BASE_MENU_BUTTON_BINDINGS);
-        MENU_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, OPEN_ACTION));
-        MENU_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED, OPEN_ACTION));
+        /**
+         * The key bindings for the MenuButton. Sets up the keys to open the menu.
+         */
+        addDefaultMapping(new KeyMapping(SPACE, e -> openAction()));
+        addDefaultMapping(new KeyMapping(ENTER, e -> openAction()));
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/MenuButtonBehaviorBase.java	2015-09-03 14:48:17.842833500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/MenuButtonBehaviorBase.java	2015-09-03 14:48:17.246799400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -25,91 +25,73 @@
 
 package com.sun.javafx.scene.control.behavior;
 
-import static javafx.scene.input.KeyCode.UP;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.LEFT;
-import static javafx.scene.input.KeyCode.RIGHT;
-import static javafx.scene.input.KeyCode.CANCEL;
-import static javafx.scene.input.KeyCode.ESCAPE;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.geometry.NodeOrientation;
 import javafx.geometry.Side;
 import javafx.scene.control.MenuButton;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import static javafx.scene.input.KeyCode.*;
+
 /**
  * The base behavior for a MenuButton.
  */
 public abstract class MenuButtonBehaviorBase<C extends MenuButton> extends ButtonBehavior<C> {
 
+    private final InputMap<C> buttonInputMap;
+
     /***************************************************************************
      *                                                                         *
      * Constructors                                                            *
      *                                                                         *
      **************************************************************************/
 
-    public MenuButtonBehaviorBase(final C menuButton, List<KeyBinding> bindings) {
-        super(menuButton, bindings);
+    public MenuButtonBehaviorBase(final C menuButton) {
+        super(menuButton);
+
+        // pull down the parent input map, no need to add focus traversal
+        // mappings - added in ButtonBehavior.
+        buttonInputMap = super.getInputMap();
+
+        // We want to remove the maping for MOUSE_RELEASED, as the event is
+        // handled by the skin instead, which calls the mouseReleased method below.
+        removeMapping(MouseEvent.MOUSE_RELEASED);
+
+        /**
+         * The base key bindings for a MenuButton. These basically just define the
+         * bindings to close an open menu. Subclasses will tell you what can be done
+         * to open it.
+         */
+        addDefaultMapping(new KeyMapping(ESCAPE, e -> getNode().hide()));
+        addDefaultMapping(new KeyMapping(CANCEL, e -> getNode().hide()));
+
+        // we create a child input map, as we want to override some of the
+        // focus traversal behaviors (and child maps take precedence over parent maps)
+        InputMap<C> customFocusInputMap = new InputMap<>(menuButton);
+        addDefaultMapping(customFocusInputMap, new KeyMapping(UP, this::overrideTraversalInput));
+        addDefaultMapping(customFocusInputMap, new KeyMapping(DOWN, this::overrideTraversalInput));
+        addDefaultMapping(customFocusInputMap, new KeyMapping(LEFT, this::overrideTraversalInput));
+        addDefaultMapping(customFocusInputMap, new KeyMapping(RIGHT, this::overrideTraversalInput));
+        addDefaultChildMap(buttonInputMap, customFocusInputMap);
     }
 
+
     /***************************************************************************
      *                                                                         *
      * Key event handling                                                      *
      *                                                                         *
      **************************************************************************/
 
-    /**
-     * Opens the popup menu.
-     */
-    protected static final String OPEN_ACTION = "Open";
-
-    /**
-     * Closes the popup menu.
-     */
-    protected static final String CLOSE_ACTION = "Close";
-
-    /**
-     * The base key bindings for a MenuButton. These basically just define the
-     * bindings to close an open menu. Subclasses will tell you what can be done
-     * to open it.
-     */
-    protected static final List<KeyBinding> BASE_MENU_BUTTON_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        BASE_MENU_BUTTON_BINDINGS.add(new KeyBinding(UP, "TraverseUp"));
-        BASE_MENU_BUTTON_BINDINGS.add(new KeyBinding(DOWN, "TraverseDown"));
-        BASE_MENU_BUTTON_BINDINGS.add(new KeyBinding(LEFT, "TraverseLeft"));
-        BASE_MENU_BUTTON_BINDINGS.add(new KeyBinding(RIGHT, "TraverseRight"));
-        BASE_MENU_BUTTON_BINDINGS.add(new KeyBinding(ESCAPE, KEY_PRESSED, CLOSE_ACTION));
-        BASE_MENU_BUTTON_BINDINGS.add(new KeyBinding(CANCEL, KEY_PRESSED, CLOSE_ACTION));
-    }
-
-    /**
-     * Invokes the given named action.
-     *
-     * @param name the name of the action to invoke
-     */
-    @Override protected void callAction(String name) {
-        MenuButton button = getControl();
-        Side popupSide = button.getPopupSide();
-
-        if (CLOSE_ACTION.equals(name)) {
-            button.hide();
-        } else if (OPEN_ACTION.equals(name)) {
-            if (button.isShowing()) {
-                button.hide();
-            } else {
-                button.show();
-            }
-        } else if (!button.isShowing() &&
-                   ("TraverseUp".equals(name)    && popupSide == Side.TOP)    ||
-                   ("TraverseDown".equals(name)  && (popupSide == Side.BOTTOM || popupSide == Side.TOP))  ||
-                   ("TraverseLeft".equals(name)  && (popupSide == Side.RIGHT  || popupSide == Side.LEFT)) ||
-                   ("TraverseRight".equals(name) && (popupSide == Side.RIGHT  || popupSide == Side.LEFT))) {
+    private void overrideTraversalInput(KeyEvent event) {
+        final MenuButton button = getNode();
+        final Side popupSide = button.getPopupSide();
+        if (!button.isShowing() &&
+                (event.getCode() == UP    && popupSide == Side.TOP)    ||
+                (event.getCode() == DOWN  && (popupSide == Side.BOTTOM || popupSide == Side.TOP))  ||
+                (event.getCode() == LEFT  && (popupSide == Side.RIGHT  || popupSide == Side.LEFT)) ||
+                (event.getCode() == RIGHT && (popupSide == Side.RIGHT  || popupSide == Side.LEFT))) {
             // Show the menu when arrow key matches the popupSide
             // direction -- but also allow RIGHT key for LEFT position and
             // DOWN key for TOP position. To be symmetrical, we also allow for
@@ -117,8 +99,14 @@
             // because the skin only paints right- and down-facing arrows in
             // these cases.
             button.show();
+        }
+    }
+
+    protected void openAction() {
+        if (getNode().isShowing()) {
+            getNode().hide();
         } else {
-            super.callAction(name);
+            getNode().show();
         }
     }
 
@@ -136,7 +124,7 @@
      * @param behaveLikeButton if true, this should act just like a button
      */
     public void mousePressed(MouseEvent e, boolean behaveLikeButton) {
-        final C control = getControl();
+        final C control = getNode();
 
         /*
          * Behaving like a button is easy - we just call super. But, we cannot
@@ -165,12 +153,6 @@
         }
     }
 
-    @Override public void mouseReleased(MouseEvent e) {
-        // Overriding to not call fire() on mouseReleased.
-        // The event is handled by the skin instead, which calls
-        // the method below.
-    }
-
     /**
      * Handles mouse release events.  This will be called by the skin.
      *
@@ -181,10 +163,10 @@
         if (behaveLikeButton) {
             super.mouseReleased(e);
         } else {
-            if (getControl().isShowing() && !getControl().contains(e.getX(), e.getY())) {
-                getControl().hide();
+            if (getNode().isShowing() && !getNode().contains(e.getX(), e.getY())) {
+                getNode().hide();
             }
-            getControl().disarm();
+            getNode().disarm();
         }
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/PaginationBehavior.java	2015-09-03 14:48:25.215255200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/PaginationBehavior.java	2015-09-03 14:48:24.628221600 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -25,74 +25,52 @@
 
 package com.sun.javafx.scene.control.behavior;
 
-import javafx.geometry.NodeOrientation;
 import javafx.scene.control.Pagination;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import com.sun.javafx.scene.control.skin.PaginationSkin;
+
+import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import static com.sun.javafx.scene.control.inputmap.InputMap.MouseMapping;
 
 public class PaginationBehavior extends BehaviorBase<Pagination> {
 
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    private static final String LEFT = "Left";
-    private static final String RIGHT = "Right";
-
-    protected static final List<KeyBinding> PAGINATION_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        PAGINATION_BINDINGS.add(new KeyBinding(KeyCode.LEFT, LEFT));
-        PAGINATION_BINDINGS.add(new KeyBinding(KeyCode.RIGHT, RIGHT));
-    }
-
-    protected String matchActionForEvent(KeyEvent e) {
-        String action = super.matchActionForEvent(e);
-        if (action != null) {
-            if (e.getCode() == KeyCode.LEFT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = RIGHT;
-                }
-            } else if (e.getCode() == KeyCode.RIGHT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = LEFT;
-                }
-            }
-        }
-        return action;
-    }
-
-    @Override protected void callAction(String name) {
-        if (LEFT.equals(name)) {
-            PaginationSkin ps = (PaginationSkin)getControl().getSkin();
-            ps.selectPrevious();
-        } else if (RIGHT.equals(name)) {
-            PaginationSkin ps = (PaginationSkin)getControl().getSkin();
-            ps.selectNext();
-        } else {
-            super.callAction(name);
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Mouse event handling                                                    *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        Pagination p = getControl();
-        p.requestFocus();
-    }
-
-    /**************************************************************************
-     *                         State and Functions                            *
-     *************************************************************************/
+    private final InputMap<Pagination> paginationInputMap;
 
     public PaginationBehavior(Pagination pagination) {
-        super(pagination, PAGINATION_BINDINGS);
+        super(pagination);
+
+        // create a map for paginiation-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        paginationInputMap = createInputMap();
+
+        // then button-specific mappings for key and mouse input
+        addDefaultMapping(paginationInputMap,
+            new KeyMapping(LEFT, e -> rtl(pagination, this::right, this::left)),
+            new KeyMapping(RIGHT, e -> rtl(pagination, this::left, this::right)),
+            new MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
+    }
+
+    @Override public InputMap<Pagination> getInputMap() {
+        return paginationInputMap;
+    }
+
+    public void mousePressed(MouseEvent e) {
+        getNode().requestFocus();
+    }
+
+    private void left() {
+        movePage(-1);
+    }
+
+    private void right() {
+        movePage(1);
+    }
+
+    private void movePage(int delta) {
+        final Pagination pagination = getNode();
+        final int currentPageIndex = pagination.getCurrentPageIndex();
+        pagination.setCurrentPageIndex(currentPageIndex + delta);
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/PasswordFieldBehavior.java	2015-09-03 14:48:32.825690500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/PasswordFieldBehavior.java	2015-09-03 14:48:32.203654900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -26,9 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import javafx.scene.control.PasswordField;
-
-import com.sun.javafx.scene.text.HitInfo;
-
+import static javafx.scene.control.skin.TextFieldSkin.TextPosInfo;
 
 /**
  * Password field behavior.
@@ -44,14 +42,14 @@
     protected void deletePreviousWord() { }
     protected void deleteNextWord() { }
     protected void selectPreviousWord() { }
-    protected void selectNextWord() { }
+    public void selectNextWord() { }
     protected void previousWord() { }
     protected void nextWord() { }
     protected void selectWord() {
-        getControl().selectAll();
+        getNode().selectAll();
     }
-    protected void mouseDoubleClick(HitInfo hit) {
-        getControl().selectAll();
+    protected void mouseDoubleClick(TextPosInfo hit) {
+        getNode().selectAll();
     }
 
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ScrollBarBehavior.java	2015-09-03 14:48:40.254115300 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ScrollBarBehavior.java	2015-09-03 14:48:39.660081400 -0700
@@ -30,19 +30,12 @@
 import javafx.animation.Timeline;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import javafx.event.EventType;
-import javafx.geometry.NodeOrientation;
 import javafx.geometry.Orientation;
-import javafx.scene.control.Control;
 import javafx.scene.control.ScrollBar;
 import javafx.scene.control.Skin;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.util.Duration;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static javafx.scene.input.KeyCode.*;
 import static javafx.scene.input.KeyEvent.KEY_RELEASED;
 
@@ -53,6 +46,8 @@
 
 public class ScrollBarBehavior extends BehaviorBase<ScrollBar> {
 
+    private final InputMap<ScrollBar> inputMap;
+
     /***************************************************************************
      *                                                                         *
      * Constructors                                                            *
@@ -60,7 +55,38 @@
      **************************************************************************/
 
     public ScrollBarBehavior(ScrollBar scrollBar) {
-        super(scrollBar, SCROLL_BAR_BINDINGS);
+        super(scrollBar);
+
+        // create a map for scrollbar-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        inputMap = createInputMap();
+
+        // scrollbar-specific mappings for key and mouse input
+        addDefaultMapping(inputMap,
+            new InputMap.KeyMapping(HOME, KEY_RELEASED, e -> home()),
+            new InputMap.KeyMapping(END, KEY_RELEASED, e -> end())
+        );
+
+        // create two child input maps for horizontal and vertical scrollbars
+        InputMap<ScrollBar> horizontalInputMap = new InputMap<>(scrollBar);
+        horizontalInputMap.setInterceptor(e -> scrollBar.getOrientation() != Orientation.HORIZONTAL);
+        horizontalInputMap.getMappings().addAll(
+            new InputMap.KeyMapping(LEFT, e -> rtl(scrollBar, this::incrementValue, this::decrementValue)),
+            new InputMap.KeyMapping(KP_LEFT, e -> rtl(scrollBar, this::incrementValue, this::decrementValue)),
+            new InputMap.KeyMapping(RIGHT, e -> rtl(scrollBar, this::decrementValue, this::incrementValue)),
+            new InputMap.KeyMapping(KP_RIGHT, e -> rtl(scrollBar, this::decrementValue, this::incrementValue))
+        );
+        addDefaultChildMap(inputMap, horizontalInputMap);
+
+        InputMap<ScrollBar> verticalInputMap = new InputMap<>(scrollBar);
+        verticalInputMap.setInterceptor(e -> scrollBar.getOrientation() != Orientation.VERTICAL);
+        verticalInputMap.getMappings().addAll(
+                new InputMap.KeyMapping(UP, e -> decrementValue()),
+                new InputMap.KeyMapping(KP_UP, e -> decrementValue()),
+                new InputMap.KeyMapping(DOWN, e -> incrementValue()),
+                new InputMap.KeyMapping(KP_DOWN, e -> incrementValue())
+        );
+        addDefaultChildMap(inputMap, verticalInputMap);
     }
 
     /***************************************************************************
@@ -69,73 +95,27 @@
      *                                                                         *
      **************************************************************************/
 
-    void home() {
-        getControl().setValue(getControl().getMin());
-    }
 
-    void decrementValue() {
-        getControl().adjustValue(0);
+    @Override public InputMap<ScrollBar> getInputMap() {
+        return inputMap;
     }
-
-    void end() {
-        getControl().setValue(getControl().getMax());
+    private void home() {
+        getNode().setValue(getNode().getMin());
     }
 
-    void incrementValue() {
-        getControl().adjustValue(1);
+    private void decrementValue() {
+        getNode().adjustValue(0);
     }
 
-    /***************************************************************************
-     *                                                                         *
-     * Key event handling                                                      *
-     *                                                                         *
-     **************************************************************************/
-
-    /* We manually specify the focus traversal keys because Slider has
-     * different usage for up/down arrow keys.
-     */
-    protected static final List<KeyBinding> SCROLL_BAR_BINDINGS = new ArrayList<>();
-    static {
-        SCROLL_BAR_BINDINGS.add(new KeyBinding(F4, "TraverseDebug").alt().ctrl().shift());
-
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(LEFT, "DecrementValue"));
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(KP_LEFT, "DecrementValue"));
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(UP, "DecrementValue").vertical());
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(KP_UP, "DecrementValue").vertical());
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(RIGHT, "IncrementValue"));
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(KP_RIGHT, "IncrementValue"));
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(DOWN, "IncrementValue").vertical());
-        SCROLL_BAR_BINDINGS.add(new ScrollBarKeyBinding(KP_DOWN, "IncrementValue").vertical());
-
-        SCROLL_BAR_BINDINGS.add(new KeyBinding(HOME, KEY_RELEASED, "Home"));
-        SCROLL_BAR_BINDINGS.add(new KeyBinding(END, KEY_RELEASED, "End"));
-    }
-
-    protected /*final*/ String matchActionForEvent(KeyEvent e) {
-        String action = super.matchActionForEvent(e);
-        if (action != null) {
-            if (e.getCode() == LEFT || e.getCode() == KP_LEFT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = getControl().getOrientation() == Orientation.HORIZONTAL ? "IncrementValue" : "DecrementValue";
-                }
-            } else if (e.getCode() == RIGHT || e.getCode() == KP_RIGHT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = getControl().getOrientation() == Orientation.HORIZONTAL ? "DecrementValue" : "IncrementValue";
-                }
-            }
-        }
-        return action;
+    private void end() {
+        getNode().setValue(getNode().getMax());
     }
 
-    @Override protected void callAction(String name) {
-        if ("Home".equals(name)) home();
-        else if ("End".equals(name)) end();
-        else if ("IncrementValue".equals(name)) incrementValue();
-        else if ("DecrementValue".equals(name)) decrementValue();
-        else super.callAction(name);
-        super.callAction(name);
+    private void incrementValue() {
+        getNode().adjustValue(1);
     }
 
+
     /***************************************************************************
      *                                                                         *
      * Mouse event handling                                                    *
@@ -166,7 +146,7 @@
 
         // determine the percentage of the way between min and max
         // represented by this mouse event
-        final ScrollBar bar = getControl();
+        final ScrollBar bar = getNode();
         if (!bar.isFocused() && bar.isFocusTraversable()) bar.requestFocus();
         final double pos = position;
         final boolean incrementing = (pos > ((bar.getValue() - bar.getMin())/(bar.getMax() - bar.getMin())));
@@ -204,7 +184,7 @@
      * press occurs on the decrement button of the bar.
      */
     public void decButtonPressed() {
-        final ScrollBar bar = getControl();
+        final ScrollBar bar = getNode();
         if (!bar.isFocused() && bar.isFocusTraversable()) bar.requestFocus();
         stopTimeline();
         timeline = new Timeline();
@@ -238,7 +218,7 @@
      * press occurs on the increment button of the bar.
      */
     public void incButtonPressed() {
-        final ScrollBar bar = getControl();
+        final ScrollBar bar = getNode();
         if (!bar.isFocused() && bar.isFocusTraversable()) bar.requestFocus();
         stopTimeline();
         timeline = new Timeline();
@@ -277,7 +257,7 @@
      * @param position The mouse position on track with 0.0 being begining of track and 1.0 being the end
      */
     public void thumbDragged(double position) {
-        final ScrollBar scrollbar = getControl();
+        final ScrollBar scrollbar = getNode();
 
         // Stop the timeline for continuous increments as drags take precedence
         stopTimeline();
@@ -295,21 +275,4 @@
             timeline = null;
         }
     }
-
-    /**
-     * Class to handle key bindings based upon the orientation of the control.
-     */
-    public static class ScrollBarKeyBinding extends OrientedKeyBinding {
-        public ScrollBarKeyBinding(KeyCode code, String action) {
-            super(code, action);
-        }
-
-        public ScrollBarKeyBinding(KeyCode code, EventType<KeyEvent> type, String action) {
-            super(code, type, action);
-        }
-
-        public @Override boolean getVertical(Control control) {
-            return ((ScrollBar)control).getOrientation() == Orientation.VERTICAL;
-        }
-    }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ScrollPaneBehavior.java	2015-09-03 14:48:47.689540600 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ScrollPaneBehavior.java	2015-09-03 14:48:47.090506400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -25,15 +25,15 @@
 
 package com.sun.javafx.scene.control.behavior;
 
-import javafx.geometry.NodeOrientation;
+import javafx.scene.control.ScrollBar;
 import javafx.scene.control.ScrollPane;
-import javafx.scene.input.KeyEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import com.sun.javafx.scene.control.skin.ScrollPaneSkin;
+import javafx.scene.control.skin.ScrollPaneSkin;
+
+import java.util.Optional;
+
 import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.F4;
 import static javafx.scene.input.KeyCode.LEFT;
 import static javafx.scene.input.KeyCode.PAGE_DOWN;
 import static javafx.scene.input.KeyCode.PAGE_UP;
@@ -54,6 +54,8 @@
  */
 public class ScrollPaneBehavior extends BehaviorBase<ScrollPane> {
 
+    private final InputMap<ScrollPane> inputMap;
+
     /***************************************************************************
      *                                                                         *
      * Constructors                                                            *
@@ -61,163 +63,94 @@
      **************************************************************************/
 
     public ScrollPaneBehavior(ScrollPane scrollPane) {
-        super(scrollPane, SCROLL_PANE_BINDINGS);
+        super(scrollPane);
+
+        // create a map for scrollpane-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        inputMap = createInputMap();
+
+        // scrollpane-specific mappings for key and mouse input
+        addDefaultMapping(inputMap,
+            new InputMap.KeyMapping(LEFT, e -> rtl(scrollPane, this::horizontalUnitIncrement, this::horizontalUnitDecrement)),
+            new InputMap.KeyMapping(RIGHT, e -> rtl(scrollPane, this::horizontalUnitDecrement, this::horizontalUnitIncrement)),
+
+            new InputMap.KeyMapping(UP, e -> verticalUnitDecrement()),
+            new InputMap.KeyMapping(DOWN, e -> verticalUnitIncrement()),
+
+            new InputMap.KeyMapping(PAGE_UP, e -> verticalPageDecrement()),
+            new InputMap.KeyMapping(PAGE_DOWN, e -> verticalPageIncrement()),
+            new InputMap.KeyMapping(SPACE, e -> verticalPageIncrement()),
+
+            new InputMap.KeyMapping(HOME, e -> verticalHome()),
+            new InputMap.KeyMapping(END, e -> verticalEnd()),
+
+            new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
     }
 
+
+
     /***************************************************************************
      *                                                                         *
      * Functions                                                               *
      *                                                                         *
      **************************************************************************/
 
+    @Override public InputMap<ScrollPane> getInputMap() {
+        return inputMap;
+    }
+
     public void horizontalUnitIncrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).hsbIncrement();
+        getHorizontalScrollBar().ifPresent(ScrollBar::increment);
     }
     public void horizontalUnitDecrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).hsbDecrement();
+        getHorizontalScrollBar().ifPresent(ScrollBar::decrement);
     }
     public void verticalUnitIncrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).vsbIncrement();
+        getVerticalScrollBar().ifPresent(ScrollBar::increment);
     }
     void verticalUnitDecrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).vsbDecrement();
+        getVerticalScrollBar().ifPresent(ScrollBar::decrement);
     }
     void horizontalPageIncrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).hsbPageIncrement();
+        getHorizontalScrollBar().ifPresent(ScrollBar::increment);
     }
     void horizontalPageDecrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).hsbPageDecrement();
+        getHorizontalScrollBar().ifPresent(ScrollBar::decrement);
     }
     void verticalPageIncrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).vsbPageIncrement();
+        getVerticalScrollBar().ifPresent(ScrollBar::increment);
     }
     void verticalPageDecrement() {
-        ((ScrollPaneSkin)getControl().getSkin()).vsbPageDecrement();
+        getVerticalScrollBar().ifPresent(ScrollBar::decrement);
     }
     void verticalHome() {
-        ScrollPane sp = getControl();
+        ScrollPane sp = getNode();
         sp.setHvalue(sp.getHmin());
         sp.setVvalue(sp.getVmin());
     }
     void verticalEnd() {
-        ScrollPane sp = getControl();
+        ScrollPane sp = getNode();
         sp.setHvalue(sp.getHmax());
         sp.setVvalue(sp.getVmax());
     }
 
-
-    public void contentDragged(double deltaX, double deltaY) {
-        // negative when dragged to the right/bottom
-        ScrollPane scroll = getControl();
-        if (!scroll.isPannable()) return;
-        if (deltaX < 0 && scroll.getHvalue() != 0 || deltaX > 0 && scroll.getHvalue() != scroll.getHmax()) {
-            scroll.setHvalue(scroll.getHvalue() + deltaX);
-        }
-        if (deltaY < 0 && scroll.getVvalue() != 0 || deltaY > 0 && scroll.getVvalue() != scroll.getVmax()) {
-            scroll.setVvalue(scroll.getVvalue() + deltaY);
-        }
+    private Optional<ScrollBar> getVerticalScrollBar() {
+        return Optional.ofNullable(((ScrollPaneSkin)getNode().getSkin()).getVerticalScrollBar());
     }
 
-    /***************************************************************************
-     *                                                                         *
-     * Key event handling                                                      *
-     *                                                                         *
-     **************************************************************************/
-
-    static final String TRAVERSE_DEBUG = "TraverseDebug";
-    static final String HORIZONTAL_UNITDECREMENT = "HorizontalUnitDecrement";
-    static final String HORIZONTAL_UNITINCREMENT = "HorizontalUnitIncrement";
-    static final String VERTICAL_UNITDECREMENT = "VerticalUnitDecrement";
-    static final String VERTICAL_UNITINCREMENT = "VerticalUnitIncrement";
-    static final String VERTICAL_PAGEDECREMENT = "VerticalPageDecrement";
-    static final String VERTICAL_PAGEINCREMENT = "VerticalPageIncrement";
-    static final String VERTICAL_HOME = "VerticalHome";
-    static final String VERTICAL_END = "VerticalEnd";
-
-    /**
-     * We manually handle focus traversal keys due to the ScrollPane binding
-     * the left/right/up/down keys specially.
-     */
-    protected static final List<KeyBinding> SCROLL_PANE_BINDINGS = new ArrayList<>();
-    static {
-        // TODO XXX DEBUGGING ONLY
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(F4, TRAVERSE_DEBUG).alt().ctrl().shift());
-
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(LEFT, HORIZONTAL_UNITDECREMENT));
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(RIGHT, HORIZONTAL_UNITINCREMENT));
-
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(UP, VERTICAL_UNITDECREMENT));
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(DOWN, VERTICAL_UNITINCREMENT));
-
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(PAGE_UP, VERTICAL_PAGEDECREMENT));
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(PAGE_DOWN, VERTICAL_PAGEINCREMENT));
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(SPACE, VERTICAL_PAGEINCREMENT));
-
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(HOME, VERTICAL_HOME));
-        SCROLL_PANE_BINDINGS.add(new KeyBinding(END, VERTICAL_END));
-    }
-
-    protected /*final*/ String matchActionForEvent(KeyEvent e) {
-        //TODO - untested code doesn't seem to get triggered (key eaten?)
-        String action = super.matchActionForEvent(e);
-        if (action != null) {
-            if (e.getCode() == LEFT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = "HorizontalUnitIncrement";
-                }
-            } else if (e.getCode() == RIGHT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = "HorizontalUnitDecrement";
-                }
-            }
-        }
-        return action;
-    }
-
-    @Override protected void callAction(String name) {
-        switch (name) {
-        case HORIZONTAL_UNITDECREMENT:
-            horizontalUnitDecrement();
-            break;
-        case HORIZONTAL_UNITINCREMENT:
-            horizontalUnitIncrement();
-            break;
-        case VERTICAL_UNITDECREMENT:
-            verticalUnitDecrement();
-            break;
-        case VERTICAL_UNITINCREMENT:
-            verticalUnitIncrement();
-            break;
-        case VERTICAL_PAGEDECREMENT:
-            verticalPageDecrement();
-            break;
-        case VERTICAL_PAGEINCREMENT:
-            verticalPageIncrement();
-            break;
-        case VERTICAL_HOME:
-            verticalHome();
-            break;
-        case VERTICAL_END:
-            verticalEnd();
-            break;
-        default :
-         super.callAction(name);
-            break;
-        }
+    private Optional<ScrollBar> getHorizontalScrollBar() {
+        return Optional.ofNullable(((ScrollPaneSkin)getNode().getSkin()).getHorizontalScrollBar());
     }
 
+
     /***************************************************************************
      *                                                                         *
      * Mouse event handling                                                    *
      *                                                                         *
      **************************************************************************/
 
-    public void mouseClicked() {
-        getControl().requestFocus();
-    }
-
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        getControl().requestFocus();
+    public void mousePressed(MouseEvent e) {
+        getNode().requestFocus();
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java	2015-09-03 14:48:55.223971600 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java	2015-09-03 14:48:54.683940700 -0700
@@ -25,84 +25,59 @@
 
 package com.sun.javafx.scene.control.behavior;
 
-import javafx.event.EventType;
-import javafx.geometry.NodeOrientation;
 import javafx.geometry.Orientation;
-import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
 import javafx.scene.control.Slider;
-import javafx.scene.input.KeyCode;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
 import com.sun.javafx.util.Utils;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.END;
-import static javafx.scene.input.KeyCode.F4;
-import static javafx.scene.input.KeyCode.HOME;
-import static javafx.scene.input.KeyCode.KP_DOWN;
-import static javafx.scene.input.KeyCode.KP_LEFT;
-import static javafx.scene.input.KeyCode.KP_RIGHT;
-import static javafx.scene.input.KeyCode.KP_UP;
-import static javafx.scene.input.KeyCode.LEFT;
-import static javafx.scene.input.KeyCode.RIGHT;
-import static javafx.scene.input.KeyCode.UP;
-import static javafx.scene.input.KeyEvent.KEY_RELEASED;
+import static javafx.scene.input.KeyCode.*;
 
 public class SliderBehavior extends BehaviorBase<Slider> {
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *                                                                        *
-     * We manually specify the focus traversal keys because Slider has        *
-     * different usage for up/down arrow keys.                                *
-     *************************************************************************/
-    protected static final List<KeyBinding> SLIDER_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        SLIDER_BINDINGS.add(new KeyBinding(F4, "TraverseDebug").alt().ctrl().shift());
-
-        SLIDER_BINDINGS.add(new SliderKeyBinding(LEFT, "DecrementValue"));
-        SLIDER_BINDINGS.add(new SliderKeyBinding(KP_LEFT, "DecrementValue"));
-        SLIDER_BINDINGS.add(new SliderKeyBinding(UP, "IncrementValue").vertical());
-        SLIDER_BINDINGS.add(new SliderKeyBinding(KP_UP, "IncrementValue").vertical());
-        SLIDER_BINDINGS.add(new SliderKeyBinding(RIGHT, "IncrementValue"));
-        SLIDER_BINDINGS.add(new SliderKeyBinding(KP_RIGHT, "IncrementValue"));
-        SLIDER_BINDINGS.add(new SliderKeyBinding(DOWN, "DecrementValue").vertical());
-        SLIDER_BINDINGS.add(new SliderKeyBinding(KP_DOWN, "DecrementValue").vertical());
-
-        SLIDER_BINDINGS.add(new KeyBinding(HOME, KEY_RELEASED, "Home"));
-        SLIDER_BINDINGS.add(new KeyBinding(END, KEY_RELEASED, "End"));
-    }
-
-    protected /*final*/ String matchActionForEvent(KeyEvent e) {
-        String action = super.matchActionForEvent(e);
-        if (action != null) {
-            if (e.getCode() == LEFT || e.getCode() == KP_LEFT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = getControl().getOrientation() == Orientation.HORIZONTAL ? "IncrementValue" : "DecrementValue";
-                }
-            } else if (e.getCode() == RIGHT || e.getCode() == KP_RIGHT) {
-                if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                    action = getControl().getOrientation() == Orientation.HORIZONTAL ? "DecrementValue" : "IncrementValue";
-                }
-            }
-        }
-        return action;
-    }
-    
-    @Override
-    protected void callAction(String name) {
-        if ("Home".equals(name)) home();
-        else if ("End".equals(name)) end();
-        else if ("IncrementValue".equals(name)) incrementValue();
-        else if ("DecrementValue".equals(name)) decrementValue();
-        else super.callAction(name);
-    }
 
+    private final InputMap<Slider> sliderInputMap;
+    
     private TwoLevelFocusBehavior tlFocus;
 
     public SliderBehavior(Slider slider) {
-        super(slider, SLIDER_BINDINGS);
+        super(slider);
+
+        // create a map for slider-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        sliderInputMap = createInputMap();
+
+        // then slider-specific mappings for key input
+        addDefaultMapping(sliderInputMap,
+            new InputMap.KeyMapping(HOME, KeyEvent.KEY_RELEASED, e -> home()),
+            new InputMap.KeyMapping(END, KeyEvent.KEY_RELEASED, e -> end())
+        );
+
+        // we split the rest of the mappings into vertical and horizontal slider
+        // child input maps
+        // -- horizontal
+        InputMap<Slider> horizontalMappings = new InputMap<>(slider);
+        horizontalMappings.setInterceptor(e -> slider.getOrientation() != Orientation.HORIZONTAL);
+        horizontalMappings.getMappings().addAll(
+            // we use the rtl method to translate depending on the RTL state of the UI
+            new InputMap.KeyMapping(LEFT, e -> rtl(slider, this::incrementValue, this::decrementValue)),
+            new InputMap.KeyMapping(KP_LEFT, e -> rtl(slider, this::incrementValue, this::decrementValue)),
+            new InputMap.KeyMapping(RIGHT, e -> rtl(slider, this::decrementValue, this::incrementValue)),
+            new InputMap.KeyMapping(KP_RIGHT, e -> rtl(slider, this::decrementValue, this::incrementValue))
+        );
+        addDefaultChildMap(sliderInputMap, horizontalMappings);
+
+        // -- vertical
+        InputMap<Slider> verticalMappings = new InputMap<>(slider);
+        verticalMappings.setInterceptor(e -> slider.getOrientation() != Orientation.VERTICAL);
+        verticalMappings.getMappings().addAll(
+                new InputMap.KeyMapping(DOWN, e -> decrementValue()),
+                new InputMap.KeyMapping(KP_DOWN, e -> decrementValue()),
+                new InputMap.KeyMapping(UP, e -> incrementValue()),
+                new InputMap.KeyMapping(KP_UP, e -> incrementValue())
+        );
+        addDefaultChildMap(sliderInputMap, verticalMappings);
+
         // Only add this if we're on an embedded platform that supports 5-button navigation
         if (com.sun.javafx.scene.control.skin.Utils.isTwoLevelFocus()) {
             tlFocus = new TwoLevelFocusBehavior(slider); // needs to be last.
@@ -114,6 +89,10 @@
         super.dispose();
     }
 
+    @Override public InputMap<Slider> getInputMap() {
+        return sliderInputMap;
+    }
+
     /**************************************************************************
      *                         State and Functions                            *
      *************************************************************************/
@@ -129,7 +108,7 @@
     public void trackPress(MouseEvent e, double position) {
         // determine the percentage of the way between min and max
         // represented by this mouse event
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         // If not already focused, request focus
         if (!slider.isFocused()) slider.requestFocus();
         if (slider.getOrientation().equals(Orientation.HORIZONTAL)) {
@@ -145,7 +124,7 @@
      */
     public void thumbPressed(MouseEvent e, double position) {
         // If not already focused, request focus
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         if (!slider.isFocused())  slider.requestFocus();
         slider.setValueChanging(true);
     }
@@ -155,12 +134,12 @@
      *        track and 1.0 being the end
      */
     public void thumbDragged(MouseEvent e, double position) {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         slider.setValue(Utils.clamp(slider.getMin(), (position * (slider.getMax() - slider.getMin())) + slider.getMin(), slider.getMax()));
     }
 
     private double snapValueToTicks(double val) {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         double v = val;
         double tickSpacing = 0;
         // compute the nearest tick to this value
@@ -181,7 +160,7 @@
      * When thumb is released valueChanging should be set to false.
      */
     public void thumbReleased(MouseEvent e) {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         slider.setValueChanging(false);
         // RT-15207 When snapToTicks is true, slider value calculated in drag
         // is then snapped to the nearest tick on mouse release.
@@ -191,12 +170,12 @@
     }
 
     void home() {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         slider.adjustValue(slider.getMin());
     }
 
     void decrementValue() {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         // RT-8634 If snapToTicks is true and block increment is less than
         // tick spacing, tick spacing is used as the decrement value.
         if (slider.isSnapToTicks()) {
@@ -208,12 +187,12 @@
     }
 
     void end() {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         slider.adjustValue(slider.getMax());
     }
 
     void incrementValue() {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         // RT-8634 If snapToTicks is true and block increment is less than
         // tick spacing, tick spacing is used as the increment value.
         if (slider.isSnapToTicks()) {
@@ -225,7 +204,7 @@
 
     // Used only if snapToTicks is true.
     double computeIncrement() {
-        final Slider slider = getControl();
+        final Slider slider = getNode();
         double tickSpacing = 0;
         if (slider.getMinorTickCount() != 0) {
             tickSpacing = slider.getMajorTickUnit() / (Math.max(slider.getMinorTickCount(),0)+1);
@@ -240,18 +219,18 @@
         return slider.getBlockIncrement();
     }
 
-    public static class SliderKeyBinding extends OrientedKeyBinding {
-        public SliderKeyBinding(KeyCode code, String action) {
-            super(code, action);
-        }
-
-        public SliderKeyBinding(KeyCode code, EventType<KeyEvent> type, String action) {
-            super(code, type, action);
-        }
-
-        public @Override boolean getVertical(Control control) {
-            return ((Slider)control).getOrientation() == Orientation.VERTICAL;
-        }
-    }
+//    public static class SliderKeyBinding extends OrientedKeyBinding {
+//        public SliderKeyBinding(KeyCode code, String action) {
+//            super(code, action);
+//        }
+//
+//        public SliderKeyBinding(KeyCode code, EventType<KeyEvent> type, String action) {
+//            super(code, type, action);
+//        }
+//
+//        public @Override boolean getVertical(Control control) {
+//            return ((Slider)control).getOrientation() == Orientation.VERTICAL;
+//        }
+//    }
 
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SpinnerBehavior.java	2015-09-03 14:49:02.953413700 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SpinnerBehavior.java	2015-09-03 14:49:02.265374300 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -30,13 +30,14 @@
 import javafx.event.EventHandler;
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import javafx.scene.input.KeyEvent;
 import javafx.util.Duration;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 
 public class SpinnerBehavior<T> extends BehaviorBase<Spinner<T>> {
 
@@ -46,6 +47,8 @@
     // step size)
     private static final double INITIAL_DURATION_MS = 750;
 
+    private final InputMap<Spinner<T>> spinnerInputMap;
+
     private final int STEP_AMOUNT = 1;
 
     private boolean isIncrementing = false;
@@ -53,7 +56,7 @@
     private Timeline timeline;
 
     final EventHandler<ActionEvent> spinningKeyFrameEventHandler = event -> {
-        final SpinnerValueFactory<T> valueFactory = getControl().getValueFactory();
+        final SpinnerValueFactory<T> valueFactory = getNode().getValueFactory();
         if (valueFactory == null) {
             return;
         }
@@ -74,66 +77,47 @@
      **************************************************************************/
 
     public SpinnerBehavior(Spinner<T> spinner) {
-        super(spinner, SPINNER_BINDINGS);
+        super(spinner);
+
+        // create a map for spinner-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        spinnerInputMap = createInputMap();
+
+        // then spinner-specific mappings for key and mouse input
+        addDefaultMapping(spinnerInputMap,
+            new KeyMapping(UP, KeyEvent.KEY_PRESSED, e -> {
+                if (arrowsAreVertical()) increment(1); else FocusTraversalInputMap.traverseUp(e);
+            }),
+            new KeyMapping(RIGHT, KeyEvent.KEY_PRESSED, e -> {
+                if (! arrowsAreVertical()) increment(1); else FocusTraversalInputMap.traverseRight(e);
+            }),
+            new KeyMapping(LEFT, KeyEvent.KEY_PRESSED, e -> {
+                if (! arrowsAreVertical()) decrement(1); else FocusTraversalInputMap.traverseLeft(e);
+            }),
+            new KeyMapping(DOWN, KeyEvent.KEY_PRESSED, e -> {
+                if (arrowsAreVertical()) decrement(1); else FocusTraversalInputMap.traverseDown(e);
+            })
+        );
     }
 
 
 
     /***************************************************************************
      *                                                                         *
-     * Key event handling                                                      *
+     * API                                                                     *
      *                                                                         *
      **************************************************************************/
 
-    /**
-     * Indicates that a keyboard key has been pressed which represents the
-     * event (this could be space bar for example). As long as keyDown is true,
-     * we are also armed, and will ignore mouse events related to arming.
-     * Note this is made package private solely for the sake of testing.
-     */
-    private boolean keyDown;
-
-    protected static final List<KeyBinding> SPINNER_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        SPINNER_BINDINGS.add(new KeyBinding(UP, "increment-up"));
-        SPINNER_BINDINGS.add(new KeyBinding(RIGHT, "increment-right"));
-        SPINNER_BINDINGS.add(new KeyBinding(LEFT, "decrement-left"));
-        SPINNER_BINDINGS.add(new KeyBinding(DOWN, "decrement-down"));
-    }
-
-    @Override protected void callAction(String name) {
-        boolean vertical = arrowsAreVertical();
-
-        switch (name) {
-            case "increment-up": {
-                if (vertical) increment(1); else traverseUp(); break;
-            }
-            case "increment-right": {
-                if (! vertical) increment(1); else traverseRight(); break;
-            }
-            case "decrement-down": {
-                if (vertical) decrement(1); else traverseDown(); break;
-            }
-            case "decrement-left": {
-                if (! vertical) decrement(1); else traverseLeft(); break;
-            }
-            default: super.callAction(name); break;
-        }
+    @Override public InputMap<Spinner<T>> getInputMap() {
+        return spinnerInputMap;
     }
 
-
-    /***************************************************************************
-     *                                                                         *
-     * API                                                                     *
-     *                                                                         *
-     **************************************************************************/
-
     public void increment(int steps) {
-        getControl().increment(steps);
+        getNode().increment(steps);
     }
 
     public void decrement(int steps) {
-        getControl().decrement(steps);
+        getNode().decrement(steps);
     }
 
     public void startSpinning(boolean increment) {
@@ -166,7 +150,7 @@
      **************************************************************************/
 
     private boolean arrowsAreVertical() {
-        final List<String> styleClass = getControl().getStyleClass();
+        final List<String> styleClass = getNode().getStyleClass();
 
         return ! (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_LEFT_HORIZONTAL)  ||
                   styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_RIGHT_HORIZONTAL) ||
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SplitMenuButtonBehavior.java	2015-09-03 14:49:10.508845800 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/SplitMenuButtonBehavior.java	2015-09-03 14:49:09.835807300 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -26,8 +26,8 @@
 package com.sun.javafx.scene.control.behavior;
 
 import javafx.scene.control.SplitMenuButton;
-import java.util.ArrayList;
-import java.util.List;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.SPACE;
 import static javafx.scene.input.KeyEvent.KEY_PRESSED;
@@ -50,7 +50,16 @@
      * @param splitMenuButton the SplitMenuButton
      */
     public SplitMenuButtonBehavior(final SplitMenuButton splitMenuButton) {
-        super(splitMenuButton, SPLIT_MENU_BUTTON_BINDINGS);
+        super(splitMenuButton);
+
+        /**
+         * The key bindings for the SplitMenuButton. Sets the Enter key as the means
+         * to open the menu and the space key as the means to activate the action.
+         */
+        addDefaultMapping(new InputMap.KeyMapping(SPACE, KEY_PRESSED, this::keyPressed));
+        addDefaultMapping(new InputMap.KeyMapping(SPACE, KEY_RELEASED, this::keyReleased));
+        addDefaultMapping(new InputMap.KeyMapping(ENTER, KEY_PRESSED, this::keyPressed));
+        addDefaultMapping(new InputMap.KeyMapping(ENTER, KEY_RELEASED, this::keyReleased));
     }
 
     /***************************************************************************
@@ -59,22 +68,18 @@
      *                                                                         *
      **************************************************************************/
 
-    /**
-     * The key bindings for the SplitMenuButton. Sets the Enter key as the means
-     * to open the menu and the space key as the means to activate the action.
-     */
-    protected static final List<KeyBinding> SPLIT_MENU_BUTTON_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        SPLIT_MENU_BUTTON_BINDINGS.addAll(BASE_MENU_BUTTON_BINDINGS);
-
-        /*
-         * TODO: ButtonBehavior should define "Press" and "Release" in
-         * constants.
-         */
-        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, "Press"));
-        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_RELEASED, "Release"));
-
-        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED,  "Press"));
-        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_RELEASED, "Release"));
-    }
+//    /**
+//     * The key bindings for the SplitMenuButton. Sets the Enter key as the means
+//     * to open the menu and the space key as the means to activate the action.
+//     */
+//    protected static final List<KeyBinding> SPLIT_MENU_BUTTON_BINDINGS = new ArrayList<KeyBinding>();
+//    static {
+//        SPLIT_MENU_BUTTON_BINDINGS.addAll(BASE_MENU_BUTTON_BINDINGS);
+//
+//        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_PRESSED, "Press"));
+//        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(SPACE, KEY_RELEASED, "Release"));
+//
+//        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED,  "Press"));
+//        SPLIT_MENU_BUTTON_BINDINGS.add(new KeyBinding(ENTER, KEY_RELEASED, "Release"));
+//    }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TabPaneBehavior.java	2015-09-03 14:49:17.760260600 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TabPaneBehavior.java	2015-09-03 14:49:17.156226000 -0700
@@ -25,101 +25,61 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.event.Event;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.Node;
-import javafx.scene.Parent;
 import javafx.scene.control.SelectionModel;
-import javafx.scene.control.SingleSelectionModel;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
+import javafx.scene.input.*;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+
 import java.util.List;
 
-public class TabPaneBehavior extends BehaviorBase<TabPane> {
+import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import static com.sun.javafx.scene.control.inputmap.InputMap.MouseMapping;
 
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    private static final String HOME = "Home";
-    private static final String END = "End";
-    private static final String CTRL_PAGE_UP = "Ctrl_Page_Up";
-    private static final String CTRL_PAGE_DOWN = "Ctrl_Page_Down";
-    private static final String CTRL_TAB = "Ctrl_Tab";
-    private static final String CTRL_SHIFT_TAB = "Ctrl_Shift_Tab";
-
-    protected static final List<KeyBinding> TAB_PANE_BINDINGS = new ArrayList<>();
-    static {
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.UP, "TraverseUp"));
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.DOWN, "TraverseDown"));
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.LEFT, "TraverseLeft"));
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.RIGHT, "TraverseRight"));
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.HOME, HOME));
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.END, END));
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.PAGE_UP, CTRL_PAGE_UP).ctrl());
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.PAGE_DOWN, CTRL_PAGE_DOWN).ctrl());
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.TAB, CTRL_TAB).ctrl());
-        TAB_PANE_BINDINGS.add(new KeyBinding(KeyCode.TAB, CTRL_SHIFT_TAB).shift().ctrl());
-    }
-
-    @Override protected void callAction(String name) {
-        boolean rtl = (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
-
-        if (("TraverseLeft".equals(name) && !rtl) ||
-            ("TraverseRight".equals(name) && rtl) ||
-            "TraverseUp".equals(name)) {
-            if (getControl().isFocused()) {
-                selectPreviousTab();
-            }
-        } else if (("TraverseRight".equals(name) && !rtl) || 
-                   ("TraverseLeft".equals(name) && rtl) ||
-                   "TraverseDown".equals(name)) {
-            if (getControl().isFocused()) {
-                selectNextTab();
-            }
-        } else if (CTRL_TAB.equals(name) || CTRL_PAGE_DOWN.equals(name)) {
-            selectNextTab();
-        } else if (CTRL_SHIFT_TAB.equals(name) || CTRL_PAGE_UP.equals(name)) {
-            selectPreviousTab();
-        } else if (HOME.equals(name)) {
-            if (getControl().isFocused()) {
-                moveSelection(0, 1);
-            }
-        } else if (END.equals(name)) {
-            if (getControl().isFocused()) {
-                moveSelection(getControl().getTabs().size() - 1, -1);
-            }
-        } else {
-            super.callAction(name);
-        }
-    }
+public class TabPaneBehavior extends BehaviorBase<TabPane> {
 
+    private final InputMap<TabPane> tabPaneInputMap;
 
+    public TabPaneBehavior(TabPane tabPane) {
+        super(tabPane);
 
-    /***************************************************************************
-     *                                                                         *
-     * Mouse event handling                                                    *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        TabPane tp = getControl();
-        tp.requestFocus();
+        // create a map for TabPane-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        tabPaneInputMap = createInputMap();
+
+        // TabPane-specific mappings for key and mouse input
+        addDefaultMapping(tabPaneInputMap,
+            new KeyMapping(UP, e -> selectPreviousTab()),
+            new KeyMapping(DOWN, e -> selectNextTab()),
+            new KeyMapping(LEFT, e -> rtl(tabPane, this::selectNextTab, this::selectPreviousTab)),
+            new KeyMapping(RIGHT, e -> rtl(tabPane, this::selectPreviousTab, this::selectNextTab)),
+            new KeyMapping(HOME, e -> {
+                if (getNode().isFocused()) {
+                    moveSelection(0, 1);
+                }
+            }),
+            new KeyMapping(END, e -> {
+                if (getNode().isFocused()) {
+                    moveSelection(getNode().getTabs().size() - 1, -1);
+                }
+            }),
+            new KeyMapping(new KeyBinding(PAGE_UP).ctrl(), e -> selectPreviousTab()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).ctrl(), e -> selectNextTab()),
+            new KeyMapping(new KeyBinding(TAB).ctrl(), e -> selectNextTab()),
+            new KeyMapping(new KeyBinding(TAB).ctrl().shift(), e -> selectPreviousTab()),
+            new MouseMapping(MouseEvent.MOUSE_PRESSED, e -> getNode().requestFocus())
+        );
     }
 
-    /**************************************************************************
-     *                         State and Functions                            *
-     *************************************************************************/
-
-    public TabPaneBehavior(TabPane tabPane) {
-        super(tabPane, TAB_PANE_BINDINGS);
+    @Override public InputMap<TabPane> getInputMap() {
+        return tabPaneInputMap;
     }
 
     public void selectTab(Tab tab) {
-        getControl().getSelectionModel().select(tab);
+        getNode().getSelectionModel().select(tab);
     }
 
     public boolean canCloseTab(Tab tab) {
@@ -129,7 +89,7 @@
     }
     
     public void closeTab(Tab tab) {
-        TabPane tabPane = getControl();
+        TabPane tabPane = getNode();
         // only switch to another tab if the selected tab is the one we're closing
         int index = tabPane.getTabs().indexOf(tab);
         if (index != -1) {
@@ -152,11 +112,11 @@
     }
 
     private void moveSelection(int delta) {
-        moveSelection(getControl().getSelectionModel().getSelectedIndex(), delta);
+        moveSelection(getNode().getSelectionModel().getSelectedIndex(), delta);
     }
 
     private void moveSelection(int startIndex, int delta) {
-        final TabPane tabPane = getControl();
+        final TabPane tabPane = getNode();
         int tabIndex = findValidTab(startIndex, delta);
         if (tabIndex > -1) {
             final SelectionModel<Tab> selectionModel = tabPane.getSelectionModel();
@@ -166,7 +126,7 @@
     }
 
     private int findValidTab(int startIndex, int delta) {
-        final TabPane tabPane = getControl();
+        final TabPane tabPane = getNode();
         final List<Tab> tabs = tabPane.getTabs();
         final int max = tabs.size();
 
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableCellBehavior.java	2015-09-03 14:49:25.308692300 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableCellBehavior.java	2015-09-03 14:49:24.694657200 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -57,12 +57,12 @@
 
     /** @{@inheritDoc} */
     @Override protected TableView<S> getCellContainer() {
-        return getControl().getTableView();
+        return getNode().getTableView();
     }
 
     /** @{@inheritDoc} */
     @Override protected TableColumn<S,T> getTableColumn() {
-        return getControl().getTableColumn();
+        return getNode().getTableColumn();
     }
 
     /** @{@inheritDoc} */
@@ -87,7 +87,7 @@
 
     /** @{@inheritDoc} */
     @Override protected boolean isTableRowSelected() {
-        return getControl().getTableRow().isSelected();
+        return getNode().getTableRow().isSelected();
     }
 
     /** @{@inheritDoc} */
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableCellBehaviorBase.java	2015-09-03 14:49:32.728116700 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableCellBehaviorBase.java	2015-09-03 14:49:32.119081900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -34,8 +34,6 @@
 import javafx.scene.control.TableSelectionModel;
 import javafx.scene.input.MouseButton;
 
-import java.util.Collections;
-
 public abstract class TableCellBehaviorBase<S, T, TC extends TableColumnBase<S, ?>, C extends IndexedCell<T>> extends CellBehaviorBase<C> {
     
     /***************************************************************************
@@ -52,7 +50,7 @@
      **************************************************************************/    
 
     public TableCellBehaviorBase(C control) {
-        super(control, Collections.emptyList());
+        super(control);
     }
     
     
@@ -98,7 +96,7 @@
                           final int clickCount, final boolean shiftDown, final boolean shortcutDown) {
         // Note that table.select will reset selection
         // for out of bounds indexes. So, need to check
-        final C tableCell = getControl();
+        final C tableCell = getNode();
 
         // If the mouse event is not contained within this tableCell, then
         // we don't want to react to it.
@@ -202,7 +200,7 @@
 
     protected void simpleSelect(MouseButton button, int clickCount, boolean shortcutDown) {
         final TableSelectionModel<S> sm = getSelectionModel();
-        final int row = getControl().getIndex();
+        final int row = getNode().getIndex();
         final TableColumnBase<S,T> column = getTableColumn();
         boolean isAlreadySelected = sm.isSelected(row, column);
 
@@ -233,7 +231,7 @@
         if (sm == null) return false;
 
         if (sm.isCellSelectionEnabled()) {
-            final C cell = getControl();
+            final C cell = getNode();
             return cell.isSelected();
         } else {
             return isTableRowSelected();
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableRowBehavior.java	2015-09-03 14:49:40.271548100 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableRowBehavior.java	2015-09-03 14:49:39.660513200 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -69,7 +69,7 @@
     }
 
     @Override protected TableView<T> getCellContainer() {
-        return getControl().getTableView();
+        return getNode().getTableView();
     }
 
     @Override protected void edit(TableRow<T> cell) {
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableRowBehaviorBase.java	2015-09-03 14:49:47.812979500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableRowBehaviorBase.java	2015-09-03 14:49:47.169942700 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -34,7 +34,6 @@
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 
-import java.util.Collections;
 import java.util.List;
 
 public abstract class TableRowBehaviorBase<T extends Cell> extends CellBehaviorBase<T> {
@@ -46,7 +45,7 @@
      **************************************************************************/
 
     public TableRowBehaviorBase(T control) {
-        super(control, Collections.emptyList());
+        super(control);
     }
 
 
@@ -109,7 +108,7 @@
                 } else if (shiftDown) {
                     // we add all rows between the current focus and
                     // this row (inclusive) to the current selection.
-                    TablePositionBase<?> anchor = TableCellBehavior.getAnchor(table, getFocusedCell());
+                    TablePositionBase<?> anchor = getAnchor(table, getFocusedCell());
                     final int anchorRow = anchor.getRow();
                     selectRows(anchorRow, index);
                 } else {
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehavior.java	2015-09-03 14:49:55.396413200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehavior.java	2015-09-03 14:49:54.769377400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -99,53 +99,53 @@
     
     /** {@inheritDoc}  */
     @Override protected int getItemCount() {
-        return getControl().getItems() == null ? 0 : getControl().getItems().size();
+        return getNode().getItems() == null ? 0 : getNode().getItems().size();
     }
 
     /** {@inheritDoc}  */
     @Override protected TableFocusModel getFocusModel() {
-        return getControl().getFocusModel();
+        return getNode().getFocusModel();
     }
 
     /** {@inheritDoc}  */
     @Override protected TableSelectionModel<T> getSelectionModel() {
-        return getControl().getSelectionModel();
+        return getNode().getSelectionModel();
     }
 
     /** {@inheritDoc}  */
     @Override protected ObservableList<TablePosition> getSelectedCells() {
-        return getControl().getSelectionModel().getSelectedCells();
+        return getNode().getSelectionModel().getSelectedCells();
     }
 
     /** {@inheritDoc}  */
     @Override protected TablePositionBase getFocusedCell() {
-        return getControl().getFocusModel().getFocusedCell();
+        return getNode().getFocusModel().getFocusedCell();
     }
 
     /** {@inheritDoc}  */
     @Override protected int getVisibleLeafIndex(TableColumnBase tc) {
-        return getControl().getVisibleLeafIndex((TableColumn)tc);
+        return getNode().getVisibleLeafIndex((TableColumn)tc);
     }
 
     /** {@inheritDoc}  */
     @Override protected TableColumn<T,?> getVisibleLeafColumn(int index) {
-        return getControl().getVisibleLeafColumn(index);
+        return getNode().getVisibleLeafColumn(index);
     }
 
     /** {@inheritDoc}  */
     @Override protected void editCell(int row, TableColumnBase tc) {
-        getControl().edit(row, (TableColumn)tc);
+        getNode().edit(row, (TableColumn)tc);
     }
 
     /** {@inheritDoc}  */
     @Override protected ObservableList<TableColumn<T,?>> getVisibleLeafColumns() {
-        return getControl().getVisibleLeafColumns();
+        return getNode().getVisibleLeafColumns();
     }
 
     /** {@inheritDoc}  */
     @Override protected TablePositionBase<TableColumn<T, ?>> 
             getTablePosition(int row, TableColumnBase<T, ?> tc) {
-        return new TablePosition(getControl(), row, (TableColumn)tc);
+        return new TablePosition(getNode(), row, (TableColumn)tc);
     }
 
 
@@ -159,7 +159,7 @@
     /** {@inheritDoc} */
     @Override protected void selectAllToFocus(boolean setAnchorToFocusIndex) {
         // Fix for RT-31241
-        if (getControl().getEditingCell() != null) return;
+        if (getNode().getEditingCell() != null) return;
 
         super.selectAllToFocus(setAnchorToFocusIndex);
     }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java	2015-09-03 14:50:02.786835900 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TableViewBehaviorBase.java	2015-09-03 14:50:02.138798900 -0700
@@ -29,205 +29,52 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.WeakListChangeListener;
+import javafx.event.EventHandler;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.control.*;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 import java.util.ArrayList;
 import java.util.List;
 import com.sun.javafx.PlatformUtil;
-import static javafx.scene.input.KeyCode.A;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.END;
-import static javafx.scene.input.KeyCode.ENTER;
-import static javafx.scene.input.KeyCode.ESCAPE;
-import static javafx.scene.input.KeyCode.F2;
-import static javafx.scene.input.KeyCode.HOME;
-import static javafx.scene.input.KeyCode.KP_DOWN;
-import static javafx.scene.input.KeyCode.KP_LEFT;
-import static javafx.scene.input.KeyCode.KP_RIGHT;
-import static javafx.scene.input.KeyCode.KP_UP;
-import static javafx.scene.input.KeyCode.LEFT;
-import static javafx.scene.input.KeyCode.PAGE_DOWN;
-import static javafx.scene.input.KeyCode.PAGE_UP;
-import static javafx.scene.input.KeyCode.RIGHT;
-import static javafx.scene.input.KeyCode.SPACE;
-import static javafx.scene.input.KeyCode.TAB;
-import static javafx.scene.input.KeyCode.UP;
+import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 
 public abstract class TableViewBehaviorBase<C extends Control, T, TC extends TableColumnBase<T,?>> extends BehaviorBase<C> {
 
     /**************************************************************************
      *                                                                        *
-     * Setup key bindings                                                     *
-     *                                                                        *  
-     *************************************************************************/
-    protected static final List<KeyBinding> TABLE_VIEW_BINDINGS = new ArrayList<KeyBinding>();
-
-    static {
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(TAB, "TraverseNext"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(TAB, "TraversePrevious").shift());
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(HOME, "SelectFirstRow"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(END, "SelectLastRow"));
-        
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "ScrollUp"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "ScrollDown"));
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "SelectLeftCell"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_LEFT, "SelectLeftCell"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "SelectRightCell"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_RIGHT, "SelectRightCell"));
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(UP, "SelectPreviousRow"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_UP, "SelectPreviousRow"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "SelectNextRow"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_DOWN, "SelectNextRow"));
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "TraverseLeft"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_LEFT, "TraverseLeft"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "SelectNextRow"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_RIGHT, "SelectNextRow"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(UP, "TraverseUp"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_UP, "TraverseUp"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "TraverseDown"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_DOWN, "TraverseDown"));
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(HOME, "SelectAllToFirstRow").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(END, "SelectAllToLastRow").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "SelectAllPageUp").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "SelectAllPageDown").shift());
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(UP, "AlsoSelectPrevious").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_UP, "AlsoSelectPrevious").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "AlsoSelectNext").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_DOWN, "AlsoSelectNext").shift());
-        
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "SelectAllToFocus").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "SelectAllToFocusAndSetAnchor").shortcut().shift());
-
-//        TABLE_VIEW_BINDINGS.add(new KeyBinding(UP, "AlsoSelectPreviousCell").shift());
-//        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_UP, "AlsoSelectPreviousCell").shift());
-//        TABLE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "AlsoSelectNextCell").shift());
-//        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_DOWN, "AlsoSelectNextCell").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "AlsoSelectLeftCell").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_LEFT, "AlsoSelectLeftCell").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "AlsoSelectRightCell").shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_RIGHT, "AlsoSelectRightCell").shift());
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(UP, "FocusPreviousRow").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "FocusNextRow").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "FocusRightCell").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_RIGHT, "FocusRightCell").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "FocusLeftCell").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_LEFT, "FocusLeftCell").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(A, "SelectAll").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(HOME, "FocusFirstRow").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(END, "FocusLastRow").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "FocusPageUp").shortcut());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "FocusPageDown").shortcut());
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(UP, "DiscontinuousSelectPreviousRow").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "DiscontinuousSelectNextRow").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "DiscontinuousSelectPreviousColumn").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "DiscontinuousSelectNextColumn").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "DiscontinuousSelectPageUp").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "DiscontinuousSelectPageDown").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(HOME, "DiscontinuousSelectAllToFirstRow").shortcut().shift());
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(END, "DiscontinuousSelectAllToLastRow").shortcut().shift());
-        
-        if (PlatformUtil.isMac()) {
-            TABLE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection").ctrl().shortcut());
-        } else {
-            TABLE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection").ctrl());
-        }
-
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(ENTER, "Activate"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "Activate"));
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(F2, "Activate"));
-//        TABLE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "Activate").ctrl());
-        
-        TABLE_VIEW_BINDINGS.add(new KeyBinding(ESCAPE, "CancelEdit"));
-    }
-
-    @Override protected void callAction(String name) {
-        boolean rtl = (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
-
-        if ("SelectPreviousRow".equals(name)) selectPreviousRow();
-        else if ("SelectNextRow".equals(name)) selectNextRow();
-        else if ("SelectLeftCell".equals(name)) { if (rtl) selectRightCell(); else selectLeftCell(); }
-        else if ("SelectRightCell".equals(name)) { if (rtl) selectLeftCell(); else selectRightCell(); }
-        else if ("SelectFirstRow".equals(name)) selectFirstRow();
-        else if ("SelectLastRow".equals(name)) selectLastRow();
-        else if ("SelectAll".equals(name)) selectAll();
-        else if ("SelectAllPageUp".equals(name)) selectAllPageUp();
-        else if ("SelectAllPageDown".equals(name)) selectAllPageDown();
-        else if ("SelectAllToFirstRow".equals(name)) selectAllToFirstRow();
-        else if ("SelectAllToLastRow".equals(name)) selectAllToLastRow();
-        else if ("AlsoSelectNext".equals(name)) alsoSelectNext();
-        else if ("AlsoSelectPrevious".equals(name)) alsoSelectPrevious();
-        else if ("AlsoSelectLeftCell".equals(name)) { if (rtl) alsoSelectRightCell(); else alsoSelectLeftCell(); }
-        else if ("AlsoSelectRightCell".equals(name)) { if (rtl) alsoSelectLeftCell(); else alsoSelectRightCell(); }
-        else if ("ClearSelection".equals(name)) clearSelection();
-        else if ("ScrollUp".equals(name)) scrollUp();
-        else if ("ScrollDown".equals(name)) scrollDown();
-        else if ("FocusPreviousRow".equals(name)) focusPreviousRow();
-        else if ("FocusNextRow".equals(name)) focusNextRow();
-        else if ("FocusLeftCell".equals(name)) { if (rtl) focusRightCell(); else focusLeftCell(); }
-        else if ("FocusRightCell".equals(name)) { if (rtl) focusLeftCell(); else focusRightCell(); }
-        else if ("Activate".equals(name)) activate();
-        else if ("CancelEdit".equals(name)) cancelEdit();
-        else if ("FocusFirstRow".equals(name)) focusFirstRow();
-        else if ("FocusLastRow".equals(name)) focusLastRow();
-        else if ("toggleFocusOwnerSelection".equals(name)) toggleFocusOwnerSelection();
-
-        else if ("SelectAllToFocus".equals(name)) selectAllToFocus(false);
-        else if ("SelectAllToFocusAndSetAnchor".equals(name)) selectAllToFocus(true);
-
-        else if ("FocusPageUp".equals(name)) focusPageUp();
-        else if ("FocusPageDown".equals(name)) focusPageDown();
-        else if ("DiscontinuousSelectNextRow".equals(name)) discontinuousSelectNextRow();
-        else if ("DiscontinuousSelectPreviousRow".equals(name)) discontinuousSelectPreviousRow();
-        else if ("DiscontinuousSelectNextColumn".equals(name)) { if (rtl) discontinuousSelectPreviousColumn(); else discontinuousSelectNextColumn(); }
-        else if ("DiscontinuousSelectPreviousColumn".equals(name)) { if (rtl) discontinuousSelectNextColumn(); else discontinuousSelectPreviousColumn(); }
-        else if ("DiscontinuousSelectPageUp".equals(name)) discontinuousSelectPageUp();
-        else if ("DiscontinuousSelectPageDown".equals(name)) discontinuousSelectPageDown();
-        else if ("DiscontinuousSelectAllToLastRow".equals(name)) discontinuousSelectAllToLastRow();
-        else if ("DiscontinuousSelectAllToFirstRow".equals(name)) discontinuousSelectAllToFirstRow();
-        else super.callAction(name);
-    }
-
-    @Override protected void callActionForEvent(KeyEvent e) {
-        // RT-12751: we want to keep an eye on the user holding down the shift key, 
-        // so that we know when they enter/leave multiple selection mode. This
-        // changes what happens when certain key combinations are pressed.
-        isShiftDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShiftDown();
-        isShortcutDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShortcutDown();
-        
-        super.callActionForEvent(e);
-    }
-    
-    
-    
-    /**************************************************************************
-     *                                                                        *
      * Internal fields                                                        *
      *                                                                        *  
      *************************************************************************/
+
+    private final InputMap<C> tableViewInputMap;
     
     protected boolean isShortcutDown = false;
     protected boolean isShiftDown = false;
     private boolean selectionPathDeviated = false;
     protected boolean selectionChanging = false;
 
+    private final EventHandler<KeyEvent> keyEventListener = e -> {
+        if (!e.isConsumed()) {
+            // RT-12751: we want to keep an eye on the user holding down the shift key,
+            // so that we know when they enter/leave multiple selection mode. This
+            // changes what happens when certain key combinations are pressed.
+            isShiftDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShiftDown();
+            isShortcutDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShortcutDown();
+        }
+    };
+
     private final SizeLimitedList<TablePositionBase> selectionHistory = new SizeLimitedList<>(10);
 
     protected final ListChangeListener<TablePositionBase> selectedCellsListener = c -> {
         while (c.next()) {
             if (c.wasReplaced()) {
-                if (TreeTableCellBehavior.hasDefaultAnchor(getControl())) {
-                    TreeTableCellBehavior.removeAnchor(getControl());
+                if (TreeTableCellBehavior.hasDefaultAnchor(getNode())) {
+                    TreeTableCellBehavior.removeAnchor(getNode());
                 }
             }
 
@@ -282,11 +129,106 @@
      *************************************************************************/
 
     public TableViewBehaviorBase(C control) {
-        this(control, null);
-    }
+        super(control);
+
+
+        // create a map for TableView(Base)-specific mappings
+        tableViewInputMap = createInputMap();
 
-    public TableViewBehaviorBase(C control, List<KeyBinding> bindings) {
-        super(control, bindings == null ? TABLE_VIEW_BINDINGS : bindings);
+        addDefaultMapping(tableViewInputMap,
+                new KeyMapping(TAB, FocusTraversalInputMap::traverseNext),
+                new KeyMapping(new KeyBinding(TAB).shift(), FocusTraversalInputMap::traversePrevious),
+
+                new KeyMapping(HOME, e -> selectFirstRow()),
+                new KeyMapping(END, e -> selectLastRow()),
+
+                new KeyMapping(PAGE_UP, e -> scrollUp()),
+                new KeyMapping(PAGE_DOWN, e -> scrollDown()),
+
+                new KeyMapping(LEFT, e -> selectLeftCell()),
+                new KeyMapping(KP_LEFT, e -> selectLeftCell()),
+                new KeyMapping(RIGHT, e -> selectRightCell()),
+                new KeyMapping(KP_RIGHT, e -> selectRightCell()),
+
+                new KeyMapping(UP, e -> selectPreviousRow()),
+                new KeyMapping(KP_UP, e -> selectPreviousRow()),
+                new KeyMapping(DOWN, e -> selectNextRow()),
+                new KeyMapping(KP_DOWN, e -> selectNextRow()),
+
+                new KeyMapping(LEFT, FocusTraversalInputMap::traverseLeft),
+                new KeyMapping(KP_LEFT, FocusTraversalInputMap::traverseLeft),
+                new KeyMapping(RIGHT, FocusTraversalInputMap::traverseRight),
+                new KeyMapping(KP_RIGHT, FocusTraversalInputMap::traverseRight),
+                new KeyMapping(UP, FocusTraversalInputMap::traverseUp),
+                new KeyMapping(KP_UP, FocusTraversalInputMap::traverseUp),
+                new KeyMapping(DOWN, FocusTraversalInputMap::traverseDown),
+                new KeyMapping(KP_DOWN, FocusTraversalInputMap::traverseDown),
+
+                new KeyMapping(new KeyBinding(HOME).shift(), e -> selectAllToFirstRow()),
+                new KeyMapping(new KeyBinding(END).shift(), e -> selectAllToLastRow()),
+                new KeyMapping(new KeyBinding(PAGE_UP).shift(), e -> selectAllPageUp()),
+                new KeyMapping(new KeyBinding(PAGE_DOWN).shift(), e -> selectAllPageDown()),
+
+                new KeyMapping(new KeyBinding(UP).shift(), e -> alsoSelectPrevious()),
+                new KeyMapping(new KeyBinding(KP_UP).shift(), e -> alsoSelectPrevious()),
+                new KeyMapping(new KeyBinding(DOWN).shift(), e -> alsoSelectNext()),
+                new KeyMapping(new KeyBinding(KP_DOWN).shift(), e -> alsoSelectNext()),
+
+                new KeyMapping(new KeyBinding(SPACE).shift(), e -> selectAllToFocus(false)),
+                new KeyMapping(new KeyBinding(SPACE).shortcut().shift(), e -> selectAllToFocus(true)),
+
+                new KeyMapping(new KeyBinding(LEFT).shift(), e -> alsoSelectLeftCell()),
+                new KeyMapping(new KeyBinding(KP_LEFT).shift(), e -> alsoSelectLeftCell()),
+                new KeyMapping(new KeyBinding(RIGHT).shift(), e -> alsoSelectRightCell()),
+                new KeyMapping(new KeyBinding(KP_RIGHT).shift(), e -> alsoSelectRightCell()),
+
+                new KeyMapping(new KeyBinding(UP).shortcut(), e -> focusPreviousRow()),
+                new KeyMapping(new KeyBinding(DOWN).shortcut(), e -> focusNextRow()),
+                new KeyMapping(new KeyBinding(RIGHT).shortcut(), e -> focusRightCell()),
+                new KeyMapping(new KeyBinding(KP_RIGHT).shortcut(), e -> focusRightCell()),
+                new KeyMapping(new KeyBinding(LEFT).shortcut(), e -> focusLeftCell()),
+                new KeyMapping(new KeyBinding(KP_LEFT).shortcut(), e -> focusLeftCell()),
+
+                new KeyMapping(new KeyBinding(A).shortcut(), e -> selectAll()),
+                new KeyMapping(new KeyBinding(HOME).shortcut(), e -> focusFirstRow()),
+                new KeyMapping(new KeyBinding(END).shortcut(), e -> focusLastRow()),
+                new KeyMapping(new KeyBinding(PAGE_UP).shortcut(), e -> focusPageUp()),
+                new KeyMapping(new KeyBinding(PAGE_DOWN).shortcut(), e -> focusPageDown()),
+
+                new KeyMapping(new KeyBinding(UP).shortcut().shift(), e -> discontinuousSelectPreviousRow()),
+                new KeyMapping(new KeyBinding(DOWN).shortcut().shift(), e -> discontinuousSelectNextRow()),
+                new KeyMapping(new KeyBinding(LEFT).shortcut().shift(), e -> discontinuousSelectPreviousColumn()),
+                new KeyMapping(new KeyBinding(RIGHT).shortcut().shift(), e -> discontinuousSelectNextColumn()),
+                new KeyMapping(new KeyBinding(PAGE_UP).shortcut().shift(), e -> discontinuousSelectPageUp()),
+                new KeyMapping(new KeyBinding(PAGE_DOWN).shortcut().shift(), e -> discontinuousSelectPageDown()),
+                new KeyMapping(new KeyBinding(HOME).shortcut().shift(), e -> discontinuousSelectAllToFirstRow()),
+                new KeyMapping(new KeyBinding(END).shortcut().shift(), e -> discontinuousSelectAllToLastRow()),
+
+                new KeyMapping(ENTER, e -> activate()),
+                new KeyMapping(SPACE, e -> activate()),
+                new KeyMapping(F2, e -> activate()),
+                new KeyMapping(ESCAPE, e -> cancelEdit()),
+
+                new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
+
+        // create OS-specific child mappings
+        // --- mac OS
+        InputMap<C> macInputMap = new InputMap<>(control);
+        macInputMap.setInterceptor(event -> !PlatformUtil.isMac());
+        addDefaultMapping(macInputMap, new KeyMapping(new KeyBinding(SPACE).shortcut().ctrl(), e -> toggleFocusOwnerSelection()));
+        addDefaultChildMap(tableViewInputMap, macInputMap);
+
+        // --- all other platforms
+        InputMap<C> otherOsInputMap = new InputMap<>(control);
+        otherOsInputMap.setInterceptor(event -> PlatformUtil.isMac());
+        addDefaultMapping(otherOsInputMap, new KeyMapping(new KeyBinding(SPACE).ctrl(), e -> toggleFocusOwnerSelection()));
+        addDefaultChildMap(tableViewInputMap, otherOsInputMap);
+
+        // set up other listeners
+        // We make this an event _filter_ so that we can determine the state
+        // of the shift key before the event handlers get a shot at the event.
+        control.addEventFilter(KeyEvent.ANY, keyEventListener);
     }
 
     
@@ -295,13 +237,18 @@
      *                                                                        *
      * Abstract API                                                           *
      *                                                                        *  
-     *************************************************************************/    
-    
+     *************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public InputMap<C> getInputMap() {
+        return tableViewInputMap;
+    }
+
     /**
      * Call to record the current anchor position
      */
     protected void setAnchor(TablePositionBase tp) {
-        TableCellBehaviorBase.setAnchor(getControl(), tp, false);
+        TableCellBehaviorBase.setAnchor(getNode(), tp, false);
         setSelectionPathDeviated(false);
     }
     
@@ -309,14 +256,14 @@
      * Will return the current anchor position.
      */
     protected TablePositionBase getAnchor() {
-        return TableCellBehaviorBase.getAnchor(getControl(), getFocusedCell());
+        return TableCellBehaviorBase.getAnchor(getNode(), getFocusedCell());
     }
     
     /**
      * Returns true if there is an anchor set, and false if not anchor is set.
      */
     protected boolean hasAnchor() {
-        return TableCellBehaviorBase.hasNonDefaultAnchor(getControl());
+        return TableCellBehaviorBase.hasNonDefaultAnchor(getNode());
     }
     
     /**
@@ -443,20 +390,18 @@
     private Runnable onSelectLeftCell;
     public void setOnSelectLeftCell(Runnable r) { onSelectLeftCell = r; }
     
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        
+    public void mousePressed(MouseEvent e) {
 //        // FIXME can't assume (yet) cells.get(0) is necessarily the lead cell
 //        ObservableList<? extends TablePositionBase> cells = getSelectedCells();
 //        setAnchor(cells.isEmpty() ? null : cells.get(0));
         
-        if (!getControl().isFocused() && getControl().isFocusTraversable()) {
-            getControl().requestFocus();
+        if (!getNode().isFocused() && getNode().isFocusTraversable()) {
+            getNode().requestFocus();
         }
     }
 
     protected boolean isRTL() {
-        return (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
+        return (getNode().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
     }
     
     
@@ -1151,7 +1096,7 @@
 
         TablePosition focusedCell = fm.getFocusedCell();
         
-        TableColumn endColumn = getControl().getVisibleLeafColumn(0);
+        TableColumn endColumn = getNode().getVisibleLeafColumn(0);
         sm.clearAndSelect(focusedCell.getRow(), endColumn);
     }
     
@@ -1167,7 +1112,7 @@
 
         TablePosition focusedCell = fm.getFocusedCell();
         
-        TableColumn endColumn = getControl().getVisibleLeafColumn(getControl().getVisibleLeafColumns().size() - 1);
+        TableColumn endColumn = getNode().getVisibleLeafColumn(getNode().getVisibleLeafColumns().size() - 1);
         sm.clearAndSelect(focusedCell.getRow(), endColumn);
     }
      */
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextAreaBehavior.java	2015-09-03 14:50:11.128313100 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextAreaBehavior.java	2015-09-03 14:50:10.485276300 -0700
@@ -1,511 +1,507 @@
-/*
- * Copyright (c) 2011, 2015, 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.behavior;
-
-import com.sun.javafx.PlatformUtil;
-import com.sun.javafx.geom.transform.Affine3D;
-import com.sun.javafx.scene.control.skin.TextAreaSkin;
-import com.sun.javafx.scene.text.HitInfo;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.geometry.Bounds;
-import javafx.geometry.Point2D;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.Scene;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.IndexRange;
-import javafx.scene.control.TextArea;
-import javafx.scene.input.ContextMenuEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.stage.Screen;
-import javafx.stage.Window;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static com.sun.javafx.PlatformUtil.isMac;
-import static com.sun.javafx.PlatformUtil.isWindows;
-import static javafx.scene.input.KeyCode.*;
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
-
-
-/**
- * Text area behavior.
- */
-public class TextAreaBehavior extends TextInputControlBehavior<TextArea> {
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    protected static final List<KeyBinding> TEXT_AREA_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        TEXT_AREA_BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED, "LineStart")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(END, KEY_PRESSED, "LineEnd")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "PreviousLine")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "PreviousLine")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "NextLine")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "NextLine")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_UP, KEY_PRESSED, "PreviousPage")); // new
-        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_DOWN, KEY_PRESSED, "NextPage")); // new
-        TEXT_AREA_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED, "InsertNewLine")); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(TAB, KEY_PRESSED, "TraverseOrInsertTab")); // changed
-
-        TEXT_AREA_BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED, "SelectLineStart").shift()); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(END, KEY_PRESSED, "SelectLineEnd").shift()); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectPreviousLine").shift()); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectPreviousLine").shift()); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectNextLine").shift()); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectNextLine").shift()); // changed
-        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_UP, KEY_PRESSED, "SelectPreviousPage").shift()); // new
-        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_DOWN, KEY_PRESSED, "SelectNextPage").shift()); // new
-        // Platform specific settings
-        if (isMac()) {
-            TEXT_AREA_BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED, "LineStart").shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED, "LineStart").shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED, "LineEnd").shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED, "LineEnd").shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "Home").shortcut());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "Home").shortcut());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "End").shortcut());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "End").shortcut());
-
-            TEXT_AREA_BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED, "SelectLineStartExtend").shift().shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED, "SelectLineStartExtend").shift().shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED, "SelectLineEndExtend").shift().shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED, "SelectLineEndExtend").shift().shortcut()); // changed
-            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectHomeExtend").shortcut().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectHomeExtend").shortcut().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectEndExtend").shortcut().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectEndExtend").shortcut().shift());
-
-            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "ParagraphStart").alt());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "ParagraphStart").alt());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "ParagraphEnd").alt());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "ParagraphEnd").alt());
-
-            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectParagraphStart").alt().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectParagraphStart").alt().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectParagraphEnd").alt().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectParagraphEnd").alt().shift());
-        } else {
-            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "ParagraphStart").ctrl());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "ParagraphStart").ctrl());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "ParagraphEnd").ctrl());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "ParagraphEnd").ctrl());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectParagraphStart").ctrl().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectParagraphStart").ctrl().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectParagraphEnd").ctrl().shift());
-            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectParagraphEnd").ctrl().shift());
-        }
-        // Add the other standard key bindings in
-        TEXT_AREA_BINDINGS.addAll(TextInputControlBindings.BINDINGS);
-        // However, we want to consume other key press / release events too, for
-        // things that would have been handled by the InputCharacter normally
-        TEXT_AREA_BINDINGS.add(new KeyBinding(null, KEY_PRESSED, "Consume"));
-    }
-
-    private TextAreaSkin skin;
-    private ContextMenu contextMenu;
-    private TwoLevelFocusBehavior tlFocus;
-
-    /**************************************************************************
-     * Constructors                                                           *
-     *************************************************************************/
-
-    public TextAreaBehavior(final TextArea textArea) {
-        super(textArea, TEXT_AREA_BINDINGS);
-
-        contextMenu = new ContextMenu();
-        if (IS_TOUCH_SUPPORTED) {
-            contextMenu.getStyleClass().add("text-input-context-menu");
-        }
-
-        // Register for change events
-        textArea.focusedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                // NOTE: The code in this method is *almost* and exact copy of what is in TextFieldBehavior.
-                // The only real difference is that TextFieldBehavior selects all the text when the control
-                // receives focus (when not gained by mouse click), whereas TextArea doesn't, and also the
-                // TextArea doesn't lose selection on focus lost, whereas the TextField does.
-                final TextArea textArea = getControl();
-                if (textArea.isFocused()) {
-                    if (PlatformUtil.isIOS()) {
-                        // Special handling of focus on iOS is required to allow to
-                        // control native keyboard, because native keyboard is popped-up only when native
-                        // text component gets focus. When we have JFX keyboard we can remove this code
-                        final Bounds bounds = textArea.getBoundsInParent();
-                        double w = bounds.getWidth();
-                        double h = bounds.getHeight();
-                        Affine3D trans = TextFieldBehavior.calculateNodeToSceneTransform(textArea);
-                        String text = textArea.textProperty().getValueSafe();
-
-                        // we need to display native text input component on the place where JFX component is drawn
-                        // all parameters needed to do that are passed to native impl. here
-                        textArea.getScene().getWindow().impl_getPeer().requestInput(text, TextFieldBehavior.TextInputTypes.TEXT_AREA.ordinal(), w, h,
-                                trans.getMxx(), trans.getMxy(), trans.getMxz(), trans.getMxt(),
-                                trans.getMyx(), trans.getMyy(), trans.getMyz(), trans.getMyt(),
-                                trans.getMzx(), trans.getMzy(), trans.getMzz(), trans.getMzt());
-                    }
-                    if (!focusGainedByMouseClick) {
-                        setCaretAnimating(true);
-                    }
-                } else {
-//                    skin.hideCaret();
-                    if (PlatformUtil.isIOS() && textArea.getScene() != null) {
-                        // releasing the focus => we need to hide the native component and also native keyboard
-                        textArea.getScene().getWindow().impl_getPeer().releaseInput();
-                    }
-                    focusGainedByMouseClick = false;
-                    setCaretAnimating(false);
-                }
-            }
-        });
-
-        // Only add this if we're on an embedded platform that supports 5-button navigation
-        if (com.sun.javafx.scene.control.skin.Utils.isTwoLevelFocus()) {
-            tlFocus = new TwoLevelFocusBehavior(textArea); // needs to be last.
-        }
-    }
-
-    @Override public void dispose() {
-        if (tlFocus != null) tlFocus.dispose();
-        super.dispose();
-    }
-
-    // An unholy back-reference!
-    public void setTextAreaSkin(TextAreaSkin skin) {
-        this.skin = skin;
-    }
-
-    /**************************************************************************
-     * Key handling implementation                                            *
-     *************************************************************************/
-
-    @Override public void callAction(String name) {
-        final TextArea textInputControl = getControl();
-
-        boolean done = false;
-
-        if (textInputControl.isEditable()) {
-//            fnCaretAnim(false);
-//            setCaretOpacity(1.0);
-            setEditing(true);
-            done = true;
-            if ("InsertNewLine".equals(name)) insertNewLine();
-            else if ("TraverseOrInsertTab".equals(name)) insertTab();
-            else {
-                done = false;
-            }
-            setEditing(false);
-        }
-
-        if (!done) {
-            done = true;
-            if ("LineStart".equals(name)) lineStart(false, false);
-            else if ("LineEnd".equals(name)) lineEnd(false, false);
-            else if ("SelectLineStart".equals(name)) lineStart(true, false);
-            else if ("SelectLineStartExtend".equals(name)) lineStart(true, true);
-            else if ("SelectLineEnd".equals(name)) lineEnd(true, false);
-            else if ("SelectLineEndExtend".equals(name)) lineEnd(true, true);
-            else if ("PreviousLine".equals(name)) skin.previousLine(false);
-            else if ("NextLine".equals(name)) skin.nextLine(false);
-            else if ("SelectPreviousLine".equals(name)) skin.previousLine(true);
-            else if ("SelectNextLine".equals(name)) skin.nextLine(true);
-
-            else if ("ParagraphStart".equals(name)) skin.paragraphStart(true, false);
-            else if ("ParagraphEnd".equals(name)) skin.paragraphEnd(true, isWindows(), false);
-            else if ("SelectParagraphStart".equals(name)) skin.paragraphStart(true, true);
-            else if ("SelectParagraphEnd".equals(name)) skin.paragraphEnd(true, isWindows(), true);
-
-            else if ("PreviousPage".equals(name)) skin.previousPage(false);
-            else if ("NextPage".equals(name)) skin.nextPage(false);
-            else if ("SelectPreviousPage".equals(name)) skin.previousPage(true);
-            else if ("SelectNextPage".equals(name)) skin.nextPage(true);
-            else if ("TraverseOrInsertTab".equals(name)) {
-                // RT-40312: Non-editabe mode means traverse instead of insert.
-                name = "TraverseNext";
-                done = false;
-            } else {
-                done = false;
-            }
-        }
-//            fnCaretAnim(true);
-
-        if (!done) {
-            super.callAction(name);
-        }
-    }
-
-    private void insertNewLine() {
-        TextArea textArea = getControl();
-        textArea.replaceSelection("\n");
-    }
-
-    private void insertTab() {
-        TextArea textArea = getControl();
-        textArea.replaceSelection("\t");
-    }
-
-    @Override protected void deleteChar(boolean previous) {
-        skin.deleteChar(previous);
-    }
-
-    @Override protected void deleteFromLineStart() {
-        TextArea textArea = getControl();
-        int end = textArea.getCaretPosition();
-
-        if (end > 0) {
-            lineStart(false, false);
-            int start = textArea.getCaretPosition();
-            if (end > start) {
-                replaceText(start, end, "");
-            }
-        }
-    }
-
-    private void lineStart(boolean select, boolean extendSelection) {
-        skin.lineStart(select, extendSelection);
-    }
-
-    private void lineEnd(boolean select, boolean extendSelection) {
-        skin.lineEnd(select, extendSelection);
-    }
-
-    protected void scrollCharacterToVisible(int index) {
-        // TODO this method should be removed when TextAreaSkin
-        // TODO is refactored to no longer need it.
-        skin.scrollCharacterToVisible(index);
-    }
-
-    @Override protected void replaceText(int start, int end, String txt) {
-        getControl().replaceText(start, end, txt);
-    }
-
-    /**
-     * If the focus is gained via response to a mouse click, then we don't
-     * want to select all the text even if selectOnFocus is true.
-     */
-    private boolean focusGainedByMouseClick = false; // TODO!!
-    private boolean shiftDown = false;
-    private boolean deferClick = false;
-
-    @Override public void mousePressed(MouseEvent e) {
-        TextArea textArea = getControl();
-        super.mousePressed(e);
-        // We never respond to events if disabled
-        if (!textArea.isDisabled()) {
-            // If the text field doesn't have focus, then we'll attempt to set
-            // the focus and we'll indicate that we gained focus by a mouse
-            // click, TODO which will then NOT honor the selectOnFocus variable
-            // of the textInputControl
-            if (!textArea.isFocused()) {
-                focusGainedByMouseClick = true;
-                textArea.requestFocus();
-            }
-
-            // stop the caret animation
-            setCaretAnimating(false);
-            // only if there is no selection should we see the caret
-//            setCaretOpacity(if (textInputControl.dot == textInputControl.mark) then 1.0 else 0.0);
-
-            // if the primary button was pressed
-            if (e.getButton() == MouseButton.PRIMARY && !(e.isMiddleButtonDown() || e.isSecondaryButtonDown())) {
-                HitInfo hit = skin.getIndex(e.getX(), e.getY());
-                int i = com.sun.javafx.scene.control.skin.Utils.getHitInsertionIndex(hit, textArea.textProperty().getValueSafe());
-//                 int i = skin.getInsertionPoint(e.getX(), e.getY());
-                final int anchor = textArea.getAnchor();
-                final int caretPosition = textArea.getCaretPosition();
-                if (e.getClickCount() < 2 &&
-                    (e.isSynthesized() ||
-                     (anchor != caretPosition &&
-                      ((i > anchor && i < caretPosition) || (i < anchor && i > caretPosition))))) {
-                    // if there is a selection, then we will NOT handle the
-                    // press now, but will defer until the release. If you
-                    // select some text and then press down, we change the
-                    // caret and wait to allow you to drag the text (TODO).
-                    // When the drag concludes, then we handle the click
-
-                    deferClick = true;
-                    // TODO start a timer such that after some millis we
-                    // switch into text dragging mode, change the cursor
-                    // to indicate the text can be dragged, etc.
-                } else if (!(e.isControlDown() || e.isAltDown() || e.isShiftDown() || e.isMetaDown() || e.isShortcutDown())) {
-                    switch (e.getClickCount()) {
-                        case 1: skin.positionCaret(hit, false, false); break;
-                        case 2: mouseDoubleClick(hit); break;
-                        case 3: mouseTripleClick(hit); break;
-                        default: // no-op
-                    }
-                } else if (e.isShiftDown() && !(e.isControlDown() || e.isAltDown() || e.isMetaDown() || e.isShortcutDown()) && e.getClickCount() == 1) {
-                    // didn't click inside the selection, so select
-                    shiftDown = true;
-                    // if we are on mac os, then we will accumulate the
-                    // selection instead of just moving the dot. This happens
-                    // by figuring out past which (dot/mark) are extending the
-                    // selection, and set the mark to be the other side and
-                    // the dot to be the new position.
-                    // everywhere else we just move the dot.
-                    if (isMac()) {
-                        textArea.extendSelection(i);
-                    } else {
-                        skin.positionCaret(hit, true, false);
-                    }
-                }
-//                 skin.setForwardBias(hit.isLeading());
-//                if (textInputControl.editable)
-//                    displaySoftwareKeyboard(true);
-            }
-            if (contextMenu.isShowing()) {
-                contextMenu.hide();
-            }
-        }
-    }
-
-    @Override public void mouseDragged(MouseEvent e) {
-        final TextArea textArea = getControl();
-        // we never respond to events if disabled, but we do notify any onXXX
-        // event listeners on the control
-        if (!textArea.isDisabled() && !e.isSynthesized()) {
-            if (e.getButton() == MouseButton.PRIMARY &&
-                    !(e.isMiddleButtonDown() || e.isSecondaryButtonDown() ||
-                            e.isControlDown() || e.isAltDown() || e.isShiftDown() || e.isMetaDown())) {
-                skin.positionCaret(skin.getIndex(e.getX(), e.getY()), true, false);
-            }
-        }
-        deferClick = false;
-    }
-
-    @Override public void mouseReleased(final MouseEvent e) {
-        final TextArea textArea = getControl();
-        super.mouseReleased(e);
-        // we never respond to events if disabled, but we do notify any onXXX
-        // event listeners on the control
-        if (!textArea.isDisabled()) {
-            setCaretAnimating(false);
-            if (deferClick) {
-                deferClick = false;
-                skin.positionCaret(skin.getIndex(e.getX(), e.getY()), shiftDown, false);
-                shiftDown = false;
-            }
-            setCaretAnimating(true);
-        }
-    }
-
-    @Override public void contextMenuRequested(ContextMenuEvent e) {
-        final TextArea textArea = getControl();
-
-        if (contextMenu.isShowing()) {
-            contextMenu.hide();
-        } else if (textArea.getContextMenu() == null) {
-            double screenX = e.getScreenX();
-            double screenY = e.getScreenY();
-            double sceneX = e.getSceneX();
-
-            if (IS_TOUCH_SUPPORTED) {
-                Point2D menuPos;
-                if (textArea.getSelection().getLength() == 0) {
-                    skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false, false);
-                    menuPos = skin.getMenuPosition();
-                } else {
-                    menuPos = skin.getMenuPosition();
-                    if (menuPos != null && (menuPos.getX() <= 0 || menuPos.getY() <= 0)) {
-                        skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false, false);
-                        menuPos = skin.getMenuPosition();
-                    }
-                }
-
-                if (menuPos != null) {
-                    Point2D p = getControl().localToScene(menuPos);
-                    Scene scene = getControl().getScene();
-                    Window window = scene.getWindow();
-                    Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
-                                                   window.getY() + scene.getY() + p.getY());
-                    screenX = location.getX();
-                    sceneX = p.getX();
-                    screenY = location.getY();
-                }
-            }
-
-            skin.populateContextMenu(contextMenu);
-            double menuWidth = contextMenu.prefWidth(-1);
-            double menuX = screenX - (IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
-            Screen currentScreen = com.sun.javafx.util.Utils.getScreenForPoint(screenX, 0);
-            Rectangle2D bounds = currentScreen.getBounds();
-
-            if (menuX < bounds.getMinX()) {
-                getControl().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
-                getControl().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
-                contextMenu.show(getControl(), bounds.getMinX(), screenY);
-            } else if (screenX + menuWidth > bounds.getMaxX()) {
-                double leftOver = menuWidth - ( bounds.getMaxX() - screenX);
-                getControl().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
-                getControl().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
-                contextMenu.show(getControl(), screenX - leftOver, screenY);
-            } else {
-                getControl().getProperties().put("CONTEXT_MENU_SCREEN_X", 0);
-                getControl().getProperties().put("CONTEXT_MENU_SCENE_X", 0);
-                contextMenu.show(getControl(), menuX, screenY);
-            }
-        }
-
-        e.consume();
-    }
-
-    @Override protected void setCaretAnimating(boolean play) {
-        skin.setCaretAnimating(play);
-    }
-
-    protected void mouseDoubleClick(HitInfo hit) {
-        final TextArea textArea = getControl();
-        textArea.previousWord();
-        if (isWindows()) {
-            textArea.selectNextWord();
-        } else {
-            textArea.selectEndOfNextWord();
-        }
-    }
-
-    protected void mouseTripleClick(HitInfo hit) {
-        // select the line
-        skin.paragraphStart(false, false);
-        skin.paragraphEnd(false, isWindows(), true);
-    }
-
-    //    public function mouseWheelMove(e:MouseEvent):Void {
-//        def textBox = bind skin.control as TextBox;
-//        // we never respond to events if disabled, but we do notify any onXXX
-//        // event listeners on the control
-//        if (not textBox.disabled) {
-//            var rot = Math.abs(e.wheelRotation);
-//            while (rot > 0) {
-//                rot--;
-//                scrollText(e.wheelRotation > 0);
-//            }
-//        }
-//    }
-
-}
+/*
+ * Copyright (c) 2011, 2015, 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.behavior;
+
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.geom.transform.Affine3D;
+import com.sun.javafx.scene.control.Properties;
+import javafx.scene.control.skin.TextAreaSkin;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Bounds;
+import javafx.geometry.Point2D;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.Scene;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.TextArea;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.scene.input.ContextMenuEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.stage.Screen;
+import javafx.stage.Window;
+
+import java.util.function.Predicate;
+
+import static javafx.scene.control.skin.TextAreaSkin.TextPosInfo;
+
+import static com.sun.javafx.PlatformUtil.isMac;
+import static com.sun.javafx.PlatformUtil.isWindows;
+import static javafx.scene.control.skin.TextInputControlSkin.TextUnit;
+import static javafx.scene.control.skin.TextInputControlSkin.Direction;
+import static javafx.scene.input.KeyCode.*;
+
+
+/**
+ * Text area behavior.
+ */
+public class TextAreaBehavior extends TextInputControlBehavior<TextArea> {
+//    /**************************************************************************
+//     *                          Setup KeyBindings                             *
+//     *************************************************************************/
+//    protected static final List<KeyBinding> TEXT_AREA_BINDINGS = new ArrayList<KeyBinding>();
+//    static {
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED, "LineStart")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(END, KEY_PRESSED, "LineEnd")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "PreviousLine")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "PreviousLine")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "NextLine")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "NextLine")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_UP, KEY_PRESSED, "PreviousPage")); // new
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_DOWN, KEY_PRESSED, "NextPage")); // new
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED, "InsertNewLine")); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(TAB, KEY_PRESSED, "TraverseOrInsertTab")); // changed
+//
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED, "SelectLineStart").shift()); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(END, KEY_PRESSED, "SelectLineEnd").shift()); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectPreviousLine").shift()); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectPreviousLine").shift()); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectNextLine").shift()); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectNextLine").shift()); // changed
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_UP, KEY_PRESSED, "SelectPreviousPage").shift()); // new
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(PAGE_DOWN, KEY_PRESSED, "SelectNextPage").shift()); // new
+//        // Platform specific settings
+//        if (isMac()) {
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED, "LineStart").shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED, "LineStart").shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED, "LineEnd").shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED, "LineEnd").shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "Home").shortcut());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "Home").shortcut());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "End").shortcut());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "End").shortcut());
+//
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED, "SelectLineStartExtend").shift().shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED, "SelectLineStartExtend").shift().shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED, "SelectLineEndExtend").shift().shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED, "SelectLineEndExtend").shift().shortcut()); // changed
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectHomeExtend").shortcut().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectHomeExtend").shortcut().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectEndExtend").shortcut().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectEndExtend").shortcut().shift());
+//
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "ParagraphStart").alt());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "ParagraphStart").alt());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "ParagraphEnd").alt());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "ParagraphEnd").alt());
+//
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectParagraphStart").alt().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectParagraphStart").alt().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectParagraphEnd").alt().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectParagraphEnd").alt().shift());
+//        } else {
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "ParagraphStart").ctrl());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "ParagraphStart").ctrl());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "ParagraphEnd").ctrl());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "ParagraphEnd").ctrl());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(UP, KEY_PRESSED, "SelectParagraphStart").ctrl().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED, "SelectParagraphStart").ctrl().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED, "SelectParagraphEnd").ctrl().shift());
+//            TEXT_AREA_BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED, "SelectParagraphEnd").ctrl().shift());
+//        }
+//        // Add the other standard key bindings in
+//        TEXT_AREA_BINDINGS.addAll(TextInputControlBindings.BINDINGS);
+//        // However, we want to consume other key press / release events too, for
+//        // things that would have been handled by the InputCharacter normally
+//        TEXT_AREA_BINDINGS.add(new KeyBinding(null, KEY_PRESSED, "Consume"));
+//    }
+//
+    private TextAreaSkin skin;
+    private ContextMenu contextMenu;
+    private TwoLevelFocusBehavior tlFocus;
+
+    /**************************************************************************
+     * Constructors                                                           *
+     *************************************************************************/
+
+    public TextAreaBehavior(final TextArea c) {
+        super(c);
+
+        contextMenu = new ContextMenu();
+        if (Properties.IS_TOUCH_SUPPORTED) {
+            contextMenu.getStyleClass().add("text-input-context-menu");
+        }
+
+        // some of the mappings are only valid when the control is editable, or
+        // only on certain platforms, so we create the following predicates that filters out the mapping when the
+        // control is not in the correct state / on the correct platform
+        final Predicate<KeyEvent> validWhenEditable = e -> !c.isEditable();
+        final Predicate<KeyEvent> validOnMac = e -> !PlatformUtil.isMac();
+        final Predicate<KeyEvent> validOnWindows = e -> !PlatformUtil.isWindows();
+        final Predicate<KeyEvent> validOnLinux = e -> !PlatformUtil.isLinux();
+
+        // Add these bindings as a child input map, so they take precedence
+        InputMap<TextArea> textAreaInputMap = new InputMap<>(c);
+        textAreaInputMap.getMappings().addAll(
+            keyMapping(HOME,      e -> lineStart(false)),
+            keyMapping(END,       e -> lineEnd(false)),
+            keyMapping(UP,        e -> skin.moveCaret(TextUnit.LINE, Direction.UP,   false)),
+            keyMapping(DOWN,      e -> skin.moveCaret(TextUnit.LINE, Direction.DOWN, false)),
+            keyMapping(PAGE_UP,   e -> skin.moveCaret(TextUnit.PAGE, Direction.UP,   false)),
+            keyMapping(PAGE_DOWN, e -> skin.moveCaret(TextUnit.PAGE, Direction.DOWN, false)),
+
+            keyMapping(new KeyBinding(HOME).shift(),      e -> lineStart(true)),
+            keyMapping(new KeyBinding(END).shift(),       e -> lineEnd(true)),
+            keyMapping(new KeyBinding(UP).shift(),        e -> skin.moveCaret(TextUnit.LINE, Direction.UP,   true)),
+            keyMapping(new KeyBinding(DOWN).shift(),      e -> skin.moveCaret(TextUnit.LINE, Direction.DOWN, true)),
+            keyMapping(new KeyBinding(PAGE_UP).shift(),   e -> skin.moveCaret(TextUnit.PAGE, Direction.UP,   true)),
+            keyMapping(new KeyBinding(PAGE_DOWN).shift(), e -> skin.moveCaret(TextUnit.PAGE, Direction.DOWN, true)),
+
+            // editing-only mappings
+            keyMapping(new KeyBinding(ENTER), e -> insertNewLine(), validWhenEditable),
+            keyMapping(new KeyBinding(TAB), e -> insertTab(), validWhenEditable)
+        );
+        addDefaultChildMap(getInputMap(), textAreaInputMap);
+
+        // mac os specific mappings
+        InputMap<TextArea> macOsInputMap = new InputMap<>(c);
+        macOsInputMap.setInterceptor(e -> !PlatformUtil.isMac());
+        macOsInputMap.getMappings().addAll(
+            // Mac OS specific mappings
+            keyMapping(new KeyBinding(LEFT).shortcut(),  e -> lineStart(false)),
+            keyMapping(new KeyBinding(RIGHT).shortcut(), e -> lineEnd(false)),
+            keyMapping(new KeyBinding(UP).shortcut(),    e -> c.home()),
+            keyMapping(new KeyBinding(DOWN).shortcut(),  e -> c.end()),
+
+            keyMapping(new KeyBinding(LEFT).shortcut().shift(),  e -> lineStart(true)),
+            keyMapping(new KeyBinding(RIGHT).shortcut().shift(), e -> lineEnd(true)),
+            keyMapping(new KeyBinding(UP).shortcut().shift(),    e -> selectHomeExtend()),
+            keyMapping(new KeyBinding(DOWN).shortcut().shift(),  e -> selectEndExtend()),
+
+            keyMapping(new KeyBinding(UP).alt(),           e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.UP,   false)),
+            keyMapping(new KeyBinding(DOWN).alt(),         e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.DOWN, false)),
+            keyMapping(new KeyBinding(UP).alt().shift(),   e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.UP,   true)),
+            keyMapping(new KeyBinding(DOWN).alt().shift(), e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.DOWN, true))
+        );
+        addDefaultChildMap(textAreaInputMap, macOsInputMap);
+
+        // windows / linux specific mappings
+        InputMap<TextArea> nonMacOsInputMap = new InputMap<>(c);
+        nonMacOsInputMap.setInterceptor(e -> PlatformUtil.isMac());
+        nonMacOsInputMap.getMappings().addAll(
+            keyMapping(new KeyBinding(UP).ctrl(),           e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.UP,   false)),
+            keyMapping(new KeyBinding(DOWN).ctrl(),         e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.DOWN, false)),
+            keyMapping(new KeyBinding(UP).ctrl().shift(),   e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.UP,   true)),
+            keyMapping(new KeyBinding(DOWN).ctrl().shift(), e -> skin.moveCaret(TextUnit.PARAGRAPH, Direction.DOWN, true))
+        );
+        addDefaultChildMap(textAreaInputMap, nonMacOsInputMap);
+
+        addKeyPadMappings(textAreaInputMap);
+
+        // Register for change events
+        c.focusedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                // NOTE: The code in this method is *almost* and exact copy of what is in TextFieldBehavior.
+                // The only real difference is that TextFieldBehavior selects all the text when the control
+                // receives focus (when not gained by mouse click), whereas TextArea doesn't, and also the
+                // TextArea doesn't lose selection on focus lost, whereas the TextField does.
+                final TextArea textArea = getNode();
+                if (textArea.isFocused()) {
+                    if (PlatformUtil.isIOS()) {
+                        // Special handling of focus on iOS is required to allow to
+                        // control native keyboard, because native keyboard is popped-up only when native
+                        // text component gets focus. When we have JFX keyboard we can remove this code
+                        final Bounds bounds = textArea.getBoundsInParent();
+                        double w = bounds.getWidth();
+                        double h = bounds.getHeight();
+                        Affine3D trans = TextFieldBehavior.calculateNodeToSceneTransform(textArea);
+                        String text = textArea.textProperty().getValueSafe();
+
+                        // we need to display native text input component on the place where JFX component is drawn
+                        // all parameters needed to do that are passed to native impl. here
+                        textArea.getScene().getWindow().impl_getPeer().requestInput(text, TextFieldBehavior.TextInputTypes.TEXT_AREA.ordinal(), w, h,
+                                trans.getMxx(), trans.getMxy(), trans.getMxz(), trans.getMxt(),
+                                trans.getMyx(), trans.getMyy(), trans.getMyz(), trans.getMyt(),
+                                trans.getMzx(), trans.getMzy(), trans.getMzz(), trans.getMzt());
+                    }
+                    if (!focusGainedByMouseClick) {
+                        setCaretAnimating(true);
+                    }
+                } else {
+//                    skin.hideCaret();
+                    if (PlatformUtil.isIOS() && textArea.getScene() != null) {
+                        // releasing the focus => we need to hide the native component and also native keyboard
+                        textArea.getScene().getWindow().impl_getPeer().releaseInput();
+                    }
+                    focusGainedByMouseClick = false;
+                    setCaretAnimating(false);
+                }
+            }
+        });
+
+        // Only add this if we're on an embedded platform that supports 5-button navigation
+        if (Utils.isTwoLevelFocus()) {
+            tlFocus = new TwoLevelFocusBehavior(c); // needs to be last.
+        }
+    }
+
+    @Override public void dispose() {
+        if (tlFocus != null) tlFocus.dispose();
+        super.dispose();
+    }
+
+    // An unholy back-reference!
+    public void setTextAreaSkin(TextAreaSkin skin) {
+        this.skin = skin;
+    }
+
+    private void insertNewLine() {
+        setEditing(true);
+        getNode().replaceSelection("\n");
+        setEditing(false);
+    }
+
+    private void insertTab() {
+        setEditing(true);
+        getNode().replaceSelection("\t");
+        setEditing(false);
+    }
+
+    @Override protected void deleteChar(boolean previous) {
+        if (previous) {
+            getNode().deletePreviousChar();
+        } else {
+            getNode().deleteNextChar();
+        }
+    }
+
+    @Override protected void deleteFromLineStart() {
+        TextArea textArea = getNode();
+        int end = textArea.getCaretPosition();
+
+        if (end > 0) {
+            lineStart(false);
+            int start = textArea.getCaretPosition();
+            if (end > start) {
+                replaceText(start, end, "");
+            }
+        }
+    }
+
+    private void lineStart(boolean select) {
+        skin.moveCaret(TextUnit.LINE, Direction.BEGINNING, select);
+    }
+
+    private void lineEnd(boolean select) {
+        skin.moveCaret(TextUnit.LINE, Direction.END, select);
+    }
+
+    @Override protected void replaceText(int start, int end, String txt) {
+        getNode().replaceText(start, end, txt);
+    }
+
+    /**
+     * If the focus is gained via response to a mouse click, then we don't
+     * want to select all the text even if selectOnFocus is true.
+     */
+    private boolean focusGainedByMouseClick = false; // TODO!!
+    private boolean shiftDown = false;
+    private boolean deferClick = false;
+
+    @Override public void mousePressed(MouseEvent e) {
+        TextArea textArea = getNode();
+        // We never respond to events if disabled
+        if (!textArea.isDisabled()) {
+            // If the text field doesn't have focus, then we'll attempt to set
+            // the focus and we'll indicate that we gained focus by a mouse
+            // click, TODO which will then NOT honor the selectOnFocus variable
+            // of the textInputControl
+            if (!textArea.isFocused()) {
+                focusGainedByMouseClick = true;
+                textArea.requestFocus();
+            }
+
+            // stop the caret animation
+            setCaretAnimating(false);
+            // only if there is no selection should we see the caret
+//            setCaretOpacity(if (textInputControl.dot == textInputControl.mark) then 1.0 else 0.0);
+
+            // if the primary button was pressed
+            if (e.getButton() == MouseButton.PRIMARY && !(e.isMiddleButtonDown() || e.isSecondaryButtonDown())) {
+                TextPosInfo hit = skin.getIndex(e.getX(), e.getY());
+                int i = Utils.getHitInsertionIndex(hit, textArea.textProperty().getValueSafe());
+//                 int i = skin.getInsertionPoint(e.getX(), e.getY());
+                final int anchor = textArea.getAnchor();
+                final int caretPosition = textArea.getCaretPosition();
+                if (e.getClickCount() < 2 &&
+                    (e.isSynthesized() ||
+                     (anchor != caretPosition &&
+                      ((i > anchor && i < caretPosition) || (i < anchor && i > caretPosition))))) {
+                    // if there is a selection, then we will NOT handle the
+                    // press now, but will defer until the release. If you
+                    // select some text and then press down, we change the
+                    // caret and wait to allow you to drag the text (TODO).
+                    // When the drag concludes, then we handle the click
+
+                    deferClick = true;
+                    // TODO start a timer such that after some millis we
+                    // switch into text dragging mode, change the cursor
+                    // to indicate the text can be dragged, etc.
+                } else if (!(e.isControlDown() || e.isAltDown() || e.isShiftDown() || e.isMetaDown() || e.isShortcutDown())) {
+                    switch (e.getClickCount()) {
+                        case 1: skin.positionCaret(hit, false); break;
+                        case 2: mouseDoubleClick(hit); break;
+                        case 3: mouseTripleClick(hit); break;
+                        default: // no-op
+                    }
+                } else if (e.isShiftDown() && !(e.isControlDown() || e.isAltDown() || e.isMetaDown() || e.isShortcutDown()) && e.getClickCount() == 1) {
+                    // didn't click inside the selection, so select
+                    shiftDown = true;
+                    // if we are on mac os, then we will accumulate the
+                    // selection instead of just moving the dot. This happens
+                    // by figuring out past which (dot/mark) are extending the
+                    // selection, and set the mark to be the other side and
+                    // the dot to be the new position.
+                    // everywhere else we just move the dot.
+                    if (isMac()) {
+                        textArea.extendSelection(i);
+                    } else {
+                        skin.positionCaret(hit, true);
+                    }
+                }
+//                 skin.setForwardBias(hit.isLeading());
+//                if (textInputControl.editable)
+//                    displaySoftwareKeyboard(true);
+            }
+            if (contextMenu.isShowing()) {
+                contextMenu.hide();
+            }
+        }
+    }
+
+    @Override public void mouseDragged(MouseEvent e) {
+        final TextArea textArea = getNode();
+        // we never respond to events if disabled, but we do notify any onXXX
+        // event listeners on the control
+        if (!textArea.isDisabled() && !e.isSynthesized()) {
+            if (e.getButton() == MouseButton.PRIMARY &&
+                    !(e.isMiddleButtonDown() || e.isSecondaryButtonDown() ||
+                            e.isControlDown() || e.isAltDown() || e.isShiftDown() || e.isMetaDown())) {
+                skin.positionCaret(skin.getIndex(e.getX(), e.getY()), true);
+            }
+        }
+        deferClick = false;
+    }
+
+    @Override public void mouseReleased(final MouseEvent e) {
+        final TextArea textArea = getNode();
+        // we never respond to events if disabled, but we do notify any onXXX
+        // event listeners on the control
+        if (!textArea.isDisabled()) {
+            setCaretAnimating(false);
+            if (deferClick) {
+                deferClick = false;
+                skin.positionCaret(skin.getIndex(e.getX(), e.getY()), shiftDown);
+                shiftDown = false;
+            }
+            setCaretAnimating(true);
+        }
+    }
+
+    @Override public void contextMenuRequested(ContextMenuEvent e) {
+        final TextArea textArea = getNode();
+
+        if (contextMenu.isShowing()) {
+            contextMenu.hide();
+        } else if (textArea.getContextMenu() == null) {
+            double screenX = e.getScreenX();
+            double screenY = e.getScreenY();
+            double sceneX = e.getSceneX();
+
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                Point2D menuPos;
+                if (textArea.getSelection().getLength() == 0) {
+                    skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
+                    menuPos = skin.getMenuPosition();
+                } else {
+                    menuPos = skin.getMenuPosition();
+                    if (menuPos != null && (menuPos.getX() <= 0 || menuPos.getY() <= 0)) {
+                        skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
+                        menuPos = skin.getMenuPosition();
+                    }
+                }
+
+                if (menuPos != null) {
+                    Point2D p = getNode().localToScene(menuPos);
+                    Scene scene = getNode().getScene();
+                    Window window = scene.getWindow();
+                    Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
+                                                   window.getY() + scene.getY() + p.getY());
+                    screenX = location.getX();
+                    sceneX = p.getX();
+                    screenY = location.getY();
+                }
+            }
+
+            populateContextMenu(contextMenu);
+            double menuWidth = contextMenu.prefWidth(-1);
+            double menuX = screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
+            Screen currentScreen = com.sun.javafx.util.Utils.getScreenForPoint(screenX, 0);
+            Rectangle2D bounds = currentScreen.getBounds();
+
+            if (menuX < bounds.getMinX()) {
+                getNode().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
+                getNode().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
+                contextMenu.show(getNode(), bounds.getMinX(), screenY);
+            } else if (screenX + menuWidth > bounds.getMaxX()) {
+                double leftOver = menuWidth - ( bounds.getMaxX() - screenX);
+                getNode().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
+                getNode().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
+                contextMenu.show(getNode(), screenX - leftOver, screenY);
+            } else {
+                getNode().getProperties().put("CONTEXT_MENU_SCREEN_X", 0);
+                getNode().getProperties().put("CONTEXT_MENU_SCENE_X", 0);
+                contextMenu.show(getNode(), menuX, screenY);
+            }
+        }
+
+        e.consume();
+    }
+
+    @Override protected void setCaretAnimating(boolean play) {
+        skin.setCaretAnimating(play);
+    }
+
+    protected void mouseDoubleClick(TextPosInfo hit) {
+        final TextArea textArea = getNode();
+        textArea.previousWord();
+        if (isWindows()) {
+            textArea.selectNextWord();
+        } else {
+            textArea.selectEndOfNextWord();
+        }
+    }
+
+    protected void mouseTripleClick(TextPosInfo hit) {
+        // select the line
+        skin.moveCaret(TextUnit.PARAGRAPH, Direction.BEGINNING, false);
+        skin.moveCaret(TextUnit.PARAGRAPH, Direction.END, true);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextFieldBehavior.java	2015-09-03 14:50:18.350726200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextFieldBehavior.java	2015-09-03 14:50:17.700689000 -0700
@@ -25,6 +25,7 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.Properties;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.WeakChangeListener;
 import javafx.event.ActionEvent;
@@ -36,6 +37,8 @@
 import javafx.scene.Scene;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.TextField;
+import javafx.scene.control.skin.TextFieldSkin;
+import com.sun.javafx.scene.control.skin.Utils;
 import javafx.scene.input.ContextMenuEvent;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
@@ -43,8 +46,8 @@
 import javafx.stage.Window;
 import com.sun.javafx.PlatformUtil;
 import com.sun.javafx.geom.transform.Affine3D;
-import com.sun.javafx.scene.control.skin.TextFieldSkin;
-import com.sun.javafx.scene.text.HitInfo;
+
+import static javafx.scene.control.skin.TextFieldSkin.TextPosInfo;
 import static com.sun.javafx.PlatformUtil.isMac;
 import static com.sun.javafx.PlatformUtil.isWindows;
 
@@ -59,10 +62,10 @@
     private ChangeListener<Node> focusOwnerListener;
 
     public TextFieldBehavior(final TextField textField) {
-        super(textField, TEXT_INPUT_BINDINGS);
+        super(textField);
 
         contextMenu = new ContextMenu();
-        if (IS_TOUCH_SUPPORTED) {
+        if (Properties.IS_TOUCH_SUPPORTED) {
             contextMenu.getStyleClass().add("text-input-context-menu");
         }
 
@@ -103,7 +106,7 @@
         }
 
         // Only add this if we're on an embedded platform that supports 5-button navigation
-        if (com.sun.javafx.scene.control.skin.Utils.isTwoLevelFocus()) {
+        if (Utils.isTwoLevelFocus()) {
             tlFocus = new TwoLevelFocusBehavior(textField); // needs to be last.
         }
     }
@@ -114,7 +117,7 @@
     }
 
     private void handleFocusChange() {
-        TextField textField = getControl();
+        TextField textField = getNode();
         
         if (textField.isFocused()) {
             if (PlatformUtil.isIOS()) {
@@ -172,7 +175,7 @@
     }
 
     @Override protected void fire(KeyEvent event) {
-        TextField textField = getControl();
+        TextField textField = getNode();
         EventHandler<ActionEvent> onAction = textField.getOnAction();
         ActionEvent actionEvent = new ActionEvent(textField, null);
 
@@ -186,7 +189,7 @@
 
     @Override
     protected void cancelEdit(KeyEvent event) {
-        TextField textField = getControl();
+        TextField textField = getNode();
         if (textField.getTextFormatter() != null) {
             textField.cancelEdit();
         } else {
@@ -203,7 +206,7 @@
     }
 
     @Override protected void deleteFromLineStart() {
-        TextField textField = getControl();
+        TextField textField = getNode();
         int end = textField.getCaretPosition();
 
         if (end > 0) {
@@ -235,8 +238,7 @@
     private boolean deferClick = false;
 
     @Override public void mousePressed(MouseEvent e) {
-        TextField textField = getControl();
-        super.mousePressed(e);
+        TextField textField = getNode();
         // We never respond to events if disabled
         if (!textField.isDisabled()) {
             // If the text field doesn't have focus, then we'll attempt to set
@@ -255,13 +257,13 @@
 
             // if the primary button was pressed
             if (e.isPrimaryButtonDown() && !(e.isMiddleButtonDown() || e.isSecondaryButtonDown())) {
-                HitInfo hit = skin.getIndex(e.getX(), e.getY());
+                TextPosInfo hit = skin.getIndex(e.getX(), e.getY());
                 String text = textField.textProperty().getValueSafe();
-                int i = com.sun.javafx.scene.control.skin.Utils.getHitInsertionIndex(hit, text);
+                int i = Utils.getHitInsertionIndex(hit, text);
                 final int anchor = textField.getAnchor();
                 final int caretPosition = textField.getCaretPosition();
                 if (e.getClickCount() < 2 &&
-                    (IS_TOUCH_SUPPORTED ||
+                    (Properties.IS_TOUCH_SUPPORTED ||
                      (anchor != caretPosition &&
                       ((i > anchor && i < caretPosition) || (i < anchor && i > caretPosition))))) {
                     // if there is a selection, then we will NOT handle the
@@ -307,7 +309,7 @@
     }
 
     @Override public void mouseDragged(MouseEvent e) {
-        final TextField textField = getControl();
+        final TextField textField = getNode();
         // we never respond to events if disabled, but we do notify any onXXX
         // event listeners on the control
         if (!textField.isDisabled() && !deferClick) {
@@ -320,8 +322,7 @@
     }
 
     @Override public void mouseReleased(MouseEvent e) {
-        final TextField textField = getControl();
-        super.mouseReleased(e);
+        final TextField textField = getNode();
         // we never respond to events if disabled, but we do notify any onXXX
         // event listeners on the control
         if (!textField.isDisabled()) {
@@ -336,7 +337,7 @@
     }
 
     @Override public void contextMenuRequested(ContextMenuEvent e) {
-        final TextField textField = getControl();
+        final TextField textField = getNode();
 
         if (contextMenu.isShowing()) {
             contextMenu.hide();
@@ -345,7 +346,7 @@
             double screenY = e.getScreenY();
             double sceneX = e.getSceneX();
 
-            if (IS_TOUCH_SUPPORTED) {
+            if (Properties.IS_TOUCH_SUPPORTED) {
                 Point2D menuPos;
                 if (textField.getSelection().getLength() == 0) {
                     skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
@@ -359,8 +360,8 @@
                 }
 
                 if (menuPos != null) {
-                    Point2D p = getControl().localToScene(menuPos);
-                    Scene scene = getControl().getScene();
+                    Point2D p = getNode().localToScene(menuPos);
+                    Scene scene = getNode().getScene();
                     Window window = scene.getWindow();
                     Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
                                                    window.getY() + scene.getY() + p.getY());
@@ -370,61 +371,37 @@
                 }
             }
 
-            skin.populateContextMenu(contextMenu);
+            populateContextMenu(contextMenu);
             double menuWidth = contextMenu.prefWidth(-1);
-            double menuX = screenX - (IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
+            double menuX = screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
             Screen currentScreen = com.sun.javafx.util.Utils.getScreenForPoint(screenX, 0);
             Rectangle2D bounds = currentScreen.getBounds();
 
             if (menuX < bounds.getMinX()) {
-                getControl().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
-                getControl().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
-                contextMenu.show(getControl(), bounds.getMinX(), screenY);
+                getNode().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
+                getNode().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
+                contextMenu.show(getNode(), bounds.getMinX(), screenY);
             } else if (screenX + menuWidth > bounds.getMaxX()) {
                 double leftOver = menuWidth - ( bounds.getMaxX() - screenX);
-                getControl().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
-                getControl().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
-                contextMenu.show(getControl(), screenX - leftOver, screenY);
+                getNode().getProperties().put("CONTEXT_MENU_SCREEN_X", screenX);
+                getNode().getProperties().put("CONTEXT_MENU_SCENE_X", sceneX);
+                contextMenu.show(getNode(), screenX - leftOver, screenY);
             } else {
-                getControl().getProperties().put("CONTEXT_MENU_SCREEN_X", 0);
-                getControl().getProperties().put("CONTEXT_MENU_SCENE_X", 0);
-                contextMenu.show(getControl(), menuX, screenY);
+                getNode().getProperties().put("CONTEXT_MENU_SCREEN_X", 0);
+                getNode().getProperties().put("CONTEXT_MENU_SCENE_X", 0);
+                contextMenu.show(getNode(), menuX, screenY);
             }
         }
 
         e.consume();
     }
 
-//    var hadFocus = false;
-//    var focused = bind (skin.control as TextInputControl).focused on replace old {
-//        if (focused) {
-//            hadFocus = true;
-//            focusChanged(true);
-//        } else {
-//            if (hadFocus) {
-//                focusChanged(false);
-//            }
-//            hadFocus = false;
-//        }
-//    }
-//
-//    protected function focusChanged(f:Boolean):Void {
-//        def textInputControl = skin.control as TextInputControl;
-//        if (f and textInputControl.selectOnFocus and not focusGainedByMouseClick) {
-//            textInputControl.selectAll();
-//        } else if (not f) {
-//            textInputControl.commit();
-//            focusGainedByMouseClick = false;
-//            displaySoftwareKeyboard(false);
-//        }
-//    }
-//
-    protected void mouseSingleClick(HitInfo hit) {
+    protected void mouseSingleClick(TextPosInfo hit) {
         skin.positionCaret(hit, false);
     }
 
-    protected void mouseDoubleClick(HitInfo hit) {
-        final TextField textField = getControl();
+    protected void mouseDoubleClick(TextPosInfo hit) {
+        final TextField textField = getNode();
         textField.previousWord();
         if (isWindows()) {
             textField.selectNextWord();
@@ -433,8 +410,8 @@
         }
     }
 
-    protected void mouseTripleClick(HitInfo hit) {
-        getControl().selectAll();
+    protected void mouseTripleClick(TextPosInfo hit) {
+        getNode().selectAll();
     }
     
     // Enumeration of all types of text input that can be simulated on 
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java	2015-09-03 14:50:25.267121700 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBehavior.java	2015-09-03 14:50:24.736091400 -0700
@@ -1,460 +1,698 @@
-/*
- * 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.behavior;
-
-import javafx.application.ConditionalFeature;
-import javafx.beans.InvalidationListener;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.control.IndexRange;
-import javafx.scene.control.TextInputControl;
-import javafx.scene.input.KeyEvent;
-
-import java.text.Bidi;
-import java.text.BreakIterator;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.sun.javafx.application.PlatformImpl;
-import com.sun.javafx.scene.control.skin.TextInputControlSkin;
-
-import static javafx.scene.input.KeyEvent.KEY_PRESSED;
-
-import static com.sun.javafx.PlatformUtil.*;
-
-/**
- * Abstract base class for text input behaviors.
- */
-public abstract class TextInputControlBehavior<T extends TextInputControl> extends BehaviorBase<T> {
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    protected static final List<KeyBinding> TEXT_INPUT_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        TEXT_INPUT_BINDINGS.addAll(TextInputControlBindings.BINDINGS);
-        // However, we want to consume other key press / release events too, for
-        // things that would have been handled by the InputCharacter normally
-        TEXT_INPUT_BINDINGS.add(new KeyBinding(null, KEY_PRESSED, "Consume"));
-    }
-
-    /**************************************************************************
-     * Fields                                                                 *
-     *************************************************************************/
-
-    T textInputControl;
-
-    /**
-     * Used to keep track of the most recent key event. This is used when
-     * handling InputCharacter actions.
-     */
-    private KeyEvent lastEvent;
-
-    private InvalidationListener textListener = observable -> {
-        invalidateBidi();
-    };
-
-    /**************************************************************************
-     * Constructors                                                           *
-     *************************************************************************/
-
-    /**
-     * Create a new TextInputControlBehavior.
-     * @param textInputControl cannot be null
-     */
-    public TextInputControlBehavior(T textInputControl, List<KeyBinding> bindings) {
-        super(textInputControl, bindings);
-
-        this.textInputControl = textInputControl;
-
-        textInputControl.textProperty().addListener(textListener);
-    }
-
-    /**************************************************************************
-     * Disposal methods                                                       *
-     *************************************************************************/
-
-    @Override public void dispose() {
-        textInputControl.textProperty().removeListener(textListener);
-        super.dispose();
-    }
-
-    /**************************************************************************
-     * Abstract methods                                                       *
-     *************************************************************************/
-
-    protected abstract void deleteChar(boolean previous);
-    protected abstract void replaceText(int start, int end, String txt);
-    protected abstract void setCaretAnimating(boolean play);
-    protected abstract void deleteFromLineStart();
-
-    protected void scrollCharacterToVisible(int index) {
-        // TODO this method should be removed when TextAreaSkin
-        // TODO is refactored to no longer need it.
-    }
-
-    /**************************************************************************
-     * Key handling implementation                                            *
-     *************************************************************************/
-
-    /**
-     * Records the last KeyEvent we saw.
-     * @param e
-     */
-    @Override protected void callActionForEvent(KeyEvent e) {
-        lastEvent = e;
-        super.callActionForEvent(e);
-    }
-
-    @Override public void callAction(String name) {
-        TextInputControl textInputControl = getControl();
-        boolean done = false;
-
-        setCaretAnimating(false);
-
-        if (textInputControl.isEditable()) {
-            setEditing(true);
-            done = true;
-            if ("InputCharacter".equals(name)) defaultKeyTyped(lastEvent);
-            else if ("Cut".equals(name)) cut();
-            else if ("Paste".equals(name)) paste();
-            else if ("DeleteFromLineStart".equals(name)) deleteFromLineStart();
-            else if ("DeletePreviousChar".equals(name)) deletePreviousChar();
-            else if ("DeleteNextChar".equals(name)) deleteNextChar();
-            else if ("DeletePreviousWord".equals(name)) deletePreviousWord();
-            else if ("DeleteNextWord".equals(name)) deleteNextWord();
-            else if ("DeleteSelection".equals(name)) deleteSelection();
-            else if ("Undo".equals(name)) textInputControl.undo();
-            else if ("Redo".equals(name)) textInputControl.redo();
-            else {
-                done = false;
-            }
-            setEditing(false);
-        }
-        if (!done) {
-            done = true;
-            if ("Copy".equals(name)) textInputControl.copy();
-            else if ("SelectBackward".equals(name)) textInputControl.selectBackward();
-            else if ("SelectForward".equals(name)) textInputControl.selectForward();
-            else if ("SelectLeft".equals(name)) selectLeft();
-            else if ("SelectRight".equals(name)) selectRight();
-            else if ("PreviousWord".equals(name)) previousWord();
-            else if ("NextWord".equals(name)) nextWord();
-            else if ("LeftWord".equals(name)) leftWord();
-            else if ("RightWord".equals(name)) rightWord();
-            else if ("SelectPreviousWord".equals(name)) selectPreviousWord();
-            else if ("SelectNextWord".equals(name)) selectNextWord();
-            else if ("SelectLeftWord".equals(name)) selectLeftWord();
-            else if ("SelectRightWord".equals(name)) selectRightWord();
-            else if ("SelectWord".equals(name)) selectWord();
-            else if ("SelectAll".equals(name)) textInputControl.selectAll();
-            else if ("Home".equals(name)) textInputControl.home();
-            else if ("End".equals(name)) textInputControl.end();
-            else if ("Forward".equals(name)) textInputControl.forward();
-            else if ("Backward".equals(name)) textInputControl.backward();
-            else if ("Right".equals(name)) nextCharacterVisually(true);
-            else if ("Left".equals(name)) nextCharacterVisually(false);
-            else if ("Fire".equals(name)) fire(lastEvent);
-            else if ("Cancel".equals(name)) cancelEdit(lastEvent);
-            else if ("Unselect".equals(name)) textInputControl.deselect();
-            else if ("SelectHome".equals(name)) selectHome();
-            else if ("SelectEnd".equals(name)) selectEnd();
-            else if ("SelectHomeExtend".equals(name)) selectHomeExtend();
-            else if ("SelectEndExtend".equals(name)) selectEndExtend();
-            else if ("ToParent".equals(name)) forwardToParent(lastEvent);
-            /*DEBUG*/else if ("UseVK".equals(name) && PlatformImpl.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) {
-                ((TextInputControlSkin<?,?>)textInputControl.getSkin()).toggleUseVK();
-            } else {
-                done = false;
-            }
-        }
-        setCaretAnimating(true);
-
-        if (!done) {
-            if ("TraverseNext".equals(name)) traverseNext();
-            else if ("TraversePrevious".equals(name)) traversePrevious();
-            else super.callAction(name);
-
-        }
-        // Note, I don't have to worry about "Consume" here.
-    }
-
-    /**
-     * The default handler for a key typed event, which is called when none of
-     * the other key bindings match. This is the method which handles basic
-     * text entry.
-     * @param event not null
-     */
-    private void defaultKeyTyped(KeyEvent event) {
-        final TextInputControl textInput = getControl();
-        // I'm not sure this case can actually ever happen, maybe this
-        // should be an assert instead?
-        if (!textInput.isEditable() || textInput.isDisabled()) return;
-
-        // Sometimes we get events with no key character, in which case
-        // we need to bail.
-        String character = event.getCharacter();
-        if (character.length() == 0) return;
-
-        // Filter out control keys except control+Alt on PC or Alt on Mac
-        if (event.isControlDown() || event.isAltDown() || (isMac() && event.isMetaDown())) {
-            if (!((event.isControlDown() || isMac()) && event.isAltDown())) return;
-        }
-
-        // Ignore characters in the control range and the ASCII delete
-        // character as well as meta key presses
-        if (character.charAt(0) > 0x1F
-            && character.charAt(0) != 0x7F
-            && !event.isMetaDown()) { // Not sure about this one
-            final IndexRange selection = textInput.getSelection();
-            final int start = selection.getStart();
-            final int end = selection.getEnd();
-
-//            if (textInput.getLength() - selection.getLength()
-//                + character.length() > textInput.getMaximumLength()) {
-//                // TODO Beep?
-//            } else {
-                replaceText(start, end, character);
-//            }
-
-            scrollCharacterToVisible(start);
-        }
-    }
-
-    private Bidi bidi = null;
-    private Boolean mixed = null;
-    private Boolean rtlText = null;
-
-    private void invalidateBidi() {
-        bidi = null;
-        mixed = null;
-        rtlText = null;
-    }
-
-    private Bidi getBidi() {
-        if (bidi == null) {
-            bidi = new Bidi(textInputControl.textProperty().getValueSafe(),
-                            (textInputControl.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT)
-                                    ? Bidi.DIRECTION_RIGHT_TO_LEFT
-                                    : Bidi.DIRECTION_LEFT_TO_RIGHT);
-        }
-        return bidi;
-    }
-
-    protected boolean isMixed() {
-        if (mixed == null) {
-            mixed = getBidi().isMixed();
-        }
-        return mixed;
-    }
-
-    protected boolean isRTLText() {
-        if (rtlText == null) {
-            Bidi bidi = getBidi();
-            rtlText =
-                (bidi.isRightToLeft() ||
-                 (isMixed() &&
-                  textInputControl.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT));
-        }
-        return rtlText;
-    }
-
-    private void nextCharacterVisually(boolean moveRight) {
-        if (isMixed()) {
-            TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>)textInputControl.getSkin();
-            skin.nextCharacterVisually(moveRight);
-        } else if (moveRight != isRTLText()) {
-            textInputControl.forward();
-        } else {
-            textInputControl.backward();
-        }
-    }
-
-    private void selectLeft() {
-        if (isRTLText()) {
-            textInputControl.selectForward();
-        } else {
-            textInputControl.selectBackward();
-        }
-    }
-
-    private void selectRight() {
-        if (isRTLText()) {
-            textInputControl.selectBackward();
-        } else {
-            textInputControl.selectForward();
-        }
-    }
-
-    private void deletePreviousChar() {
-        deleteChar(true);
-    }
-
-    private void deleteNextChar() {
-        deleteChar(false);
-    }
-
-    protected void deletePreviousWord() {
-        TextInputControl textInputControl = getControl();
-        int end = textInputControl.getCaretPosition();
-
-        if (end > 0) {
-            textInputControl.previousWord();
-            int start = textInputControl.getCaretPosition();
-            replaceText(start, end, "");
-        }
-    }
-
-    protected void deleteNextWord() {
-        TextInputControl textInputControl = getControl();
-        int start = textInputControl.getCaretPosition();
-
-        if (start < textInputControl.getLength()) {
-            nextWord();
-            int end = textInputControl.getCaretPosition();
-            replaceText(start, end, "");
-        }
-    }
-
-    private void deleteSelection() {
-        TextInputControl textInputControl = getControl();
-        IndexRange selection = textInputControl.getSelection();
-
-        if (selection.getLength() > 0) {
-            deleteChar(false);
-        }
-    }
-
-    private void cut() {
-        TextInputControl textInputControl = getControl();
-        textInputControl.cut();
-    }
-
-    private void paste() {
-        TextInputControl textInputControl = getControl();
-        textInputControl.paste();
-    }
-
-    protected void selectPreviousWord() {
-        getControl().selectPreviousWord();
-    }
-
-    protected void selectNextWord() {
-        TextInputControl textInputControl = getControl();
-        if (isMac() || isLinux()) {
-            textInputControl.selectEndOfNextWord();
-        } else {
-            textInputControl.selectNextWord();
-        }
-    }
-
-    private void selectLeftWord() {
-        if (isRTLText()) {
-            selectNextWord();
-        } else {
-            selectPreviousWord();
-        }
-    }
-
-    private void selectRightWord() {
-        if (isRTLText()) {
-            selectPreviousWord();
-        } else {
-            selectNextWord();
-        }
-    }
-
-    protected void selectWord() {
-        final TextInputControl textInputControl = getControl();
-        textInputControl.previousWord();
-        if (isWindows()) {
-            textInputControl.selectNextWord();
-        } else {
-            textInputControl.selectEndOfNextWord();
-        }
-    }
-
-    protected void previousWord() {
-        getControl().previousWord();
-    }
-
-    protected void nextWord() {
-        TextInputControl textInputControl = getControl();
-        if (isMac() || isLinux()) {
-            textInputControl.endOfNextWord();
-        } else {
-            textInputControl.nextWord();
-        }
-    }
-
-    private void leftWord() {
-        if (isRTLText()) {
-            nextWord();
-        } else {
-            previousWord();
-        }
-    }
-
-    private void rightWord() {
-        if (isRTLText()) {
-            previousWord();
-        } else {
-            nextWord();
-        }
-    }
-
-    protected void fire(KeyEvent event) { } // TODO move to TextFieldBehavior
-    protected void cancelEdit(KeyEvent event) { forwardToParent(event);}
-
-    protected void forwardToParent(KeyEvent event) {
-        if (getControl().getParent() != null) {
-            getControl().getParent().fireEvent(event);
-        }
-    }
-
-    private void selectHome() {
-        getControl().selectHome();
-    }
-
-    private void selectEnd() {
-        getControl().selectEnd();
-    }
-
-    private void selectHomeExtend() {
-        getControl().extendSelection(0);
-    }
-
-    private void selectEndExtend() {
-        TextInputControl textInputControl = getControl();
-        textInputControl.extendSelection(textInputControl.getLength());
-    }
-
-    private boolean editing = false;
-    protected void setEditing(boolean b) {
-        editing = b;
-    }
-    public boolean isEditing() {
-        return editing;
-    }
-}
+/*
+ * Copyright (c) 2011, 2015, 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.behavior;
+
+import com.sun.javafx.PlatformUtil;
+import com.sun.javafx.application.PlatformImpl;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.skin.FXVK;
+
+import javafx.event.ActionEvent;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.scene.control.skin.TextInputControlSkin;
+import javafx.application.ConditionalFeature;
+import javafx.beans.InvalidationListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.NodeOrientation;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.IndexRange;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.TextInputControl;
+import javafx.scene.input.ContextMenuEvent;
+import javafx.scene.input.Clipboard;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
+
+import java.text.Bidi;
+import java.util.function.Predicate;
+
+import static com.sun.javafx.PlatformUtil.isLinux;
+import static com.sun.javafx.PlatformUtil.isMac;
+import static com.sun.javafx.PlatformUtil.isWindows;
+import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
+import static javafx.scene.control.skin.TextInputControlSkin.TextUnit;
+import static javafx.scene.control.skin.TextInputControlSkin.Direction;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
+import static com.sun.javafx.scene.control.inputmap.InputMap.MouseMapping;
+import static javafx.scene.input.KeyCode.*;
+import static javafx.scene.input.KeyEvent.*;
+
+/**
+ * All of the "button" types (CheckBox, RadioButton, ToggleButton, and Button)
+ * and also maybe some other types like hyperlinks operate on the "armed"
+ * selection strategy, just like JButton. This behavior class encapsulates that
+ * logic in a way that can be reused and extended by each of the individual
+ * class behaviors.
+ *
+ */
+public abstract class TextInputControlBehavior<T extends TextInputControl> extends BehaviorBase<T> {
+
+    /**
+     * Specifies whether we ought to show handles. We should do it on touch platforms, but not
+     * iOS (and maybe not Android either?)
+     */
+    static final boolean SHOW_HANDLES = Properties.IS_TOUCH_SUPPORTED && !PlatformUtil.isIOS();
+
+    /**************************************************************************
+     * Fields                                                                 *
+     *************************************************************************/
+
+    final T textInputControl;
+
+    /**
+     * Used to keep track of the most recent key event. This is used when
+     * handling InputCharacter actions.
+     */
+    private KeyEvent lastEvent;
+
+    private InvalidationListener textListener = observable -> {
+        invalidateBidi();
+    };
+
+    private final InputMap<T> inputMap;
+
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    public TextInputControlBehavior(T c) {
+        super(c);
+
+        this.textInputControl = c;
+
+        textInputControl.textProperty().addListener(textListener);
+
+        // create a map for text input-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        inputMap = createInputMap();
+
+        // some of the mappings are only valid when the control is editable, or
+        // only on certain platforms, so we create the following predicates that filters out the mapping when the
+        // control is not in the correct state / on the correct platform
+        final Predicate<KeyEvent> validWhenEditable = e -> !c.isEditable();
+        final Predicate<KeyEvent> validOnMac = e -> !PlatformUtil.isMac();
+        final Predicate<KeyEvent> validOnWindows = e -> !PlatformUtil.isWindows();
+        final Predicate<KeyEvent> validOnLinux = e -> !PlatformUtil.isLinux();
+
+        // create a child input map for mappings which are applicable on all
+        // platforms, and regardless of editing state
+        addDefaultMapping(inputMap,
+                // caret movement
+                keyMapping(RIGHT, e -> nextCharacterVisually(true)),
+                keyMapping(LEFT, e -> nextCharacterVisually(false)),
+                keyMapping(UP, e -> c.home()),
+                keyMapping(HOME, e -> c.home()),
+                keyMapping(DOWN, e -> c.end()),
+                keyMapping(END, e -> c.end()),
+                keyMapping(ENTER, this::fire),
+
+                keyMapping(new KeyBinding(HOME).shortcut(), e -> c.home()),
+                keyMapping(new KeyBinding(END).shortcut(), e -> c.end()),
+
+                // deletion (only applies when control is editable)
+                keyMapping(new KeyBinding(BACK_SPACE), e -> deletePreviousChar(), validWhenEditable),
+                keyMapping(new KeyBinding(BACK_SPACE).shift(), e -> deletePreviousChar(), validWhenEditable),
+                keyMapping(new KeyBinding(DELETE), e -> deleteNextChar(), validWhenEditable),
+                keyMapping(new KeyBinding(DELETE).shift(), e -> deleteNextChar(), validWhenEditable),
+
+                // cut (only applies when control is editable)
+                keyMapping(new KeyBinding(X).shortcut(), e -> c.cut(), validWhenEditable),
+                keyMapping(new KeyBinding(CUT), e -> cut(), validWhenEditable),
+                keyMapping(new KeyBinding(DELETE).shift(), e -> cut(), validWhenEditable),
+
+                // copy
+                keyMapping(new KeyBinding(C).shortcut(), e -> c.copy()),
+                keyMapping(new KeyBinding(INSERT).shortcut(), e -> c.copy()),
+                keyMapping(COPY, e -> c.copy()),
+
+                // paste (only applies when control is editable)
+                keyMapping(new KeyBinding(V).shortcut(), e -> c.paste(), validWhenEditable),
+                keyMapping(new KeyBinding(PASTE), e -> paste(), validWhenEditable),
+                keyMapping(new KeyBinding(INSERT).shift(), e -> paste(), validWhenEditable),
+
+                // selection
+                keyMapping(new KeyBinding(RIGHT).shift(), e -> selectRight()),
+                keyMapping(new KeyBinding(LEFT).shift(), e -> selectLeft()),
+                keyMapping(new KeyBinding(UP).shift(), e -> selectHome()),
+                keyMapping(new KeyBinding(DOWN).shift(), e -> selectEnd()),
+                keyMapping(new KeyBinding(HOME).shortcut().shift(), e -> selectHome()),
+                keyMapping(new KeyBinding(END).shortcut().shift(), e -> selectEnd()),
+                keyMapping(new KeyBinding(LEFT).shortcut().shift(), e -> selectHomeExtend()),
+                keyMapping(new KeyBinding(RIGHT).shortcut().shift(), e -> selectEndExtend()),
+                keyMapping(new KeyBinding(A).shortcut(), e -> c.selectAll()),
+
+                // Traversal Bindings
+                new KeyMapping(new KeyBinding(TAB), FocusTraversalInputMap::traverseNext),
+                new KeyMapping(new KeyBinding(TAB).shift(), FocusTraversalInputMap::traversePrevious),
+                new KeyMapping(new KeyBinding(TAB).ctrl(), FocusTraversalInputMap::traverseNext),
+                new KeyMapping(new KeyBinding(TAB).ctrl().shift(), FocusTraversalInputMap::traversePrevious),
+
+                // The following keys are forwarded to the parent container
+                new KeyMapping(ESCAPE, this::cancelEdit),
+                new KeyMapping(F10, this::forwardToParent),
+
+                // Linux specific mappings
+                keyMapping(new KeyBinding(Z).ctrl(), e -> undo(), validOnLinux),
+                keyMapping(new KeyBinding(Z).ctrl().shift(), e -> redo(), validOnLinux),
+
+                // character input.
+                // Any other key press first goes to normal text input
+                // Note this is KEY_TYPED because otherwise the character is not available in the event.
+                keyMapping(new KeyBinding(null, KEY_TYPED), this::defaultKeyTyped),
+
+                // However, we want to consume other key press / release events too, for
+                // things that would have been handled by the InputCharacter normally
+                keyMapping(new KeyBinding(null, KEY_PRESSED), e -> e.consume()),
+
+                // VK
+                new KeyMapping(new KeyBinding(DIGIT9).ctrl().shift(), e -> {
+                    FXVK.toggleUseVK(textInputControl);
+                }, p -> !PlatformImpl.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)),
+
+                // mouse and context menu mappings
+                new MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed),
+                new MouseMapping(MouseEvent.MOUSE_DRAGGED, this::mouseDragged),
+                new MouseMapping(MouseEvent.MOUSE_RELEASED, this::mouseReleased),
+                new InputMap.Mapping<ContextMenuEvent>(ContextMenuEvent.CONTEXT_MENU_REQUESTED, this::contextMenuRequested) {
+                    @Override public int getSpecificity(Event event) {
+                        return 1;
+                    }
+                }
+        );
+
+        // mac os specific mappings
+        InputMap<T> macOsInputMap = new InputMap<>(c);
+        macOsInputMap.setInterceptor(e -> !PlatformUtil.isMac());
+        macOsInputMap.getMappings().addAll(
+            // Mac OS specific mappings
+            keyMapping(new KeyBinding(HOME).shift(), e -> selectHomeExtend()),
+            keyMapping(new KeyBinding(END).shift(), e -> selectEndExtend()),
+            keyMapping(new KeyBinding(LEFT).shortcut(), e -> c.home()),
+            keyMapping(new KeyBinding(RIGHT).shortcut(), e -> c.end()),
+            keyMapping(new KeyBinding(LEFT).alt(), e -> leftWord()),
+            keyMapping(new KeyBinding(RIGHT).alt(), e -> rightWord()),
+            keyMapping(new KeyBinding(DELETE).alt(), e -> deleteNextWord()),
+            keyMapping(new KeyBinding(BACK_SPACE).alt(), e -> deletePreviousWord()),
+            keyMapping(new KeyBinding(BACK_SPACE).shortcut(), e -> deleteFromLineStart()),
+            keyMapping(new KeyBinding(Z).shortcut(), e -> undo()),
+            keyMapping(new KeyBinding(Z).shortcut().shift(), e -> redo()),
+
+            // Mac OS specific selection mappings
+            keyMapping(new KeyBinding(LEFT).shift().alt(), e -> selectLeftWord()),
+            keyMapping(new KeyBinding(RIGHT).shift().alt(), e -> selectRightWord())
+        );
+        addDefaultChildMap(inputMap, macOsInputMap);
+
+        // windows / linux specific mappings
+        InputMap<T> nonMacOsInputMap = new InputMap<>(c);
+        nonMacOsInputMap.setInterceptor(e -> PlatformUtil.isMac());
+        nonMacOsInputMap.getMappings().addAll(
+            keyMapping(new KeyBinding(HOME).shift(), e -> selectHome()),
+            keyMapping(new KeyBinding(END).shift(), e -> selectEnd()),
+            keyMapping(new KeyBinding(LEFT).ctrl(), e -> leftWord()),
+            keyMapping(new KeyBinding(RIGHT).ctrl(), e -> rightWord()),
+            keyMapping(new KeyBinding(H).ctrl(), e -> deletePreviousChar()),
+            keyMapping(new KeyBinding(DELETE).ctrl(), e -> deleteNextWord()),
+            keyMapping(new KeyBinding(BACK_SPACE).ctrl(), e -> deletePreviousWord()),
+            keyMapping(new KeyBinding(BACK_SLASH).ctrl(), e -> c.deselect()),
+            keyMapping(new KeyBinding(Z).ctrl(), e -> undo()),
+            keyMapping(new KeyBinding(Y).ctrl(), e -> redo())
+        );
+        addDefaultChildMap(inputMap, nonMacOsInputMap);
+
+        addKeyPadMappings(inputMap);
+
+        textInputControl.textProperty().addListener(textListener);
+    }
+
+    @Override public InputMap<T> getInputMap() {
+        return inputMap;
+    }
+
+    /**
+     * Bind keypad arrow keys to the same as the regular arrow keys.
+     */
+    protected void addKeyPadMappings(InputMap<T> map) {
+        // First create a temporary map for the keypad mappings
+        InputMap<T> tmpMap = new InputMap<>(getNode());
+        for (Object o : map.getMappings()) {
+            if (o instanceof KeyMapping) {
+                KeyMapping mapping = (KeyMapping)o;
+                KeyBinding kb = (KeyBinding)mapping.getMappingKey();
+                if (kb.getCode() != null) {
+                    KeyCode newCode = null;
+                    switch (kb.getCode()) {
+                        case LEFT:  newCode = KP_LEFT;  break;
+                        case RIGHT: newCode = KP_RIGHT; break;
+                        case UP:    newCode = KP_UP;    break;
+                        case DOWN:  newCode = KP_DOWN;  break;
+                    }
+                    if (newCode != null) {
+                        KeyBinding newkb = new KeyBinding(newCode).shift(kb.getShift())
+                                                                  .ctrl(kb.getCtrl())
+                                                                  .alt(kb.getAlt())
+                                                                  .meta(kb.getMeta());
+                        tmpMap.getMappings().add(new KeyMapping(newkb, mapping.getEventHandler()));
+                    }
+                }
+            }
+        }
+        // Install mappings
+        for (Object o : tmpMap.getMappings()) {
+            map.getMappings().add((KeyMapping)o);
+        }
+
+        // Recursive call for child maps
+        for (Object o : map.getChildInputMaps()) {
+            addKeyPadMappings((InputMap<T>)o);
+        }
+    }
+
+
+    /**
+     * Wraps the event handler to pause caret blinking when
+     * processing the key event.
+     */
+    protected KeyMapping keyMapping(final KeyCode keyCode, final EventHandler<KeyEvent> eventHandler) {
+        return keyMapping(new KeyBinding(keyCode), eventHandler);
+    }
+
+    protected KeyMapping keyMapping(KeyBinding keyBinding, final EventHandler<KeyEvent> eventHandler) {
+        return keyMapping(keyBinding, eventHandler, null);
+    }
+
+    protected KeyMapping keyMapping(KeyBinding keyBinding, final EventHandler<KeyEvent> eventHandler, 
+                                    Predicate<KeyEvent> interceptor) {
+        return new KeyMapping(keyBinding,
+                              e -> {
+                                  setCaretAnimating(false);
+                                  eventHandler.handle(e);
+                                  setCaretAnimating(true);
+                              },
+                              interceptor);
+    }
+
+
+
+
+
+    /**************************************************************************
+     * Disposal methods                                                       *
+     *************************************************************************/
+
+    @Override public void dispose() {
+        textInputControl.textProperty().removeListener(textListener);
+        super.dispose();
+    }
+
+    /**************************************************************************
+     * Abstract methods                                                       *
+     *************************************************************************/
+
+    protected abstract void deleteChar(boolean previous);
+    protected abstract void replaceText(int start, int end, String txt);
+    protected abstract void setCaretAnimating(boolean play);
+    protected abstract void deleteFromLineStart();
+
+    protected abstract void mousePressed(MouseEvent e);
+    protected abstract void mouseDragged(MouseEvent e);
+    protected abstract void mouseReleased(MouseEvent e);
+    protected abstract void contextMenuRequested(ContextMenuEvent e);
+
+    /**************************************************************************
+     * Key handling implementation                                            *
+     *************************************************************************/
+
+    /**
+     * The default handler for a key typed event, which is called when none of
+     * the other key bindings match. This is the method which handles basic
+     * text entry.
+     * @param event not null
+     */
+    private void defaultKeyTyped(KeyEvent event) {
+        final TextInputControl textInput = getNode();
+        // I'm not sure this case can actually ever happen, maybe this
+        // should be an assert instead?
+        if (!textInput.isEditable() || textInput.isDisabled()) return;
+
+        // Sometimes we get events with no key character, in which case
+        // we need to bail.
+        String character = event.getCharacter();
+        if (character.length() == 0) return;
+
+        // Filter out control keys except control+Alt on PC or Alt on Mac
+        if (event.isControlDown() || event.isAltDown() || (isMac() && event.isMetaDown())) {
+            if (!((event.isControlDown() || isMac()) && event.isAltDown())) return;
+        }
+
+        setEditing(true);
+
+        // Ignore characters in the control range and the ASCII delete
+        // character as well as meta key presses
+        if (character.charAt(0) > 0x1F
+                && character.charAt(0) != 0x7F
+                && !event.isMetaDown()) { // Not sure about this one
+            final IndexRange selection = textInput.getSelection();
+            final int start = selection.getStart();
+            final int end = selection.getEnd();
+
+            replaceText(start, end, character);
+        }
+
+        setEditing(false);
+    }
+
+    private Bidi bidi = null;
+    private Boolean mixed = null;
+    private Boolean rtlText = null;
+
+    private void invalidateBidi() {
+        bidi = null;
+        mixed = null;
+        rtlText = null;
+    }
+
+    private Bidi getBidi() {
+        if (bidi == null) {
+            bidi = new Bidi(textInputControl.textProperty().getValueSafe(),
+                    (textInputControl.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT)
+                            ? Bidi.DIRECTION_RIGHT_TO_LEFT
+                            : Bidi.DIRECTION_LEFT_TO_RIGHT);
+        }
+        return bidi;
+    }
+
+    protected boolean isMixed() {
+        if (mixed == null) {
+            mixed = getBidi().isMixed();
+        }
+        return mixed;
+    }
+
+    protected boolean isRTLText() {
+        if (rtlText == null) {
+            Bidi bidi = getBidi();
+            rtlText =
+                    (bidi.isRightToLeft() ||
+                            (isMixed() &&
+                                    textInputControl.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT));
+        }
+        return rtlText;
+    }
+
+    private void nextCharacterVisually(boolean moveRight) {
+        if (isMixed()) {
+            TextInputControlSkin<?> skin = (TextInputControlSkin<?>)textInputControl.getSkin();
+	    skin.moveCaret(TextUnit.CHARACTER, moveRight ? Direction.RIGHT : Direction.LEFT, false);
+        } else if (moveRight != isRTLText()) {
+            textInputControl.forward();
+        } else {
+            textInputControl.backward();
+        }
+    }
+
+    private void selectLeft() {
+        if (isRTLText()) {
+            textInputControl.selectForward();
+        } else {
+            textInputControl.selectBackward();
+        }
+    }
+
+    private void selectRight() {
+        if (isRTLText()) {
+            textInputControl.selectBackward();
+        } else {
+            textInputControl.selectForward();
+        }
+    }
+
+    private void deletePreviousChar() {
+        setEditing(true);
+        deleteChar(true);
+        setEditing(false);
+    }
+
+    private void deleteNextChar() {
+        setEditing(true);
+        deleteChar(false);
+        setEditing(false);
+    }
+
+    protected void deletePreviousWord() {
+        setEditing(true);
+        TextInputControl textInputControl = getNode();
+        int end = textInputControl.getCaretPosition();
+
+        if (end > 0) {
+            textInputControl.previousWord();
+            int start = textInputControl.getCaretPosition();
+            replaceText(start, end, "");
+        }
+        setEditing(false);
+    }
+
+    protected void deleteNextWord() {
+        setEditing(true);
+        TextInputControl textInputControl = getNode();
+        int start = textInputControl.getCaretPosition();
+
+        if (start < textInputControl.getLength()) {
+            nextWord();
+            int end = textInputControl.getCaretPosition();
+            replaceText(start, end, "");
+        }
+        setEditing(false);
+    }
+
+    public void deleteSelection() {
+        setEditing(true);
+        TextInputControl textInputControl = getNode();
+        IndexRange selection = textInputControl.getSelection();
+
+        if (selection.getLength() > 0) {
+            deleteChar(false);
+        }
+        setEditing(false);
+    }
+
+    public void cut() {
+        setEditing(true);
+        getNode().cut();
+        setEditing(false);
+    }
+
+    public void paste() {
+        setEditing(true);
+        getNode().paste();
+        setEditing(false);
+    }
+
+    public void undo() {
+        setEditing(true);
+        getNode().undo();
+        setEditing(false);
+    }
+
+    public void redo() {
+        setEditing(true);
+        getNode().redo();
+        setEditing(false);
+    }
+
+    protected void selectPreviousWord() {
+        getNode().selectPreviousWord();
+    }
+
+    public void selectNextWord() {
+        TextInputControl textInputControl = getNode();
+        if (isMac() || isLinux()) {
+            textInputControl.selectEndOfNextWord();
+        } else {
+            textInputControl.selectNextWord();
+        }
+    }
+
+    private void selectLeftWord() {
+        if (isRTLText()) {
+            selectNextWord();
+        } else {
+            selectPreviousWord();
+        }
+    }
+
+    private void selectRightWord() {
+        if (isRTLText()) {
+            selectPreviousWord();
+        } else {
+            selectNextWord();
+        }
+    }
+
+    protected void selectWord() {
+        final TextInputControl textInputControl = getNode();
+        textInputControl.previousWord();
+        if (isWindows()) {
+            textInputControl.selectNextWord();
+        } else {
+            textInputControl.selectEndOfNextWord();
+        }
+    }
+
+    protected void previousWord() {
+        getNode().previousWord();
+    }
+
+    protected void nextWord() {
+        TextInputControl textInputControl = getNode();
+        if (isMac() || isLinux()) {
+            textInputControl.endOfNextWord();
+        } else {
+            textInputControl.nextWord();
+        }
+    }
+
+    private void leftWord() {
+        if (isRTLText()) {
+            nextWord();
+        } else {
+            previousWord();
+        }
+    }
+
+    private void rightWord() {
+        if (isRTLText()) {
+            previousWord();
+        } else {
+            nextWord();
+        }
+    }
+
+    protected void fire(KeyEvent event) { } // TODO move to TextFieldBehavior
+    protected void cancelEdit(KeyEvent event) { forwardToParent(event);}
+
+    protected void forwardToParent(KeyEvent event) {
+        if (getNode().getParent() != null) {
+            getNode().getParent().fireEvent(event);
+        }
+    }
+
+    protected void selectHome() {
+        getNode().selectHome();
+    }
+
+    protected void selectEnd() {
+        getNode().selectEnd();
+    }
+
+    protected void selectHomeExtend() {
+        getNode().extendSelection(0);
+    }
+
+    protected void selectEndExtend() {
+        TextInputControl textInputControl = getNode();
+        textInputControl.extendSelection(textInputControl.getLength());
+    }
+
+    private boolean editing = false;
+    protected void setEditing(boolean b) {
+        editing = b;
+    }
+    public boolean isEditing() {
+        return editing;
+    }
+
+    protected void populateContextMenu(ContextMenu contextMenu) {
+        TextInputControl textInputControl = getNode();
+        boolean editable = textInputControl.isEditable();
+        boolean hasText = (textInputControl.getLength() > 0);
+        boolean hasSelection = (textInputControl.getSelection().getLength() > 0);
+        boolean maskText = (textInputControl instanceof PasswordField); // (maskText("A") != "A");
+        ObservableList<MenuItem> items = contextMenu.getItems();
+
+        if (SHOW_HANDLES) {
+            items.clear();
+            if (!maskText && hasSelection) {
+                if (editable) {
+                    items.add(cutMI);
+                }
+                items.add(copyMI);
+            }
+            if (editable && Clipboard.getSystemClipboard().hasString()) {
+                items.add(pasteMI);
+            }
+            if (hasText) {
+                if (!hasSelection) {
+                    items.add(selectWordMI);
+                }
+                items.add(selectAllMI);
+            }
+            selectWordMI.getProperties().put("refreshMenu", Boolean.TRUE);
+            selectAllMI.getProperties().put("refreshMenu", Boolean.TRUE);
+        } else {
+            if (editable) {
+                items.setAll(undoMI, redoMI, cutMI, copyMI, pasteMI, deleteMI,
+                        separatorMI, selectAllMI);
+            } else {
+                items.setAll(copyMI, separatorMI, selectAllMI);
+            }
+            undoMI.setDisable(!getNode().isUndoable());
+            redoMI.setDisable(!getNode().isRedoable());
+            cutMI.setDisable(maskText || !hasSelection);
+            copyMI.setDisable(maskText || !hasSelection);
+            pasteMI.setDisable(!Clipboard.getSystemClipboard().hasString());
+            deleteMI.setDisable(!hasSelection);
+        }
+    }
+
+    private static class ContextMenuItem extends MenuItem {
+        ContextMenuItem(final String action, EventHandler<ActionEvent> onAction) {
+            super(getString("TextInputControl.menu." + action));
+            setOnAction(onAction);
+        }
+    }
+
+    private final MenuItem undoMI   = new ContextMenuItem("Undo", e -> undo());
+    private final MenuItem redoMI   = new ContextMenuItem("Redo", e -> redo());
+    private final MenuItem cutMI    = new ContextMenuItem("Cut", e -> cut());
+    private final MenuItem copyMI   = new ContextMenuItem("Copy", e -> getNode().copy());
+    private final MenuItem pasteMI  = new ContextMenuItem("Paste", e -> paste());
+    private final MenuItem deleteMI = new ContextMenuItem("DeleteSelection", e -> deleteSelection());
+    private final MenuItem selectWordMI = new ContextMenuItem("SelectWord", e -> selectNextWord());
+    private final MenuItem selectAllMI = new ContextMenuItem("SelectAll", e -> getNode().selectAll());
+    private final MenuItem separatorMI = new SeparatorMenuItem();
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TitledPaneBehavior.java	2015-09-03 14:50:31.785494600 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TitledPaneBehavior.java	2015-09-03 14:50:31.147458100 -0700
@@ -26,60 +26,81 @@
 package com.sun.javafx.scene.control.behavior;
 
 import javafx.scene.control.TitledPane;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-import static javafx.scene.input.KeyCode.ENTER;
+
 import static javafx.scene.input.KeyCode.SPACE;
 
 public class TitledPaneBehavior extends BehaviorBase<TitledPane> {
 
-    private TitledPane titledPane;
+    private final TitledPane titledPane;
+    private final InputMap<TitledPane> inputMap;
 
     public TitledPaneBehavior(TitledPane pane) {
-        super(pane, TITLEDPANE_BINDINGS);
+        super(pane);
         this.titledPane = pane;
-    }
 
-    /***************************************************************************
-     *                                                                         *
-     * Key event handling                                                      *
-     *                                                                         *
-     **************************************************************************/
+        // create a map for titledPane-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        inputMap = createInputMap();
 
-    private static final String PRESS_ACTION = "Press";
+        // add focus traversal mappings
+        addDefaultMapping(inputMap, FocusTraversalInputMap.getFocusTraversalMappings());
 
-    protected static final List<KeyBinding> TITLEDPANE_BINDINGS = new ArrayList<KeyBinding>();
-    static {
         // ENTER should not be a key binding for TitledPane, as this is the
         // key reserved for the default button. See RT-40166 for more detail.
-        // TITLEDPANE_BINDINGS.add(new KeyBinding(ENTER, PRESS_ACTION));
-        TITLEDPANE_BINDINGS.add(new KeyBinding(SPACE, PRESS_ACTION));
+        addDefaultMapping(
+            new InputMap.KeyMapping(SPACE, e -> {
+                if (titledPane.isCollapsible() && titledPane.isFocused()) {
+                    titledPane.setExpanded(!titledPane.isExpanded());
+                    titledPane.requestFocus();
+                }
+            }),
+            new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
     }
 
-    @Override protected void callAction(String name) {
-        switch (name) {
-          case PRESS_ACTION:
-            if (titledPane.isCollapsible() && titledPane.isFocused()) {
-                titledPane.setExpanded(!titledPane.isExpanded());
-                titledPane.requestFocus();
-            }
-            break;
-          default:
-            super.callAction(name);
-        }
+    @Override public InputMap<TitledPane> getInputMap() {
+        return inputMap;
     }
 
     /***************************************************************************
      *                                                                         *
+     * Key event handling                                                      *
+     *                                                                         *
+     **************************************************************************/
+
+//    private static final String PRESS_ACTION = "Press";
+//
+//    protected static final List<KeyBinding> TITLEDPANE_BINDINGS = new ArrayList<KeyBinding>();
+//    static {
+//        // ENTER should not be a key binding for TitledPane, as this is the
+//        // key reserved for the default button. See RT-40166 for more detail.
+//        // TITLEDPANE_BINDINGS.add(new KeyBinding(ENTER, PRESS_ACTION));
+//        TITLEDPANE_BINDINGS.add(new KeyBinding(SPACE, PRESS_ACTION));
+//    }
+//
+//    @Override protected void callAction(String name) {
+//        switch (name) {
+//          case PRESS_ACTION:
+//            if (titledPane.isCollapsible() && titledPane.isFocused()) {
+//                titledPane.setExpanded(!titledPane.isExpanded());
+//                titledPane.requestFocus();
+//            }
+//            break;
+//          default:
+//            super.callAction(name);
+//        }
+//    }
+
+    /***************************************************************************
+     *                                                                         *
      * Mouse event handling                                                    *
      *                                                                         *
      **************************************************************************/
 
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        TitledPane tp = getControl();
-        tp.requestFocus();
+    public void mousePressed(MouseEvent e) {
+        getNode().requestFocus();
     }
 
     /**************************************************************************
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ToggleButtonBehavior.java	2015-09-03 14:50:39.523937200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ToggleButtonBehavior.java	2015-09-03 14:50:38.910902100 -0700
@@ -1,6 +1,5 @@
-package com.sun.javafx.scene.control.behavior;
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -23,8 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.control.skin.Utils;
+import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Node;
@@ -32,27 +33,33 @@
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
-import javafx.scene.input.KeyCode;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 
-import java.util.ArrayList;
-import java.util.List;
+import static com.sun.javafx.scene.control.inputmap.InputMap.*;
+import static javafx.scene.input.KeyCode.*;
 
 public class ToggleButtonBehavior<C extends ToggleButton> extends ButtonBehavior<C>{
 
     public ToggleButtonBehavior(C button) {
-        super(button, TOGGLE_BUTTON_BINDINGS);
-    }
+        super(button);
 
-    /**
-     * The key bindings for the ToggleButton. Sets up the keys to open the menu.
-     */
-    protected static final List<KeyBinding> TOGGLE_BUTTON_BINDINGS = new ArrayList<>();
-    static {
-        TOGGLE_BUTTON_BINDINGS.addAll(BUTTON_BINDINGS);
-        TOGGLE_BUTTON_BINDINGS.add(new KeyBinding(KeyCode.RIGHT, "ToggleNext-Right"));
-        TOGGLE_BUTTON_BINDINGS.add(new KeyBinding(KeyCode.LEFT, "TogglePrevious-Left"));
-        TOGGLE_BUTTON_BINDINGS.add(new KeyBinding(KeyCode.DOWN, "ToggleNext-Down"));
-        TOGGLE_BUTTON_BINDINGS.add(new KeyBinding(KeyCode.UP, "TogglePrevious-Up"));
+        ObservableList<Mapping<?>> mappings = FXCollections.observableArrayList(
+            new KeyMapping(RIGHT, e -> traverse("ToggleNext-Right")),
+            new KeyMapping(LEFT, e -> traverse("TogglePrevious-Left")),
+            new KeyMapping(DOWN, e -> traverse("ToggleNext-Down")),
+            new KeyMapping(UP, e -> traverse("TogglePrevious-Up"))
+        );
+
+        // we disable auto-consuming, so that unconsumed events work their way
+        // back up the input map hierarchy and back out of the node.
+        for (Mapping<?> mapping : mappings) {
+            mapping.setAutoConsume(false);
+        }
+
+        // put the mappings into a child input map so they take precedence
+        InputMap<C> overriddenFocusInput = new InputMap<>(button);
+        overriddenFocusInput.getMappings().addAll(mappings);
+        addDefaultChildMap(getInputMap(), overriddenFocusInput);
     }
 
     /**
@@ -83,47 +90,46 @@
         return i;
     }
 
-    @Override
-    protected void callAction(String name) {
-        ToggleButton toggleButton = getControl();
+    private void traverse(String name) {
+        ToggleButton toggleButton = getNode();
         final ToggleGroup toggleGroup = toggleButton.getToggleGroup();
         // A ToggleButton does not have to be in a group.
         if (toggleGroup == null) {
-            super.callAction(name);
+            // Because we don't auto-consume (see mapping definitions above), we
+            // can simply return here and have the traversal handled by another
+            // appropriate mapping
             return;
         }
         ObservableList<Toggle> toggles = toggleGroup.getToggles();
         final int currentToggleIdx = toggles.indexOf(toggleButton);
 
-        switch (name) {
-            case "ToggleNext-Right":
-            case "ToggleNext-Down":
-            case "TogglePrevious-Left":
-            case "TogglePrevious-Up":
-                boolean traversingToNext = traversingToNext(name, toggleButton.getEffectiveNodeOrientation());
-                if (Utils.isTwoLevelFocus()) {
-                    super.callAction(toggleToTraverseAction(name));
-                } else if (traversingToNext) {
-                    int nextToggleIndex = nextToggleIndex(toggles, currentToggleIdx);
-                    if (nextToggleIndex == currentToggleIdx) {
-                        super.callAction(toggleToTraverseAction(name));
-                    } else {
-                        Toggle toggle = toggles.get(nextToggleIndex);
-                        toggleGroup.selectToggle(toggle);
-                        ((Control)toggle).requestFocus();
-                    }
-                } else {
-                    int prevToggleIndex = previousToggleIndex(toggles, currentToggleIdx);
-                    if (prevToggleIndex == currentToggleIdx) {
-                        super.callAction(toggleToTraverseAction(name));
-                    } else {
-                        Toggle toggle = toggles.get(prevToggleIndex);
-                        toggleGroup.selectToggle(toggle);
-                        ((Control)toggle).requestFocus();
-                    }
-                }
-                break;
-            default: super.callAction(name);
+        boolean traversingToNext = traversingToNext(name, toggleButton.getEffectiveNodeOrientation());
+        if (Utils.isTwoLevelFocus()) {
+            // Because we don't auto-consume (see mapping definitions above), we
+            // can simply return here and have the traversal handled by another
+            // appropriate mapping
+        } else if (traversingToNext) {
+            int nextToggleIndex = nextToggleIndex(toggles, currentToggleIdx);
+            if (nextToggleIndex == currentToggleIdx) {
+                // Because we don't auto-consume (see mapping definitions above), we
+                // can simply return here and have the traversal handled by another
+                // appropriate mapping
+            } else {
+                Toggle toggle = toggles.get(nextToggleIndex);
+                toggleGroup.selectToggle(toggle);
+                ((Control)toggle).requestFocus();
+            }
+        } else {
+            int prevToggleIndex = previousToggleIndex(toggles, currentToggleIdx);
+            if (prevToggleIndex == currentToggleIdx) {
+                // Because we don't auto-consume (see mapping definitions above), we
+                // can simply return here and have the traversal handled by another
+                // appropriate mapping
+            } else {
+                Toggle toggle = toggles.get(prevToggleIndex);
+                toggleGroup.selectToggle(toggle);
+                ((Control)toggle).requestFocus();
+            }
         }
     }
 
@@ -141,20 +147,5 @@
             default:
                 throw new IllegalArgumentException("Not a toggle action");
         }
-    }
-
-    private String toggleToTraverseAction(String name) {
-        switch (name) {
-            case "ToggleNext-Right":
-                return TRAVERSE_RIGHT;
-            case "ToggleNext-Down":
-                return TRAVERSE_DOWN;
-            case "TogglePrevious-Left":
-                return TRAVERSE_LEFT;
-            case "TogglePrevious-Up":
-                return TRAVERSE_UP;
-            default:
-                throw new IllegalArgumentException("Not a toggle action");
-        }
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ToolBarBehavior.java	2015-09-03 14:50:46.820354500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/ToolBarBehavior.java	2015-09-03 14:50:46.188318400 -0700
@@ -25,43 +25,38 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
 import javafx.scene.control.ToolBar;
-import javafx.scene.input.KeyCode;
-import java.util.ArrayList;
-import java.util.List;
+
+import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 
 /**
  * A Behavior implementation for ToolBars.
- *
  */
 public class ToolBarBehavior extends BehaviorBase<ToolBar> {
+    private final InputMap<ToolBar> toolBarInputMap;
 
     public ToolBarBehavior(ToolBar toolbar) {        
-        super(toolbar, TOOLBAR_BINDINGS);
-    }
-    
-    /***************************************************************************
-     *                                                                         *
-     * Key event handling                                                      *
-     *                                                                         *
-     **************************************************************************/
-    
-    private static final String CTRL_F5 = "Ctrl_F5";
-    
-    protected static final List<KeyBinding> TOOLBAR_BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        TOOLBAR_BINDINGS.add(new KeyBinding(KeyCode.F5, CTRL_F5).ctrl());    
+        super(toolbar);
+
+        // create a map for toolbar-specific mappings (this reuses the default
+        // InputMap installed on the control, if it is non-null, allowing us to pick up any user-specified mappings)
+        toolBarInputMap = createInputMap();
+
+        // toolbar-specific mappings for key and mouse input
+        addDefaultMapping(toolBarInputMap,
+            new KeyMapping(new KeyBinding(F5).ctrl(), e -> {
+                if (!toolbar.getItems().isEmpty()) {
+                    toolbar.getItems().get(0).requestFocus();
+                }
+            })
+        );
     }
-    
-    @Override protected void callAction(String name) {
-        if (CTRL_F5.equals(name)) {
-            ToolBar toolbar = getControl();
-            if (!toolbar.getItems().isEmpty()) {
-                toolbar.getItems().get(0).requestFocus();
-            }
-        } else {
-            super.callAction(name);
-        }
+
+    @Override public InputMap<ToolBar> getInputMap() {
+        return toolBarInputMap;
     }
 }
 
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeCellBehavior.java	2015-09-03 14:50:54.526795300 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeCellBehavior.java	2015-09-03 14:50:53.889758900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -33,8 +33,6 @@
 import javafx.scene.control.TreeView;
 import javafx.scene.input.MouseButton;
 
-import java.util.Collections;
-
 public class TreeCellBehavior<T> extends CellBehaviorBase<TreeCell<T>> {
 
     /***************************************************************************
@@ -44,7 +42,7 @@
      **************************************************************************/
 
     public TreeCellBehavior(final TreeCell<T> control) {
-        super(control, Collections.emptyList());
+        super(control);
     }
 
 
@@ -67,7 +65,7 @@
 
     @Override
     protected TreeView<T> getCellContainer() {
-        return getControl().getTreeView();
+        return getNode().getTreeView();
     }
 
     @Override
@@ -79,16 +77,16 @@
     @Override
     protected void handleClicks(MouseButton button, int clickCount, boolean isAlreadySelected) {
         // handle editing, which only occurs with the primary mouse button
-        TreeItem<T> treeItem = getControl().getTreeItem();
+        TreeItem<T> treeItem = getNode().getTreeItem();
         if (button == MouseButton.PRIMARY) {
             if (clickCount == 1 && isAlreadySelected) {
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount == 1) {
                 // cancel editing
                 edit(null);
             } else if (clickCount == 2 && treeItem.isLeaf()) {
                 // attempt to edit
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount % 2 == 0) {
                 // try to expand/collapse branch tree item
                 treeItem.setExpanded(! treeItem.isExpanded());
@@ -97,7 +95,7 @@
     }
 
     @Override protected boolean handleDisclosureNode(double x, double y) {
-        TreeCell<T> treeCell = getControl();
+        TreeCell<T> treeCell = getNode();
         Node disclosureNode = treeCell.getDisclosureNode();
         if (disclosureNode != null) {
             if (disclosureNode.getBoundsInParent().contains(x, y)) {
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableCellBehavior.java	2015-09-03 14:51:02.536253400 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableCellBehavior.java	2015-09-03 14:51:01.932218900 -0700
@@ -25,7 +25,6 @@
 
 package com.sun.javafx.scene.control.behavior;
 
-import javafx.geometry.Bounds;
 import javafx.scene.Node;
 import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TablePositionBase;
@@ -59,12 +58,12 @@
 
     /** @{@inheritDoc} */
     @Override protected TreeTableView<S> getCellContainer() {
-        return getControl().getTreeTableView();
+        return getNode().getTreeTableView();
     }
 
     /** @{@inheritDoc} */
     @Override protected TreeTableColumn<S,T> getTableColumn() {
-        return getControl().getTableColumn();
+        return getNode().getTableColumn();
     }
 
     /** @{@inheritDoc} */
@@ -89,7 +88,7 @@
 
     /** @{@inheritDoc} */
     @Override protected boolean isTableRowSelected() {
-        return getControl().getTreeTableRow().isSelected();
+        return getNode().getTreeTableRow().isSelected();
     }
 
     /** @{@inheritDoc} */
@@ -112,15 +111,15 @@
     }
 
     @Override protected boolean handleDisclosureNode(double x, double y) {
-        final TreeItem<S> treeItem = getControl().getTreeTableRow().getTreeItem();
+        final TreeItem<S> treeItem = getNode().getTreeTableRow().getTreeItem();
 
-        final TreeTableView<S> treeTableView = getControl().getTreeTableView();
+        final TreeTableView<S> treeTableView = getNode().getTreeTableView();
         final TreeTableColumn<S,T> column = getTableColumn();
         final TreeTableColumn<S,?> treeColumn = treeTableView.getTreeColumn() == null ?
                 treeTableView.getVisibleLeafColumn(0) : treeTableView.getTreeColumn();
 
         if (column == treeColumn) {
-            final Node disclosureNode = getControl().getTreeTableRow().getDisclosureNode();
+            final Node disclosureNode = getNode().getTreeTableRow().getDisclosureNode();
             if (disclosureNode != null) {
                 double startX = 0;
                 for (TreeTableColumn<S,?> tc : treeTableView.getVisibleLeafColumns()) {
@@ -142,16 +141,16 @@
     @Override
     protected void handleClicks(MouseButton button, int clickCount, boolean isAlreadySelected) {
         // handle editing, which only occurs with the primary mouse button
-        TreeItem<S> treeItem = getControl().getTreeTableRow().getTreeItem();
+        TreeItem<S> treeItem = getNode().getTreeTableRow().getTreeItem();
         if (button == MouseButton.PRIMARY) {
             if (clickCount == 1 && isAlreadySelected) {
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount == 1) {
                 // cancel editing
                 edit(null);
             } else if (clickCount == 2 && treeItem.isLeaf()) {
                 // attempt to edit
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount % 2 == 0) {
                 // try to expand/collapse branch tree item
                 treeItem.setExpanded(! treeItem.isExpanded());
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableRowBehavior.java	2015-09-03 14:51:10.002680500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableRowBehavior.java	2015-09-03 14:51:09.417647000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -61,7 +61,7 @@
     }
 
     @Override protected TreeTableView<T> getCellContainer() {
-        return getControl().getTreeTableView();
+        return getNode().getTreeTableView();
     }
 
     @Override protected TablePositionBase<?> getFocusedCell() {
@@ -79,16 +79,16 @@
     @Override
     protected void handleClicks(MouseButton button, int clickCount, boolean isAlreadySelected) {
         // handle editing, which only occurs with the primary mouse button
-        TreeItem<T> treeItem = getControl().getTreeItem();
+        TreeItem<T> treeItem = getNode().getTreeItem();
         if (button == MouseButton.PRIMARY) {
             if (clickCount == 1 && isAlreadySelected) {
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount == 1) {
                 // cancel editing
                 edit(null);
             } else if (clickCount == 2 && treeItem.isLeaf()) {
                 // attempt to edit
-                edit(getControl());
+                edit(getNode());
             } else if (clickCount % 2 == 0) {
                 // try to expand/collapse branch tree item
                 treeItem.setExpanded(! treeItem.isExpanded());
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableViewBehavior.java	2015-09-03 14:51:17.359101200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableViewBehavior.java	2015-09-03 14:51:16.732065400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -30,7 +30,6 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ObservableList;
-import javafx.geometry.NodeOrientation;
 import javafx.scene.control.TableColumnBase;
 import javafx.scene.control.TableFocusModel;
 import javafx.scene.control.TablePositionBase;
@@ -39,61 +38,11 @@
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTablePosition;
 import javafx.scene.control.TreeTableView;
-import javafx.scene.input.KeyEvent;
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.util.Callback;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class TreeTableViewBehavior<T> extends TableViewBehaviorBase<TreeTableView<T>, TreeItem<T>, TreeTableColumn<T, ?>> {
-    
-    /**************************************************************************
-     *                                                                        *
-     * Setup key bindings                                                     *
-     *                                                                        *  
-     *************************************************************************/
 
-    protected static final List<KeyBinding> TREE_TABLE_VIEW_BINDINGS = new ArrayList<KeyBinding>();
-    
-    static {
-        // Add these bindings at the front of the list, so they take precedence
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "CollapseRow"));
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_LEFT, "CollapseRow"));
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "ExpandRow"));
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(KP_RIGHT, "ExpandRow"));
-
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(MULTIPLY, "ExpandAll"));
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(ADD, "ExpandRow"));
-        TREE_TABLE_VIEW_BINDINGS.add(new KeyBinding(SUBTRACT, "CollapseRow"));
-
-        TREE_TABLE_VIEW_BINDINGS.addAll(TABLE_VIEW_BINDINGS);
-    }
-
-    @Override protected /*final*/ String matchActionForEvent(KeyEvent e) {
-        String action = super.matchActionForEvent(e);
-        if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-            // Rather than switching the result of the action lookup in this way, the preferred
-            // way to do this according to the current architecture would be to hoist the
-            // getEffectiveNodeOrientation call up into the key bindings, the same way that ListView
-            // orientation (horizontal vs. vertical) is handled with the OrientedKeyBinding class.
-            if ("CollapseRow".equals(action) && (e.getCode() == LEFT || e.getCode() == KP_LEFT)) {
-                action = "ExpandRow";
-            } else if ("ExpandRow".equals(action) && (e.getCode() == RIGHT || e.getCode() == KP_RIGHT)) {
-                action = "CollapseRow";
-            }
-        }
-        return action;
-    }
-
-    @Override protected void callAction(String name) {
-        if ("ExpandRow".equals(name)) rightArrowPressed();
-        else if ("CollapseRow".equals(name)) leftArrowPressed();
-        else if ("ExpandAll".equals(name)) expandAll();
-        else super.callAction(name);
-    }
-    
-
-    
     /**************************************************************************
      *                                                                        *
      * Listeners                                                              *
@@ -111,7 +60,7 @@
             };
     
     private final WeakChangeListener<TreeTableView.TreeTableViewSelectionModel<T>> weakSelectionModelListener = 
-            new WeakChangeListener<TreeTableView.TreeTableViewSelectionModel<T>>(selectionModelListener);
+            new WeakChangeListener<>(selectionModelListener);
     
     
     
@@ -122,7 +71,23 @@
      *************************************************************************/
 
     public TreeTableViewBehavior(TreeTableView<T>  control) {
-        super(control, TREE_TABLE_VIEW_BINDINGS);
+        super(control);
+
+        // Add these bindings as a child input map, so they take precedence
+        InputMap<TreeTableView<T>> expandCollapseInputMap = new InputMap<>(control);
+        expandCollapseInputMap.getMappings().addAll(
+            // these should be read as 'if RTL, use the first method, otherwise use the second'
+            new InputMap.KeyMapping(LEFT, e -> rtl(control, this::expandRow, this::collapseRow)),
+            new InputMap.KeyMapping(KP_LEFT, e -> rtl(control, this::expandRow, this::collapseRow)),
+            new InputMap.KeyMapping(RIGHT, e -> rtl(control, this::collapseRow, this::expandRow)),
+            new InputMap.KeyMapping(KP_RIGHT, e -> rtl(control, this::collapseRow, this::expandRow)),
+
+            new InputMap.KeyMapping(MULTIPLY, e -> expandAll()),
+            new InputMap.KeyMapping(ADD, e -> expandRow()),
+            new InputMap.KeyMapping(SUBTRACT, e -> collapseRow())
+        );
+        addDefaultChildMap(getInputMap(), expandCollapseInputMap);
+
 
         // Fix for RT-16565
         control.selectionModelProperty().addListener(weakSelectionModelListener);
@@ -141,53 +106,53 @@
     
     /** {@inheritDoc}  */
     @Override protected int getItemCount() {
-        return getControl().getExpandedItemCount();
+        return getNode().getExpandedItemCount();
     }
 
     /** {@inheritDoc}  */
     @Override protected TableFocusModel getFocusModel() {
-        return getControl().getFocusModel();
+        return getNode().getFocusModel();
     }
 
     /** {@inheritDoc}  */
     @Override protected TableSelectionModel<TreeItem<T>> getSelectionModel() {
-        return getControl().getSelectionModel();
+        return getNode().getSelectionModel();
     }
 
     /** {@inheritDoc}  */
     @Override protected ObservableList<TreeTablePosition<T,?>> getSelectedCells() {
-        return getControl().getSelectionModel().getSelectedCells();
+        return getNode().getSelectionModel().getSelectedCells();
     }
 
     /** {@inheritDoc}  */
     @Override protected TablePositionBase getFocusedCell() {
-        return getControl().getFocusModel().getFocusedCell();
+        return getNode().getFocusModel().getFocusedCell();
     }
 
     /** {@inheritDoc}  */
     @Override protected int getVisibleLeafIndex(TableColumnBase tc) {
-        return getControl().getVisibleLeafIndex((TreeTableColumn)tc);
+        return getNode().getVisibleLeafIndex((TreeTableColumn)tc);
     }
 
     /** {@inheritDoc}  */
     @Override protected TreeTableColumn getVisibleLeafColumn(int index) {
-        return getControl().getVisibleLeafColumn(index);
+        return getNode().getVisibleLeafColumn(index);
     }
 
     /** {@inheritDoc}  */
     @Override protected void editCell(int row, TableColumnBase tc) {
-        getControl().edit(row, (TreeTableColumn)tc);
+        getNode().edit(row, (TreeTableColumn)tc);
     }
 
     /** {@inheritDoc}  */
     @Override protected ObservableList<TreeTableColumn<T,?>> getVisibleLeafColumns() {
-        return getControl().getVisibleLeafColumns();
+        return getNode().getVisibleLeafColumns();
     }
 
     /** {@inheritDoc}  */
     @Override protected TablePositionBase<TreeTableColumn<T, ?>> 
             getTablePosition(int row, TableColumnBase<TreeItem<T>, ?> tc) {
-        return new TreeTablePosition(getControl(), row, (TreeTableColumn)tc);
+        return new TreeTablePosition(getNode(), row, (TreeTableColumn)tc);
     }
 
 
@@ -201,7 +166,7 @@
     /** {@inheritDoc} */
     @Override protected void selectAllToFocus(boolean setAnchorToFocusIndex) {
         // Fix for RT-31241
-        if (getControl().getEditingCell() != null) return;
+        if (getNode().getEditingCell() != null) return;
 
         super.selectAllToFocus(setAnchorToFocusIndex);
     }
@@ -217,7 +182,7 @@
      * on whether we are in row or cell selection.
      */
     private void rightArrowPressed() {
-        if (getControl().getSelectionModel().isCellSelectionEnabled()) {
+        if (getNode().getSelectionModel().isCellSelectionEnabled()) {
             if (isRTL()) {
                 selectLeftCell();
             } else {
@@ -229,7 +194,7 @@
     }
     
     private void leftArrowPressed() {
-        if (getControl().getSelectionModel().isCellSelectionEnabled()) {
+        if (getNode().getSelectionModel().isCellSelectionEnabled()) {
             if (isRTL()) {
                 selectRightCell();
             } else {
@@ -241,16 +206,16 @@
     }
     
     private void expandRow() {
-        Callback<TreeItem<T>, Integer> getIndex = p -> getControl().getRow(p);
-        TreeViewBehavior.expandRow(getControl().getSelectionModel(), getIndex);
+        Callback<TreeItem<T>, Integer> getIndex = p -> getNode().getRow(p);
+        TreeViewBehavior.expandRow(getNode().getSelectionModel(), getIndex);
     }
     
     private void expandAll() {
-        TreeViewBehavior.expandAll(getControl().getRoot());
+        TreeViewBehavior.expandAll(getNode().getRoot());
     }
     
     private void collapseRow() {
-        TreeTableView<T> control = getControl();
+        TreeTableView<T> control = getNode();
         TreeViewBehavior.collapseRow(control.getSelectionModel(), control.getRoot(), control.isShowRoot());
     }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java	2015-09-03 14:51:24.546512300 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeViewBehavior.java	2015-09-03 14:51:24.013481800 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -25,173 +25,38 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.inputmap.InputMap;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;
-import javafx.geometry.NodeOrientation;
+import javafx.event.EventHandler;
 import javafx.scene.control.*;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
+import javafx.scene.input.*;
 import javafx.util.Callback;
+
 import java.util.ArrayList;
 import java.util.List;
 import com.sun.javafx.PlatformUtil;
-import static javafx.scene.input.KeyCode.A;
-import static javafx.scene.input.KeyCode.ADD;
-import static javafx.scene.input.KeyCode.DOWN;
-import static javafx.scene.input.KeyCode.END;
-import static javafx.scene.input.KeyCode.ENTER;
-import static javafx.scene.input.KeyCode.ESCAPE;
-import static javafx.scene.input.KeyCode.F2;
-import static javafx.scene.input.KeyCode.HOME;
-import static javafx.scene.input.KeyCode.KP_DOWN;
-import static javafx.scene.input.KeyCode.KP_LEFT;
-import static javafx.scene.input.KeyCode.KP_RIGHT;
-import static javafx.scene.input.KeyCode.KP_UP;
-import static javafx.scene.input.KeyCode.LEFT;
-import static javafx.scene.input.KeyCode.MULTIPLY;
-import static javafx.scene.input.KeyCode.PAGE_DOWN;
-import static javafx.scene.input.KeyCode.PAGE_UP;
-import static javafx.scene.input.KeyCode.RIGHT;
-import static javafx.scene.input.KeyCode.SPACE;
-import static javafx.scene.input.KeyCode.SUBTRACT;
-import static javafx.scene.input.KeyCode.UP;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+
+import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 
 public class TreeViewBehavior<T> extends BehaviorBase<TreeView<T>> {
 
-    /**************************************************************************
-     *                          Setup KeyBindings                             *
-     *************************************************************************/
-    protected static final List<KeyBinding> TREE_VIEW_BINDINGS = new ArrayList<KeyBinding>();
+    private final InputMap<TreeView<T>> treeViewInputMap;
 
-    static {
-        TREE_VIEW_BINDINGS.add(new KeyBinding(HOME, "SelectFirstRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(END, "SelectLastRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(HOME, "SelectAllToFirstRow").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(END, "SelectAllToLastRow").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "SelectAllPageUp").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "SelectAllPageDown").shift());
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "SelectAllToFocus").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "SelectAllToFocusAndSetAnchor").shortcut().shift());
-        
-        TREE_VIEW_BINDINGS.add(new KeyBinding(HOME, "FocusFirstRow").shortcut());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(END, "FocusLastRow").shortcut());
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "ScrollUp"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "ScrollDown"));
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection"));
-        if (PlatformUtil.isMac()) {
-            TREE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection").ctrl().shortcut());
-        } else {
-            TREE_VIEW_BINDINGS.add(new KeyBinding(SPACE, "toggleFocusOwnerSelection").ctrl());
+    private final EventHandler<KeyEvent> keyEventListener = e -> {
+        if (!e.isConsumed()) {
+            // RT-12751: we want to keep an eye on the user holding down the shift key,
+            // so that we know when they enter/leave multiple selection mode. This
+            // changes what happens when certain key combinations are pressed.
+            isShiftDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShiftDown();
+            isShortcutDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShortcutDown();
         }
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(A, "SelectAll").shortcut());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "FocusPageUp").shortcut());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "FocusPageDown").shortcut());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(UP, "FocusPreviousRow").shortcut());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "FocusNextRow").shortcut());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(UP, "DiscontinuousSelectPreviousRow").shortcut().shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "DiscontinuousSelectNextRow").shortcut().shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_UP, "DiscontinuousSelectPageUp").shortcut().shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(PAGE_DOWN, "DiscontinuousSelectPageDown").shortcut().shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(HOME, "DiscontinuousSelectAllToFirstRow").shortcut().shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(END, "DiscontinuousSelectAllToLastRow").shortcut().shift());
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(LEFT, "CollapseRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(KP_LEFT, "CollapseRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(RIGHT, "ExpandRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(KP_RIGHT, "ExpandRow"));
-        
-        TREE_VIEW_BINDINGS.add(new KeyBinding(MULTIPLY, "ExpandAll"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(ADD, "ExpandRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(SUBTRACT, "CollapseRow"));
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(UP, "SelectPreviousRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(KP_UP, "SelectPreviousRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "SelectNextRow"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(KP_DOWN, "SelectNextRow"));
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(UP, "AlsoSelectPreviousRow").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(KP_UP, "AlsoSelectPreviousRow").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(DOWN, "AlsoSelectNextRow").shift());
-        TREE_VIEW_BINDINGS.add(new KeyBinding(KP_DOWN, "AlsoSelectNextRow").shift());
-
-        TREE_VIEW_BINDINGS.add(new KeyBinding(ENTER, "Edit"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(F2, "Edit"));
-        TREE_VIEW_BINDINGS.add(new KeyBinding(ESCAPE, "CancelEdit"));
-    }
-
-    @Override protected /*final*/ String matchActionForEvent(KeyEvent e) {
-        String action = super.matchActionForEvent(e);
-        if (getControl().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-            // Rather than switching the result of the action lookup in this way, the preferred
-            // way to do this according to the current architecture would be to hoist the
-            // getEffectiveNodeOrientation call up into the key bindings, the same way that ListView
-            // orientation (horizontal vs. vertical) is handled with the OrientedKeyBinding class.
-            if ("CollapseRow".equals(action) && (e.getCode() == LEFT || e.getCode() == KP_LEFT)) {
-                action = "ExpandRow";
-            } else if ("ExpandRow".equals(action) && (e.getCode() == RIGHT || e.getCode() == KP_RIGHT)) {
-                action = "CollapseRow";
-            }
-        }
-        return action;
-    }
-
-    @Override protected void callAction(String name) {
-        if ("SelectPreviousRow".equals(name)) selectPreviousRow();
-        else if ("SelectNextRow".equals(name)) selectNextRow();
-        else if ("SelectFirstRow".equals(name)) selectFirstRow();
-        else if ("SelectLastRow".equals(name)) selectLastRow();
-        else if ("SelectAllPageUp".equals(name)) selectAllPageUp();
-        else if ("SelectAllPageDown".equals(name)) selectAllPageDown();
-        else if ("SelectAllToFirstRow".equals(name)) selectAllToFirstRow();
-        else if ("SelectAllToLastRow".equals(name)) selectAllToLastRow();
-        else if ("AlsoSelectNextRow".equals(name)) alsoSelectNextRow();
-        else if ("AlsoSelectPreviousRow".equals(name)) alsoSelectPreviousRow();
-        else if ("ClearSelection".equals(name)) clearSelection();
-        else if("SelectAll".equals(name)) selectAll();
-        else if ("ScrollUp".equals(name)) scrollUp();
-        else if ("ScrollDown".equals(name)) scrollDown();
-        else if ("ExpandRow".equals(name)) expandRow();
-        else if ("CollapseRow".equals(name)) collapseRow();
-        else if ("ExpandAll".equals(name)) expandAll();
-//        else if ("ExpandOrCollapseRow".equals(name)) expandOrCollapseRow();
-        else if ("Edit".equals(name)) edit();
-        else if ("CancelEdit".equals(name)) cancelEdit();
-        else if ("FocusFirstRow".equals(name)) focusFirstRow();
-        else if ("FocusLastRow".equals(name)) focusLastRow();
-        else if ("toggleFocusOwnerSelection".equals(name)) toggleFocusOwnerSelection();
-
-        else if ("SelectAllToFocus".equals(name)) selectAllToFocus(false);
-        else if ("SelectAllToFocusAndSetAnchor".equals(name)) selectAllToFocus(true);
-
-        else if ("FocusPageUp".equals(name)) focusPageUp();
-        else if ("FocusPageDown".equals(name)) focusPageDown();
-        else if ("FocusPreviousRow".equals(name)) focusPreviousRow();
-        else if ("FocusNextRow".equals(name)) focusNextRow();
-        else if ("DiscontinuousSelectNextRow".equals(name)) discontinuousSelectNextRow();
-        else if ("DiscontinuousSelectPreviousRow".equals(name)) discontinuousSelectPreviousRow();
-        else if ("DiscontinuousSelectPageUp".equals(name)) discontinuousSelectPageUp();
-        else if ("DiscontinuousSelectPageDown".equals(name)) discontinuousSelectPageDown();
-        else if ("DiscontinuousSelectAllToLastRow".equals(name)) discontinuousSelectAllToLastRow();
-        else if ("DiscontinuousSelectAllToFirstRow".equals(name)) discontinuousSelectAllToFirstRow();
-        else super.callAction(name);
-    }
-
-    @Override protected void callActionForEvent(KeyEvent e) {
-        // RT-12751: we want to keep an eye on the user holding down the shift key, 
-        // so that we know when they enter/leave multiple selection mode. This
-        // changes what happens when certain key combinations are pressed.
-        isShiftDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShiftDown();
-        isShortcutDown = e.getEventType() == KeyEvent.KEY_PRESSED && e.isShortcutDown();
-        
-        super.callActionForEvent(e);
-    }
+    };
 
     /**************************************************************************
      *                         State and Functions                            *
@@ -233,14 +98,14 @@
     private final ListChangeListener<Integer> selectedIndicesListener = c -> {
         while (c.next()) {
             if (c.wasReplaced()) {
-                if (TreeCellBehavior.hasDefaultAnchor(getControl())) {
-                    TreeCellBehavior.removeAnchor(getControl());
+                if (TreeCellBehavior.hasDefaultAnchor(getNode())) {
+                    TreeCellBehavior.removeAnchor(getNode());
                 }
             }
 
             final int shift = c.wasPermutated() ? c.getTo() - c.getFrom() : 0;
 
-            MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+            MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
 
             // there are no selected items, so lets clear out the anchor
             if (! selectionChanging) {
@@ -275,52 +140,143 @@
     };
     
     private final WeakListChangeListener<Integer> weakSelectedIndicesListener = 
-            new WeakListChangeListener<Integer>(selectedIndicesListener);
+            new WeakListChangeListener<>(selectedIndicesListener);
     private final WeakChangeListener<MultipleSelectionModel<TreeItem<T>>> weakSelectionModelListener =
-            new WeakChangeListener<MultipleSelectionModel<TreeItem<T>>>(selectionModelListener);
+            new WeakChangeListener<>(selectionModelListener);
 
     public TreeViewBehavior(TreeView<T> control) {
-        super(control, TREE_VIEW_BINDINGS);
-        
+        super(control);
+
+//        // Fix for RT-16565
+//        getNode().selectionModelProperty().addListener(weakSelectionModelListener);
+//        if (control.getSelectionModel() != null) {
+//            control.getSelectionModel().getSelectedIndices().addListener(weakSelectedIndicesListener);
+//        }
+
+
+
+        // create a map for treeView-specific mappings
+        treeViewInputMap = createInputMap();
+
+//        // add focus traversal mappings
+//        addDefaultMapping(treeViewInputMap, FocusTraversalInputMap.getFocusTraversalMappings());
+        addDefaultMapping(treeViewInputMap,
+            new KeyMapping(HOME, e -> selectFirstRow()),
+            new KeyMapping(END, e -> selectLastRow()),
+            new KeyMapping(new KeyBinding(HOME).shift(), e -> selectAllToFirstRow()),
+            new KeyMapping(new KeyBinding(END).shift(), e -> selectAllToLastRow()),
+            new KeyMapping(new KeyBinding(PAGE_UP).shift(), e -> selectAllPageUp()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).shift(), e -> selectAllPageDown()),
+
+            new KeyMapping(new KeyBinding(SPACE).shift(), e -> selectAllToFocus(false)),
+            new KeyMapping(new KeyBinding(SPACE).shortcut().shift(), e -> selectAllToFocus(true)),
+
+            new KeyMapping(new KeyBinding(HOME).shortcut(), e -> focusFirstRow()),
+            new KeyMapping(new KeyBinding(END).shortcut(), e -> focusLastRow()),
+
+            new KeyMapping(PAGE_UP, e -> scrollUp()),
+            new KeyMapping(PAGE_DOWN, e -> scrollDown()),
+
+            new KeyMapping(SPACE, e -> toggleFocusOwnerSelection()),
+
+            new KeyMapping(new KeyBinding(A).shortcut(), e -> selectAll()),
+            new KeyMapping(new KeyBinding(PAGE_UP).shortcut(), e -> focusPageUp()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).shortcut(), e -> focusPageDown()),
+            new KeyMapping(new KeyBinding(UP).shortcut(), e -> focusPreviousRow()),
+            new KeyMapping(new KeyBinding(DOWN).shortcut(), e -> focusNextRow()),
+            new KeyMapping(new KeyBinding(UP).shortcut().shift(), e -> discontinuousSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(DOWN).shortcut().shift(), e -> discontinuousSelectNextRow()),
+            new KeyMapping(new KeyBinding(PAGE_UP).shortcut().shift(), e -> discontinuousSelectPageUp()),
+            new KeyMapping(new KeyBinding(PAGE_DOWN).shortcut().shift(), e -> discontinuousSelectPageDown()),
+            new KeyMapping(new KeyBinding(HOME).shortcut().shift(), e -> discontinuousSelectAllToFirstRow()),
+            new KeyMapping(new KeyBinding(END).shortcut().shift(), e -> discontinuousSelectAllToLastRow()),
+
+            // these should be read as 'if RTL, use the first method, otherwise use the second'
+            new KeyMapping(LEFT, e -> rtl(control, this::expandRow, this::collapseRow)),
+            new KeyMapping(KP_LEFT, e -> rtl(control, this::expandRow, this::collapseRow)),
+            new KeyMapping(RIGHT, e -> rtl(control, this::collapseRow, this::expandRow)),
+            new KeyMapping(KP_RIGHT, e -> rtl(control, this::collapseRow, this::expandRow)),
+
+            new KeyMapping(MULTIPLY, e -> expandAll()),
+            new KeyMapping(ADD, e -> expandRow()),
+            new KeyMapping(SUBTRACT, e -> collapseRow()),
+
+            new KeyMapping(UP, e -> selectPreviousRow()),
+            new KeyMapping(KP_UP, e -> selectPreviousRow()),
+            new KeyMapping(DOWN, e -> selectNextRow()),
+            new KeyMapping(KP_DOWN, e -> selectNextRow()),
+
+            new KeyMapping(new KeyBinding(UP).shift(), e -> alsoSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(KP_UP).shift(), e -> alsoSelectPreviousRow()),
+            new KeyMapping(new KeyBinding(DOWN).shift(), e -> alsoSelectNextRow()),
+            new KeyMapping(new KeyBinding(KP_DOWN).shift(), e -> alsoSelectNextRow()),
+
+            new KeyMapping(ENTER, e -> edit()),
+            new KeyMapping(F2, e -> edit()),
+            new KeyMapping(ESCAPE, e -> cancelEdit()),
+
+            new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, this::mousePressed)
+        );
+
+        // create OS-specific child mappings
+        // --- mac OS
+        InputMap<TreeView<T>> macInputMap = new InputMap<>(control);
+        macInputMap.setInterceptor(event -> !PlatformUtil.isMac());
+        addDefaultMapping(macInputMap, new KeyMapping(new KeyBinding(SPACE).shortcut().ctrl(), e -> toggleFocusOwnerSelection()));
+        addDefaultChildMap(treeViewInputMap, macInputMap);
+
+        // --- all other platforms
+        InputMap<TreeView<T>> otherOsInputMap = new InputMap<>(control);
+        otherOsInputMap.setInterceptor(event -> PlatformUtil.isMac());
+        addDefaultMapping(otherOsInputMap, new KeyMapping(new KeyBinding(SPACE).ctrl(), e -> toggleFocusOwnerSelection()));
+        addDefaultChildMap(treeViewInputMap, otherOsInputMap);
+
+        // set up other listeners
+        // We make this an event _filter_ so that we can determine the state
+        // of the shift key before the event handlers get a shot at the event.
+        control.addEventFilter(KeyEvent.ANY, keyEventListener);
+
         // Fix for RT-16565
-        getControl().selectionModelProperty().addListener(weakSelectionModelListener);
+        control.selectionModelProperty().addListener(weakSelectionModelListener);
         if (control.getSelectionModel() != null) {
             control.getSelectionModel().getSelectedIndices().addListener(weakSelectedIndicesListener);
         }
     }
-    
+
+    @Override public InputMap<TreeView<T>> getInputMap() {
+        return treeViewInputMap;
+    }
+
     @Override public void dispose() {
-        TreeCellBehavior.removeAnchor(getControl());
+        TreeCellBehavior.removeAnchor(getNode());
         super.dispose();
     }
     
     private void setAnchor(int anchor) {
-        TreeCellBehavior.setAnchor(getControl(), anchor < 0 ? null : anchor, false);
+        TreeCellBehavior.setAnchor(getNode(), anchor < 0 ? null : anchor, false);
     }
     
     private int getAnchor() {
-        return TreeCellBehavior.getAnchor(getControl(), getControl().getFocusModel().getFocusedIndex());
+        return TreeCellBehavior.getAnchor(getNode(), getNode().getFocusModel().getFocusedIndex());
     }
     
     private boolean hasAnchor() {
-        return TreeCellBehavior.hasNonDefaultAnchor(getControl());
+        return TreeCellBehavior.hasNonDefaultAnchor(getNode());
     }
 
-    @Override public void mousePressed(MouseEvent e) {
-        super.mousePressed(e);
-        
+    public void mousePressed(MouseEvent e) {
         if (! e.isShiftDown()) {
-            int index = getControl().getSelectionModel().getSelectedIndex();
+            int index = getNode().getSelectionModel().getSelectedIndex();
             setAnchor(index);
         }
         
-        if (! getControl().isFocused() && getControl().isFocusTraversable()) {
-            getControl().requestFocus();
+        if (! getNode().isFocused() && getNode().isFocusTraversable()) {
+            getNode().requestFocus();
         }
     }
 
     private void clearSelection() {
-        getControl().getSelectionModel().clearSelection();
+        getNode().getSelectionModel().clearSelection();
         //select(null);
     }
 
@@ -331,7 +287,7 @@
         }
         if (newSelectedIndex == -1) return;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         sm.clearAndSelect(newSelectedIndex);
     }
@@ -343,13 +299,13 @@
         }
         if (newSelectedIndex == -1) return;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         sm.clearAndSelect(newSelectedIndex);
     }
     
     private void focusFirstRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(0);
         
@@ -357,18 +313,18 @@
     }
     
     private void focusLastRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
-        fm.focus(getControl().getExpandedItemCount() - 1);
+        fm.focus(getNode().getExpandedItemCount() - 1);
         
         if (onMoveToLastCell != null) onMoveToLastCell.run();
     }
     
     private void focusPreviousRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         fm.focusPrevious();
@@ -381,10 +337,10 @@
     }
 
     private void focusNextRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         fm.focusNext();
@@ -399,7 +355,7 @@
     private void focusPageUp() {
         int newFocusIndex = onScrollPageUp.call(true);
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(newFocusIndex);
     }
@@ -407,16 +363,16 @@
     private void focusPageDown() {
         int newFocusIndex = onScrollPageDown.call(true);
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         fm.focus(newFocusIndex);
     }
 
     private void alsoSelectPreviousRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         if (isShiftDown && getAnchor() != -1) {
@@ -446,10 +402,10 @@
     }
 
     private void alsoSelectNextRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         if (isShiftDown && getAnchor() != -1) {
@@ -477,7 +433,7 @@
     }
     
     private void clearSelectionOutsideRange(int start, int end) {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         int min = Math.min(start, end);
@@ -496,7 +452,7 @@
     }
 
     private void selectPreviousRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusIndex = fm.getFocusedIndex();
@@ -505,41 +461,41 @@
         }
 
         setAnchor(focusIndex - 1);
-        getControl().getSelectionModel().clearAndSelect(focusIndex - 1);
+        getNode().getSelectionModel().clearAndSelect(focusIndex - 1);
         onSelectPreviousRow.run();
     }
 
     private void selectNextRow() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusIndex = fm.getFocusedIndex();
-        if (focusIndex == getControl().getExpandedItemCount() - 1) {
+        if (focusIndex == getNode().getExpandedItemCount() - 1) {
             return;
         }
 
         setAnchor(focusIndex + 1);
-        getControl().getSelectionModel().clearAndSelect(focusIndex + 1);
+        getNode().getSelectionModel().clearAndSelect(focusIndex + 1);
         onSelectNextRow.run();
     }
 
     private void selectFirstRow() {
-        if (getControl().getExpandedItemCount() > 0) {
-            getControl().getSelectionModel().clearAndSelect(0);
+        if (getNode().getExpandedItemCount() > 0) {
+            getNode().getSelectionModel().clearAndSelect(0);
             if (onMoveToFirstCell != null) onMoveToFirstCell.run();
         }
     }
 
     private void selectLastRow() {
-        getControl().getSelectionModel().clearAndSelect(getControl().getExpandedItemCount() - 1);
+        getNode().getSelectionModel().clearAndSelect(getNode().getExpandedItemCount() - 1);
         onMoveToLastCell.run();
     }
 
     private void selectAllToFirstRow() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int leadIndex = fm.getFocusedIndex();
@@ -562,10 +518,10 @@
     }
 
     private void selectAllToLastRow() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int leadIndex = fm.getFocusedIndex();
@@ -575,7 +531,7 @@
         }
 
         sm.clearSelection();
-        sm.selectRange(leadIndex, getControl().getExpandedItemCount());
+        sm.selectRange(leadIndex, getNode().getExpandedItemCount());
         
         if (isShiftDown) {
             setAnchor(leadIndex);
@@ -585,11 +541,11 @@
     }
 
     private void selectAll() {
-        getControl().getSelectionModel().selectAll();
+        getNode().getSelectionModel().selectAll();
     }
     
     private void selectAllPageUp() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int leadIndex = fm.getFocusedIndex();
@@ -603,7 +559,7 @@
         // fix for RT-34407
         int adjust = leadIndex < leadSelectedIndex ? 1 : -1;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         selectionChanging = true;
@@ -617,7 +573,7 @@
     }
     
     private void selectAllPageDown() {
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         
         int leadIndex = fm.getFocusedIndex();
@@ -631,7 +587,7 @@
         // fix for RT-34407
         int adjust = leadIndex < leadSelectedIndex ? 1 : -1;
         
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
         selectionChanging = true;
@@ -646,7 +602,7 @@
     
     private void selectAllToFocus(boolean setAnchorToFocusIndex) {
         // Fix for RT-31241
-        final TreeView<T> treeView = getControl();
+        final TreeView<T> treeView = getNode();
         if (treeView.getEditingItem() != null) return;
 
         MultipleSelectionModel<TreeItem<T>> sm = treeView.getSelectionModel();
@@ -666,16 +622,16 @@
     }
     
     private void expandRow() {
-        Callback<TreeItem<T>, Integer> getIndex = p -> getControl().getRow(p);
-        TreeViewBehavior.expandRow(getControl().getSelectionModel(), getIndex);
+        Callback<TreeItem<T>, Integer> getIndex = p -> getNode().getRow(p);
+        TreeViewBehavior.expandRow(getNode().getSelectionModel(), getIndex);
     }
     
     private void expandAll() {
-        TreeViewBehavior.expandAll(getControl().getRoot());
+        TreeViewBehavior.expandAll(getNode().getRoot());
     }
     
     private void collapseRow() {
-        TreeView<T> control = getControl();
+        TreeView<T> control = getNode();
         TreeViewBehavior.collapseRow(control.getSelectionModel(), control.getRoot(), control.isShowRoot());
     }
 
@@ -747,21 +703,21 @@
     }
     
     private void cancelEdit() {
-        getControl().edit(null);
+        getNode().edit(null);
     }
 
     private void edit() {
-        TreeItem<T> treeItem = getControl().getSelectionModel().getSelectedItem();
+        TreeItem<T> treeItem = getNode().getSelectionModel().getSelectedItem();
         if (treeItem == null) return;
 
-        getControl().edit(treeItem);
+        getNode().edit(treeItem);
     }
     
     private void toggleFocusOwnerSelection() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusedIndex = fm.getFocusedIndex();
@@ -781,7 +737,7 @@
      *************************************************************************/
     
     private void discontinuousSelectPreviousRow() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
         if (sm.getSelectionMode() != SelectionMode.MULTIPLE) {
@@ -789,7 +745,7 @@
             return;
         }
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusIndex = fm.getFocusedIndex();
@@ -808,7 +764,7 @@
     }
     
     private void discontinuousSelectNextRow() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
 
         if (sm.getSelectionMode() != SelectionMode.MULTIPLE) {
@@ -816,12 +772,12 @@
             return;
         }
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int focusIndex = fm.getFocusedIndex();
         final int newFocusIndex = focusIndex + 1;
-        if (newFocusIndex >= getControl().getExpandedItemCount()) return;
+        if (newFocusIndex >= getNode().getExpandedItemCount()) return;
 
         int startIndex = focusIndex;
         if (isShiftDown) {
@@ -835,10 +791,10 @@
     }
     
     private void discontinuousSelectPageUp() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int anchor = getAnchor();
@@ -847,10 +803,10 @@
     }
     
     private void discontinuousSelectPageDown() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
         
         int anchor = getAnchor();
@@ -859,10 +815,10 @@
     }
     
     private void discontinuousSelectAllToFirstRow() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int index = fm.getFocusedIndex();
@@ -873,14 +829,14 @@
     }
     
     private void discontinuousSelectAllToLastRow() {
-        MultipleSelectionModel<TreeItem<T>> sm = getControl().getSelectionModel();
+        MultipleSelectionModel<TreeItem<T>> sm = getNode().getSelectionModel();
         if (sm == null) return;
         
-        FocusModel<TreeItem<T>> fm = getControl().getFocusModel();
+        FocusModel<TreeItem<T>> fm = getNode().getFocusModel();
         if (fm == null) return;
 
         int index = fm.getFocusedIndex() + 1;
-        sm.selectRange(index, getControl().getExpandedItemCount());
+        sm.selectRange(index, getNode().getExpandedItemCount());
 
         if (onMoveToLastCell != null) onMoveToLastCell.run();
     }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java	2015-09-03 14:51:31.917934000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java	2015-09-03 14:51:31.331900400 -0700
@@ -25,10 +25,12 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.Properties;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 
 import javafx.scene.Scene;
+import javafx.scene.control.skin.ComboBoxPopupControl;
 import javafx.scene.input.KeyEvent;
 
 import javafx.beans.value.ChangeListener;
@@ -37,8 +39,6 @@
 import javafx.event.EventHandler;
 import javafx.scene.input.MouseEvent;
 
-import com.sun.javafx.scene.control.skin.ComboBoxPopupControl;
-
 public class TwoLevelFocusListBehavior extends TwoLevelFocusBehavior {
 
     public TwoLevelFocusListBehavior(Node node) {
@@ -190,7 +190,7 @@
                 */
                 Parent p = tlNode.getParent();
                 if (p != null) {
-                    if (ComboBoxPopupControl.COMBO_BOX_STYLE_CLASS.equals(p.getStyleClass().toString())) {
+                    if (Properties.COMBO_BOX_STYLE_CLASS.equals(p.getStyleClass().toString())) {
                         b = false;
                     }
                 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DoubleFieldSkin.java	2015-09-03 14:51:39.493367200 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DoubleFieldSkin.java	2015-09-03 14:51:38.879332100 -0700
@@ -25,6 +25,7 @@
 
 package com.sun.javafx.scene.control.skin;
 
+import com.sun.javafx.scene.control.DoubleField;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.scene.Node;
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVK.java	2015-09-03 14:51:46.875789500 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVK.java	2015-09-03 14:51:46.279755400 -0700
@@ -25,6 +25,8 @@
 
 package com.sun.javafx.scene.control.skin;
 
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.beans.property.SimpleObjectProperty;
@@ -53,7 +55,7 @@
     public final ObjectProperty<EventHandler<KeyEvent>> onActionProperty() { return onAction; }
 
 
-    final static String[] VK_TYPE_NAMES = new String[] { "text", "numeric", "url", "email" };
+    public final static String[] VK_TYPE_NAMES = new String[] { "text", "numeric", "url", "email" };
     public final static String VK_TYPE_PROP_KEY = "vkType";
 
     String[] chars;
@@ -106,6 +108,30 @@
         }
     }
 
+    private final static boolean IS_FXVK_SUPPORTED = Platform.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD);
+    private static boolean USE_FXVK = IS_FXVK_SUPPORTED;
+
+    public static boolean useFXVK() {
+        return USE_FXVK;
+    }
+
+    public static void toggleUseVK(TextInputControl textInput) {
+        Integer vkType = (Integer)textInput.getProperties().get(VK_TYPE_PROP_KEY);
+        if (vkType == null) {
+            vkType = -1;
+        }
+        vkType++;
+        if (vkType < 4) {
+            USE_FXVK = true;
+            textInput.getProperties().put(VK_TYPE_PROP_KEY, vkType);
+            attach(textInput);
+        } else {
+            detach();
+            textInput.getProperties().put(VK_TYPE_PROP_KEY, null);
+            USE_FXVK = false;
+        }
+    }
+
     /***************************************************************************
      *                                                                         *
      * Methods                                                                 *
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java	2015-09-03 14:51:54.020198100 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/FXVKSkin.java	2015-09-03 14:51:53.450165500 -0700
@@ -44,11 +44,13 @@
 import javafx.geometry.VPos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
+import javafx.scene.control.SkinBase;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.ComboBoxBase;
 import javafx.scene.Scene;
+import javafx.scene.control.skin.TextAreaSkin;
 import javafx.scene.input.InputEvent;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
@@ -67,7 +69,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.HashMap;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
 import static javafx.scene.input.MouseEvent.MOUSE_PRESSED;
 import static javafx.scene.input.TouchEvent.TOUCH_PRESSED;
 import static javafx.scene.layout.Region.USE_PREF_SIZE;
@@ -75,7 +76,7 @@
 import java.security.PrivilegedAction;
 
 
-public class FXVKSkin extends BehaviorSkinBase<FXVK, BehaviorBase<FXVK>> {
+public class FXVKSkin extends SkinBase<FXVK> {
 
     private static final int GAP = 6;
 
@@ -353,10 +354,13 @@
     }
 
     private String getNodeVKType(Node node) {
-        Object typeValue = node.getProperties().get(FXVK.VK_TYPE_PROP_KEY);
+        Integer vkType = (Integer)node.getProperties().get(FXVK.VK_TYPE_PROP_KEY);
         String typeStr = null;
-        if (typeValue instanceof String) {
-            typeStr = ((String)typeValue).toLowerCase(Locale.ROOT);
+        if (vkType != null) {
+            Object typeValue = FXVK.VK_TYPE_NAMES[vkType];
+            if (typeValue instanceof String) {
+                typeStr = ((String)typeValue).toLowerCase(Locale.ROOT);
+            }
         }
         return (typeStr != null ? typeStr : "text");
     }
@@ -473,7 +477,7 @@
     }
 
     public FXVKSkin(final FXVK fxvk) {
-        super(fxvk, new BehaviorBase<>(fxvk, Collections.emptyList()));
+        super(fxvk);
         this.fxvk = fxvk;
         if (fxvk == FXVK.vk) {
             primaryVK = fxvk;
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/InputFieldSkin.java	2015-09-03 14:52:02.059658000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/InputFieldSkin.java	2015-09-03 14:52:01.434622200 -0700
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.skin;
 
 import com.sun.javafx.event.EventDispatchChainImpl;
+import com.sun.javafx.scene.control.InputField;
 import javafx.beans.InvalidationListener;
 import javafx.event.EventDispatchChain;
 import javafx.scene.Node;
@@ -34,7 +35,7 @@
 
 /**
  */
-abstract class InputFieldSkin implements Skin<InputField> {
+public abstract class InputFieldSkin implements Skin<InputField> {
     /**
      * The {@code Control} that is referencing this Skin. There is a
      * one-to-one relationship between a {@code Skin} and a {@code Control}.
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/IntegerFieldSkin.java	2015-09-03 14:52:09.376076400 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/IntegerFieldSkin.java	2015-09-03 14:52:08.772041900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -25,6 +25,7 @@
 
 package com.sun.javafx.scene.control.skin;
 
+import com.sun.javafx.scene.control.IntegerField;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.scene.Node;
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/Utils.java	2015-09-03 14:52:17.301529700 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/Utils.java	2015-09-03 14:52:16.737497500 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -30,16 +30,13 @@
 
 package com.sun.javafx.scene.control.skin;
 
-import java.text.Bidi;
-import java.text.BreakIterator;
-import java.util.function.Consumer;
-
-import static javafx.scene.control.OverrunStyle.*;
-import javafx.application.Platform;
+import com.sun.javafx.scene.control.behavior.TextBinding;
+import com.sun.javafx.scene.text.TextLayout;
+import com.sun.javafx.tk.Toolkit;
 import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
-import javafx.beans.property.Property;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.geometry.Bounds;
@@ -50,17 +47,27 @@
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.OverrunStyle;
+import com.sun.javafx.scene.control.ContextMenuContent;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.Mnemonic;
+import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextBoundsType;
 
-import com.sun.javafx.scene.control.behavior.TextBinding;
-import com.sun.javafx.scene.text.HitInfo;
-import com.sun.javafx.scene.text.TextLayout;
-import com.sun.javafx.tk.Toolkit;
-import javafx.util.Callback;
+import java.text.Bidi;
+import java.text.BreakIterator;
+import java.util.Locale;
+import java.util.function.Consumer;
+
+import static javafx.scene.control.OverrunStyle.CENTER_ELLIPSIS;
+import static javafx.scene.control.OverrunStyle.CENTER_WORD_ELLIPSIS;
+import static javafx.scene.control.OverrunStyle.CLIP;
+import static javafx.scene.control.OverrunStyle.ELLIPSIS;
+import static javafx.scene.control.OverrunStyle.LEADING_ELLIPSIS;
+import static javafx.scene.control.OverrunStyle.LEADING_WORD_ELLIPSIS;
+import static javafx.scene.control.OverrunStyle.WORD_ELLIPSIS;
+import static javafx.scene.control.skin.TextFieldSkin.TextPosInfo;
 
 /**
  * BE REALLY CAREFUL WITH RESTORING OR RESETTING STATE OF helper NODE AS LEFTOVER
@@ -88,7 +95,7 @@
      * */
     static final TextLayout layout = Toolkit.getToolkit().getTextLayoutFactory().createLayout();
 
-    static double getAscent(Font font, TextBoundsType boundsType) {
+    public static double getAscent(Font font, TextBoundsType boundsType) {
         layout.setContent("", font.impl_getNativeFont());
         layout.setWrapWidth(0);
         layout.setLineSpacing(0);
@@ -100,7 +107,7 @@
         return -layout.getBounds().getMinY();
     }
 
-    static double getLineHeight(Font font, TextBoundsType boundsType) {
+    public static double getLineHeight(Font font, TextBoundsType boundsType) {
         layout.setContent("", font.impl_getNativeFont());
         layout.setWrapWidth(0);
         layout.setLineSpacing(0);
@@ -114,18 +121,18 @@
         return layout.getLines()[0].getBounds().getHeight();
     }
 
-    static double computeTextWidth(Font font, String text, double wrappingWidth) {
+    public static double computeTextWidth(Font font, String text, double wrappingWidth) {
         layout.setContent(text != null ? text : "", font.impl_getNativeFont());
         layout.setWrapWidth((float)wrappingWidth);
         return layout.getBounds().getWidth();
     }
 
-    static double computeTextHeight(Font font, String text, double wrappingWidth, TextBoundsType boundsType) {
+    public static double computeTextHeight(Font font, String text, double wrappingWidth, TextBoundsType boundsType) {
         return computeTextHeight(font, text, wrappingWidth, 0, boundsType);
     }
 
     @SuppressWarnings("deprecation")
-    static double computeTextHeight(Font font, String text, double wrappingWidth, double lineSpacing, TextBoundsType boundsType) {
+    public static double computeTextHeight(Font font, String text, double wrappingWidth, double lineSpacing, TextBoundsType boundsType) {
         layout.setContent(text != null ? text : "", font.impl_getNativeFont());
         layout.setWrapWidth((float)wrappingWidth);
         layout.setLineSpacing((float)lineSpacing);
@@ -137,7 +144,7 @@
         return layout.getBounds().getHeight();
     }
 
-    static int computeTruncationIndex(Font font, String text, double width) {
+    public static int computeTruncationIndex(Font font, String text, double width) {
         helper.setText(text);
         helper.setFont(font);
         helper.setWrappingWidth(0);
@@ -155,7 +162,7 @@
         return index;
     }
 
-    static String computeClippedText(Font font, String text, double width,
+    public static String computeClippedText(Font font, String text, double width,
                                      OverrunStyle type, String ellipsisString) {
         if (font == null) {
             throw new IllegalArgumentException("Must specify a font");
@@ -356,7 +363,7 @@
         }
     }
 
-    static String computeClippedWrappedText(Font font, String text, double width,
+    public static String computeClippedWrappedText(Font font, String text, double width,
                                             double height, OverrunStyle truncationStyle,
                                             String ellipsisString, TextBoundsType boundsType) {
         if (font == null) {
@@ -634,11 +641,11 @@
         return Math.min(Math.max(value, min), Math.max(min,max));
     }
 
-    static void addMnemonics(ContextMenu popup, Scene scene) {
+    public static void addMnemonics(ContextMenu popup, Scene scene) {
         addMnemonics(popup, scene, false);
     }
 
-    static void addMnemonics(ContextMenu popup, Scene scene, boolean initialState) {
+    public static void addMnemonics(ContextMenu popup, Scene scene, boolean initialState) {
 
         if (!com.sun.javafx.PlatformUtil.isMac()) {
 
@@ -667,7 +674,7 @@
 
 
 
-    static void removeMnemonics(ContextMenu popup, Scene scene) {
+    public static void removeMnemonics(ContextMenu popup, Scene scene) {
 
         if (!com.sun.javafx.PlatformUtil.isMac()) {
 
@@ -700,7 +707,7 @@
         }
     }
 
-    static double computeXOffset(double width, double contentWidth, HPos hpos) {
+    public static double computeXOffset(double width, double contentWidth, HPos hpos) {
         if (hpos == null) {
             return 0;
         }
@@ -717,7 +724,7 @@
         }
     }
 
-    static double computeYOffset(double height, double contentHeight, VPos vpos) {
+    public static double computeYOffset(double height, double contentHeight, VPos vpos) {
         if (vpos == null) {
             return 0;
         }
@@ -751,7 +758,7 @@
     // Workaround for RT-26961. HitInfo.getInsertionIndex() doesn't skip
     // complex character clusters / ligatures.
     private static BreakIterator charIterator = null;
-    public static int getHitInsertionIndex(HitInfo hit, String text) {
+    public static int getHitInsertionIndex(TextPosInfo hit, String text) {
         int charIndex = hit.getCharIndex();
         if (text != null && !hit.isLeading()) {
             if (charIterator == null) {
@@ -790,4 +797,15 @@
             p.addListener(listener);
         }
     }
+
+    public static String formatHexString(Color c) {
+        if (c != null) {
+            return String.format((Locale) null, "#%02x%02x%02x",
+                    Math.round(c.getRed() * 255),
+                    Math.round(c.getGreen() * 255),
+                    Math.round(c.getBlue() * 255));
+        } else {
+            return null;
+        }
+    }
 }
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/WebColorFieldSkin.java	2015-09-03 14:52:24.923965700 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/WebColorFieldSkin.java	2015-09-03 14:52:24.323931400 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -27,14 +27,16 @@
 
 import java.util.Locale;
 
+import com.sun.javafx.scene.control.WebColorField;
 import javafx.beans.InvalidationListener;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Node;
+import javafx.scene.control.skin.ColorPickerSkin;
 import javafx.scene.paint.Color;
 
 /**
  */
-class WebColorFieldSkin extends InputFieldSkin {
+public class WebColorFieldSkin extends InputFieldSkin {
     private InvalidationListener integerFieldValueListener;
     private boolean noChangeInValue = false;
 
@@ -91,7 +93,7 @@
     protected void updateText() {
         Color color = ((WebColorField) control).getValue();
         if (color == null) color = Color.BLACK;
-        getTextField().setText(ColorPickerSkin.formatHexString(color));
+        getTextField().setText(Utils.formatHexString(color));
     }
 
     protected void updateValue() {
@@ -107,7 +109,7 @@
                     // calling setText results in updateValue - so we set this flag to true
                     // so that when this is true updateValue simply returns.
                     noChangeInValue = true; 
-                    getTextField().setText(ColorPickerSkin.formatHexString(newValue));
+                    getTextField().setText(Utils.formatHexString(newValue));
                     noChangeInValue = false;
                 }
             } catch (java.lang.IllegalArgumentException ex) {
--- old/modules/controls/src/main/java/javafx/scene/chart/AreaChart.java	2015-09-03 14:52:32.393393000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/AreaChart.java	2015-09-03 14:52:31.842361400 -0700
@@ -53,7 +53,7 @@
 
 import com.sun.javafx.charts.Legend;
 import com.sun.javafx.charts.Legend.LegendItem;
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.converter.BooleanConverter;
 import javafx.beans.property.BooleanProperty;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
--- old/modules/controls/src/main/java/javafx/scene/chart/Axis.java	2015-09-03 14:52:39.800816600 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/Axis.java	2015-09-03 14:52:39.170780600 -0700
@@ -32,10 +32,10 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableObjectProperty;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
 
 import java.util.*;
 
@@ -44,7 +44,6 @@
 import javafx.beans.binding.ObjectExpression;
 import javafx.beans.binding.StringExpression;
 import javafx.beans.property.*;
-import javafx.beans.value.WritableBooleanValue;
 import javafx.beans.value.WritableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
--- old/modules/controls/src/main/java/javafx/scene/chart/BarChart.java	2015-09-03 14:52:47.570261000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/BarChart.java	2015-09-03 14:52:47.013229200 -0700
@@ -53,7 +53,7 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/chart/CategoryAxis.java	2015-09-03 14:52:55.268701300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/CategoryAxis.java	2015-09-03 14:52:54.651666100 -0700
@@ -51,8 +51,8 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.SizeConverter;
 
 import java.util.Collections;
 
--- old/modules/controls/src/main/java/javafx/scene/chart/Chart.java	2015-09-03 14:53:02.985142700 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/Chart.java	2015-09-03 14:53:02.349106300 -0700
@@ -56,8 +56,8 @@
 import javafx.css.StyleableObjectProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/chart/LineChart.java	2015-09-03 14:53:10.309561600 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/LineChart.java	2015-09-03 14:53:09.733528700 -0700
@@ -63,7 +63,7 @@
 import javafx.css.StyleableBooleanProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.converter.BooleanConverter;
 
 import java.util.*;
 
--- old/modules/controls/src/main/java/javafx/scene/chart/NumberAxis.java	2015-09-03 14:53:17.714985200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/NumberAxis.java	2015-09-03 14:53:17.121951300 -0700
@@ -50,7 +50,7 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/chart/PieChart.java	2015-09-03 14:53:25.306419400 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/PieChart.java	2015-09-03 14:53:24.704385000 -0700
@@ -77,8 +77,8 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.SizeConverter;
 import java.util.BitSet;
 
 import javafx.css.Styleable;
--- old/modules/controls/src/main/java/javafx/scene/chart/StackedAreaChart.java	2015-09-03 14:53:32.565834600 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/StackedAreaChart.java	2015-09-03 14:53:31.911797200 -0700
@@ -45,7 +45,7 @@
 
 import com.sun.javafx.charts.Legend;
 import com.sun.javafx.charts.Legend.LegendItem;
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.converter.BooleanConverter;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.value.WritableValue;
--- old/modules/controls/src/main/java/javafx/scene/chart/StackedBarChart.java	2015-09-03 14:53:40.071263900 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/StackedBarChart.java	2015-09-03 14:53:39.465229200 -0700
@@ -47,7 +47,7 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 
 import javafx.collections.ListChangeListener;
 import javafx.css.Styleable;
--- old/modules/controls/src/main/java/javafx/scene/chart/ValueAxis.java	2015-09-03 14:53:47.310678000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/ValueAxis.java	2015-09-03 14:53:46.700643100 -0700
@@ -30,8 +30,8 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableIntegerProperty;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.SizeConverter;
 
 import java.util.ArrayList;
 import java.util.Collections;
--- old/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2015-09-03 14:53:55.406141000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	2015-09-03 14:53:54.797106200 -0700
@@ -71,7 +71,7 @@
 import javafx.util.Duration;
 
 import com.sun.javafx.collections.NonIterableChange;
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.converter.BooleanConverter;
 
 
 
--- old/modules/controls/src/main/java/javafx/scene/control/Accordion.java	2015-09-03 14:54:03.043577800 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Accordion.java	2015-09-03 14:54:02.507547200 -0700
@@ -30,7 +30,7 @@
 import javafx.collections.ObservableList;
 
 import com.sun.javafx.collections.TrackableObservableList;
-import com.sun.javafx.scene.control.skin.AccordionSkin;
+import javafx.scene.control.skin.AccordionSkin;
 
 import javafx.beans.property.ObjectPropertyBase;
 import javafx.beans.value.WritableValue;
--- old/modules/controls/src/main/java/javafx/scene/control/Alert.java	2015-09-03 14:54:10.760019200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Alert.java	2015-09-03 14:54:10.127983100 -0700
@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.sun.javafx.scene.control.skin.AccordionSkin;
 import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import javafx.beans.InvalidationListener;
 import javafx.beans.NamedArg;
@@ -38,9 +37,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.scene.Node;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 
 /**
  * The Alert class subclasses the {@link Dialog} class, and provides support for a number
--- old/modules/controls/src/main/java/javafx/scene/control/Button.java	2015-09-03 14:54:18.398456100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Button.java	2015-09-03 14:54:17.653413500 -0700
@@ -32,7 +32,7 @@
 import javafx.scene.Node;
 
 import javafx.css.PseudoClass;
-import com.sun.javafx.scene.control.skin.ButtonSkin;
+import javafx.scene.control.skin.ButtonSkin;
 
 /**
  * <p>A simple button control.  The button control can contain
--- old/modules/controls/src/main/java/javafx/scene/control/ButtonBar.java	2015-09-03 14:54:25.903885400 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ButtonBar.java	2015-09-03 14:54:25.310851500 -0700
@@ -24,8 +24,7 @@
  */
 package javafx.scene.control;
 
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
+import com.sun.javafx.scene.control.Properties;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -38,11 +37,7 @@
 import javafx.scene.layout.HBox;
 
 import com.sun.javafx.util.Utils;
-import com.sun.javafx.scene.control.skin.ButtonBarSkin;
-import com.sun.javafx.scene.traversal.Algorithm;
-import com.sun.javafx.scene.traversal.Direction;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import com.sun.javafx.scene.traversal.TraversalContext;
+import javafx.scene.control.skin.ButtonBarSkin;
 import javafx.beans.value.WritableValue;
 import javafx.css.StyleableProperty;
 
@@ -367,11 +362,11 @@
         final Map<Object,Object> properties = button.getProperties();
         final ObjectProperty<ButtonData> property =
                 (ObjectProperty<ButtonData>) properties.getOrDefault(
-                        ButtonBarSkin.BUTTON_DATA_PROPERTY,
+                        Properties.BUTTON_DATA_PROPERTY,
                         new SimpleObjectProperty<>(button, "buttonData", buttonData));
 
         property.set(buttonData);
-        properties.putIfAbsent(ButtonBarSkin.BUTTON_DATA_PROPERTY, property);
+        properties.putIfAbsent(Properties.BUTTON_DATA_PROPERTY, property);
     }
     
     /**
@@ -382,8 +377,8 @@
      */
     public static ButtonData getButtonData(Node button) {
         final Map<Object,Object> properties = button.getProperties();
-        if (properties.containsKey(ButtonBarSkin.BUTTON_DATA_PROPERTY)) {
-            ObjectProperty<ButtonData> property = (ObjectProperty<ButtonData>) properties.get(ButtonBarSkin.BUTTON_DATA_PROPERTY);
+        if (properties.containsKey(Properties.BUTTON_DATA_PROPERTY)) {
+            ObjectProperty<ButtonData> property = (ObjectProperty<ButtonData>) properties.get(Properties.BUTTON_DATA_PROPERTY);
             return property == null ? null : property.get();
         }
         return null;
@@ -408,9 +403,9 @@
         // we store the false, but remove the true (as the isButtonUniformSize 
         // method returns true by default)
         if (uniformSize) {
-            button.getProperties().remove(ButtonBarSkin.BUTTON_SIZE_INDEPENDENCE);
+            button.getProperties().remove(Properties.BUTTON_SIZE_INDEPENDENCE);
         } else {
-            button.getProperties().put(ButtonBarSkin.BUTTON_SIZE_INDEPENDENCE, uniformSize);
+            button.getProperties().put(Properties.BUTTON_SIZE_INDEPENDENCE, uniformSize);
         }
     }
     
@@ -420,7 +415,7 @@
      * {@link #setButtonUniformSize(Node, boolean)}) will return true here.
      */
     public static boolean isButtonUniformSize(Node button) {
-        return (boolean) button.getProperties().getOrDefault(ButtonBarSkin.BUTTON_SIZE_INDEPENDENCE, true);
+        return (boolean) button.getProperties().getOrDefault(Properties.BUTTON_SIZE_INDEPENDENCE, true);
     }
 
 
--- old/modules/controls/src/main/java/javafx/scene/control/CheckBox.java	2015-09-03 14:54:33.476318500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/CheckBox.java	2015-09-03 14:54:32.947288200 -0700
@@ -34,7 +34,7 @@
 import javafx.css.PseudoClass;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.AccessibleRole;
-import com.sun.javafx.scene.control.skin.CheckBoxSkin;
+import javafx.scene.control.skin.CheckBoxSkin;
 
 /**
  * A tri-state selection Control typically skinned as a box with a checkmark or
--- old/modules/controls/src/main/java/javafx/scene/control/ChoiceBox.java	2015-09-03 14:54:40.416715500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ChoiceBox.java	2015-09-03 14:54:39.870684200 -0700
@@ -44,7 +44,7 @@
 import javafx.util.StringConverter;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.scene.control.skin.ChoiceBoxSkin;
+import javafx.scene.control.skin.ChoiceBoxSkin;
 
 import javafx.beans.DefaultProperty;
 
--- old/modules/controls/src/main/java/javafx/scene/control/ColorPicker.java	2015-09-03 14:54:48.230162400 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ColorPicker.java	2015-09-03 14:54:47.673130500 -0700
@@ -28,7 +28,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.paint.Color;
-import com.sun.javafx.scene.control.skin.ColorPickerSkin;
+import javafx.scene.control.skin.ColorPickerSkin;
 
 /**
  * <p>ColorPicker control allows the user to select a color from either a standard 
--- old/modules/controls/src/main/java/javafx/scene/control/ComboBox.java	2015-09-03 14:54:55.567582100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ComboBox.java	2015-09-03 14:54:55.002549700 -0700
@@ -25,15 +25,15 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.scene.control.FakeFocusTextField;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.WeakInvalidationListener;
 import javafx.collections.WeakListChangeListener;
-import com.sun.javafx.scene.control.skin.ComboBoxListViewSkin;
+import javafx.scene.control.skin.ComboBoxListViewSkin;
 import javafx.beans.property.*;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WeakChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -378,8 +378,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(); 
--- old/modules/controls/src/main/java/javafx/scene/control/ContextMenu.java	2015-09-03 14:55:03.108013300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ContextMenu.java	2015-09-03 14:55:02.573982800 -0700
@@ -43,7 +43,7 @@
 
 import com.sun.javafx.util.Utils;
 import com.sun.javafx.collections.TrackableObservableList;
-import com.sun.javafx.scene.control.skin.ContextMenuSkin;
+import javafx.scene.control.skin.ContextMenuSkin;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 
--- old/modules/controls/src/main/java/javafx/scene/control/Control.java	2015-09-03 14:55:10.728449200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Control.java	2015-09-03 14:55:10.152416300 -0700
@@ -40,20 +40,19 @@
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.WritableValue;
 import javafx.collections.ObservableList;
+import javafx.css.CssParser;
 import javafx.event.EventHandler;
-import javafx.geometry.Side;
 import javafx.scene.AccessibleAction;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.Node;
 import javafx.scene.input.ContextMenuEvent;
 import javafx.scene.layout.Region;
 import com.sun.javafx.application.PlatformImpl;
-import com.sun.javafx.css.CssError;
 import javafx.css.CssMetaData;
 import com.sun.javafx.css.StyleManager;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableStringProperty;
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.StringConverter;
 import com.sun.javafx.scene.control.Logging;
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
@@ -420,6 +419,11 @@
         // we add a listener for menu request events to show the context menu
         // that may be set on the Control
         this.addEventHandler(ContextMenuEvent.CONTEXT_MENU_REQUESTED, contextMenuHandler);
+
+        // TODO re-enable when InputMap moves back to Node / Control
+//        // Most controls need an input map, so we set this to be non-null in
+//        // Control to save people from running into NPEs.
+//        setInputMap(new InputMap(this));
     }
 
 
@@ -686,9 +690,9 @@
         if (skinClassName == null || skinClassName.isEmpty()) {
             final String msg =
                 "Empty -fx-skin property specified for control " + control;
-            final List<CssError> errors = StyleManager.getErrors();
+            final List<CssParser.ParseError> errors = StyleManager.getErrors();
             if (errors != null) {
-                CssError error = new CssError(msg);
+                CssParser.ParseError error = new CssParser.ParseError(msg);
                 errors.add(error); // RT-19884
             }
             Logging.getControlsLogger().severe(msg);
@@ -712,9 +716,9 @@
                     "No valid constructor defined in '" + skinClassName + "' for control " + control +
                         ".\r\nYou must provide a constructor that accepts a single "
                         + "Skinnable (e.g. Control or PopupControl) parameter in " + skinClassName + ".";
-                final List<CssError> errors = StyleManager.getErrors();
+                final List<CssParser.ParseError> errors = StyleManager.getErrors();
                 if (errors != null) {
-                    CssError error = new CssError(msg);
+                    CssParser.ParseError error = new CssParser.ParseError(msg);
                     errors.add(error); // RT-19884
                 }
                 Logging.getControlsLogger().severe(msg);
@@ -727,18 +731,18 @@
         } catch (InvocationTargetException e) {
             final String msg =
                 "Failed to load skin '" + skinClassName + "' for control " + control;
-            final List<CssError> errors = StyleManager.getErrors();
+            final List<CssParser.ParseError> errors = StyleManager.getErrors();
             if (errors != null) {
-                CssError error = new CssError(msg + " :" + e.getLocalizedMessage());
+                CssParser.ParseError error = new CssParser.ParseError(msg + " :" + e.getLocalizedMessage());
                 errors.add(error); // RT-19884
             }
             Logging.getControlsLogger().severe(msg, e.getCause());
         } catch (Exception e) {
             final String msg =
                 "Failed to load skin '" + skinClassName + "' for control " + control;
-            final List<CssError> errors = StyleManager.getErrors();
+            final List<CssParser.ParseError> errors = StyleManager.getErrors();
             if (errors != null) {
-                CssError error = new CssError(msg + " :" + e.getLocalizedMessage());
+                CssParser.ParseError error = new CssParser.ParseError(msg + " :" + e.getLocalizedMessage());
                 errors.add(error); // RT-19884
             }
             Logging.getControlsLogger().severe(msg, e);
@@ -863,9 +867,9 @@
             } else {
                 final String msg = "The -fx-skin property has not been defined in CSS for " + this +
                                    " and createDefaultSkin() returned null.";
-                final List<CssError> errors = StyleManager.getErrors();
+                final List<CssParser.ParseError> errors = StyleManager.getErrors();
                 if (errors != null) {
-                    CssError error = new CssError(msg);
+                    CssParser.ParseError error = new CssParser.ParseError(msg);
                     errors.add(error); // RT-19884
                 }
                 Logging.getControlsLogger().severe(msg);
--- old/modules/controls/src/main/java/javafx/scene/control/ControlUtils.java	2015-09-03 14:55:18.351885200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ControlUtils.java	2015-09-03 14:55:17.781852600 -0700
@@ -26,11 +26,8 @@
 package javafx.scene.control;
 
 import com.sun.javafx.scene.control.skin.Utils;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.collections.ObservableMap;
 import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.Parent;
--- old/modules/controls/src/main/java/javafx/scene/control/DateCell.java	2015-09-03 14:55:26.205334400 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/DateCell.java	2015-09-03 14:55:25.620301000 -0700
@@ -27,7 +27,7 @@
 
 import java.time.LocalDate;
 
-import com.sun.javafx.scene.control.skin.DateCellSkin;
+import javafx.scene.control.skin.DateCellSkin;
 
 /**
  * DateCell is used by {@link DatePicker} to render the individual
--- old/modules/controls/src/main/java/javafx/scene/control/DatePicker.java	2015-09-03 14:55:34.013781000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/DatePicker.java	2015-09-03 14:55:33.474750200 -0700
@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.Locale;
 
-import com.sun.javafx.scene.control.skin.ComboBoxListViewSkin;
+import com.sun.javafx.scene.control.FakeFocusTextField;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -55,8 +55,8 @@
 import javafx.util.StringConverter;
 import javafx.util.converter.LocalDateStringConverter;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.scene.control.skin.DatePickerSkin;
+import javafx.css.converter.BooleanConverter;
+import javafx.scene.control.skin.DatePickerSkin;
 import com.sun.javafx.scene.control.skin.resources.ControlResources;
 
 
@@ -416,8 +416,8 @@
     }
     public final ReadOnlyObjectProperty<TextField> editorProperty() {
         if (editor == null) {
-            editor = new ReadOnlyObjectWrapper<TextField>(this, "editor");
-            editor.set(new ComboBoxListViewSkin.FakeFocusTextField());
+            editor = new ReadOnlyObjectWrapper<>(this, "editor");
+            editor.set(new FakeFocusTextField());
         }
         return editor.getReadOnlyProperty();
     }
--- old/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	2015-09-03 14:55:41.472207600 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/DialogPane.java	2015-09-03 14:55:40.858172500 -0700
@@ -65,7 +65,7 @@
 import javafx.scene.layout.StackPane;
 
 import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.StringConverter;
 
 /**
  * DialogPane should be considered to be the root node displayed within a
--- old/modules/controls/src/main/java/javafx/scene/control/Hyperlink.java	2015-09-03 14:55:48.978637000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Hyperlink.java	2015-09-03 14:55:48.413604700 -0700
@@ -35,7 +35,7 @@
 import javafx.scene.Node;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.scene.control.skin.HyperlinkSkin;
+import javafx.scene.control.skin.HyperlinkSkin;
 
 import javafx.css.StyleableProperty;
 
--- old/modules/controls/src/main/java/javafx/scene/control/Label.java	2015-09-03 14:55:56.803084500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Label.java	2015-09-03 14:55:56.201050100 -0700
@@ -25,7 +25,7 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.LabelSkin;
+import javafx.scene.control.skin.LabelSkin;
 import com.sun.javafx.scene.NodeHelper;
 
 import javafx.beans.property.ObjectProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/Labeled.java	2015-09-03 14:56:04.043498600 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Labeled.java	2015-09-03 14:56:03.463465500 -0700
@@ -27,12 +27,12 @@
 
 
 import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.InsetsConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.InsetsConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StringConverter;
 
 import java.util.ArrayList;
 import java.util.Collections;
--- old/modules/controls/src/main/java/javafx/scene/control/ListCell.java	2015-09-03 14:56:11.589930300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ListCell.java	2015-09-03 14:56:10.866888900 -0700
@@ -42,7 +42,7 @@
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.AccessibleRole;
 
-import com.sun.javafx.scene.control.skin.ListCellSkin;
+import javafx.scene.control.skin.ListCellSkin;
 
 /**
  * <p>The {@link Cell} type used within {@link ListView} instances. In addition 
--- old/modules/controls/src/main/java/javafx/scene/control/ListView.java	2015-09-03 14:56:19.224366900 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ListView.java	2015-09-03 14:56:18.656334500 -0700
@@ -30,8 +30,8 @@
 import java.util.HashMap;
 import java.util.List;
 
+import com.sun.javafx.scene.control.Properties;
 import com.sun.javafx.scene.control.behavior.ListCellBehavior;
-import com.sun.javafx.scene.control.skin.TableViewSkinBase;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.WeakInvalidationListener;
@@ -43,8 +43,6 @@
 import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.WeakChangeListener;
 import javafx.beans.value.WritableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
@@ -61,12 +59,12 @@
 import javafx.css.StyleableObjectProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.EnumConverter;
+import javafx.css.converter.EnumConverter;
 
 import javafx.collections.WeakListChangeListener;
 
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.ListViewSkin;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.ListViewSkin;
 
 import java.lang.ref.WeakReference;
 
@@ -964,7 +962,7 @@
      * @since JavaFX 8u60
      */
     public void refresh() {
-        getProperties().put(ListViewSkin.RECREATE, Boolean.TRUE);
+        getProperties().put(Properties.RECREATE, Boolean.TRUE);
     }
 
 
--- old/modules/controls/src/main/java/javafx/scene/control/MenuBar.java	2015-09-03 14:56:26.646791500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/MenuBar.java	2015-09-03 14:56:26.157763500 -0700
@@ -25,7 +25,7 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.converter.BooleanConverter;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,7 +40,7 @@
 import javafx.css.CssMetaData;
 import javafx.css.StyleableBooleanProperty;
 
-import com.sun.javafx.scene.control.skin.MenuBarSkin;
+import javafx.scene.control.skin.MenuBarSkin;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/MenuButton.java	2015-09-03 14:56:34.245226100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/MenuButton.java	2015-09-03 14:56:33.671193300 -0700
@@ -37,7 +37,7 @@
 import javafx.scene.AccessibleAction;
 import javafx.scene.AccessibleRole;
 import javafx.scene.Node;
-import com.sun.javafx.scene.control.skin.MenuButtonSkin;
+import javafx.scene.control.skin.MenuButtonSkin;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 
--- old/modules/controls/src/main/java/javafx/scene/control/MenuItem.java	2015-09-03 14:56:42.614704800 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/MenuItem.java	2015-09-03 14:56:42.028671300 -0700
@@ -49,8 +49,8 @@
 import javafx.scene.input.KeyCombination;
 
 import com.sun.javafx.event.EventHandlerManager;
-import com.sun.javafx.scene.control.skin.ContextMenuContent;
-import com.sun.javafx.scene.control.skin.ContextMenuSkin;
+import com.sun.javafx.scene.control.ContextMenuContent;
+import javafx.scene.control.skin.ContextMenuSkin;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -612,7 +612,7 @@
         for (int i = 0; i < childrenNodes.size(); i++) {
             if (! (childrenNodes.get(i) instanceof ContextMenuContent.MenuItemContainer)) continue;
 
-            ContextMenuContent.MenuItemContainer MenuRow = 
+            ContextMenuContent.MenuItemContainer MenuRow =
                     (ContextMenuContent.MenuItemContainer) childrenNodes.get(i);
 
             if (desiredMenuItem.equals(MenuRow.getItem())) {
--- old/modules/controls/src/main/java/javafx/scene/control/Pagination.java	2015-09-03 14:56:50.039129400 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Pagination.java	2015-09-03 14:56:49.423094200 -0700
@@ -42,8 +42,8 @@
 import javafx.scene.AccessibleRole;
 import javafx.scene.Node;
 import javafx.util.Callback;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.PaginationSkin;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.PaginationSkin;
 
 /**
  * <p>
--- old/modules/controls/src/main/java/javafx/scene/control/PopupControl.java	2015-09-03 14:56:57.172537500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/PopupControl.java	2015-09-03 14:56:56.603504900 -0700
@@ -39,19 +39,19 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
+import javafx.css.CssParser;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.layout.Pane;
 import javafx.stage.PopupWindow;
 import com.sun.javafx.application.PlatformImpl;
-import com.sun.javafx.css.CssError;
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 import com.sun.javafx.css.StyleManager;
 import javafx.css.Styleable;
 import javafx.css.StyleableStringProperty;
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.StringConverter;
 import com.sun.javafx.scene.control.Logging;
 import javafx.css.StyleableProperty;
 import javafx.stage.Window;
@@ -1182,9 +1182,9 @@
                 } else {
                     final String msg = "The -fx-skin property has not been defined in CSS for " + this +
                             " and createDefaultSkin() returned null.";
-                    final List<CssError> errors = StyleManager.getErrors();
+                    final List<CssParser.ParseError> errors = StyleManager.getErrors();
                     if (errors != null) {
-                        CssError error = new CssError(msg);
+                        CssParser.ParseError error = new CssParser.ParseError(msg);
                         errors.add(error); // RT-19884
                     }
                     Logging.getControlsLogger().severe(msg);
--- old/modules/controls/src/main/java/javafx/scene/control/ProgressBar.java	2015-09-03 14:57:04.746970700 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ProgressBar.java	2015-09-03 14:57:04.126935200 -0700
@@ -25,7 +25,7 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.ProgressBarSkin;
+import javafx.scene.control.skin.ProgressBarSkin;
 
 import javafx.beans.value.WritableValue;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java	2015-09-03 14:57:12.319403800 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ProgressIndicator.java	2015-09-03 14:57:11.678367100 -0700
@@ -27,7 +27,7 @@
 
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.scene.control.skin.ProgressIndicatorSkin;
+import javafx.scene.control.skin.ProgressIndicatorSkin;
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
--- old/modules/controls/src/main/java/javafx/scene/control/RadioButton.java	2015-09-03 14:57:20.191854100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/RadioButton.java	2015-09-03 14:57:19.649823100 -0700
@@ -27,7 +27,7 @@
 
 import javafx.geometry.Pos;
 
-import com.sun.javafx.scene.control.skin.RadioButtonSkin;
+import javafx.scene.control.skin.RadioButtonSkin;
 
 import javafx.beans.value.WritableValue;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/ScrollBar.java	2015-09-03 14:57:27.551275000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ScrollBar.java	2015-09-03 14:57:26.969241700 -0700
@@ -25,10 +25,11 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.scene.control.Properties;
 import com.sun.javafx.util.Utils;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.ScrollBarSkin;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.ScrollBarSkin;
 
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -86,8 +87,8 @@
      */
     public ScrollBar() {
         // TODO : we need to ensure we have a width and height
-        setWidth(ScrollBarSkin.DEFAULT_WIDTH);
-        setHeight(ScrollBarSkin.DEFAULT_LENGTH);
+        setWidth(Properties.DEFAULT_WIDTH);
+        setHeight(Properties.DEFAULT_LENGTH);
         getStyleClass().setAll(DEFAULT_STYLE_CLASS);
         setAccessibleRole(AccessibleRole.SCROLL_BAR);
         // focusTraversable is styleable through css. Calling setFocusTraversable
--- old/modules/controls/src/main/java/javafx/scene/control/ScrollPane.java	2015-09-03 14:57:35.449726800 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ScrollPane.java	2015-09-03 14:57:34.831691400 -0700
@@ -47,9 +47,9 @@
 import javafx.scene.AccessibleRole;
 import javafx.scene.Node;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.scene.control.skin.ScrollPaneSkin;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.scene.control.skin.ScrollPaneSkin;
 
 import javafx.css.Styleable;
 
--- old/modules/controls/src/main/java/javafx/scene/control/Separator.java	2015-09-03 14:57:42.647138500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Separator.java	2015-09-03 14:57:42.010102000 -0700
@@ -38,8 +38,8 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.scene.control.skin.SeparatorSkin;
+import javafx.css.converter.EnumConverter;
+import javafx.scene.control.skin.SeparatorSkin;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/SkinBase.java	2015-09-03 14:57:50.302576300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/SkinBase.java	2015-09-03 14:57:49.772546000 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -25,10 +25,17 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
+import javafx.beans.value.ObservableValue;
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
+
 import javafx.collections.ObservableList;
 import javafx.css.Styleable;
 import javafx.event.EventHandler;
@@ -50,7 +57,7 @@
  * @since JavaFX 8.0
  */
 public abstract class SkinBase<C extends Control> implements Skin<C> {
-    
+
     /***************************************************************************
      *                                                                         *
      * Private fields                                                          *
@@ -69,8 +76,15 @@
      * A local field that directly refers to the children list inside the Control.
      */
     private ObservableList<Node> children;
-    
-    
+
+    /**
+     * This is part of the workaround introduced during delomboking. We probably will
+     * want to adjust the way listeners are added rather than continuing to use this
+     * map (although it doesn't really do much harm).
+     */
+    private LambdaMultiplePropertyChangeListenerHandler lambdaChangeListenerHandler;
+
+
     
     /***************************************************************************
      *                                                                         *
@@ -139,6 +153,11 @@
     @Override public void dispose() { 
 //        control.removeEventHandler(ContextMenuEvent.CONTEXT_MENU_REQUESTED, contextMenuHandler);
 
+        // unhook listeners
+        if (lambdaChangeListenerHandler != null) {
+            lambdaChangeListenerHandler.dispose();
+        }
+
         this.control = null;
     }
     
@@ -181,7 +200,20 @@
             control.removeEventHandler(MouseEvent.ANY, mouseEventConsumer);
         }
     }
-    
+
+
+    /**
+     * Subclasses can invoke this method to register that we want to listen to
+     * property change events for the given property.
+     */
+    protected final void registerChangeListener(ObservableValue<?> property, Consumer<ObservableValue<?>> consumer) {
+        if (lambdaChangeListenerHandler == null) {
+            lambdaChangeListenerHandler = new LambdaMultiplePropertyChangeListenerHandler();
+        }
+        lambdaChangeListenerHandler.registerChangeListener(property, consumer);
+    }
+
+
     
     
     /***************************************************************************
@@ -721,7 +753,6 @@
      **************************************************************************/
 
     private static class StyleableProperties {
-
         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
 
         static {
@@ -730,9 +761,10 @@
     }
 
     /** 
-     * @return The CssMetaData associated with this class, which may include the
+     * Returns the CssMetaData associated with this class, which may include the
      * CssMetaData of its super classes.
-     */    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
         return SkinBase.StyleableProperties.STYLEABLES;
     }
 
@@ -746,7 +778,36 @@
         return getClassCssMetaData();
     }
     
-    /** @see Node#pseudoClassStateChanged */
+    /**
+     * Used to specify that a pseudo-class of this Node has changed. If the
+     * pseudo-class is used in a CSS selector that matches this Node, CSS will
+     * be reapplied. Typically, this method is called from the {@code invalidated}
+     * method of a property that is used as a pseudo-class. For example:
+     * <code><pre>
+     *
+     *     private static final PseudoClass MY_PSEUDO_CLASS_STATE = PseudoClass.getPseudoClass("my-state");
+     *
+     *     BooleanProperty myPseudoClassState = new BooleanPropertyBase(false) {
+     *
+     *           {@literal @}Override public void invalidated() {
+     *                pseudoClassStateChanged(MY_PSEUDO_CLASS_STATE, get());
+     *           }
+     *
+     *           {@literal @}Override public Object getBean() {
+     *               return MyControl.this;
+     *           }
+     *
+     *           {@literal @}Override public String getName() {
+     *               return "myPseudoClassState";
+     *           }
+     *       };
+     * </pre><code>
+     *
+     * @see Node#pseudoClassStateChanged
+     * @param pseudoClass the pseudo-class that has changed state
+     * @param active whether or not the state is active
+     * @since JavaFX 8.0
+     */
     public final void pseudoClassStateChanged(PseudoClass pseudoClass, boolean active) {
         Control ctl = getSkinnable();
         if (ctl != null) {
@@ -761,12 +822,47 @@
      *                                                                         *
      **************************************************************************/
 
-    /** @see Node#queryAccessibleAttribute */
+    /**
+     * This method is called by the assistive technology to request
+     * the value for an attribute.
+     * <p>
+     * This method is commonly overridden by subclasses to implement
+     * attributes that are required for a specific role.<br>
+     * If a particular attribute is not handled, the super class implementation
+     * must be called.
+     * </p>
+     *
+     * @param attribute the requested attribute
+     * @param parameters optional list of parameters
+     * @return the value for the requested attribute
+     *
+     * @see AccessibleAttribute
+     * @see Node#queryAccessibleAttribute
+     *
+     * @since JavaFX 8u40
+     */
     protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
         return null;
     }
 
-    /** @see Node#executeAccessibleAction */
+    /**
+     * This method is called by the assistive technology to request the action
+     * indicated by the argument should be executed.
+     * <p>
+     * This method is commonly overridden by subclasses to implement
+     * action that are required for a specific role.<br>
+     * If a particular action is not handled, the super class implementation
+     * must be called.
+     * </p>
+     *
+     * @param action the action to execute
+     * @param parameters optional list of parameters
+     *
+     * @see AccessibleAction
+     * @see Node#executeAccessibleAction
+     *
+     * @since JavaFX 8u40
+     */
     protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
     }
 
--- old/modules/controls/src/main/java/javafx/scene/control/Slider.java	2015-09-03 14:57:57.348979400 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Slider.java	2015-09-03 14:57:56.667940400 -0700
@@ -52,10 +52,10 @@
 import javafx.css.StyleableIntegerProperty;
 import javafx.css.StyleableObjectProperty;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.SliderSkin;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.SliderSkin;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- 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();
--- old/modules/controls/src/main/java/javafx/scene/control/SpinnerValueFactory.java	2015-09-03 14:58:12.526847500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/SpinnerValueFactory.java	2015-09-03 14:58:11.906812000 -0700
@@ -24,7 +24,6 @@
  */
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.ListViewSkin;
 import javafx.beans.NamedArg;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -36,8 +35,6 @@
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleLongProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.WeakChangeListener;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.WeakListChangeListener;
@@ -47,17 +44,13 @@
 import java.lang.ref.WeakReference;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.text.NumberFormat;
 import java.text.ParseException;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
 import java.time.temporal.ChronoUnit;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalField;
 import java.time.temporal.TemporalUnit;
 import java.util.List;
 
--- old/modules/controls/src/main/java/javafx/scene/control/SplitMenuButton.java	2015-09-03 14:58:20.023276200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/SplitMenuButton.java	2015-09-03 14:58:19.423241900 -0700
@@ -29,7 +29,7 @@
 import javafx.scene.AccessibleAction;
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.AccessibleRole;
-import com.sun.javafx.scene.control.skin.SplitMenuButtonSkin;
+import javafx.scene.control.skin.SplitMenuButtonSkin;
 
 /**
  * The SplitMenuButton, like the {@link MenuButton} is closely associated with
--- old/modules/controls/src/main/java/javafx/scene/control/SplitPane.java	2015-09-03 14:58:27.533705800 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/SplitPane.java	2015-09-03 14:58:26.956672800 -0700
@@ -47,8 +47,8 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.scene.control.skin.SplitPaneSkin;
+import javafx.css.converter.EnumConverter;
+import javafx.scene.control.skin.SplitPaneSkin;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/TabPane.java	2015-09-03 14:58:35.327151600 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TabPane.java	2015-09-03 14:58:34.712116400 -0700
@@ -48,8 +48,8 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.TabPaneSkin;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.TabPaneSkin;
 
 import javafx.beans.DefaultProperty;
 import javafx.css.Styleable;
--- old/modules/controls/src/main/java/javafx/scene/control/TableCell.java	2015-09-03 14:58:43.102596300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TableCell.java	2015-09-03 14:58:42.530563600 -0700
@@ -36,7 +36,7 @@
 import javafx.scene.AccessibleRole;
 import javafx.scene.control.TableView.TableViewFocusModel;
 
-import com.sun.javafx.scene.control.skin.TableCellSkin;
+import javafx.scene.control.skin.TableCellSkin;
 import javafx.collections.WeakListChangeListener;
 import java.lang.ref.WeakReference;
 import java.util.List;
--- old/modules/controls/src/main/java/javafx/scene/control/TableColumn.java	2015-09-03 14:58:50.659028500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TableColumn.java	2015-09-03 14:58:50.046993500 -0700
@@ -25,11 +25,12 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.NestedTableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableHeaderRow;
-import com.sun.javafx.scene.control.skin.TableViewSkin;
-import com.sun.javafx.scene.control.skin.TableViewSkinBase;
+import com.sun.javafx.scene.control.Properties;
+import javafx.scene.control.skin.NestedTableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableHeaderRow;
+import javafx.scene.control.skin.TableViewSkin;
+import javafx.scene.control.skin.TableViewSkinBase;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -418,10 +419,10 @@
                     TableView<S> table = getTableView();
                     if (table == null) return;
                     Map<Object,Object> properties = table.getProperties();
-                    if (properties.containsKey(TableViewSkinBase.RECREATE)) {
-                        properties.remove(TableViewSkinBase.RECREATE);
+                    if (properties.containsKey(Properties.RECREATE)) {
+                        properties.remove(Properties.RECREATE);
                     }
-                    properties.put(TableViewSkinBase.RECREATE, Boolean.TRUE);
+                    properties.put(Properties.RECREATE, Boolean.TRUE);
                 }
             };
 
@@ -636,8 +637,19 @@
         if (! (getTableView().getSkin() instanceof TableViewSkin)) return null;
         TableViewSkin<?> skin = (TableViewSkin<?>) getTableView().getSkin();
 
-        TableHeaderRow tableHeader = skin.getTableHeaderRow();
-        NestedTableColumnHeader rootHeader = tableHeader.getRootHeader();
+        TableHeaderRow tableHeader = null;
+        for (Node n : skin.getChildren()) {
+            if (n instanceof TableHeaderRow) {
+                tableHeader = (TableHeaderRow)n;
+            }
+        }
+
+        NestedTableColumnHeader rootHeader = null;
+        for (Node n : tableHeader.getChildren()) {
+            if (n instanceof NestedTableColumnHeader) {
+                rootHeader = (NestedTableColumnHeader) n;
+            }
+        }
 
         // we now need to do a search for the header. We'll go depth-first.
         return scan(rootHeader);
--- old/modules/controls/src/main/java/javafx/scene/control/TableColumnBase.java	2015-09-03 14:58:58.780493000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TableColumnBase.java	2015-09-03 14:58:58.139456400 -0700
@@ -50,7 +50,6 @@
 import javafx.event.EventType;
 import javafx.scene.Node;
 
-import com.sun.javafx.scene.control.skin.Utils;
 import com.sun.javafx.event.EventHandlerManager;
 import java.util.HashMap;
 
@@ -61,6 +60,7 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableMap;
+import com.sun.javafx.scene.control.skin.Utils;
 
 /**
  * Table-like controls (such as {@link TableView} and {@link TreeTableView}) are
--- old/modules/controls/src/main/java/javafx/scene/control/TableRow.java	2015-09-03 14:59:05.774893100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TableRow.java	2015-09-03 14:59:05.212860900 -0700
@@ -37,7 +37,7 @@
 import java.util.List;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
-import com.sun.javafx.scene.control.skin.TableRowSkin;
+import javafx.scene.control.skin.TableRowSkin;
 
 /**
  * <p>TableRow is an {@link javafx.scene.control.IndexedCell IndexedCell}, but
--- old/modules/controls/src/main/java/javafx/scene/control/TableView.java	2015-09-03 14:59:13.384328300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TableView.java	2015-09-03 14:59:12.829296600 -0700
@@ -1,3435 +1,3441 @@
-/*
- * Copyright (c) 2011, 2015, 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;
-
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import com.sun.javafx.scene.control.Logging;
-import com.sun.javafx.scene.control.SelectedCellsMap;
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
-import com.sun.javafx.scene.control.behavior.TableCellBehaviorBase;
-import javafx.beans.*;
-import javafx.beans.Observable;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ObjectPropertyBase;
-import javafx.beans.property.Property;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.ReadOnlyObjectWrapper;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.WeakListChangeListener;
-import javafx.collections.transformation.SortedList;
-import javafx.css.CssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableProperty;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.layout.Region;
-import javafx.util.Callback;
-
-import com.sun.javafx.collections.MappingChange;
-import com.sun.javafx.collections.NonIterableChange;
-import com.sun.javafx.collections.annotations.ReturnsUnmodifiableCollection;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
-import com.sun.javafx.scene.control.TableColumnComparatorBase.TableColumnComparator;
-import com.sun.javafx.scene.control.skin.TableViewSkin;
-import com.sun.javafx.scene.control.skin.TableViewSkinBase;
-
-/**
- * The TableView control is designed to visualize an unlimited number of rows
- * of data, broken out into columns. A TableView is therefore very similar to the
- * {@link ListView} control, with the addition of support for columns. For an
- * example on how to create a TableView, refer to the 'Creating a TableView'
- * control section below.
- *
- * <p>The TableView control has a number of features, including:
- * <ul>
- * <li>Powerful {@link TableColumn} API:
- *   <ul>
- *   <li>Support for {@link TableColumn#cellFactoryProperty() cell factories} to
- *      easily customize {@link Cell cell} contents in both rendering and editing
- *      states.
- *   <li>Specification of {@link TableColumn#minWidthProperty() minWidth}/
- *      {@link TableColumn#prefWidthProperty() prefWidth}/
- *      {@link TableColumn#maxWidthProperty() maxWidth},
- *      and also {@link TableColumn#resizableProperty() fixed width columns}.
- *   <li>Width resizing by the user at runtime.
- *   <li>Column reordering by the user at runtime.
- *   <li>Built-in support for {@link TableColumn#getColumns() column nesting}
- *   </ul>
- * <li>Different {@link #columnResizePolicyProperty() resizing policies} to 
- *      dictate what happens when the user resizes columns.
- * <li>Support for {@link #getSortOrder() multiple column sorting} by clicking 
- *      the column header (hold down Shift keyboard key whilst clicking on a 
- *      header to sort by multiple columns).
- * </ul>
- * </p>
- *
- * <p>Note that TableView is intended to be used to visualize data - it is not
- * intended to be used for laying out your user interface. If you want to lay
- * your user interface out in a grid-like fashion, consider the 
- * {@link javafx.scene.layout.GridPane} layout instead.</p>
- *
- * <h2>Creating a TableView</h2>
- *
- * <p>Creating a TableView is a multi-step process, and also depends on the
- * underlying data model needing to be represented. For this example we'll use
- * an ObservableList<Person>, as it is the simplest way of showing data in a 
- * TableView. The <code>Person</code> class will consist of a first
- * name and last name properties. That is:
- * 
- * <pre>
- * {@code
- * public class Person {
- *     private StringProperty firstName;
- *     public void setFirstName(String value) { firstNameProperty().set(value); }
- *     public String getFirstName() { return firstNameProperty().get(); }
- *     public StringProperty firstNameProperty() { 
- *         if (firstName == null) firstName = new SimpleStringProperty(this, "firstName");
- *         return firstName; 
- *     }
- * 
- *     private StringProperty lastName;
- *     public void setLastName(String value) { lastNameProperty().set(value); }
- *     public String getLastName() { return lastNameProperty().get(); }
- *     public StringProperty lastNameProperty() { 
- *         if (lastName == null) lastName = new SimpleStringProperty(this, "lastName");
- *         return lastName; 
- *     } 
- * }}</pre>
- * 
- * <p>Firstly, a TableView instance needs to be defined, as such:
- * 
- * <pre>
- * {@code
- * TableView<Person> table = new TableView<Person>();}</pre>
- *
- * <p>With the basic table defined, we next focus on the data model. As mentioned,
- * for this example, we'll be using a ObservableList<Person>. We can immediately
- * set such a list directly in to the TableView, as such:
- *
- * <pre>
- * {@code
- * ObservableList<Person> teamMembers = getTeamMembers();
- * table.setItems(teamMembers);}</pre>
- * 
- * <p>With the items set as such, TableView will automatically update whenever
- * the <code>teamMembers</code> list changes. If the items list is available
- * before the TableView is instantiated, it is possible to pass it directly into
- * the constructor. 
- * 
- * <p>At this point we now have a TableView hooked up to observe the 
- * <code>teamMembers</code> observableList. The missing ingredient 
- * now is the means of splitting out the data contained within the model and 
- * representing it in one or more {@link TableColumn TableColumn} instances. To 
- * create a two-column TableView to show the firstName and lastName properties,
- * we extend the last code sample as follows:
- * 
- * <pre>
- * {@code
- * ObservableList<Person> teamMembers = ...;
- * table.setItems(teamMembers);
- * 
- * TableColumn<Person,String> firstNameCol = new TableColumn<Person,String>("First Name");
- * firstNameCol.setCellValueFactory(new PropertyValueFactory("firstName"));
- * TableColumn<Person,String> lastNameCol = new TableColumn<Person,String>("Last Name");
- * lastNameCol.setCellValueFactory(new PropertyValueFactory("lastName"));
- * 
- * table.getColumns().setAll(firstNameCol, lastNameCol);}</pre>
- * 
- * <p>With the code shown above we have fully defined the minimum properties
- * required to create a TableView instance. Running this code (assuming the
- * people ObservableList is appropriately created) will result in a TableView being
- * shown with two columns for firstName and lastName. Any other properties of the
- * Person class will not be shown, as no TableColumns are defined.
- * 
- * <h3>TableView support for classes that don't contain properties</h3>
- *
- * <p>The code shown above is the shortest possible code for creating a TableView
- * when the domain objects are designed with JavaFX properties in mind 
- * (additionally, {@link javafx.scene.control.cell.PropertyValueFactory} supports
- * normal JavaBean properties too, although there is a caveat to this, so refer 
- * to the class documentation for more information). When this is not the case, 
- * it is necessary to provide a custom cell value factory. More information
- * about cell value factories can be found in the {@link TableColumn} API 
- * documentation, but briefly, here is how a TableColumn could be specified:
- * 
- * <pre>
- * {@code
- * firstNameCol.setCellValueFactory(new Callback<CellDataFeatures<Person, String>, ObservableValue<String>>() {
- *     public ObservableValue<String> call(CellDataFeatures<Person, String> p) {
- *         // p.getValue() returns the Person instance for a particular TableView row
- *         return p.getValue().firstNameProperty();
- *     }
- *  });
- * }}</pre>
- * 
- * <h3>TableView Selection / Focus APIs</h3>
- * <p>To track selection and focus, it is necessary to become familiar with the
- * {@link SelectionModel} and {@link FocusModel} classes. A TableView has at most
- * one instance of each of these classes, available from 
- * {@link #selectionModelProperty() selectionModel} and 
- * {@link #focusModelProperty() focusModel} properties respectively.
- * Whilst it is possible to use this API to set a new selection model, in
- * most circumstances this is not necessary - the default selection and focus
- * models should work in most circumstances.
- * 
- * <p>The default {@link SelectionModel} used when instantiating a TableView is
- * an implementation of the {@link MultipleSelectionModel} abstract class. 
- * However, as noted in the API documentation for
- * the {@link MultipleSelectionModel#selectionModeProperty() selectionMode}
- * property, the default value is {@link SelectionMode#SINGLE}. To enable 
- * multiple selection in a default TableView instance, it is therefore necessary
- * to do the following:
- * 
- * <pre>
- * {@code 
- * tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);}</pre>
- *
- * <h3>Customizing TableView Visuals</h3>
- * <p>The visuals of the TableView can be entirely customized by replacing the 
- * default {@link #rowFactoryProperty() row factory}. A row factory is used to
- * generate {@link TableRow} instances, which are used to represent an entire
- * row in the TableView. 
- * 
- * <p>In many cases, this is not what is desired however, as it is more commonly
- * the case that cells be customized on a per-column basis, not a per-row basis.
- * It is therefore important to note that a {@link TableRow} is not a 
- * {@link TableCell}. A  {@link TableRow} is simply a container for zero or more
- * {@link TableCell}, and in most circumstances it is more likely that you'll 
- * want to create custom TableCells, rather than TableRows. The primary use case
- * for creating custom TableRow instances would most probably be to introduce
- * some form of column spanning support.
- * 
- * <p>You can create custom {@link TableCell} instances per column by assigning 
- * the appropriate function to the TableColumn
- * {@link TableColumn#cellFactoryProperty() cell factory} property.
- * 
- * <p>See the {@link Cell} class documentation for a more complete
- * description of how to write custom Cells.
- *
- * <h3>Sorting</h3>
- * <p>Prior to JavaFX 8.0, the TableView control would treat the
- * {@link #getItems() items} list as the view model, meaning that any changes to
- * the list would be immediately reflected visually. TableView would also modify
- * the order of this list directly when a user initiated a sort. This meant that
- * (again, prior to JavaFX 8.0) it was not possible to have the TableView return
- * to an unsorted state (after iterating through ascending and descending
- * orders).</p>
- *
- * <p>Starting with JavaFX 8.0 (and the introduction of {@link SortedList}), it
- * is now possible to have the collection return to the unsorted state when
- * there are no columns as part of the TableView
- * {@link #getSortOrder() sort order}. To do this, you must create a SortedList
- * instance, and bind its
- * {@link javafx.collections.transformation.SortedList#comparatorProperty() comparator}
- * property to the TableView {@link #comparatorProperty() comparator} property,
- * list so:</p>
- *
- * <pre>
- * {@code
- * // create a SortedList based on the provided ObservableList
- * SortedList sortedList = new SortedList(FXCollections.observableArrayList(2, 1, 3));
- *
- * // create a TableView with the sorted list set as the items it will show
- * final TableView<Integer> tableView = new TableView<>(sortedList);
- *
- * // bind the sortedList comparator to the TableView comparator
- * sortedList.comparatorProperty().bind(tableView.comparatorProperty());
- *
- * // Don't forget to define columns!
- * }</pre>
- *
- * <h3>Editing</h3>
- * <p>This control supports inline editing of values, and this section attempts to
- * give an overview of the available APIs and how you should use them.</p>
- *
- * <p>Firstly, cell editing most commonly requires a different user interface
- * than when a cell is not being edited. This is the responsibility of the
- * {@link Cell} implementation being used. For TableView, it is highly
- * recommended that editing be
- * {@link javafx.scene.control.TableColumn#cellFactoryProperty() per-TableColumn},
- * rather than {@link #rowFactoryProperty() per row}, as more often than not
- * you want users to edit each column value differently, and this approach allows
- * for editors specific to each column. It is your choice whether the cell is
- * permanently in an editing state (e.g. this is common for {@link CheckBox} cells),
- * or to switch to a different UI when editing begins (e.g. when a double-click
- * is received on a cell).</p>
- *
- * <p>To know when editing has been requested on a cell,
- * simply override the {@link javafx.scene.control.Cell#startEdit()} method, and
- * update the cell {@link javafx.scene.control.Cell#textProperty() text} and
- * {@link javafx.scene.control.Cell#graphicProperty() graphic} properties as
- * appropriate (e.g. set the text to null and set the graphic to be a
- * {@link TextField}). Additionally, you should also override
- * {@link Cell#cancelEdit()} to reset the UI back to its original visual state
- * when the editing concludes. In both cases it is important that you also
- * ensure that you call the super method to have the cell perform all duties it
- * must do to enter or exit its editing mode.</p>
- *
- * <p>Once your cell is in an editing state, the next thing you are most probably
- * interested in is how to commit or cancel the editing that is taking place. This is your
- * responsibility as the cell factory provider. Your cell implementation will know
- * when the editing is over, based on the user input (e.g. when the user presses
- * the Enter or ESC keys on their keyboard). When this happens, it is your
- * responsibility to call {@link Cell#commitEdit(Object)} or
- * {@link Cell#cancelEdit()}, as appropriate.</p>
- *
- * <p>When you call {@link Cell#commitEdit(Object)} an event is fired to the
- * TableView, which you can observe by adding an {@link EventHandler} via
- * {@link TableColumn#setOnEditCommit(javafx.event.EventHandler)}. Similarly,
- * you can also observe edit events for
- * {@link TableColumn#setOnEditStart(javafx.event.EventHandler) edit start}
- * and {@link TableColumn#setOnEditCancel(javafx.event.EventHandler) edit cancel}.</p>
- *
- * <p>By default the TableColumn edit commit handler is non-null, with a default
- * handler that attempts to overwrite the property value for the
- * item in the currently-being-edited row. It is able to do this as the
- * {@link Cell#commitEdit(Object)} method is passed in the new value, and this
- * is passed along to the edit commit handler via the
- * {@link javafx.scene.control.TableColumn.CellEditEvent CellEditEvent} that is
- * fired. It is simply a matter of calling
- * {@link javafx.scene.control.TableColumn.CellEditEvent#getNewValue()} to
- * retrieve this value.
- *
- * <p>It is very important to note that if you call
- * {@link TableColumn#setOnEditCommit(javafx.event.EventHandler)} with your own
- * {@link EventHandler}, then you will be removing the default handler. Unless
- * you then handle the writeback to the property (or the relevant data source),
- * nothing will happen. You can work around this by using the
- * {@link TableColumn#addEventHandler(javafx.event.EventType, javafx.event.EventHandler)}
- * method to add a {@link TableColumn#EDIT_COMMIT_EVENT} {@link EventType} with
- * your desired {@link EventHandler} as the second argument. Using this method,
- * you will not replace the default implementation, but you will be notified when
- * an edit commit has occurred.</p>
- *
- * <p>Hopefully this summary answers some of the commonly asked questions.
- * Fortunately, JavaFX ships with a number of pre-built cell factories that
- * handle all the editing requirements on your behalf. You can find these
- * pre-built cell factories in the javafx.scene.control.cell package.</p>
- *
- * @see TableColumn
- * @see TablePosition
- * @param <S> The type of the objects contained within the TableView items list.
- * @since JavaFX 2.0
- */
-@DefaultProperty("items")
-public class TableView<S> extends Control {
-    
-    /***************************************************************************
-     *                                                                         *
-     * Static properties and methods                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    // strings used to communicate via the TableView properties map between
-    // the control and the skin. Because they are private here, the strings
-    // are also duplicated in the TableViewSkin class - so any changes to these
-    // strings must also be duplicated there
-    static final String SET_CONTENT_WIDTH = "TableView.contentWidth";
-    
-    /**
-     * <p>Very simple resize policy that just resizes the specified column by the
-     * provided delta and shifts all other columns (to the right of the given column)
-     * further to the right (when the delta is positive) or to the left (when the
-     * delta is negative).
-     *
-     * <p>It also handles the case where we have nested columns by sharing the new space,
-     * or subtracting the removed space, evenly between all immediate children columns.
-     * Of course, the immediate children may themselves be nested, and they would
-     * then use this policy on their children.
-     */
-    public static final Callback<ResizeFeatures, Boolean> UNCONSTRAINED_RESIZE_POLICY = new Callback<ResizeFeatures, Boolean>() {
-        @Override public String toString() {
-            return "unconstrained-resize";
-        }
-        
-        @Override public Boolean call(ResizeFeatures prop) {
-            double result = TableUtil.resize(prop.getColumn(), prop.getDelta());
-            return Double.compare(result, 0.0) == 0;
-        }
-    };
-
-    /**
-     * <p>Simple policy that ensures the width of all visible leaf columns in 
-     * this table sum up to equal the width of the table itself.
-     * 
-     * <p>When the user resizes a column width with this policy, the table automatically
-     * adjusts the width of the right hand side columns. When the user increases a
-     * column width, the table decreases the width of the rightmost column until it
-     * reaches its minimum width. Then it decreases the width of the second
-     * rightmost column until it reaches minimum width and so on. When all right
-     * hand side columns reach minimum size, the user cannot increase the size of
-     * resized column any more.
-     */
-    public static final Callback<ResizeFeatures, Boolean> CONSTRAINED_RESIZE_POLICY = new Callback<ResizeFeatures, Boolean>() {
-
-        private boolean isFirstRun = true;
-        
-        @Override public String toString() {
-            return "constrained-resize";
-        }
-        
-        @Override public Boolean call(ResizeFeatures prop) {
-            TableView<?> table = prop.getTable();
-            List<? extends TableColumnBase<?,?>> visibleLeafColumns = table.getVisibleLeafColumns();
-            Boolean result = TableUtil.constrainedResize(prop, 
-                                               isFirstRun, 
-                                               table.contentWidth,
-                                               visibleLeafColumns);
-            isFirstRun = ! isFirstRun ? false : ! result;
-            return result;
-        }
-    };
-    
-    /**
-     * The default {@link #sortPolicyProperty() sort policy} that this TableView
-     * will use if no other policy is specified. The sort policy is a simple 
-     * {@link Callback} that accepts a TableView as the sole argument and expects
-     * a Boolean response representing whether the sort succeeded or not. A Boolean
-     * response of true represents success, and a response of false (or null) will
-     * be considered to represent failure.
-     * @since JavaFX 8.0
-     */
-    public static final Callback<TableView, Boolean> DEFAULT_SORT_POLICY = new Callback<TableView, Boolean>() {
-        @Override public Boolean call(TableView table) {
-            try {
-                ObservableList<?> itemsList = table.getItems();
-                if (itemsList instanceof SortedList) {
-                    // it is the responsibility of the SortedList to bind to the
-                    // comparator provided by the TableView. However, we don't
-                    // want to fail the sort (which would put the UI in an
-                    // inconsistent state), so we return true here, but only if
-                    // the SortedList has its comparator bound to the TableView
-                    // comparator property.
-                    SortedList sortedList = (SortedList) itemsList;
-                    boolean comparatorsBound = sortedList.comparatorProperty().
-                            isEqualTo(table.comparatorProperty()).get();
-
-                    if (! comparatorsBound) {
-                        // this isn't a good situation to be in, so lets log it
-                        // out in case the developer is unaware
-                        if (Logging.getControlsLogger().isEnabled()) {
-                            String s = "TableView items list is a SortedList, but the SortedList " +
-                                    "comparator should be bound to the TableView comparator for " +
-                                    "sorting to be enabled (e.g. " +
-                                    "sortedList.comparatorProperty().bind(tableView.comparatorProperty());).";
-                            Logging.getControlsLogger().info(s);
-                        }
-                    }
-                    return comparatorsBound;
-                } else {
-                    if (itemsList == null || itemsList.isEmpty()) {
-                        // sorting is not supported on null or empty lists
-                        return true;
-                    }
-
-                    Comparator comparator = table.getComparator();
-                    if (comparator == null) {
-                        return true;
-                    }
-
-                    // otherwise we attempt to do a manual sort, and if successful
-                    // we return true
-                    FXCollections.sort(itemsList, comparator);
-                    return true;
-                }
-            } catch (UnsupportedOperationException e) {
-                // TODO might need to support other exception types including:
-                // ClassCastException - if the class of the specified element prevents it from being added to this list
-                // NullPointerException - if the specified element is null and this list does not permit null elements
-                // IllegalArgumentException - if some property of this element prevents it from being added to this list
-
-                // If we are here the list does not support sorting, so we gracefully 
-                // fail the sort request and ensure the UI is put back to its previous
-                // state. This is handled in the code that calls the sort policy.
-                
-                return false;
-            }
-        }
-    };
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Creates a default TableView control with no content.
-     * 
-     * <p>Refer to the {@link TableView} class documentation for details on the
-     * default state of other properties.
-     */
-    public TableView() {
-        this(FXCollections.<S>observableArrayList());
-    }
-
-    /**
-     * Creates a TableView with the content provided in the items ObservableList.
-     * This also sets up an observer such that any changes to the items list
-     * will be immediately reflected in the TableView itself.
-     * 
-     * <p>Refer to the {@link TableView} class documentation for details on the
-     * default state of other properties.
-     * 
-     * @param items The items to insert into the TableView, and the list to watch
-     *          for changes (to automatically show in the TableView).
-     */
-    public TableView(ObservableList<S> items) {
-        getStyleClass().setAll(DEFAULT_STYLE_CLASS);
-        setAccessibleRole(AccessibleRole.TABLE_VIEW);
-
-        // we quite happily accept items to be null here
-        setItems(items);
-
-        // install default selection and focus models
-        // it's unlikely this will be changed by many users.
-        setSelectionModel(new TableViewArrayListSelectionModel<S>(this));
-        setFocusModel(new TableViewFocusModel<S>(this));
-
-        // we watch the columns list, such that when it changes we can update
-        // the leaf columns and visible leaf columns lists (which are read-only).
-        getColumns().addListener(weakColumnsObserver);
-
-        // watch for changes to the sort order list - and when it changes run
-        // the sort method.
-        getSortOrder().addListener((ListChangeListener<TableColumn<S, ?>>) c -> {
-            doSort(TableUtil.SortEventType.SORT_ORDER_CHANGE, c);
-        });
-
-        // We're watching for changes to the content width such
-        // that the resize policy can be run if necessary. This comes from
-        // TreeViewSkin.
-        getProperties().addListener(new MapChangeListener<Object, Object>() {
-            @Override
-            public void onChanged(Change<? extends Object, ? extends Object> c) {
-                if (c.wasAdded() && SET_CONTENT_WIDTH.equals(c.getKey())) {
-                    if (c.getValueAdded() instanceof Number) {
-                        setContentWidth((Double) c.getValueAdded());
-                    }
-                    getProperties().remove(SET_CONTENT_WIDTH);
-                }
-            }
-        });
-
-        isInited = true;
-    }
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Instance Variables                                                      *
-     *                                                                         *
-     **************************************************************************/    
-
-    // this is the only publicly writable list for columns. This represents the
-    // columns as they are given initially by the developer.
-    private final ObservableList<TableColumn<S,?>> columns = FXCollections.observableArrayList();
-
-    // Finally, as convenience, we also have an observable list that contains
-    // only the leaf columns that are currently visible.
-    private final ObservableList<TableColumn<S,?>> visibleLeafColumns = FXCollections.observableArrayList();
-    private final ObservableList<TableColumn<S,?>> unmodifiableVisibleLeafColumns = FXCollections.unmodifiableObservableList(visibleLeafColumns);
-    
-    
-    // Allows for multiple column sorting based on the order of the TableColumns
-    // in this observableArrayList. Each TableColumn is responsible for whether it is
-    // sorted using ascending or descending order.
-    private ObservableList<TableColumn<S,?>> sortOrder = FXCollections.observableArrayList();
-
-    // width of VirtualFlow minus the vbar width
-    private double contentWidth;
-    
-    // Used to minimise the amount of work performed prior to the table being
-    // completely initialised. In particular it reduces the amount of column
-    // resize operations that occur, which slightly improves startup time.
-    private boolean isInited = false;
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Callbacks and Events                                                    *
-     *                                                                         *
-     **************************************************************************/
-    
-    private final ListChangeListener<TableColumn<S,?>> columnsObserver = new ListChangeListener<TableColumn<S,?>>() {
-        @Override public void onChanged(Change<? extends TableColumn<S,?>> c) {
-            final List<TableColumn<S,?>> columns = getColumns();
-
-            // Fix for RT-39822 - don't allow the same column to be installed twice
-            while (c.next()) {
-                if (c.wasAdded()) {
-                    List<TableColumn<S,?>> duplicates = new ArrayList<>();
-                    for (TableColumn<S,?> addedColumn : c.getAddedSubList()) {
-                        if (addedColumn == null) continue;
-
-                        int count = 0;
-                        for (TableColumn<S,?> column : columns) {
-                            if (addedColumn == column) {
-                                count++;
-                            }
-                        }
-
-                        if (count > 1) {
-                            duplicates.add(addedColumn);
-                        }
-                    }
-
-                    if (!duplicates.isEmpty()) {
-                        String titleList = "";
-                        for (TableColumn<S,?> dupe : duplicates) {
-                            titleList += "'" + dupe.getText() + "', ";
-                        }
-                        throw new IllegalStateException("Duplicate TableColumns detected in TableView columns list with titles " + titleList);
-                    }
-                }
-            }
-            c.reset();
-
-            // We don't maintain a bind for leafColumns, we simply call this update
-            // function behind the scenes in the appropriate places.
-            updateVisibleLeafColumns();
-            
-            // Fix for RT-15194: Need to remove removed columns from the 
-            // sortOrder list.
-            List<TableColumn<S,?>> toRemove = new ArrayList<>();
-            while (c.next()) {
-                final List<? extends TableColumn<S, ?>> removed = c.getRemoved();
-                final List<? extends TableColumn<S, ?>> added = c.getAddedSubList();
-                
-                if (c.wasRemoved()) {
-                    toRemove.addAll(removed);
-                    for (TableColumn<S,?> tc : removed) {
-                        tc.setTableView(null);
-                    }
-                }
-                
-                if (c.wasAdded()) {
-                    toRemove.removeAll(added);
-                    for (TableColumn<S,?> tc : added) {
-                        tc.setTableView(TableView.this);
-                    }
-                }
-                
-                // set up listeners
-                TableUtil.removeColumnsListener(removed, weakColumnsObserver);
-                TableUtil.addColumnsListener(added, weakColumnsObserver);
-                
-                TableUtil.removeTableColumnListener(c.getRemoved(),
-                        weakColumnVisibleObserver,
-                        weakColumnSortableObserver,
-                        weakColumnSortTypeObserver,
-                        weakColumnComparatorObserver);
-                TableUtil.addTableColumnListener(c.getAddedSubList(),
-                        weakColumnVisibleObserver,
-                        weakColumnSortableObserver,
-                        weakColumnSortTypeObserver,
-                        weakColumnComparatorObserver);
-            }
-            
-            sortOrder.removeAll(toRemove);
-
-            // Fix for RT-38892.
-            final TableViewFocusModel<S> fm = getFocusModel();
-            final TableViewSelectionModel<S> sm = getSelectionModel();
-            c.reset();
-            while (c.next()) {
-                if (! c.wasRemoved()) continue;
-
-                List<? extends TableColumn<S,?>> removed = c.getRemoved();
-
-                // Fix for focus - we simply move focus to a cell to the left
-                // of the focused cell if the focused cell was located within
-                // a column that has been removed.
-                if (fm != null) {
-                    TablePosition<S, ?> focusedCell = fm.getFocusedCell();
-                    boolean match = false;
-                    for (TableColumn<S, ?> tc : removed) {
-                        match = focusedCell != null && focusedCell.getTableColumn() == tc;
-                        if (match) {
-                            break;
-                        }
-                    }
-
-                    if (match) {
-                        int matchingColumnIndex = lastKnownColumnIndex.getOrDefault(focusedCell.getTableColumn(), 0);
-                        int newFocusColumnIndex =
-                                matchingColumnIndex == 0 ? 0 :
-                                Math.min(getVisibleLeafColumns().size() - 1, matchingColumnIndex - 1);
-                        fm.focus(focusedCell.getRow(), getVisibleLeafColumn(newFocusColumnIndex));
-                    }
-                }
-
-                // Fix for selection - we remove selection from all cells that
-                // were within the removed column.
-                if (sm != null) {
-                    List<TablePosition> selectedCells = new ArrayList<>(sm.getSelectedCells());
-                    for (TablePosition selectedCell : selectedCells) {
-                        boolean match = false;
-                        for (TableColumn<S, ?> tc : removed) {
-                            match = selectedCell != null && selectedCell.getTableColumn() == tc;
-                            if (match) break;
-                        }
-
-                        if (match) {
-                            // we can't just use the selectedCell.getTableColumn(), as that
-                            // column no longer exists and therefore its index is not correct.
-                            int matchingColumnIndex = lastKnownColumnIndex.getOrDefault(selectedCell.getTableColumn(), -1);
-                            if (matchingColumnIndex == -1) continue;
-
-                            if (sm instanceof TableViewArrayListSelectionModel) {
-                                // Also, because the table column no longer exists in the columns
-                                // list at this point, we can't just call:
-                                // sm.clearSelection(selectedCell.getRow(), selectedCell.getTableColumn());
-                                // as the tableColumn would map to an index of -1, which means that
-                                // selection will not be cleared. Instead, we have to create
-                                // a new TablePosition with a fixed column index and use that.
-                                TablePosition<S,?> fixedTablePosition =
-                                        new TablePosition<S,Object>(TableView.this,
-                                                selectedCell.getRow(),
-                                                selectedCell.getTableColumn());
-                                fixedTablePosition.fixedColumnIndex = matchingColumnIndex;
-
-                                ((TableViewArrayListSelectionModel)sm).clearSelection(fixedTablePosition);
-                            } else {
-                                sm.clearSelection(selectedCell.getRow(), selectedCell.getTableColumn());
-                            }
-                        }
-                    }
-                }
-            }
-
-
-            // update the lastKnownColumnIndex map
-            lastKnownColumnIndex.clear();
-            for (TableColumn<S,?> tc : getColumns()) {
-                int index = getVisibleLeafIndex(tc);
-                if (index > -1) {
-                    lastKnownColumnIndex.put(tc, index);
-                }
-            }
-        }
-    };
-
-    private final WeakHashMap<TableColumn<S,?>, Integer> lastKnownColumnIndex = new WeakHashMap<>();
-    
-    private final InvalidationListener columnVisibleObserver = valueModel -> {
-        updateVisibleLeafColumns();
-    };
-    
-    private final InvalidationListener columnSortableObserver = valueModel -> {
-        Object col = ((Property<?>)valueModel).getBean();
-        if (! getSortOrder().contains(col)) return;
-        doSort(TableUtil.SortEventType.COLUMN_SORTABLE_CHANGE, col);
-    };
-
-    private final InvalidationListener columnSortTypeObserver = valueModel -> {
-        Object col = ((Property<?>)valueModel).getBean();
-        if (! getSortOrder().contains(col)) return;
-        doSort(TableUtil.SortEventType.COLUMN_SORT_TYPE_CHANGE, col);
-    };
-    
-    private final InvalidationListener columnComparatorObserver = valueModel -> {
-        Object col = ((Property<?>)valueModel).getBean();
-        if (! getSortOrder().contains(col)) return;
-        doSort(TableUtil.SortEventType.COLUMN_COMPARATOR_CHANGE, col);
-    };
-    
-    /* proxy pseudo-class state change from selectionModel's cellSelectionEnabledProperty */
-    private final InvalidationListener cellSelectionModelInvalidationListener = o -> {
-        final boolean isCellSelection = ((BooleanProperty)o).get();
-        pseudoClassStateChanged(PSEUDO_CLASS_CELL_SELECTION,  isCellSelection);
-        pseudoClassStateChanged(PSEUDO_CLASS_ROW_SELECTION,  !isCellSelection);
-    };
-    
-    
-    private final WeakInvalidationListener weakColumnVisibleObserver = 
-            new WeakInvalidationListener(columnVisibleObserver);
-    
-    private final WeakInvalidationListener weakColumnSortableObserver = 
-            new WeakInvalidationListener(columnSortableObserver);
-    
-    private final WeakInvalidationListener weakColumnSortTypeObserver = 
-            new WeakInvalidationListener(columnSortTypeObserver);
-    
-    private final WeakInvalidationListener weakColumnComparatorObserver = 
-            new WeakInvalidationListener(columnComparatorObserver);
-    
-    private final WeakListChangeListener<TableColumn<S,?>> weakColumnsObserver = 
-            new WeakListChangeListener<TableColumn<S,?>>(columnsObserver);
-    
-    private final WeakInvalidationListener weakCellSelectionModelInvalidationListener = 
-            new WeakInvalidationListener(cellSelectionModelInvalidationListener);
-
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Properties                                                              *
-     *                                                                         *
-     **************************************************************************/
-
-
-    // --- Items
-    /**
-     * The underlying data model for the TableView. Note that it has a generic
-     * type that must match the type of the TableView itself.
-     */
-    public final ObjectProperty<ObservableList<S>> itemsProperty() { return items; }
-    private ObjectProperty<ObservableList<S>> items = 
-        new SimpleObjectProperty<ObservableList<S>>(this, "items") {
-            WeakReference<ObservableList<S>> oldItemsRef;
-
-            @Override protected void invalidated() {
-                final ObservableList<S> oldItems = oldItemsRef == null ? null : oldItemsRef.get();
-                final ObservableList<S> newItems = getItems();
-
-                // Fix for RT-36425
-                if (newItems != null && newItems == oldItems) {
-                    return;
-                }
-
-                // Fix for RT-35763
-                if (! (newItems instanceof SortedList)) {
-                    getSortOrder().clear();
-                }
-
-                oldItemsRef = new WeakReference<>(newItems);
-            }
-        };
-    public final void setItems(ObservableList<S> value) { itemsProperty().set(value); }
-    public final ObservableList<S> getItems() {return items.get(); }
-    
-    
-    // --- Table menu button visible
-    private BooleanProperty tableMenuButtonVisible;
-    /**
-     * This controls whether a menu button is available when the user clicks
-     * in a designated space within the TableView, within which is a radio menu
-     * item for each TableColumn in this table. This menu allows for the user to
-     * show and hide all TableColumns easily.
-     */
-    public final BooleanProperty tableMenuButtonVisibleProperty() {
-        if (tableMenuButtonVisible == null) {
-            tableMenuButtonVisible = new SimpleBooleanProperty(this, "tableMenuButtonVisible");
-        }
-        return tableMenuButtonVisible;
-    }
-    public final void setTableMenuButtonVisible (boolean value) {
-        tableMenuButtonVisibleProperty().set(value);
-    }
-    public final boolean isTableMenuButtonVisible() {
-        return tableMenuButtonVisible == null ? false : tableMenuButtonVisible.get();
-    }
-    
-    
-    // --- Column Resize Policy
-    private ObjectProperty<Callback<ResizeFeatures, Boolean>> columnResizePolicy;
-    public final void setColumnResizePolicy(Callback<ResizeFeatures, Boolean> callback) {
-        columnResizePolicyProperty().set(callback);
-    }
-    public final Callback<ResizeFeatures, Boolean> getColumnResizePolicy() {
-        return columnResizePolicy == null ? UNCONSTRAINED_RESIZE_POLICY : columnResizePolicy.get();
-    }
-
-    /**
-     * This is the function called when the user completes a column-resize
-     * operation. The two most common policies are available as static functions
-     * in the TableView class: {@link #UNCONSTRAINED_RESIZE_POLICY} and
-     * {@link #CONSTRAINED_RESIZE_POLICY}.
-     */
-    public final ObjectProperty<Callback<ResizeFeatures, Boolean>> columnResizePolicyProperty() {
-        if (columnResizePolicy == null) {
-            columnResizePolicy = new SimpleObjectProperty<Callback<ResizeFeatures, Boolean>>(this, "columnResizePolicy", UNCONSTRAINED_RESIZE_POLICY) {
-                private Callback<ResizeFeatures, Boolean> oldPolicy;
-                
-                @Override protected void invalidated() {
-                    if (isInited) {
-                        get().call(new ResizeFeatures(TableView.this, null, 0.0));
-
-                        if (oldPolicy != null) {
-                            PseudoClass state = PseudoClass.getPseudoClass(oldPolicy.toString());
-                            pseudoClassStateChanged(state, false);
-                        }
-                        if (get() != null) {
-                            PseudoClass state = PseudoClass.getPseudoClass(get().toString());
-                            pseudoClassStateChanged(state, true);
-                        }
-                        oldPolicy = get();
-                    }
-                }
-            };
-        }
-        return columnResizePolicy;
-    }
-    
-    
-    // --- Row Factory
-    private ObjectProperty<Callback<TableView<S>, TableRow<S>>> rowFactory;
-
-    /**
-     * A function which produces a TableRow. The system is responsible for
-     * reusing TableRows. Return from this function a TableRow which
-     * might be usable for representing a single row in a TableView.
-     * <p>
-     * Note that a TableRow is <b>not</b> a TableCell. A TableRow is
-     * simply a container for a TableCell, and in most circumstances it is more
-     * likely that you'll want to create custom TableCells, rather than
-     * TableRows. The primary use case for creating custom TableRow
-     * instances would most probably be to introduce some form of column
-     * spanning support.
-     * <p>
-     * You can create custom TableCell instances per column by assigning the
-     * appropriate function to the cellFactory property in the TableColumn class.
-     */
-    public final ObjectProperty<Callback<TableView<S>, TableRow<S>>> rowFactoryProperty() {
-        if (rowFactory == null) {
-            rowFactory = new SimpleObjectProperty<Callback<TableView<S>, TableRow<S>>>(this, "rowFactory");
-        }
-        return rowFactory;
-    }
-    public final void setRowFactory(Callback<TableView<S>, TableRow<S>> value) {
-        rowFactoryProperty().set(value);
-    }
-    public final Callback<TableView<S>, TableRow<S>> getRowFactory() {
-        return rowFactory == null ? null : rowFactory.get();
-    }
-    
-    
-    // --- Placeholder Node
-    private ObjectProperty<Node> placeholder;
-    /**
-     * This Node is shown to the user when the table has no content to show.
-     * This may be the case because the table model has no data in the first
-     * place, that a filter has been applied to the table model, resulting
-     * in there being nothing to show the user, or that there are no currently
-     * visible columns.
-     */
-    public final ObjectProperty<Node> placeholderProperty() {
-        if (placeholder == null) {
-            placeholder = new SimpleObjectProperty<Node>(this, "placeholder");
-        }
-        return placeholder;
-    }
-    public final void setPlaceholder(Node value) {
-        placeholderProperty().set(value);
-    }
-    public final Node getPlaceholder() {
-        return placeholder == null ? null : placeholder.get();
-    }
-
-
-    // --- Selection Model
-    private ObjectProperty<TableViewSelectionModel<S>> selectionModel 
-            = new SimpleObjectProperty<TableViewSelectionModel<S>>(this, "selectionModel") {
-
-        TableViewSelectionModel<S> oldValue = null;
-        
-        @Override protected void invalidated() {
-            
-            if (oldValue != null) {
-                oldValue.cellSelectionEnabledProperty().removeListener(weakCellSelectionModelInvalidationListener);
-            }
-            
-            oldValue = get();
-            
-            if (oldValue != null) {
-                oldValue.cellSelectionEnabledProperty().addListener(weakCellSelectionModelInvalidationListener);
-                // fake an invalidation to ensure updated pseudo-class state
-                weakCellSelectionModelInvalidationListener.invalidated(oldValue.cellSelectionEnabledProperty());
-            } 
-        }
-    };
-    
-    /**
-     * The SelectionModel provides the API through which it is possible
-     * to select single or multiple items within a TableView, as  well as inspect
-     * which items have been selected by the user. Note that it has a generic
-     * type that must match the type of the TableView itself.
-     */
-    public final ObjectProperty<TableViewSelectionModel<S>> selectionModelProperty() {
-        return selectionModel;
-    }
-    public final void setSelectionModel(TableViewSelectionModel<S> value) {
-        selectionModelProperty().set(value);
-    }
-
-    public final TableViewSelectionModel<S> getSelectionModel() {
-        return selectionModel.get();
-    }
-
-    
-    // --- Focus Model
-    private ObjectProperty<TableViewFocusModel<S>> focusModel;
-    public final void setFocusModel(TableViewFocusModel<S> value) {
-        focusModelProperty().set(value);
-    }
-    public final TableViewFocusModel<S> getFocusModel() {
-        return focusModel == null ? null : focusModel.get();
-    }
-    /**
-     * Represents the currently-installed {@link TableViewFocusModel} for this
-     * TableView. Under almost all circumstances leaving this as the default
-     * focus model will suffice.
-     */
-    public final ObjectProperty<TableViewFocusModel<S>> focusModelProperty() {
-        if (focusModel == null) {
-            focusModel = new SimpleObjectProperty<TableViewFocusModel<S>>(this, "focusModel");
-        }
-        return focusModel;
-    }
-    
-    
-//    // --- Span Model
-//    private ObjectProperty<SpanModel<S>> spanModel 
-//            = new SimpleObjectProperty<SpanModel<S>>(this, "spanModel") {
-//
-//        @Override protected void invalidated() {
-//            ObservableList<String> styleClass = getStyleClass();
-//            if (getSpanModel() == null) {
-//                styleClass.remove(CELL_SPAN_TABLE_VIEW_STYLE_CLASS);
-//            } else if (! styleClass.contains(CELL_SPAN_TABLE_VIEW_STYLE_CLASS)) {
-//                styleClass.add(CELL_SPAN_TABLE_VIEW_STYLE_CLASS);
-//            }
-//        }
-//    };
-//
-//    public final ObjectProperty<SpanModel<S>> spanModelProperty() {
-//        return spanModel;
-//    }
-//    public final void setSpanModel(SpanModel<S> value) {
-//        spanModelProperty().set(value);
-//    }
-//
-//    public final SpanModel<S> getSpanModel() {
-//        return spanModel.get();
-//    }
-    
-    // --- Editable
-    private BooleanProperty editable;
-    public final void setEditable(boolean value) {
-        editableProperty().set(value);
-    }
-    public final boolean isEditable() {
-        return editable == null ? false : editable.get();
-    }
-    /**
-     * Specifies whether this TableView is editable - only if the TableView, the
-     * TableColumn (if applicable) and the TableCells within it are both 
-     * editable will a TableCell be able to go into their editing state.
-     */
-    public final BooleanProperty editableProperty() {
-        if (editable == null) {
-            editable = new SimpleBooleanProperty(this, "editable", false);
-        }
-        return editable;
-    }
-
-
-    // --- Fixed cell size
-    private DoubleProperty fixedCellSize;
-
-    /**
-     * Sets the new fixed cell size for this control. Any value greater than
-     * zero will enable fixed cell size mode, whereas a zero or negative value
-     * (or Region.USE_COMPUTED_SIZE) will be used to disabled fixed cell size
-     * mode.
-     *
-     * @param value The new fixed cell size value, or a value less than or equal
-     *              to zero (or Region.USE_COMPUTED_SIZE) to disable.
-     * @since JavaFX 8.0
-     */
-    public final void setFixedCellSize(double value) {
-        fixedCellSizeProperty().set(value);
-    }
-
-    /**
-     * Returns the fixed cell size value. A value less than or equal to zero is
-     * used to represent that fixed cell size mode is disabled, and a value
-     * greater than zero represents the size of all cells in this control.
-     *
-     * @return A double representing the fixed cell size of this control, or a
-     *      value less than or equal to zero if fixed cell size mode is disabled.
-     * @since JavaFX 8.0
-     */
-    public final double getFixedCellSize() {
-        return fixedCellSize == null ? Region.USE_COMPUTED_SIZE : fixedCellSize.get();
-    }
-    /**
-     * Specifies whether this control has cells that are a fixed height (of the
-     * specified value). If this value is less than or equal to zero,
-     * then all cells are individually sized and positioned. This is a slow
-     * operation. Therefore, when performance matters and developers are not
-     * dependent on variable cell sizes it is a good idea to set the fixed cell
-     * size value. Generally cells are around 24px, so setting a fixed cell size
-     * of 24 is likely to result in very little difference in visuals, but a
-     * improvement to performance.
-     *
-     * <p>To set this property via CSS, use the -fx-fixed-cell-size property.
-     * This should not be confused with the -fx-cell-size property. The difference
-     * between these two CSS properties is that -fx-cell-size will size all
-     * cells to the specified size, but it will not enforce that this is the
-     * only size (thus allowing for variable cell sizes, and preventing the
-     * performance gains from being possible). Therefore, when performance matters
-     * use -fx-fixed-cell-size, instead of -fx-cell-size. If both properties are
-     * specified in CSS, -fx-fixed-cell-size takes precedence.</p>
-     *
-     * @since JavaFX 8.0
-     */
-    public final DoubleProperty fixedCellSizeProperty() {
-        if (fixedCellSize == null) {
-            fixedCellSize = new StyleableDoubleProperty(Region.USE_COMPUTED_SIZE) {
-                @Override public CssMetaData<TableView<?>,Number> getCssMetaData() {
-                    return StyleableProperties.FIXED_CELL_SIZE;
-                }
-
-                @Override public Object getBean() {
-                    return TableView.this;
-                }
-
-                @Override public String getName() {
-                    return "fixedCellSize";
-                }
-            };
-        }
-        return fixedCellSize;
-    }
-
-
-    // --- Editing Cell
-    private ReadOnlyObjectWrapper<TablePosition<S,?>> editingCell;
-    private void setEditingCell(TablePosition<S,?> value) {
-        editingCellPropertyImpl().set(value);
-    }
-    public final TablePosition<S,?> getEditingCell() {
-        return editingCell == null ? null : editingCell.get();
-    }
-
-    /**
-     * Represents the current cell being edited, or null if
-     * there is no cell being edited.
-     */
-    public final ReadOnlyObjectProperty<TablePosition<S,?>> editingCellProperty() {
-        return editingCellPropertyImpl().getReadOnlyProperty();
-    }
-
-    private ReadOnlyObjectWrapper<TablePosition<S,?>> editingCellPropertyImpl() {
-        if (editingCell == null) {
-            editingCell = new ReadOnlyObjectWrapper<TablePosition<S,?>>(this, "editingCell");
-        }
-        return editingCell;
-    }
-
-    
-    // --- Comparator (built via sortOrder list, so read-only)
-    /**
-     * The comparator property is a read-only property that is representative of the
-     * current state of the {@link #getSortOrder() sort order} list. The sort
-     * order list contains the columns that have been added to it either programmatically
-     * or via a user clicking on the headers themselves.
-     * @since JavaFX 8.0
-     */
-    private ReadOnlyObjectWrapper<Comparator<S>> comparator;
-    private void setComparator(Comparator<S> value) {
-        comparatorPropertyImpl().set(value);
-    }
-    public final Comparator<S> getComparator() {
-        return comparator == null ? null : comparator.get();
-    }
-    public final ReadOnlyObjectProperty<Comparator<S>> comparatorProperty() {
-        return comparatorPropertyImpl().getReadOnlyProperty();
-    }
-    private ReadOnlyObjectWrapper<Comparator<S>> comparatorPropertyImpl() {
-        if (comparator == null) {
-            comparator = new ReadOnlyObjectWrapper<Comparator<S>>(this, "comparator");
-        }
-        return comparator;
-    }
-    
-    
-    // --- sortPolicy
-    /**
-     * The sort policy specifies how sorting in this TableView should be performed.
-     * For example, a basic sort policy may just call 
-     * {@code FXCollections.sort(tableView.getItems())}, whereas a more advanced
-     * sort policy may call to a database to perform the necessary sorting on the
-     * server-side.
-     * 
-     * <p>TableView ships with a {@link TableView#DEFAULT_SORT_POLICY default
-     * sort policy} that does precisely as mentioned above: it simply attempts
-     * to sort the items list in-place.
-     * 
-     * <p>It is recommended that rather than override the {@link TableView#sort() sort}
-     * method that a different sort policy be provided instead.
-     * @since JavaFX 8.0
-     */
-    private ObjectProperty<Callback<TableView<S>, Boolean>> sortPolicy;
-    public final void setSortPolicy(Callback<TableView<S>, Boolean> callback) {
-        sortPolicyProperty().set(callback);
-    }
-    @SuppressWarnings("unchecked") 
-    public final Callback<TableView<S>, Boolean> getSortPolicy() {
-        return sortPolicy == null ? 
-                (Callback<TableView<S>, Boolean>)(Object) DEFAULT_SORT_POLICY : 
-                sortPolicy.get();
-    }
-    @SuppressWarnings("unchecked")
-    public final ObjectProperty<Callback<TableView<S>, Boolean>> sortPolicyProperty() {
-        if (sortPolicy == null) {
-            sortPolicy = new SimpleObjectProperty<Callback<TableView<S>, Boolean>>(
-                    this, "sortPolicy", (Callback<TableView<S>, Boolean>)(Object) DEFAULT_SORT_POLICY) {
-                @Override protected void invalidated() {
-                    sort();
-                }
-            };
-        }
-        return sortPolicy;
-    }
-    
-    
-    // onSort
-    /**
-     * Called when there's a request to sort the control.
-     * @since JavaFX 8.0
-     */
-    private ObjectProperty<EventHandler<SortEvent<TableView<S>>>> onSort;
-    
-    public void setOnSort(EventHandler<SortEvent<TableView<S>>> value) {
-        onSortProperty().set(value);
-    }
-    
-    public EventHandler<SortEvent<TableView<S>>> getOnSort() {
-        if( onSort != null ) {
-            return onSort.get();
-        }
-        return null;
-    }
-    
-    public ObjectProperty<EventHandler<SortEvent<TableView<S>>>> onSortProperty() {
-        if( onSort == null ) {
-            onSort = new ObjectPropertyBase<EventHandler<SortEvent<TableView<S>>>>() {
-                @Override protected void invalidated() {
-                    EventType<SortEvent<TableView<S>>> eventType = SortEvent.sortEvent();
-                    EventHandler<SortEvent<TableView<S>>> eventHandler = get();
-                    setEventHandler(eventType, eventHandler);
-                }
-                
-                @Override public Object getBean() {
-                    return TableView.this;
-                }
-
-                @Override public String getName() {
-                    return "onSort";
-                }
-            };
-        }
-        return onSort;
-    }
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/
-    /**
-     * The TableColumns that are part of this TableView. As the user reorders
-     * the TableView columns, this list will be updated to reflect the current
-     * visual ordering.
-     *
-     * <p>Note: to display any data in a TableView, there must be at least one
-     * TableColumn in this ObservableList.</p>
-     */
-    public final ObservableList<TableColumn<S,?>> getColumns() {
-        return columns;
-    }
-    
-    /**
-     * The sortOrder list defines the order in which {@link TableColumn} instances
-     * are sorted. An empty sortOrder list means that no sorting is being applied
-     * on the TableView. If the sortOrder list has one TableColumn within it, 
-     * the TableView will be sorted using the 
-     * {@link TableColumn#sortTypeProperty() sortType} and
-     * {@link TableColumn#comparatorProperty() comparator} properties of this
-     * TableColumn (assuming 
-     * {@link TableColumn#sortableProperty() TableColumn.sortable} is true).
-     * If the sortOrder list contains multiple TableColumn instances, then
-     * the TableView is firstly sorted based on the properties of the first 
-     * TableColumn. If two elements are considered equal, then the second
-     * TableColumn in the list is used to determine ordering. This repeats until
-     * the results from all TableColumn comparators are considered, if necessary.
-     * 
-     * @return An ObservableList containing zero or more TableColumn instances.
-     */
-    public final ObservableList<TableColumn<S,?>> getSortOrder() {
-        return sortOrder;
-    }
-    
-    /**
-     * Scrolls the TableView so that the given index is visible within the viewport.
-     * @param index The index of an item that should be visible to the user.
-     */
-    public void scrollTo(int index) {
-       ControlUtils.scrollToIndex(this, index);
-    }
-    
-    /**
-     * Scrolls the TableView so that the given object is visible within the viewport.
-     * @param object The object that should be visible to the user.
-     * @since JavaFX 8.0
-     */
-    public void scrollTo(S object) {
-        if( getItems() != null ) {
-            int idx = getItems().indexOf(object);
-            if( idx >= 0 ) {
-                ControlUtils.scrollToIndex(this, idx);        
-            }
-        }
-    }
-    
-    /**
-     * Called when there's a request to scroll an index into view using {@link #scrollTo(int)}
-     * or {@link #scrollTo(Object)}
-     * @since JavaFX 8.0
-     */
-    private ObjectProperty<EventHandler<ScrollToEvent<Integer>>> onScrollTo;
-    
-    public void setOnScrollTo(EventHandler<ScrollToEvent<Integer>> value) {
-        onScrollToProperty().set(value);
-    }
-    
-    public EventHandler<ScrollToEvent<Integer>> getOnScrollTo() {
-        if( onScrollTo != null ) {
-            return onScrollTo.get();
-        }
-        return null;
-    }
-    
-    public ObjectProperty<EventHandler<ScrollToEvent<Integer>>> onScrollToProperty() {
-        if( onScrollTo == null ) {
-            onScrollTo = new ObjectPropertyBase<EventHandler<ScrollToEvent<Integer>>>() {
-                @Override
-                protected void invalidated() {
-                    setEventHandler(ScrollToEvent.scrollToTopIndex(), get());
-                }
-                @Override
-                public Object getBean() {
-                    return TableView.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "onScrollTo";
-                }
-            };
-        }
-        return onScrollTo;
-    }
-    
-    /**
-     * Scrolls the TableView so that the given column is visible within the viewport.
-     * @param column The column that should be visible to the user.
-     * @since JavaFX 8.0
-     */
-    public void scrollToColumn(TableColumn<S, ?> column) {
-        ControlUtils.scrollToColumn(this, column);
-    }
-    
-    /**
-     * Scrolls the TableView so that the given index is visible within the viewport.
-     * @param columnIndex The index of a column that should be visible to the user.
-     * @since JavaFX 8.0
-     */
-    public void scrollToColumnIndex(int columnIndex) {
-        if( getColumns() != null ) {
-            ControlUtils.scrollToColumn(this, getColumns().get(columnIndex));
-        }
-    }
-    
-    /**
-     * Called when there's a request to scroll a column into view using {@link #scrollToColumn(TableColumn)} 
-     * or {@link #scrollToColumnIndex(int)}
-     * @since JavaFX 8.0
-     */
-    private ObjectProperty<EventHandler<ScrollToEvent<TableColumn<S, ?>>>> onScrollToColumn;
-    
-    public void setOnScrollToColumn(EventHandler<ScrollToEvent<TableColumn<S, ?>>> value) {
-        onScrollToColumnProperty().set(value);
-    }
-    
-    public EventHandler<ScrollToEvent<TableColumn<S, ?>>> getOnScrollToColumn() {
-        if( onScrollToColumn != null ) {
-            return onScrollToColumn.get();
-        }
-        return null;
-    }
-    
-    public ObjectProperty<EventHandler<ScrollToEvent<TableColumn<S, ?>>>> onScrollToColumnProperty() {
-        if( onScrollToColumn == null ) {
-            onScrollToColumn = new ObjectPropertyBase<EventHandler<ScrollToEvent<TableColumn<S, ?>>>>() {
-                @Override protected void invalidated() {
-                    EventType<ScrollToEvent<TableColumn<S, ?>>> type = ScrollToEvent.scrollToColumn();
-                    setEventHandler(type, get());
-                }
-                
-                @Override public Object getBean() {
-                    return TableView.this;
-                }
-
-                @Override public String getName() {
-                    return "onScrollToColumn";
-                }
-            };
-        }
-        return onScrollToColumn;
-    }
-    
-    /**
-     * Applies the currently installed resize policy against the given column,
-     * resizing it based on the delta value provided.
-     */
-    public boolean resizeColumn(TableColumn<S,?> column, double delta) {
-        if (column == null || Double.compare(delta, 0.0) == 0) return false;
-
-        boolean allowed = getColumnResizePolicy().call(new ResizeFeatures<S>(TableView.this, column, delta));
-        if (!allowed) return false;
-
-        return true;
-    }
-
-    /**
-     * Causes the cell at the given row/column view indexes to switch into
-     * its editing state, if it is not already in it, and assuming that the 
-     * TableView and column are also editable.
-     *
-     * <p><strong>Note:</strong> This method will cancel editing if the given row
-     * value is less than zero and the given column is null.</p>
-     */
-    public void edit(int row, TableColumn<S,?> column) {
-        if (!isEditable() || (column != null && ! column.isEditable())) {
-            return;
-        }
-
-        if (row < 0 && column == null) {
-            setEditingCell(null);
-        } else {
-            setEditingCell(new TablePosition<>(this, row, column));
-        }
-    }
-    
-    /**
-     * Returns an unmodifiable list containing the currently visible leaf columns.
-     */
-    @ReturnsUnmodifiableCollection
-    public ObservableList<TableColumn<S,?>> getVisibleLeafColumns() {
-        return unmodifiableVisibleLeafColumns;
-    }
-    
-    /**
-     * Returns the position of the given column, relative to all other 
-     * visible leaf columns.
-     */
-    public int getVisibleLeafIndex(TableColumn<S,?> column) {
-        return visibleLeafColumns.indexOf(column);
-    }
-
-    /**
-     * Returns the TableColumn in the given column index, relative to all other
-     * visible leaf columns.
-     */
-    public TableColumn<S,?> getVisibleLeafColumn(int column) {
-        if (column < 0 || column >= visibleLeafColumns.size()) return null;
-        return visibleLeafColumns.get(column);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected Skin<?> createDefaultSkin() {
-        return new TableViewSkin<S>(this);
-    }
-    
-    /**
-     * The sort method forces the TableView to re-run its sorting algorithm. More 
-     * often than not it is not necessary to call this method directly, as it is
-     * automatically called when the {@link #getSortOrder() sort order}, 
-     * {@link #sortPolicyProperty() sort policy}, or the state of the 
-     * TableColumn {@link TableColumn#sortTypeProperty() sort type} properties 
-     * change. In other words, this method should only be called directly when
-     * something external changes and a sort is required.
-     * @since JavaFX 8.0
-     */
-    public void sort() {
-        final ObservableList<? extends TableColumnBase<S,?>> sortOrder = getSortOrder();
-        
-        // update the Comparator property
-        final Comparator<S> oldComparator = getComparator();
-        setComparator(sortOrder.isEmpty() ? null : new TableColumnComparator(sortOrder));
-
-        // fire the onSort event and check if it is consumed, if
-        // so, don't run the sort
-        SortEvent<TableView<S>> sortEvent = new SortEvent<>(TableView.this, TableView.this);
-        fireEvent(sortEvent);
-        if (sortEvent.isConsumed()) {
-            // if the sort is consumed we could back out the last action (the code
-            // is commented out right below), but we don't as we take it as a 
-            // sign that the developer has decided to handle the event themselves.
-            
-            // sortLock = true;
-            // TableUtil.handleSortFailure(sortOrder, lastSortEventType, lastSortEventSupportInfo);
-            // sortLock = false;
-            return;
-        }
-
-        final List<TablePosition> prevState = new ArrayList<>(getSelectionModel().getSelectedCells());
-        final int itemCount = prevState.size();
-
-        // we set makeAtomic to true here, so that we don't fire intermediate
-        // sort events - instead we send a single permutation event at the end
-        // of this method.
-        getSelectionModel().startAtomic();
-
-        // get the sort policy and run it
-        Callback<TableView<S>, Boolean> sortPolicy = getSortPolicy();
-        if (sortPolicy == null) return;
-        Boolean success = sortPolicy.call(this);
-
-        getSelectionModel().stopAtomic();
-        
-        if (success == null || ! success) {
-            // the sort was a failure. Need to backout if possible
-            sortLock = true;
-            TableUtil.handleSortFailure(sortOrder, lastSortEventType, lastSortEventSupportInfo);
-            setComparator(oldComparator);
-            sortLock = false;
-        } else {
-            // sorting was a success, now we possibly fire an event on the
-            // selection model that the items list has 'permutated' to a new ordering
-
-            // FIXME we should support alternative selection model implementations!
-            if (getSelectionModel() instanceof TableViewArrayListSelectionModel) {
-                final TableViewArrayListSelectionModel<S> sm = (TableViewArrayListSelectionModel<S>) getSelectionModel();
-                final ObservableList<TablePosition<S,?>> newState = (ObservableList<TablePosition<S,?>>)(Object)sm.getSelectedCells();
-
-                List<TablePosition<S, ?>> removed = new ArrayList<>();
-                for (int i = 0; i < itemCount; i++) {
-                    TablePosition<S, ?> prevItem = prevState.get(i);
-                    if (!newState.contains(prevItem)) {
-                        removed.add(prevItem);
-                    }
-                }
-
-                if (!removed.isEmpty()) {
-                    // the sort operation effectively permutates the selectedCells list,
-                    // but we cannot fire a permutation event as we are talking about
-                    // TablePosition's changing (which may reside in the same list
-                    // position before and after the sort). Therefore, we need to fire
-                    // a single add/remove event to cover the added and removed positions.
-                    ListChangeListener.Change<TablePosition<S, ?>> c = new NonIterableChange.GenericAddRemoveChange<>(0, itemCount, removed, newState);
-                    sm.handleSelectedCellsListChangeEvent(c);
-                }
-            }
-        }
-    }
-
-    /**
-     * Calling {@code refresh()} forces the TableView control to recreate and
-     * repopulate the cells necessary to populate the visual bounds of the control.
-     * In other words, this forces the TableView to update what it is showing to
-     * the user. This is useful in cases where the underlying data source has
-     * changed in a way that is not observed by the TableView itself.
-     *
-     * @since JavaFX 8u60
-     */
-    public void refresh() {
-        getProperties().put(TableViewSkinBase.RECREATE, Boolean.TRUE);
-    }
-    
-    
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation                                                  *
-     *                                                                         *
-     **************************************************************************/
-    
-    private boolean sortLock = false;
-    private TableUtil.SortEventType lastSortEventType = null;
-    private Object[] lastSortEventSupportInfo = null;
-    
-    private void doSort(final TableUtil.SortEventType sortEventType, final Object... supportInfo) {
-        if (sortLock) {
-            return;
-        }
-        
-        this.lastSortEventType = sortEventType;
-        this.lastSortEventSupportInfo = supportInfo;
-        sort();
-        this.lastSortEventType = null;
-        this.lastSortEventSupportInfo = null;
-    }
-
-
-    // --- Content width
-    private void setContentWidth(double contentWidth) {
-        this.contentWidth = contentWidth;
-        if (isInited) {
-            // sometimes the current column resize policy will have to modify the
-            // column width of all columns in the table if the table width changes,
-            // so we short-circuit the resize function and just go straight there
-            // with a null TableColumn, which indicates to the resize policy function
-            // that it shouldn't actually do anything specific to one column.
-            getColumnResizePolicy().call(new ResizeFeatures<S>(TableView.this, null, 0.0));
-        }
-    }
-    
-    /**
-     * Recomputes the currently visible leaf columns in this TableView.
-     */
-    private void updateVisibleLeafColumns() {
-        // update visible leaf columns list
-        List<TableColumn<S,?>> cols = new ArrayList<TableColumn<S,?>>();
-        buildVisibleLeafColumns(getColumns(), cols);
-        visibleLeafColumns.setAll(cols);
-
-        // sometimes the current column resize policy will have to modify the
-        // column width of all columns in the table if the table width changes,
-        // so we short-circuit the resize function and just go straight there
-        // with a null TableColumn, which indicates to the resize policy function
-        // that it shouldn't actually do anything specific to one column.
-        getColumnResizePolicy().call(new ResizeFeatures<S>(TableView.this, null, 0.0));
-    }
-
-    private void buildVisibleLeafColumns(List<TableColumn<S,?>> cols, List<TableColumn<S,?>> vlc) {
-        for (TableColumn<S,?> c : cols) {
-            if (c == null) continue;
-
-            boolean hasChildren = ! c.getColumns().isEmpty();
-
-            if (hasChildren) {
-                buildVisibleLeafColumns(c.getColumns(), vlc);
-            } else if (c.isVisible()) {
-                vlc.add(c);
-            }
-        }
-    }
-    
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final String DEFAULT_STYLE_CLASS = "table-view";
-
-    private static final PseudoClass PSEUDO_CLASS_CELL_SELECTION =
-            PseudoClass.getPseudoClass("cell-selection");
-    private static final PseudoClass PSEUDO_CLASS_ROW_SELECTION =
-            PseudoClass.getPseudoClass("row-selection");
-
-    /** @treatAsPrivate */
-    private static class StyleableProperties {
-        private static final CssMetaData<TableView<?>,Number> FIXED_CELL_SIZE =
-                new CssMetaData<TableView<?>,Number>("-fx-fixed-cell-size",
-                                                    SizeConverter.getInstance(),
-                                                    Region.USE_COMPUTED_SIZE) {
-
-                    @Override public Double getInitialValue(TableView<?> node) {
-                        return node.getFixedCellSize();
-                    }
-
-                    @Override public boolean isSettable(TableView<?> n) {
-                        return n.fixedCellSize == null || !n.fixedCellSize.isBound();
-                    }
-
-                    @Override public StyleableProperty<Number> getStyleableProperty(TableView<?> n) {
-                        return (StyleableProperty<Number>) n.fixedCellSizeProperty();
-                    }
-                };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                    new ArrayList<CssMetaData<? extends Styleable, ?>>(Control.getClassCssMetaData());
-            styleables.add(FIXED_CELL_SIZE);
-            STYLEABLES = Collections.unmodifiableList(styleables);
-        }
-    }
-
-    /**
-     * @return The CssMetaData associated with this class, which may include the
-     * CssMetaData of its super classes.
-     * @since JavaFX 8.0
-     */
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return StyleableProperties.STYLEABLES;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @since JavaFX 8.0
-     */
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Accessibility handling                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override
-    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case COLUMN_COUNT: return getVisibleLeafColumns().size();
-            case ROW_COUNT: return getItems().size();
-            case SELECTED_ITEMS: {
-                // TableViewSkin returns TableRows back to TableView.
-                // TableRowSkin returns TableCells back to TableRow.
-                @SuppressWarnings("unchecked")
-                ObservableList<TableRow<S>> rows = (ObservableList<TableRow<S>>)super.queryAccessibleAttribute(attribute, parameters);
-                List<Node> selection = new ArrayList<>();
-                for (TableRow<S> row : rows) {
-                    @SuppressWarnings("unchecked")
-                    ObservableList<Node> cells = (ObservableList<Node>)row.queryAccessibleAttribute(attribute, parameters);
-                    if (cells != null) selection.addAll(cells);
-                }
-                return FXCollections.observableArrayList(selection);
-            }
-            case FOCUS_ITEM: {
-                Node row = (Node)super.queryAccessibleAttribute(attribute, parameters);
-                if (row == null) return null;
-                Node cell = (Node)row.queryAccessibleAttribute(attribute, parameters);
-                /* cell equals to null means the row is a placeholder node */
-                return cell != null ?  cell : row;
-            }
-            case CELL_AT_ROW_COLUMN: {
-                @SuppressWarnings("unchecked")
-                TableRow<S> row = (TableRow<S>)super.queryAccessibleAttribute(attribute, parameters);
-                return row != null ? row.queryAccessibleAttribute(attribute, parameters) : null;
-            }
-            case MULTIPLE_SELECTION: {
-                MultipleSelectionModel<S> sm = getSelectionModel();
-                return sm != null && sm.getSelectionMode() == SelectionMode.MULTIPLE;
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Support Interfaces                                                      *
-     *                                                                         *
-     **************************************************************************/
-
-     /**
-      * An immutable wrapper class for use in the TableView 
-     * {@link TableView#columnResizePolicyProperty() column resize} functionality.
-      * @since JavaFX 2.0
-      */
-     public static class ResizeFeatures<S> extends ResizeFeaturesBase<S> {
-        private TableView<S> table;
-
-        /**
-         * Creates an instance of this class, with the provided TableView, 
-         * TableColumn and delta values being set and stored in this immutable
-         * instance.
-         * 
-         * @param table The TableView upon which the resize operation is occurring.
-         * @param column The column upon which the resize is occurring, or null
-         *      if this ResizeFeatures instance is being created as a result of a
-         *      TableView resize operation.
-         * @param delta The amount of horizontal space added or removed in the 
-         *      resize operation.
-         */
-        public ResizeFeatures(TableView<S> table, TableColumn<S,?> column, Double delta) {
-            super(column, delta);
-            this.table = table;
-        }
-        
-        /**
-         * Returns the column upon which the resize is occurring, or null
-         * if this ResizeFeatures instance was created as a result of a
-         * TableView resize operation.
-         */
-        @Override public TableColumn<S,?> getColumn() { 
-            return (TableColumn<S,?>) super.getColumn(); 
-        }
-        
-        /**
-         * Returns the TableView upon which the resize operation is occurring.
-         */
-        public TableView<S> getTable() { 
-            return table; 
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Support Classes                                                         *
-     *                                                                         *
-     **************************************************************************/
-
-     
-    /**
-     * A simple extension of the {@link SelectionModel} abstract class to
-     * allow for special support for TableView controls.
-     * @since JavaFX 2.0
-     */
-    public static abstract class TableViewSelectionModel<S> extends TableSelectionModel<S> {
-
-        /***********************************************************************
-         *                                                                     *
-         * Private fields                                                      *
-         *                                                                     *
-         **********************************************************************/
-
-        private final TableView<S> tableView;
-
-        boolean blockFocusCall = false;
-
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Constructors                                                        *
-         *                                                                     *
-         **********************************************************************/
-
-        /**
-         * Builds a default TableViewSelectionModel instance with the provided
-         * TableView.
-         * @param tableView The TableView upon which this selection model should
-         *      operate.
-         * @throws NullPointerException TableView can not be null.
-         */
-        public TableViewSelectionModel(final TableView<S> tableView) {
-            if (tableView == null) {
-                throw new NullPointerException("TableView can not be null");
-            }
-
-            this.tableView = tableView;
-        }
-
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Abstract API                                                        *
-         *                                                                     *
-         **********************************************************************/
-
-        /**
-         * A read-only ObservableList representing the currently selected cells 
-         * in this TableView. Rather than directly modify this list, please
-         * use the other methods provided in the TableViewSelectionModel.
-         */
-        public abstract ObservableList<TablePosition> getSelectedCells();
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Generic (type erasure) bridging                                     *
-         *                                                                     *
-         **********************************************************************/
-
-        // --- isSelected
-        /** {@inheritDoc} */
-        @Override public boolean isSelected(int row, TableColumnBase<S, ?> column) {
-            return isSelected(row, (TableColumn<S,?>)column);
-        }
-
-        /**
-         * Convenience function which tests whether the given row and column index
-         * is currently selected in this table instance.
-         */
-        public abstract boolean isSelected(int row, TableColumn<S, ?> column);
-
-
-        // --- select
-        /** {@inheritDoc} */
-        @Override public void select(int row, TableColumnBase<S, ?> column) {
-            select(row, (TableColumn<S,?>)column);
-        }
-
-        /**
-         * Selects the cell at the given row/column intersection.
-         */
-        public abstract void select(int row, TableColumn<S, ?> column);
-
-
-        // --- clearAndSelect
-        /** {@inheritDoc} */
-        @Override public void clearAndSelect(int row, TableColumnBase<S,?> column) {
-            clearAndSelect(row, (TableColumn<S,?>) column);
-        }
-
-        /**
-         * Clears all selection, and then selects the cell at the given row/column
-         * intersection.
-         */
-        public abstract void clearAndSelect(int row, TableColumn<S,?> column);
-
-
-        // --- clearSelection
-        /** {@inheritDoc} */
-        @Override public void clearSelection(int row, TableColumnBase<S,?> column) {
-            clearSelection(row, (TableColumn<S,?>) column);
-        }
-
-        /**
-         * Removes selection from the specified row/column position (in view indexes).
-         * If this particular cell (or row if the column value is -1) is not selected,
-         * nothing happens.
-         */
-        public abstract void clearSelection(int row, TableColumn<S, ?> column);
-
-        /** {@inheritDoc} */
-        @Override public void selectRange(int minRow, TableColumnBase<S,?> minColumn,
-                                          int maxRow, TableColumnBase<S,?> maxColumn) {
-            final int minColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)minColumn);
-            final int maxColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)maxColumn);
-            for (int _row = minRow; _row <= maxRow; _row++) {
-                for (int _col = minColumnIndex; _col <= maxColumnIndex; _col++) {
-                    select(_row, tableView.getVisibleLeafColumn(_col));
-                }
-            }
-        }
-
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Public API                                                          *
-         *                                                                     *
-         **********************************************************************/
-
-        /**
-         * Returns the TableView instance that this selection model is installed in.
-         */
-        public TableView<S> getTableView() {
-            return tableView;
-        }
-
-        /**
-         * Convenience method that returns getTableView().getItems().
-         * @return The items list of the current TableView.
-         */
-        protected List<S> getTableModel()  {
-            return tableView.getItems();
-        }
-
-        /** {@inheritDoc} */
-        @Override protected S getModelItem(int index) {
-            if (index < 0 || index >= getItemCount()) return null;
-            return tableView.getItems().get(index);
-        }
-
-        /** {@inheritDoc} */
-        @Override protected int getItemCount() {
-            return getTableModel().size();
-        }
-
-        /** {@inheritDoc} */
-        @Override public void focus(int row) {
-            focus(row, null);
-        }
-
-        /** {@inheritDoc} */
-        @Override public int getFocusedIndex() {
-            return getFocusedCell().getRow();
-        }
-
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Private implementation                                              *
-         *                                                                     *
-         **********************************************************************/
-
-        void focus(int row, TableColumn<S,?> column) {
-            focus(new TablePosition<>(getTableView(), row, column));
-            getTableView().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_ITEM);
-        }
-
-        void focus(TablePosition<S,?> pos) {
-            if (blockFocusCall) return;
-            if (getTableView().getFocusModel() == null) return;
-
-            getTableView().getFocusModel().focus(pos.getRow(), pos.getTableColumn());
-        }
-
-        TablePosition<S,?> getFocusedCell() {
-            if (getTableView().getFocusModel() == null) {
-                return new TablePosition<>(getTableView(), -1, null);
-            }
-            return getTableView().getFocusModel().getFocusedCell();
-        }
-    }
-    
-    
-
-    /**
-     * A primitive selection model implementation, using a List<Integer> to store all
-     * selected indices.
-     */
-    // package for testing
-    static class TableViewArrayListSelectionModel<S> extends TableViewSelectionModel<S> {
-        
-        private int itemCount = 0;
-
-        private final MappingChange.Map<TablePosition<S,?>,S> cellToItemsMap = f -> getModelItem(f.getRow());
-
-        private final MappingChange.Map<TablePosition<S,?>,Integer> cellToIndicesMap = f -> f.getRow();
-
-        /***********************************************************************
-         *                                                                     *
-         * Constructors                                                        *
-         *                                                                     *
-         **********************************************************************/
-
-        public TableViewArrayListSelectionModel(final TableView<S> tableView) {
-            super(tableView);
-            this.tableView = tableView;
-
-            this.tableView.itemsProperty().addListener(new InvalidationListener() {
-                private WeakReference<ObservableList<S>> weakItemsRef = new WeakReference<>(tableView.getItems());
-
-                @Override public void invalidated(Observable observable) {
-                    ObservableList<S> oldItems = weakItemsRef.get();
-                    weakItemsRef = new WeakReference<>(tableView.getItems());
-                    updateItemsObserver(oldItems, tableView.getItems());
-                }
-            });
-
-            selectedCellsMap = new SelectedCellsMap<TablePosition<S,?>>(c -> handleSelectedCellsListChangeEvent(c)) {
-                @Override public boolean isCellSelectionEnabled() {
-                    return TableViewArrayListSelectionModel.this.isCellSelectionEnabled();
-                }
-            };
-
-            selectedItems = new ReadOnlyUnbackedObservableList<S>() {
-                @Override public S get(int i) {
-                    return getModelItem(getSelectedIndices().get(i));
-                }
-
-                @Override public int size() {
-                    return getSelectedIndices().size();
-                }
-            };
-            
-            selectedCellsSeq = new ReadOnlyUnbackedObservableList<TablePosition<S,?>>() {
-                @Override public TablePosition<S,?> get(int i) {
-                    return selectedCellsMap.get(i);
-                }
-
-                @Override public int size() {
-                    return selectedCellsMap.size();
-                }
-            };
-
-
-            /*
-             * The following listener is used in conjunction with
-             * SelectionModel.select(T obj) to allow for a developer to select
-             * an item that is not actually in the data model. When this occurs,
-             * we actively try to find an index that matches this object, going
-             * so far as to actually watch for all changes to the items list,
-             * rechecking each time.
-             */
-
-            // watching for changes to the items list content
-            ObservableList<S> items = getTableView().getItems();
-            if (items != null) {
-                items.addListener(weakItemsContentListener);
-            }
-
-
-            updateItemCount();
-
-            updateDefaultSelection();
-
-            cellSelectionEnabledProperty().addListener(o -> {
-                updateDefaultSelection();
-                TableCellBehaviorBase.setAnchor(tableView, getFocusedCell(), true);
-            });
-        }
-        
-        private final TableView<S> tableView;
-        
-        final ListChangeListener<S> itemsContentListener = c -> {
-            updateItemCount();
-
-            List<S> items1 = getTableModel();
-
-            while (c.next()) {
-                if (c.wasReplaced() || c.getAddedSize() == getItemCount()) {
-                    this.selectedItemChange = c;
-                    updateDefaultSelection();
-                    this.selectedItemChange = null;
-                    return;
-                }
-
-                final S selectedItem = getSelectedItem();
-                final int selectedIndex = getSelectedIndex();
-
-                if (items1 == null || items1.isEmpty()) {
-                    clearSelection();
-                } else if (getSelectedIndex() == -1 && getSelectedItem() != null) {
-                    int newIndex = items1.indexOf(getSelectedItem());
-                    if (newIndex != -1) {
-                        setSelectedIndex(newIndex);
-                    }
-                } else if (c.wasRemoved() &&
-                        c.getRemovedSize() == 1 &&
-                        ! c.wasAdded() &&
-                        selectedItem != null &&
-                        selectedItem.equals(c.getRemoved().get(0))) {
-                    // Bug fix for RT-28637
-                    if (getSelectedIndex() < getItemCount()) {
-                        final int previousRow = selectedIndex == 0 ? 0 : selectedIndex - 1;
-                        S newSelectedItem = getModelItem(previousRow);
-                        if (! selectedItem.equals(newSelectedItem)) {
-                            clearAndSelect(previousRow);
-                        }
-                    }
-                }
-            }
-
-            updateSelection(c);
-        };
-        
-        final WeakListChangeListener<S> weakItemsContentListener 
-                = new WeakListChangeListener<>(itemsContentListener);
-        
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Observable properties (and getters/setters)                         *
-         *                                                                     *
-         **********************************************************************/
-        
-        // the only 'proper' internal data structure, selectedItems and selectedIndices
-        // are both 'read-only and unbacked'.
-        private final SelectedCellsMap<TablePosition<S,?>> selectedCellsMap;
-
-        // used to represent the _row_ backing data for the selectedCells
-        private final ReadOnlyUnbackedObservableList<S> selectedItems;
-        @Override public ObservableList<S> getSelectedItems() {
-            return selectedItems;
-        }
-
-        // we create a ReadOnlyUnbackedObservableList of selectedCells here so
-        // that we can fire custom list change events.
-        private final ReadOnlyUnbackedObservableList<TablePosition<S,?>> selectedCellsSeq;
-        @Override public ObservableList<TablePosition> getSelectedCells() {
-            return (ObservableList<TablePosition>)(Object)selectedCellsSeq;
-        }
-
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Internal properties                                                 *
-         *                                                                     *
-         **********************************************************************/
-
-        private int previousModelSize = 0;
-        
-        // Listen to changes in the tableview items list, such that when it 
-        // changes we can update the selected indices list to refer to the 
-        // new indices.
-        private void updateSelection(ListChangeListener.Change<? extends S> c) {
-            c.reset();
-
-            int shift = 0;
-            int startRow = -1;
-            while (c.next()) {
-                if (c.wasReplaced()) {
-                    if (c.getList().isEmpty()) {
-                        // the entire items list was emptied - clear selection
-                        clearSelection();
-                    } else {
-                        int index = getSelectedIndex();
-                        
-                        if (previousModelSize == c.getRemovedSize()) {
-                            // all items were removed from the model
-                            clearSelection();
-                        } else if (index < getItemCount() && index >= 0) {
-                            // Fix for RT-18969: the list had setAll called on it
-                            // Use of makeAtomic is a fix for RT-20945
-                            startAtomic();
-                            clearSelection(index);
-                            stopAtomic();
-                            select(index);
-                        } else {
-                            // Fix for RT-22079
-                            clearSelection();
-                        }
-                    }
-                } else if (c.wasAdded() || c.wasRemoved()) {
-                    startRow = c.getFrom();
-                    shift += c.wasAdded() ? c.getAddedSize() : -c.getRemovedSize();
-                } else if (c.wasPermutated()) {
-                    // General approach:
-                    //   -- detected a sort has happened
-                    //   -- Create a permutation lookup map (1)
-                    //   -- dump all the selected indices into a list (2)
-                    //   -- create a list containing the new indices (3)
-                    //   -- for each previously-selected index (4)
-                    //     -- if index is in the permutation lookup map
-                    //       -- add the new index to the new indices list
-                    //   -- Perform batch selection (5)
-
-                    startAtomic();
-
-                    final int oldSelectedIndex = getSelectedIndex();
-
-                    // (1)
-                    int length = c.getTo() - c.getFrom();
-                    HashMap<Integer, Integer> pMap = new HashMap<> (length);
-                    for (int i = c.getFrom(); i < c.getTo(); i++) {
-                        pMap.put(i, c.getPermutation(i));
-                    }
-
-                    // (2)
-                    List<TablePosition<S,?>> selectedIndices = new ArrayList<>((ObservableList<TablePosition<S,?>>)(Object)getSelectedCells());
-
-                    // (3)
-                    List<TablePosition<S,?>> newIndices = new ArrayList<>(selectedIndices.size());
-
-                    // (4)
-                    boolean selectionIndicesChanged = false;
-                    for (int i = 0; i < selectedIndices.size(); i++) {
-                        final TablePosition<S,?> oldIndex = selectedIndices.get(i);
-                        final int oldRow = oldIndex.getRow();
-
-                        if (pMap.containsKey(oldRow)) {
-                            int newIndex = pMap.get(oldRow);
-
-                            selectionIndicesChanged = selectionIndicesChanged || newIndex != oldRow;
-
-                            newIndices.add(new TablePosition<>(oldIndex.getTableView(), newIndex, oldIndex.getTableColumn()));
-                        }
-                    }
-
-                    if (selectionIndicesChanged) {
-                        // (5)
-                        quietClearSelection();
-                        stopAtomic();
-
-                        selectedCellsMap.setAll(newIndices);
-
-                        if (oldSelectedIndex >= 0 && oldSelectedIndex < itemCount) {
-                            int newIndex = c.getPermutation(oldSelectedIndex);
-                            setSelectedIndex(newIndex);
-                            focus(newIndex);
-                        }
-                    } else {
-                        stopAtomic();
-                    }
-                }
-            }
-
-            if (shift != 0 && startRow >= 0) {
-                List<TablePosition<S,?>> newIndices = new ArrayList<>(selectedCellsMap.size());
-
-                for (int i = 0; i < selectedCellsMap.size(); i++) {
-                    final TablePosition<S,?> old = selectedCellsMap.get(i);
-                    final int oldRow = old.getRow();
-                    final int newRow = Math.max(0, oldRow < startRow ? oldRow : oldRow + shift);
-
-                    if (oldRow < startRow) {
-                        continue;
-                    }
-
-                    // Special case for RT-28637 (See unit test in TableViewTest).
-                    // Essentially the selectedItem was correct, but selectedItems
-                    // was empty.
-                    if (oldRow == 0 && shift == -1) {
-                        newIndices.add(new TablePosition<>(getTableView(), 0, old.getTableColumn()));
-                        continue;
-                    }
-
-                    newIndices.add(new TablePosition<>(getTableView(), newRow, old.getTableColumn()));
-                }
-
-                final int newIndicesSize = newIndices.size();
-
-                if ((c.wasRemoved() || c.wasAdded()) && newIndicesSize > 0) {
-                    TablePosition<S,?> anchor = TableCellBehavior.getAnchor(tableView, null);
-                    if (anchor != null) {
-                        boolean isAnchorSelected = isSelected(anchor.getRow(), anchor.getTableColumn());
-                        if (isAnchorSelected) {
-                            TablePosition<S,?> newAnchor = new TablePosition<>(tableView, anchor.getRow() + shift, anchor.getTableColumn());
-                            TableCellBehavior.setAnchor(tableView, newAnchor, false);
-                        }
-                    }
-
-                    quietClearSelection();
-
-                    // Fix for RT-22079
-                    blockFocusCall = true;
-                    for (int i = 0; i < newIndicesSize; i++) {
-                        TablePosition<S, ?> tp = newIndices.get(i);
-                        select(tp.getRow(), tp.getTableColumn());
-                    }
-                    blockFocusCall = false;
-                }
-            }
-            
-            previousModelSize = getItemCount();
-        }
-
-        /***********************************************************************
-         *                                                                     *
-         * Public selection API                                                *
-         *                                                                     *
-         **********************************************************************/
-
-        @Override public void clearAndSelect(int row) {
-            clearAndSelect(row, null);
-        }
-
-        @Override public void clearAndSelect(int row, TableColumn<S,?> column) {
-            if (row < 0 || row >= getItemCount()) return;
-
-            final TablePosition<S,?> newTablePosition = new TablePosition<>(getTableView(), row, column);
-            final boolean isCellSelectionEnabled = isCellSelectionEnabled();
-
-            // replace the anchor
-            TableCellBehavior.setAnchor(tableView, newTablePosition, false);
-
-            // if I'm in cell selection mode but the column is null, I don't want
-            // to select the whole row instead...
-            if (isCellSelectionEnabled && column == null) {
-                return;
-            }
-
-            final boolean wasSelected = isSelected(row, column);
-
-            // firstly we make a copy of the selection, so that we can send out
-            // the correct details in the selection change event.
-            List<TablePosition<S,?>> previousSelection = new ArrayList<>(selectedCellsMap.getSelectedCells());
-
-            if (wasSelected && previousSelection.size() == 1) {
-                // before we return, we double-check that the selected item
-                // is equal to the item in the given index
-                TablePosition<S,?> selectedCell = getSelectedCells().get(0);
-                if (getSelectedItem() == getModelItem(row)) {
-                    if (selectedCell.getRow() == row && selectedCell.getTableColumn() == column) {
-                        return;
-                    }
-                }
-            }
-
-            // RT-32411 We used to call quietClearSelection() here, but this
-            // resulted in the selectedItems and selectedIndices lists never
-            // reporting that they were empty.
-            // makeAtomic toggle added to resolve RT-32618
-            startAtomic();
-
-            // then clear the current selection
-            clearSelection();
-
-            // and select the new cell
-            select(row, column);
-
-            stopAtomic();
-
-
-            // We remove the new selection from the list seeing as it is not removed.
-            if (isCellSelectionEnabled) {
-                previousSelection.remove(newTablePosition);
-            } else {
-                for (TablePosition<S,?> tp : previousSelection) {
-                    if (tp.getRow() == row) {
-                        previousSelection.remove(tp);
-                        break;
-                    }
-                }
-            }
-
-            // fire off a single add/remove/replace notification (rather than
-            // individual remove and add notifications) - see RT-33324
-            ListChangeListener.Change<TablePosition<S, ?>> change;
-
-            /*
-             * getFrom() documentation:
-             *   If wasAdded is true, the interval contains all the values that were added.
-             *   If wasPermutated is true, the interval marks the values that were permutated.
-             *   If wasRemoved is true and wasAdded is false, getFrom() and getTo() should
-             *   return the same number - the place where the removed elements were positioned in the list.
-             */
-            if (wasSelected) {
-                change = ControlUtils.buildClearAndSelectChange(selectedCellsSeq, previousSelection, row);
-            } else {
-                final int changeIndex = selectedCellsSeq.indexOf(newTablePosition);
-                change = new NonIterableChange.GenericAddRemoveChange<>(
-                        changeIndex, changeIndex + 1, previousSelection, selectedCellsSeq);
-            }
-            handleSelectedCellsListChangeEvent(change);
-        }
-
-        @Override public void select(int row) {
-            select(row, null);
-        }
-
-        @Override
-        public void select(int row, TableColumn<S,?> column) {
-            if (row < 0 || row >= getItemCount()) return;
-
-            // if I'm in cell selection mode but the column is null, select each
-            // of the contained cells individually
-            if (isCellSelectionEnabled() && column == null) {
-                List<TableColumn<S,?>> columns = getTableView().getVisibleLeafColumns();
-                for (int i = 0; i < columns.size(); i++) {
-                    select(row, columns.get(i));
-                }
-                return;
-            }
-
-            TablePosition<S,?> pos = new TablePosition<>(getTableView(), row, column);
-            
-            if (getSelectionMode() == SelectionMode.SINGLE) {
-                startAtomic();
-                quietClearSelection();
-                stopAtomic();
-            }
-
-            if (TableCellBehavior.hasDefaultAnchor(tableView)) {
-                TableCellBehavior.removeAnchor(tableView);
-            }
-
-            selectedCellsMap.add(pos);
-
-            updateSelectedIndex(row);
-            focus(row, column);
-        }
-
-        @Override public void select(S obj) {
-            if (obj == null && getSelectionMode() == SelectionMode.SINGLE) {
-                clearSelection();
-                return;
-            }
-            
-            // We have no option but to iterate through the model and select the
-            // first occurrence of the given object. Once we find the first one, we
-            // don't proceed to select any others.
-            S rowObj = null;
-            for (int i = 0; i < getItemCount(); i++) {
-                rowObj = getModelItem(i);
-                if (rowObj == null) continue;
-
-                if (rowObj.equals(obj)) {
-                    if (isSelected(i)) {
-                        return;
-                    }
-
-                    if (getSelectionMode() == SelectionMode.SINGLE) {
-                        quietClearSelection();
-                    }
-
-                    select(i);
-                    return;
-                }
-            }
-
-            // if we are here, we did not find the item in the entire data model.
-            // Even still, we allow for this item to be set to the give object.
-            // We expect that in concrete subclasses of this class we observe the
-            // data model such that we check to see if the given item exists in it,
-            // whilst SelectedIndex == -1 && SelectedItem != null.
-            setSelectedIndex(-1);
-            setSelectedItem(obj);
-        }
-
-        @Override public void selectIndices(int row, int... rows) {
-            if (rows == null) {
-                select(row);
-                return;
-            }
-
-            /*
-             * Performance optimisation - if multiple selection is disabled, only
-             * process the end-most row index.
-             */
-            int rowCount = getItemCount();
-
-            if (getSelectionMode() == SelectionMode.SINGLE) {
-                quietClearSelection();
-
-                for (int i = rows.length - 1; i >= 0; i--) {
-                    int index = rows[i];
-                    if (index >= 0 && index < rowCount) {
-                        select(index);
-                        break;
-                    }
-                }
-
-                if (selectedCellsMap.isEmpty()) {
-                    if (row > 0 && row < rowCount) {
-                        select(row);
-                    }
-                }
-            } else {
-                int lastIndex = -1;
-                Set<TablePosition<S,?>> positions = new LinkedHashSet<>();
-
-                // --- firstly, we special-case the non-varargs 'row' argument
-                if (row >= 0 && row < rowCount) {
-                    // if I'm in cell selection mode, we want to select each
-                    // of the contained cells individually
-                    if (isCellSelectionEnabled()) {
-                        List<TableColumn<S,?>> columns = getTableView().getVisibleLeafColumns();
-                        for (int column = 0; column < columns.size(); column++) {
-                            if (! selectedCellsMap.isSelected(row, column)) {
-                                positions.add(new TablePosition<>(getTableView(), row, columns.get(column)));
-                                lastIndex = row;
-                            }
-                        }
-                    } else {
-                        boolean match = selectedCellsMap.isSelected(row, -1);
-                        if (!match) {
-                            positions.add(new TablePosition<>(getTableView(), row, null));
-                        }
-                    }
-
-                    lastIndex = row;
-                }
-
-                // --- now we iterate through all varargs values
-                for (int i = 0; i < rows.length; i++) {
-                    int index = rows[i];
-                    if (index < 0 || index >= rowCount) continue;
-                    lastIndex = index;
-
-                    if (isCellSelectionEnabled()) {
-                        List<TableColumn<S,?>> columns = getTableView().getVisibleLeafColumns();
-                        for (int column = 0; column < columns.size(); column++) {
-                            if (! selectedCellsMap.isSelected(index, column)) {
-                                positions.add(new TablePosition<>(getTableView(), index, columns.get(column)));
-                                lastIndex = index;
-                            }
-                        }
-                    } else {
-                        if (! selectedCellsMap.isSelected(index, -1)) {
-                            // if we are here then we have successfully gotten through the for-loop above
-                            positions.add(new TablePosition<>(getTableView(), index, null));
-                        }
-                    }
-                }
-
-                selectedCellsMap.addAll(positions);
-                
-                if (lastIndex != -1) {
-                    select(lastIndex);
-                }
-            }
-        }
-
-        @Override public void selectAll() {
-            if (getSelectionMode() == SelectionMode.SINGLE) return;
-
-            if (isCellSelectionEnabled()) {
-                List<TablePosition<S,?>> indices = new ArrayList<>();
-                TableColumn<S,?> column;
-                TablePosition<S,?> tp = null;
-                for (int col = 0; col < getTableView().getVisibleLeafColumns().size(); col++) {
-                    column = getTableView().getVisibleLeafColumns().get(col);
-                    for (int row = 0; row < getItemCount(); row++) {
-                        tp = new TablePosition<>(getTableView(), row, column);
-                        indices.add(tp);
-                    }
-                }
-                selectedCellsMap.setAll(indices);
-                
-                if (tp != null) {
-                    select(tp.getRow(), tp.getTableColumn());
-                    focus(tp.getRow(), tp.getTableColumn());
-                }
-            } else {
-                List<TablePosition<S,?>> indices = new ArrayList<>();
-                for (int i = 0; i < getItemCount(); i++) {
-                    indices.add(new TablePosition<>(getTableView(), i, null));
-                }
-                selectedCellsMap.setAll(indices);
-                
-                int focusedIndex = getFocusedIndex();
-                if (focusedIndex == -1) {
-                    final int itemCount = getItemCount();
-                    if (itemCount > 0) {
-                        select(itemCount - 1);
-                        focus(indices.get(indices.size() - 1));
-                    }
-                } else {
-                    select(focusedIndex);
-                    focus(focusedIndex);
-                }
-            }
-        }
-
-        @Override public void selectRange(int minRow, TableColumnBase<S,?> minColumn,
-                                          int maxRow, TableColumnBase<S,?> maxColumn) {
-            if (getSelectionMode() == SelectionMode.SINGLE) {
-                quietClearSelection();
-                select(maxRow, maxColumn);
-                return;
-            }
-
-            startAtomic();
-
-            final int itemCount = getItemCount();
-            final boolean isCellSelectionEnabled = isCellSelectionEnabled();
-
-            final int minColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)minColumn);
-            final int maxColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)maxColumn);
-            final int _minColumnIndex = Math.min(minColumnIndex, maxColumnIndex);
-            final int _maxColumnIndex = Math.max(minColumnIndex, maxColumnIndex);
-
-            final int _minRow = Math.min(minRow, maxRow);
-            final int _maxRow = Math.max(minRow, maxRow);
-
-            List<TablePosition<S,?>> cellsToSelect = new ArrayList<>();
-
-            for (int _row = _minRow; _row <= _maxRow; _row++) {
-                // begin copy/paste of select(int, column) method (with some
-                // slight modifications)
-                if (_row < 0 || _row >= itemCount) continue;
-
-                if (! isCellSelectionEnabled) {
-                    cellsToSelect.add(new TablePosition<>(tableView, _row, (TableColumn<S,?>)minColumn));
-                } else {
-                    for (int _col = _minColumnIndex; _col <= _maxColumnIndex; _col++) {
-                        final TableColumn<S, ?> column = tableView.getVisibleLeafColumn(_col);
-
-                        // if I'm in cell selection mode but the column is null, I don't want
-                        // to select the whole row instead...
-                        if (column == null && isCellSelectionEnabled) continue;
-
-                        cellsToSelect.add(new TablePosition<>(tableView, _row, column));
-                        // end copy/paste
-                    }
-                }
-            }
-
-            // to prevent duplication we remove all currently selected cells from
-            // our list of cells to select.
-            cellsToSelect.removeAll(getSelectedCells());
-
-            selectedCellsMap.addAll(cellsToSelect);
-            stopAtomic();
-
-            // fire off events.
-            // Note that focus and selection always goes to maxRow, not _maxRow.
-            updateSelectedIndex(maxRow);
-            focus(maxRow, (TableColumn<S,?>)maxColumn);
-
-            final TableColumn<S,?> startColumn = (TableColumn<S,?>)minColumn;
-            final TableColumn<S,?> endColumn = isCellSelectionEnabled ? (TableColumn<S,?>)maxColumn : startColumn;
-            final int startChangeIndex = selectedCellsMap.indexOf(new TablePosition<>(tableView, minRow, startColumn));
-            final int endChangeIndex = selectedCellsMap.indexOf(new TablePosition<>(tableView, maxRow, endColumn));
-
-            if (startChangeIndex > -1 && endChangeIndex > -1) {
-                final int startIndex = Math.min(startChangeIndex, endChangeIndex);
-                final int endIndex = Math.max(startChangeIndex, endChangeIndex);
-                ListChangeListener.Change c = new NonIterableChange.SimpleAddChange<>(startIndex, endIndex + 1, selectedCellsSeq);
-                handleSelectedCellsListChangeEvent(c);
-            }
-        }
-
-        @Override public void clearSelection(int index) {
-            clearSelection(index, null);
-        }
-
-        @Override
-        public void clearSelection(int row, TableColumn<S,?> column) {
-            clearSelection(new TablePosition<>(getTableView(), row, column));
-        }
-
-        private void clearSelection(TablePosition<S,?> tp) {
-            final boolean csMode = isCellSelectionEnabled();
-            final int row = tp.getRow();
-
-            for (TablePosition pos : getSelectedCells()) {
-                if (! csMode) {
-                    if (pos.getRow() == row) {
-                        selectedCellsMap.remove(pos);
-                        break;
-                    }
-                } else {
-                    if (pos.equals(tp)) {
-                        selectedCellsMap.remove(tp);
-                        break;
-                    }
-                }
-            }
-
-            if (isEmpty() && ! isAtomic()) {
-                updateSelectedIndex(-1);
-                selectedCellsMap.clear();
-            }
-        }
-
-        @Override public void clearSelection() {
-            final List<TablePosition<S,?>> removed = new ArrayList<>((Collection)getSelectedCells());
-
-            quietClearSelection();
-
-            if (! isAtomic()) {
-                updateSelectedIndex(-1);
-                focus(-1);
-
-                if (!removed.isEmpty()) {
-                    ListChangeListener.Change<TablePosition<S, ?>> c = new NonIterableChange<TablePosition<S, ?>>(0, 0, selectedCellsSeq) {
-                        @Override
-                        public List<TablePosition<S, ?>> getRemoved() {
-                            return removed;
-                        }
-                    };
-                    handleSelectedCellsListChangeEvent(c);
-                }
-            }
-        }
-
-        private void quietClearSelection() {
-            startAtomic();
-            selectedCellsMap.clear();
-            stopAtomic();
-        }
-
-        @Override public boolean isSelected(int index) {
-            return isSelected(index, null);
-        }
-
-        @Override
-        public boolean isSelected(int row, TableColumn<S,?> column) {
-            // When in cell selection mode, we currently do NOT support selecting
-            // entire rows, so a isSelected(row, null) should always return false.
-            final boolean isCellSelectionEnabled = isCellSelectionEnabled();
-            if (isCellSelectionEnabled && column == null) return false;
-
-            int columnIndex = ! isCellSelectionEnabled || column == null ? -1 : tableView.getVisibleLeafIndex(column);
-            return selectedCellsMap.isSelected(row, columnIndex);
-        }
-
-        @Override public boolean isEmpty() {
-            return selectedCellsMap.isEmpty();
-        }
-
-        @Override public void selectPrevious() {
-            if (isCellSelectionEnabled()) {
-                // in cell selection mode, we have to wrap around, going from
-                // right-to-left, and then wrapping to the end of the previous line
-                TablePosition<S,?> pos = getFocusedCell();
-                if (pos.getColumn() - 1 >= 0) {
-                    // go to previous row
-                    select(pos.getRow(), getTableColumn(pos.getTableColumn(), -1));
-                } else if (pos.getRow() < getItemCount() - 1) {
-                    // wrap to end of previous row
-                    select(pos.getRow() - 1, getTableColumn(getTableView().getVisibleLeafColumns().size() - 1));
-                }
-            } else {
-                int focusIndex = getFocusedIndex();
-                if (focusIndex == -1) {
-                    select(getItemCount() - 1);
-                } else if (focusIndex > 0) {
-                    select(focusIndex - 1);
-                }
-            }
-        }
-
-        @Override public void selectNext() {
-            if (isCellSelectionEnabled()) {
-                // in cell selection mode, we have to wrap around, going from
-                // left-to-right, and then wrapping to the start of the next line
-                TablePosition<S,?> pos = getFocusedCell();
-                if (pos.getColumn() + 1 < getTableView().getVisibleLeafColumns().size()) {
-                    // go to next column
-                    select(pos.getRow(), getTableColumn(pos.getTableColumn(), 1));
-                } else if (pos.getRow() < getItemCount() - 1) {
-                    // wrap to start of next row
-                    select(pos.getRow() + 1, getTableColumn(0));
-                }
-            } else {
-                int focusIndex = getFocusedIndex();
-                if (focusIndex == -1) {
-                    select(0);
-                } else if (focusIndex < getItemCount() -1) {
-                    select(focusIndex + 1);
-                }
-            }
-        }
-
-        @Override public void selectAboveCell() {
-            TablePosition<S,?> pos = getFocusedCell();
-            if (pos.getRow() == -1) {
-                select(getItemCount() - 1);
-            } else if (pos.getRow() > 0) {
-                select(pos.getRow() - 1, pos.getTableColumn());
-            }
-        }
-
-        @Override public void selectBelowCell() {
-            TablePosition<S,?> pos = getFocusedCell();
-
-            if (pos.getRow() == -1) {
-                select(0);
-            } else if (pos.getRow() < getItemCount() -1) {
-                select(pos.getRow() + 1, pos.getTableColumn());
-            }
-        }
-
-        @Override public void selectFirst() {
-            TablePosition<S,?> focusedCell = getFocusedCell();
-
-            if (getSelectionMode() == SelectionMode.SINGLE) {
-                quietClearSelection();
-            }
-
-            if (getItemCount() > 0) {
-                if (isCellSelectionEnabled()) {
-                    select(0, focusedCell.getTableColumn());
-                } else {
-                    select(0);
-                }
-            }
-        }
-
-        @Override public void selectLast() {
-            TablePosition<S,?> focusedCell = getFocusedCell();
-
-            if (getSelectionMode() == SelectionMode.SINGLE) {
-                quietClearSelection();
-            }
-
-            int numItems = getItemCount();
-            if (numItems > 0 && getSelectedIndex() < numItems - 1) {
-                if (isCellSelectionEnabled()) {
-                    select(numItems - 1, focusedCell.getTableColumn());
-                } else {
-                    select(numItems - 1);
-                }
-            }
-        }
-
-        @Override
-        public void selectLeftCell() {
-            if (! isCellSelectionEnabled()) return;
-
-            TablePosition<S,?> pos = getFocusedCell();
-            if (pos.getColumn() - 1 >= 0) {
-                select(pos.getRow(), getTableColumn(pos.getTableColumn(), -1));
-            }
-        }
-
-        @Override
-        public void selectRightCell() {
-            if (! isCellSelectionEnabled()) return;
-
-            TablePosition<S,?> pos = getFocusedCell();
-            if (pos.getColumn() + 1 < getTableView().getVisibleLeafColumns().size()) {
-                select(pos.getRow(), getTableColumn(pos.getTableColumn(), 1));
-            }
-        }
-
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Support code                                                        *
-         *                                                                     *
-         **********************************************************************/
-
-        private void updateItemsObserver(ObservableList<S> oldList, ObservableList<S> newList) {
-            // the items list has changed, we need to observe
-            // the new list, and remove any observer we had from the old list
-            if (oldList != null) {
-                oldList.removeListener(weakItemsContentListener);
-            }
-            if (newList != null) {
-                newList.addListener(weakItemsContentListener);
-            }
-
-            updateItemCount();
-            updateDefaultSelection();
-        }
-
-        private void updateDefaultSelection() {
-            // when the items list totally changes, we should clear out
-            // the selection
-            int newSelectionIndex = -1;
-            int newFocusIndex = -1;
-            if (tableView.getItems() != null) {
-                S selectedItem = getSelectedItem();
-                if (selectedItem != null) {
-                    newSelectionIndex = tableView.getItems().indexOf(selectedItem);
-                }
-
-                // we put focus onto the first item, if there is at least
-                // one item in the list
-                if (newFocusIndex == -1) {
-                    newFocusIndex = tableView.getItems().size() > 0 ? 0 : -1;
-                }
-            }
-
-            clearSelection();
-            select(newSelectionIndex, isCellSelectionEnabled() ? getTableColumn(0) : null);
-            focus(newFocusIndex, isCellSelectionEnabled() ? getTableColumn(0) : null);
-        }
-        
-        private TableColumn<S,?> getTableColumn(int pos) {
-            return getTableView().getVisibleLeafColumn(pos);
-        }
-        
-        // Gets a table column to the left or right of the current one, given an offset
-        private TableColumn<S,?> getTableColumn(TableColumn<S,?> column, int offset) {
-            int columnIndex = getTableView().getVisibleLeafIndex(column);
-            int newColumnIndex = columnIndex + offset;
-            return getTableView().getVisibleLeafColumn(newColumnIndex);
-        }
-
-        private void updateSelectedIndex(int row) {
-            setSelectedIndex(row);
-            setSelectedItem(getModelItem(row));
-        }
-        
-        /** {@inheritDoc} */
-        @Override protected int getItemCount() {
-            return itemCount;
-        }
-
-        private void updateItemCount() {
-            if (tableView == null) {
-                itemCount = -1;
-            } else {
-                List<S> items = getTableModel();
-                itemCount = items == null ? -1 : items.size();
-            }
-        }
-
-        private void handleSelectedCellsListChangeEvent(ListChangeListener.Change<? extends TablePosition<S,?>> c) {
-            // RT-29313: because selectedIndices and selectedItems represent
-            // row-based selection, we need to update the
-            // selectedIndicesBitSet when the selectedCells changes to
-            // ensure that selectedIndices and selectedItems return only
-            // the correct values (and only once). The issue identified
-            // by RT-29313 is that the size and contents of selectedIndices
-            // and selectedItems can not simply defer to the
-            // selectedCells as selectedCells may be representing
-            // multiple cells from one row (e.g. selectedCells of
-            // [(0,1), (1,1), (1,2), (1,3)] should result in
-            // selectedIndices of [0,1], not [0,1,1,1]).
-            // An inefficient solution would rebuild the selectedIndicesBitSet
-            // every time the change happens, but we can do better than
-            // that. Inefficient solution:
-            //
-            // selectedIndicesBitSet.clear();
-            // for (int i = 0; i < selectedCells.size(); i++) {
-            //     final TablePosition<S,?> tp = selectedCells.get(i);
-            //     final int row = tp.getRow();
-            //     selectedIndicesBitSet.set(row);
-            // }
-            //
-            // A more efficient solution:
-            final List<Integer> newlySelectedRows = new ArrayList<>();
-            final List<Integer> newlyUnselectedRows = new ArrayList<>();
-
-            while (c.next()) {
-                if (c.wasRemoved()) {
-                    List<? extends TablePosition<S,?>> removed = c.getRemoved();
-                    for (int i = 0; i < removed.size(); i++) {
-                        final TablePosition<S,?> tp = removed.get(i);
-                        final int row = tp.getRow();
-
-                        if (selectedIndices.get(row)) {
-                            selectedIndices.clear(row);
-                            newlyUnselectedRows.add(row);
-                        }
-                    }
-                }
-                if (c.wasAdded()) {
-                    List<? extends TablePosition<S,?>> added = c.getAddedSubList();
-                    for (int i = 0; i < added.size(); i++) {
-                        final TablePosition<S,?> tp = added.get(i);
-                        final int row = tp.getRow();
-
-                        if (! selectedIndices.get(row)) {
-                            selectedIndices.set(row);
-                            newlySelectedRows.add(row);
-                        }
-                    }
-                }
-            }
-            c.reset();
-
-            if (isAtomic()) {
-                return;
-            }
-
-            // when the selectedCells observableArrayList changes, we manually call
-            // the observers of the selectedItems, selectedIndices and
-            // selectedCells lists.
-
-            // here we are considering whether to notify the observers of the
-            // selectedItems list. However, we can't just blindly do that, as
-            // noted below. This is a part of the fix for RT-37429.
-            c.next();
-            boolean fireChangeEvent;
-            outer: if (c.wasReplaced()) {
-                // if a replace happened, we need to check to see if the
-                // change actually impacts on the selected items - it may
-                // be that the index changed to the new location of the same
-                // item (i.e. if a sort occurred). Only if the item has changed
-                // should we fire an event to the observers of the selectedItems
-                // list
-                final int removedSize = c.getRemovedSize();
-                final int addedSize = c.getAddedSize();
-                if (removedSize != addedSize) {
-                    fireChangeEvent = true;
-                } else {
-                    for (int i = 0; i < removedSize; i++) {
-                        TablePosition<S, ?> removed = c.getRemoved().get(i);
-                        S removedItem = removed.getItem();
-
-                        boolean matchFound = false;
-                        for (int j = 0; j < addedSize; j++) {
-                            TablePosition<S, ?> added = c.getAddedSubList().get(j);
-                            S addedItem = added.getItem();
-
-                            if (removedItem.equals(addedItem)) {
-                                matchFound = true;
-                                break;
-                            }
-                        }
-
-                        if (!matchFound) {
-                            fireChangeEvent = true;
-                            break outer;
-                        }
-                    }
-                    fireChangeEvent = false;
-                }
-            } else {
-                fireChangeEvent = true;
-            }
-
-            if (fireChangeEvent) {
-                if (selectedItemChange != null) {
-                    selectedItems.callObservers(selectedItemChange);
-                } else {
-                    // create an on-demand list of the removed objects contained in the
-                    // given rows.
-                    selectedItems.callObservers(new MappingChange<>(c, cellToItemsMap, selectedItems));
-                }
-            }
-            c.reset();
-
-            // Fix for RT-31577 - the selectedItems list was going to
-            // empty, but the selectedItem property was staying non-null.
-            // There is a unit test for this, so if a more elegant solution
-            // can be found in the future and this code removed, the unit
-            // test will fail if it isn't fixed elsewhere.
-            // makeAtomic toggle added to resolve RT-32618
-            if (selectedItems.isEmpty() && getSelectedItem() != null) {
-                setSelectedItem(null);
-            }
-
-            final ReadOnlyUnbackedObservableList<Integer> selectedIndicesSeq =
-                    (ReadOnlyUnbackedObservableList<Integer>)getSelectedIndices();
-
-            if (! newlySelectedRows.isEmpty() && newlyUnselectedRows.isEmpty()) {
-                // need to come up with ranges based on the actualSelectedRows, and
-                // then fire the appropriate number of changes. We also need to
-                // translate from a desired row to select to where that row is
-                // represented in the selectedIndices list. For example,
-                // we may have requested to select row 5, and the selectedIndices
-                // list may therefore have the following: [1,4,5], meaning row 5
-                // is in position 2 of the selectedIndices list
-                ListChangeListener.Change<Integer> change = createRangeChange(selectedIndicesSeq, newlySelectedRows, false);
-                selectedIndicesSeq.callObservers(change);
-            } else {
-                selectedIndicesSeq.callObservers(new MappingChange<>(c, cellToIndicesMap, selectedIndicesSeq));
-                c.reset();
-            }
-
-            selectedCellsSeq.callObservers(new MappingChange<>(c, MappingChange.NOOP_MAP, selectedCellsSeq));
-            c.reset();
-        }
-    }
-    
-    
-    
-    
-    /**
-     * A {@link FocusModel} with additional functionality to support the requirements
-     * of a TableView control.
-     * 
-     * @see TableView
-     * @since JavaFX 2.0
-     */
-    public static class TableViewFocusModel<S> extends TableFocusModel<S, TableColumn<S, ?>> {
-
-        private final TableView<S> tableView;
-
-        private final TablePosition<S,?> EMPTY_CELL;
-
-        /**
-         * Creates a default TableViewFocusModel instance that will be used to
-         * manage focus of the provided TableView control.
-         * 
-         * @param tableView The tableView upon which this focus model operates.
-         * @throws NullPointerException The TableView argument can not be null.
-         */
-        public TableViewFocusModel(final TableView<S> tableView) {
-            if (tableView == null) {
-                throw new NullPointerException("TableView can not be null");
-            }
-
-            this.tableView = tableView;
-            this.EMPTY_CELL = new TablePosition<>(tableView, -1, null);
-
-            if (tableView.getItems() != null) {
-                this.tableView.getItems().addListener(weakItemsContentListener);
-            }
-
-            this.tableView.itemsProperty().addListener(new InvalidationListener() {
-                private WeakReference<ObservableList<S>> weakItemsRef = new WeakReference<>(tableView.getItems());
-
-                @Override public void invalidated(Observable observable) {
-                    ObservableList<S> oldItems = weakItemsRef.get();
-                    weakItemsRef = new WeakReference<>(tableView.getItems());
-                    updateItemsObserver(oldItems, tableView.getItems());
-                }
-            });
-
-            updateDefaultFocus();
-        }
-        
-        // Listen to changes in the tableview items list, such that when it
-        // changes we can update the focused index to refer to the new indices.
-        private final ListChangeListener<S> itemsContentListener = c -> {
-            c.next();
-            TablePosition<S,?> focusedCell = getFocusedCell();
-            final int focusedIndex = focusedCell.getRow();
-            if (focusedIndex == -1 || c.getFrom() > focusedIndex) {
-                return;
-            }
-            c.reset();
-            boolean added = false;
-            boolean removed = false;
-            int addedSize = 0;
-            int removedSize = 0;
-            while (c.next()) {
-                added |= c.wasAdded();
-                removed |= c.wasRemoved();
-                addedSize += c.getAddedSize();
-                removedSize += c.getRemovedSize();
-            }
-
-            if (added && ! removed) {
-                if (addedSize < c.getList().size()) {
-                    final int newFocusIndex = Math.min(getItemCount() - 1, getFocusedIndex() + addedSize);
-                    focus(newFocusIndex, focusedCell.getTableColumn());
-                }
-            } else if (!added && removed) {
-                final int newFocusIndex = Math.max(0, getFocusedIndex() - removedSize);
-                if (newFocusIndex < 0) {
-                    focus(0, focusedCell.getTableColumn());
-                } else {
-                    focus(newFocusIndex, focusedCell.getTableColumn());
-                }
-            }
-        };
-        
-        private WeakListChangeListener<S> weakItemsContentListener 
-                = new WeakListChangeListener<>(itemsContentListener);
-        
-        private void updateItemsObserver(ObservableList<S> oldList, ObservableList<S> newList) {
-            // the tableview items list has changed, we need to observe
-            // the new list, and remove any observer we had from the old list
-            if (oldList != null) oldList.removeListener(weakItemsContentListener);
-            if (newList != null) newList.addListener(weakItemsContentListener);
-
-            updateDefaultFocus();
-        }
-
-        /** {@inheritDoc} */
-        @Override protected int getItemCount() {
-            if (tableView.getItems() == null) return -1;
-            return tableView.getItems().size();
-        }
-
-        /** {@inheritDoc} */
-        @Override protected S getModelItem(int index) {
-            if (tableView.getItems() == null) return null;
-
-            if (index < 0 || index >= getItemCount()) return null;
-
-            return tableView.getItems().get(index);
-        }
-
-        /**
-         * The position of the current item in the TableView which has the focus.
-         */
-        private ReadOnlyObjectWrapper<TablePosition> focusedCell;
-        public final ReadOnlyObjectProperty<TablePosition> focusedCellProperty() {
-            return focusedCellPropertyImpl().getReadOnlyProperty();
-        }
-        private void setFocusedCell(TablePosition value) { focusedCellPropertyImpl().set(value);  }
-        public final TablePosition getFocusedCell() { return focusedCell == null ? EMPTY_CELL : focusedCell.get(); }
-
-        private ReadOnlyObjectWrapper<TablePosition> focusedCellPropertyImpl() {
-            if (focusedCell == null) {
-                focusedCell = new ReadOnlyObjectWrapper<TablePosition>(EMPTY_CELL) {
-                    private TablePosition old;
-                    @Override protected void invalidated() {
-                        if (get() == null) return;
-
-                        if (old == null || !old.equals(get())) {
-                            setFocusedIndex(get().getRow());
-                            setFocusedItem(getModelItem(getValue().getRow()));
-
-                            old = get();
-                        }
-                    }
-
-                    @Override
-                    public Object getBean() {
-                        return TableViewFocusModel.this;
-                    }
-
-                    @Override
-                    public String getName() {
-                        return "focusedCell";
-                    }
-                };
-            }
-            return focusedCell;
-        }
-
-
-        /**
-         * Causes the item at the given index to receive the focus.
-         *
-         * @param row The row index of the item to give focus to.
-         * @param column The column of the item to give focus to. Can be null.
-         */
-        @Override public void focus(int row, TableColumn<S,?> column) {
-            if (row < 0 || row >= getItemCount()) {
-                setFocusedCell(EMPTY_CELL);
-            } else {
-                TablePosition<S,?> oldFocusCell = getFocusedCell();
-                TablePosition<S,?> newFocusCell = new TablePosition<>(tableView, row, column);
-                setFocusedCell(newFocusCell);
-
-                if (newFocusCell.equals(oldFocusCell)) {
-                    // manually update the focus properties to ensure consistency
-                    setFocusedIndex(row);
-                    setFocusedItem(getModelItem(row));
-                }
-            }
-        }
-
-        /**
-         * Convenience method for setting focus on a particular row or cell
-         * using a {@link TablePosition}.
-         * 
-         * @param pos The table position where focus should be set.
-         */
-        public void focus(TablePosition pos) {
-            if (pos == null) return;
-            focus(pos.getRow(), pos.getTableColumn());
-        }
-
-
-        /***********************************************************************
-         *                                                                     *
-         * Public API                                                          *
-         *                                                                     *
-         **********************************************************************/
-
-        /**
-         * Tests whether the row / cell at the given location currently has the
-         * focus within the TableView.
-         */
-        @Override public boolean isFocused(int row, TableColumn<S,?> column) {
-            if (row < 0 || row >= getItemCount()) return false;
-
-            TablePosition cell = getFocusedCell();
-            boolean columnMatch = column == null || column.equals(cell.getTableColumn());
-
-            return cell.getRow() == row && columnMatch;
-        }
-
-        /**
-         * Causes the item at the given index to receive the focus. This does not
-         * cause the current selection to change. Updates the focusedItem and
-         * focusedIndex properties such that <code>focusedIndex = -1</code> unless
-         * <pre><code>0 <= index < model size</code></pre>.
-         *
-         * @param index The index of the item to get focus.
-         */
-        @Override public void focus(int index) {
-            if (index < 0 || index >= getItemCount()) {
-                setFocusedCell(EMPTY_CELL);
-            } else {
-                setFocusedCell(new TablePosition<>(tableView, index, null));
-            }
-        }
-
-        /**
-         * Attempts to move focus to the cell above the currently focused cell.
-         */
-        @Override public void focusAboveCell() {
-            TablePosition cell = getFocusedCell();
-
-            if (getFocusedIndex() == -1) {
-                focus(getItemCount() - 1, cell.getTableColumn());
-            } else if (getFocusedIndex() > 0) {
-                focus(getFocusedIndex() - 1, cell.getTableColumn());
-            }
-        }
-
-        /**
-         * Attempts to move focus to the cell below the currently focused cell.
-         */
-        @Override public void focusBelowCell() {
-            TablePosition cell = getFocusedCell();
-            if (getFocusedIndex() == -1) {
-                focus(0, cell.getTableColumn());
-            } else if (getFocusedIndex() != getItemCount() -1) {
-                focus(getFocusedIndex() + 1, cell.getTableColumn());
-            }
-        }
-
-        /**
-         * Attempts to move focus to the cell to the left of the currently focused cell.
-         */
-        @Override public void focusLeftCell() {
-            TablePosition cell = getFocusedCell();
-            if (cell.getColumn() <= 0) return;
-            focus(cell.getRow(), getTableColumn(cell.getTableColumn(), -1));
-        }
-
-        /**
-         * Attempts to move focus to the cell to the right of the the currently focused cell.
-         */
-        @Override public void focusRightCell() {
-            TablePosition cell = getFocusedCell();
-            if (cell.getColumn() == getColumnCount() - 1) return;
-            focus(cell.getRow(), getTableColumn(cell.getTableColumn(), 1));
-        }
-
-        /** {@inheritDoc} */
-        @Override public void focusPrevious() {
-            if (getFocusedIndex() == -1) {
-                focus(0);
-            } else if (getFocusedIndex() > 0) {
-                focusAboveCell();
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override public void focusNext() {
-            if (getFocusedIndex() == -1) {
-                focus(0);
-            } else if (getFocusedIndex() != getItemCount() -1) {
-                focusBelowCell();
-            }
-        }
-
-        /***********************************************************************
-         *                                                                     *
-         * Private Implementation                                              *
-         *                                                                     *
-         **********************************************************************/
-
-        private void updateDefaultFocus() {
-            // when the items list totally changes, we should clear out
-            // the focus
-            int newValueIndex = -1;
-            if (tableView.getItems() != null) {
-                S focusedItem = getFocusedItem();
-                if (focusedItem != null) {
-                    newValueIndex = tableView.getItems().indexOf(focusedItem);
-                }
-
-                // we put focus onto the first item, if there is at least
-                // one item in the list
-                if (newValueIndex == -1) {
-                    newValueIndex = tableView.getItems().size() > 0 ? 0 : -1;
-                }
-            }
-
-            TablePosition<S,?> focusedCell = getFocusedCell();
-            TableColumn<S,?> focusColumn = focusedCell != null && !EMPTY_CELL.equals(focusedCell) ?
-               focusedCell.getTableColumn() : tableView.getVisibleLeafColumn(0);
-
-            focus(newValueIndex, focusColumn);
-        }
-
-        private int getColumnCount() {
-            return tableView.getVisibleLeafColumns().size();
-        }
-
-        // Gets a table column to the left or right of the current one, given an offset
-        private TableColumn<S,?> getTableColumn(TableColumn<S,?> column, int offset) {
-            int columnIndex = tableView.getVisibleLeafIndex(column);
-            int newColumnIndex = columnIndex + offset;
-            return tableView.getVisibleLeafColumn(newColumnIndex);
-        }
-    }
-}
+/*
+ * Copyright (c) 2011, 2015, 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;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.WeakHashMap;
+
+import com.sun.javafx.scene.control.Logging;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.SelectedCellsMap;
+import com.sun.javafx.scene.control.behavior.TableCellBehavior;
+import com.sun.javafx.scene.control.behavior.TableCellBehaviorBase;
+import javafx.beans.*;
+import javafx.beans.Observable;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ObjectPropertyBase;
+import javafx.beans.property.Property;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.MapChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.WeakListChangeListener;
+import javafx.collections.transformation.SortedList;
+import javafx.css.CssMetaData;
+import javafx.css.PseudoClass;
+import javafx.css.Styleable;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableProperty;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.layout.Region;
+import javafx.util.Callback;
+
+import com.sun.javafx.collections.MappingChange;
+import com.sun.javafx.collections.NonIterableChange;
+import com.sun.javafx.collections.annotations.ReturnsUnmodifiableCollection;
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
+import com.sun.javafx.scene.control.TableColumnComparatorBase.TableColumnComparator;
+import javafx.scene.control.skin.TableViewSkin;
+
+/**
+ * The TableView control is designed to visualize an unlimited number of rows
+ * of data, broken out into columns. A TableView is therefore very similar to the
+ * {@link ListView} control, with the addition of support for columns. For an
+ * example on how to create a TableView, refer to the 'Creating a TableView'
+ * control section below.
+ *
+ * <p>The TableView control has a number of features, including:
+ * <ul>
+ * <li>Powerful {@link TableColumn} API:
+ *   <ul>
+ *   <li>Support for {@link TableColumn#cellFactoryProperty() cell factories} to
+ *      easily customize {@link Cell cell} contents in both rendering and editing
+ *      states.
+ *   <li>Specification of {@link TableColumn#minWidthProperty() minWidth}/
+ *      {@link TableColumn#prefWidthProperty() prefWidth}/
+ *      {@link TableColumn#maxWidthProperty() maxWidth},
+ *      and also {@link TableColumn#resizableProperty() fixed width columns}.
+ *   <li>Width resizing by the user at runtime.
+ *   <li>Column reordering by the user at runtime.
+ *   <li>Built-in support for {@link TableColumn#getColumns() column nesting}
+ *   </ul>
+ * <li>Different {@link #columnResizePolicyProperty() resizing policies} to 
+ *      dictate what happens when the user resizes columns.
+ * <li>Support for {@link #getSortOrder() multiple column sorting} by clicking 
+ *      the column header (hold down Shift keyboard key whilst clicking on a 
+ *      header to sort by multiple columns).
+ * </ul>
+ * </p>
+ *
+ * <p>Note that TableView is intended to be used to visualize data - it is not
+ * intended to be used for laying out your user interface. If you want to lay
+ * your user interface out in a grid-like fashion, consider the 
+ * {@link javafx.scene.layout.GridPane} layout instead.</p>
+ *
+ * <h2>Creating a TableView</h2>
+ *
+ * <p>Creating a TableView is a multi-step process, and also depends on the
+ * underlying data model needing to be represented. For this example we'll use
+ * an ObservableList<Person>, as it is the simplest way of showing data in a 
+ * TableView. The <code>Person</code> class will consist of a first
+ * name and last name properties. That is:
+ * 
+ * <pre>
+ * {@code
+ * public class Person {
+ *     private StringProperty firstName;
+ *     public void setFirstName(String value) { firstNameProperty().set(value); }
+ *     public String getFirstName() { return firstNameProperty().get(); }
+ *     public StringProperty firstNameProperty() { 
+ *         if (firstName == null) firstName = new SimpleStringProperty(this, "firstName");
+ *         return firstName; 
+ *     }
+ * 
+ *     private StringProperty lastName;
+ *     public void setLastName(String value) { lastNameProperty().set(value); }
+ *     public String getLastName() { return lastNameProperty().get(); }
+ *     public StringProperty lastNameProperty() { 
+ *         if (lastName == null) lastName = new SimpleStringProperty(this, "lastName");
+ *         return lastName; 
+ *     } 
+ * }}</pre>
+ * 
+ * <p>Firstly, a TableView instance needs to be defined, as such:
+ * 
+ * <pre>
+ * {@code
+ * TableView<Person> table = new TableView<Person>();}</pre>
+ *
+ * <p>With the basic table defined, we next focus on the data model. As mentioned,
+ * for this example, we'll be using a ObservableList<Person>. We can immediately
+ * set such a list directly in to the TableView, as such:
+ *
+ * <pre>
+ * {@code
+ * ObservableList<Person> teamMembers = getTeamMembers();
+ * table.setItems(teamMembers);}</pre>
+ * 
+ * <p>With the items set as such, TableView will automatically update whenever
+ * the <code>teamMembers</code> list changes. If the items list is available
+ * before the TableView is instantiated, it is possible to pass it directly into
+ * the constructor. 
+ * 
+ * <p>At this point we now have a TableView hooked up to observe the 
+ * <code>teamMembers</code> observableList. The missing ingredient 
+ * now is the means of splitting out the data contained within the model and 
+ * representing it in one or more {@link TableColumn TableColumn} instances. To 
+ * create a two-column TableView to show the firstName and lastName properties,
+ * we extend the last code sample as follows:
+ * 
+ * <pre>
+ * {@code
+ * ObservableList<Person> teamMembers = ...;
+ * table.setItems(teamMembers);
+ * 
+ * TableColumn<Person,String> firstNameCol = new TableColumn<Person,String>("First Name");
+ * firstNameCol.setCellValueFactory(new PropertyValueFactory("firstName"));
+ * TableColumn<Person,String> lastNameCol = new TableColumn<Person,String>("Last Name");
+ * lastNameCol.setCellValueFactory(new PropertyValueFactory("lastName"));
+ * 
+ * table.getColumns().setAll(firstNameCol, lastNameCol);}</pre>
+ * 
+ * <p>With the code shown above we have fully defined the minimum properties
+ * required to create a TableView instance. Running this code (assuming the
+ * people ObservableList is appropriately created) will result in a TableView being
+ * shown with two columns for firstName and lastName. Any other properties of the
+ * Person class will not be shown, as no TableColumns are defined.
+ * 
+ * <h3>TableView support for classes that don't contain properties</h3>
+ *
+ * <p>The code shown above is the shortest possible code for creating a TableView
+ * when the domain objects are designed with JavaFX properties in mind 
+ * (additionally, {@link javafx.scene.control.cell.PropertyValueFactory} supports
+ * normal JavaBean properties too, although there is a caveat to this, so refer 
+ * to the class documentation for more information). When this is not the case, 
+ * it is necessary to provide a custom cell value factory. More information
+ * about cell value factories can be found in the {@link TableColumn} API 
+ * documentation, but briefly, here is how a TableColumn could be specified:
+ * 
+ * <pre>
+ * {@code
+ * firstNameCol.setCellValueFactory(new Callback<CellDataFeatures<Person, String>, ObservableValue<String>>() {
+ *     public ObservableValue<String> call(CellDataFeatures<Person, String> p) {
+ *         // p.getValue() returns the Person instance for a particular TableView row
+ *         return p.getValue().firstNameProperty();
+ *     }
+ *  });
+ * }}</pre>
+ * 
+ * <h3>TableView Selection / Focus APIs</h3>
+ * <p>To track selection and focus, it is necessary to become familiar with the
+ * {@link SelectionModel} and {@link FocusModel} classes. A TableView has at most
+ * one instance of each of these classes, available from 
+ * {@link #selectionModelProperty() selectionModel} and 
+ * {@link #focusModelProperty() focusModel} properties respectively.
+ * Whilst it is possible to use this API to set a new selection model, in
+ * most circumstances this is not necessary - the default selection and focus
+ * models should work in most circumstances.
+ * 
+ * <p>The default {@link SelectionModel} used when instantiating a TableView is
+ * an implementation of the {@link MultipleSelectionModel} abstract class. 
+ * However, as noted in the API documentation for
+ * the {@link MultipleSelectionModel#selectionModeProperty() selectionMode}
+ * property, the default value is {@link SelectionMode#SINGLE}. To enable 
+ * multiple selection in a default TableView instance, it is therefore necessary
+ * to do the following:
+ * 
+ * <pre>
+ * {@code 
+ * tableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);}</pre>
+ *
+ * <h3>Customizing TableView Visuals</h3>
+ * <p>The visuals of the TableView can be entirely customized by replacing the 
+ * default {@link #rowFactoryProperty() row factory}. A row factory is used to
+ * generate {@link TableRow} instances, which are used to represent an entire
+ * row in the TableView. 
+ * 
+ * <p>In many cases, this is not what is desired however, as it is more commonly
+ * the case that cells be customized on a per-column basis, not a per-row basis.
+ * It is therefore important to note that a {@link TableRow} is not a 
+ * {@link TableCell}. A  {@link TableRow} is simply a container for zero or more
+ * {@link TableCell}, and in most circumstances it is more likely that you'll 
+ * want to create custom TableCells, rather than TableRows. The primary use case
+ * for creating custom TableRow instances would most probably be to introduce
+ * some form of column spanning support.
+ * 
+ * <p>You can create custom {@link TableCell} instances per column by assigning 
+ * the appropriate function to the TableColumn
+ * {@link TableColumn#cellFactoryProperty() cell factory} property.
+ * 
+ * <p>See the {@link Cell} class documentation for a more complete
+ * description of how to write custom Cells.
+ *
+ * <h3>Sorting</h3>
+ * <p>Prior to JavaFX 8.0, the TableView control would treat the
+ * {@link #getItems() items} list as the view model, meaning that any changes to
+ * the list would be immediately reflected visually. TableView would also modify
+ * the order of this list directly when a user initiated a sort. This meant that
+ * (again, prior to JavaFX 8.0) it was not possible to have the TableView return
+ * to an unsorted state (after iterating through ascending and descending
+ * orders).</p>
+ *
+ * <p>Starting with JavaFX 8.0 (and the introduction of {@link SortedList}), it
+ * is now possible to have the collection return to the unsorted state when
+ * there are no columns as part of the TableView
+ * {@link #getSortOrder() sort order}. To do this, you must create a SortedList
+ * instance, and bind its
+ * {@link javafx.collections.transformation.SortedList#comparatorProperty() comparator}
+ * property to the TableView {@link #comparatorProperty() comparator} property,
+ * list so:</p>
+ *
+ * <pre>
+ * {@code
+ * // create a SortedList based on the provided ObservableList
+ * SortedList sortedList = new SortedList(FXCollections.observableArrayList(2, 1, 3));
+ *
+ * // create a TableView with the sorted list set as the items it will show
+ * final TableView<Integer> tableView = new TableView<>(sortedList);
+ *
+ * // bind the sortedList comparator to the TableView comparator
+ * sortedList.comparatorProperty().bind(tableView.comparatorProperty());
+ *
+ * // Don't forget to define columns!
+ * }</pre>
+ *
+ * <h3>Editing</h3>
+ * <p>This control supports inline editing of values, and this section attempts to
+ * give an overview of the available APIs and how you should use them.</p>
+ *
+ * <p>Firstly, cell editing most commonly requires a different user interface
+ * than when a cell is not being edited. This is the responsibility of the
+ * {@link Cell} implementation being used. For TableView, it is highly
+ * recommended that editing be
+ * {@link javafx.scene.control.TableColumn#cellFactoryProperty() per-TableColumn},
+ * rather than {@link #rowFactoryProperty() per row}, as more often than not
+ * you want users to edit each column value differently, and this approach allows
+ * for editors specific to each column. It is your choice whether the cell is
+ * permanently in an editing state (e.g. this is common for {@link CheckBox} cells),
+ * or to switch to a different UI when editing begins (e.g. when a double-click
+ * is received on a cell).</p>
+ *
+ * <p>To know when editing has been requested on a cell,
+ * simply override the {@link javafx.scene.control.Cell#startEdit()} method, and
+ * update the cell {@link javafx.scene.control.Cell#textProperty() text} and
+ * {@link javafx.scene.control.Cell#graphicProperty() graphic} properties as
+ * appropriate (e.g. set the text to null and set the graphic to be a
+ * {@link TextField}). Additionally, you should also override
+ * {@link Cell#cancelEdit()} to reset the UI back to its original visual state
+ * when the editing concludes. In both cases it is important that you also
+ * ensure that you call the super method to have the cell perform all duties it
+ * must do to enter or exit its editing mode.</p>
+ *
+ * <p>Once your cell is in an editing state, the next thing you are most probably
+ * interested in is how to commit or cancel the editing that is taking place. This is your
+ * responsibility as the cell factory provider. Your cell implementation will know
+ * when the editing is over, based on the user input (e.g. when the user presses
+ * the Enter or ESC keys on their keyboard). When this happens, it is your
+ * responsibility to call {@link Cell#commitEdit(Object)} or
+ * {@link Cell#cancelEdit()}, as appropriate.</p>
+ *
+ * <p>When you call {@link Cell#commitEdit(Object)} an event is fired to the
+ * TableView, which you can observe by adding an {@link EventHandler} via
+ * {@link TableColumn#setOnEditCommit(javafx.event.EventHandler)}. Similarly,
+ * you can also observe edit events for
+ * {@link TableColumn#setOnEditStart(javafx.event.EventHandler) edit start}
+ * and {@link TableColumn#setOnEditCancel(javafx.event.EventHandler) edit cancel}.</p>
+ *
+ * <p>By default the TableColumn edit commit handler is non-null, with a default
+ * handler that attempts to overwrite the property value for the
+ * item in the currently-being-edited row. It is able to do this as the
+ * {@link Cell#commitEdit(Object)} method is passed in the new value, and this
+ * is passed along to the edit commit handler via the
+ * {@link javafx.scene.control.TableColumn.CellEditEvent CellEditEvent} that is
+ * fired. It is simply a matter of calling
+ * {@link javafx.scene.control.TableColumn.CellEditEvent#getNewValue()} to
+ * retrieve this value.
+ *
+ * <p>It is very important to note that if you call
+ * {@link TableColumn#setOnEditCommit(javafx.event.EventHandler)} with your own
+ * {@link EventHandler}, then you will be removing the default handler. Unless
+ * you then handle the writeback to the property (or the relevant data source),
+ * nothing will happen. You can work around this by using the
+ * {@link TableColumn#addEventHandler(javafx.event.EventType, javafx.event.EventHandler)}
+ * method to add a {@link TableColumn#EDIT_COMMIT_EVENT} {@link EventType} with
+ * your desired {@link EventHandler} as the second argument. Using this method,
+ * you will not replace the default implementation, but you will be notified when
+ * an edit commit has occurred.</p>
+ *
+ * <p>Hopefully this summary answers some of the commonly asked questions.
+ * Fortunately, JavaFX ships with a number of pre-built cell factories that
+ * handle all the editing requirements on your behalf. You can find these
+ * pre-built cell factories in the javafx.scene.control.cell package.</p>
+ *
+ * @see TableColumn
+ * @see TablePosition
+ * @param <S> The type of the objects contained within the TableView items list.
+ * @since JavaFX 2.0
+ */
+@DefaultProperty("items")
+public class TableView<S> extends Control {
+    
+    /***************************************************************************
+     *                                                                         *
+     * Static properties and methods                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    // strings used to communicate via the TableView properties map between
+    // the control and the skin. Because they are private here, the strings
+    // are also duplicated in the TableViewSkin class - so any changes to these
+    // strings must also be duplicated there
+    static final String SET_CONTENT_WIDTH = "TableView.contentWidth";
+    
+    /**
+     * <p>Very simple resize policy that just resizes the specified column by the
+     * provided delta and shifts all other columns (to the right of the given column)
+     * further to the right (when the delta is positive) or to the left (when the
+     * delta is negative).
+     *
+     * <p>It also handles the case where we have nested columns by sharing the new space,
+     * or subtracting the removed space, evenly between all immediate children columns.
+     * Of course, the immediate children may themselves be nested, and they would
+     * then use this policy on their children.
+     */
+    public static final Callback<ResizeFeatures, Boolean> UNCONSTRAINED_RESIZE_POLICY = new Callback<ResizeFeatures, Boolean>() {
+        @Override public String toString() {
+            return "unconstrained-resize";
+        }
+        
+        @Override public Boolean call(ResizeFeatures prop) {
+            double result = TableUtil.resize(prop.getColumn(), prop.getDelta());
+            return Double.compare(result, 0.0) == 0;
+        }
+    };
+
+    /**
+     * <p>Simple policy that ensures the width of all visible leaf columns in 
+     * this table sum up to equal the width of the table itself.
+     * 
+     * <p>When the user resizes a column width with this policy, the table automatically
+     * adjusts the width of the right hand side columns. When the user increases a
+     * column width, the table decreases the width of the rightmost column until it
+     * reaches its minimum width. Then it decreases the width of the second
+     * rightmost column until it reaches minimum width and so on. When all right
+     * hand side columns reach minimum size, the user cannot increase the size of
+     * resized column any more.
+     */
+    public static final Callback<ResizeFeatures, Boolean> CONSTRAINED_RESIZE_POLICY = new Callback<ResizeFeatures, Boolean>() {
+
+        private boolean isFirstRun = true;
+        
+        @Override public String toString() {
+            return "constrained-resize";
+        }
+        
+        @Override public Boolean call(ResizeFeatures prop) {
+            TableView<?> table = prop.getTable();
+            List<? extends TableColumnBase<?,?>> visibleLeafColumns = table.getVisibleLeafColumns();
+            Boolean result = TableUtil.constrainedResize(prop, 
+                                               isFirstRun, 
+                                               table.contentWidth,
+                                               visibleLeafColumns);
+            isFirstRun = ! isFirstRun ? false : ! result;
+            return result;
+        }
+    };
+    
+    /**
+     * The default {@link #sortPolicyProperty() sort policy} that this TableView
+     * will use if no other policy is specified. The sort policy is a simple 
+     * {@link Callback} that accepts a TableView as the sole argument and expects
+     * a Boolean response representing whether the sort succeeded or not. A Boolean
+     * response of true represents success, and a response of false (or null) will
+     * be considered to represent failure.
+     * @since JavaFX 8.0
+     */
+    public static final Callback<TableView, Boolean> DEFAULT_SORT_POLICY = new Callback<TableView, Boolean>() {
+        @Override public Boolean call(TableView table) {
+            try {
+                ObservableList<?> itemsList = table.getItems();
+                if (itemsList instanceof SortedList) {
+                    // it is the responsibility of the SortedList to bind to the
+                    // comparator provided by the TableView. However, we don't
+                    // want to fail the sort (which would put the UI in an
+                    // inconsistent state), so we return true here, but only if
+                    // the SortedList has its comparator bound to the TableView
+                    // comparator property.
+                    SortedList sortedList = (SortedList) itemsList;
+                    boolean comparatorsBound = sortedList.comparatorProperty().
+                            isEqualTo(table.comparatorProperty()).get();
+
+                    if (! comparatorsBound) {
+                        // this isn't a good situation to be in, so lets log it
+                        // out in case the developer is unaware
+                        if (Logging.getControlsLogger().isEnabled()) {
+                            String s = "TableView items list is a SortedList, but the SortedList " +
+                                    "comparator should be bound to the TableView comparator for " +
+                                    "sorting to be enabled (e.g. " +
+                                    "sortedList.comparatorProperty().bind(tableView.comparatorProperty());).";
+                            Logging.getControlsLogger().info(s);
+                        }
+                    }
+                    return comparatorsBound;
+                } else {
+                    if (itemsList == null || itemsList.isEmpty()) {
+                        // sorting is not supported on null or empty lists
+                        return true;
+                    }
+
+                    Comparator comparator = table.getComparator();
+                    if (comparator == null) {
+                        return true;
+                    }
+
+                    // otherwise we attempt to do a manual sort, and if successful
+                    // we return true
+                    FXCollections.sort(itemsList, comparator);
+                    return true;
+                }
+            } catch (UnsupportedOperationException e) {
+                // TODO might need to support other exception types including:
+                // ClassCastException - if the class of the specified element prevents it from being added to this list
+                // NullPointerException - if the specified element is null and this list does not permit null elements
+                // IllegalArgumentException - if some property of this element prevents it from being added to this list
+
+                // If we are here the list does not support sorting, so we gracefully 
+                // fail the sort request and ensure the UI is put back to its previous
+                // state. This is handled in the code that calls the sort policy.
+                
+                return false;
+            }
+        }
+    };
+    
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a default TableView control with no content.
+     * 
+     * <p>Refer to the {@link TableView} class documentation for details on the
+     * default state of other properties.
+     */
+    public TableView() {
+        this(FXCollections.<S>observableArrayList());
+    }
+
+    /**
+     * Creates a TableView with the content provided in the items ObservableList.
+     * This also sets up an observer such that any changes to the items list
+     * will be immediately reflected in the TableView itself.
+     * 
+     * <p>Refer to the {@link TableView} class documentation for details on the
+     * default state of other properties.
+     * 
+     * @param items The items to insert into the TableView, and the list to watch
+     *          for changes (to automatically show in the TableView).
+     */
+    public TableView(ObservableList<S> items) {
+        getStyleClass().setAll(DEFAULT_STYLE_CLASS);
+        setAccessibleRole(AccessibleRole.TABLE_VIEW);
+
+        // we quite happily accept items to be null here
+        setItems(items);
+
+        // install default selection and focus models
+        // it's unlikely this will be changed by many users.
+        setSelectionModel(new TableViewArrayListSelectionModel<S>(this));
+        setFocusModel(new TableViewFocusModel<S>(this));
+
+        // we watch the columns list, such that when it changes we can update
+        // the leaf columns and visible leaf columns lists (which are read-only).
+        getColumns().addListener(weakColumnsObserver);
+
+        // watch for changes to the sort order list - and when it changes run
+        // the sort method.
+        getSortOrder().addListener((ListChangeListener<TableColumn<S, ?>>) c -> {
+            doSort(TableUtil.SortEventType.SORT_ORDER_CHANGE, c);
+        });
+
+        // We're watching for changes to the content width such
+        // that the resize policy can be run if necessary. This comes from
+        // TreeViewSkin.
+        getProperties().addListener(new MapChangeListener<Object, Object>() {
+            @Override
+            public void onChanged(Change<? extends Object, ? extends Object> c) {
+                if (c.wasAdded() && SET_CONTENT_WIDTH.equals(c.getKey())) {
+                    if (c.getValueAdded() instanceof Number) {
+                        setContentWidth((Double) c.getValueAdded());
+                    }
+                    getProperties().remove(SET_CONTENT_WIDTH);
+                }
+            }
+        });
+
+        isInited = true;
+    }
+
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Instance Variables                                                      *
+     *                                                                         *
+     **************************************************************************/    
+
+    // this is the only publicly writable list for columns. This represents the
+    // columns as they are given initially by the developer.
+    private final ObservableList<TableColumn<S,?>> columns = FXCollections.observableArrayList();
+
+    // Finally, as convenience, we also have an observable list that contains
+    // only the leaf columns that are currently visible.
+    private final ObservableList<TableColumn<S,?>> visibleLeafColumns = FXCollections.observableArrayList();
+    private final ObservableList<TableColumn<S,?>> unmodifiableVisibleLeafColumns = FXCollections.unmodifiableObservableList(visibleLeafColumns);
+    
+    
+    // Allows for multiple column sorting based on the order of the TableColumns
+    // in this observableArrayList. Each TableColumn is responsible for whether it is
+    // sorted using ascending or descending order.
+    private ObservableList<TableColumn<S,?>> sortOrder = FXCollections.observableArrayList();
+
+    // width of VirtualFlow minus the vbar width
+    private double contentWidth;
+    
+    // Used to minimise the amount of work performed prior to the table being
+    // completely initialised. In particular it reduces the amount of column
+    // resize operations that occur, which slightly improves startup time.
+    private boolean isInited = false;
+    
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Callbacks and Events                                                    *
+     *                                                                         *
+     **************************************************************************/
+    
+    private final ListChangeListener<TableColumn<S,?>> columnsObserver = new ListChangeListener<TableColumn<S,?>>() {
+        @Override public void onChanged(Change<? extends TableColumn<S,?>> c) {
+            final List<TableColumn<S,?>> columns = getColumns();
+
+            // Fix for RT-39822 - don't allow the same column to be installed twice
+            while (c.next()) {
+                if (c.wasAdded()) {
+                    List<TableColumn<S,?>> duplicates = new ArrayList<>();
+                    for (TableColumn<S,?> addedColumn : c.getAddedSubList()) {
+                        if (addedColumn == null) continue;
+
+                        int count = 0;
+                        for (TableColumn<S,?> column : columns) {
+                            if (addedColumn == column) {
+                                count++;
+                            }
+                        }
+
+                        if (count > 1) {
+                            duplicates.add(addedColumn);
+                        }
+                    }
+
+                    if (!duplicates.isEmpty()) {
+                        String titleList = "";
+                        for (TableColumn<S,?> dupe : duplicates) {
+                            titleList += "'" + dupe.getText() + "', ";
+                        }
+                        throw new IllegalStateException("Duplicate TableColumns detected in TableView columns list with titles " + titleList);
+                    }
+                }
+            }
+            c.reset();
+
+            // We don't maintain a bind for leafColumns, we simply call this update
+            // function behind the scenes in the appropriate places.
+            updateVisibleLeafColumns();
+            
+            // Fix for RT-15194: Need to remove removed columns from the 
+            // sortOrder list.
+            List<TableColumn<S,?>> toRemove = new ArrayList<>();
+            while (c.next()) {
+                final List<? extends TableColumn<S, ?>> removed = c.getRemoved();
+                final List<? extends TableColumn<S, ?>> added = c.getAddedSubList();
+                
+                if (c.wasRemoved()) {
+                    toRemove.addAll(removed);
+                    for (TableColumn<S,?> tc : removed) {
+                        tc.setTableView(null);
+                    }
+                }
+                
+                if (c.wasAdded()) {
+                    toRemove.removeAll(added);
+                    for (TableColumn<S,?> tc : added) {
+                        tc.setTableView(TableView.this);
+                    }
+                }
+                
+                // set up listeners
+                TableUtil.removeColumnsListener(removed, weakColumnsObserver);
+                TableUtil.addColumnsListener(added, weakColumnsObserver);
+                
+                TableUtil.removeTableColumnListener(c.getRemoved(),
+                        weakColumnVisibleObserver,
+                        weakColumnSortableObserver,
+                        weakColumnSortTypeObserver,
+                        weakColumnComparatorObserver);
+                TableUtil.addTableColumnListener(c.getAddedSubList(),
+                        weakColumnVisibleObserver,
+                        weakColumnSortableObserver,
+                        weakColumnSortTypeObserver,
+                        weakColumnComparatorObserver);
+            }
+            
+            sortOrder.removeAll(toRemove);
+
+            // Fix for RT-38892.
+            final TableViewFocusModel<S> fm = getFocusModel();
+            final TableViewSelectionModel<S> sm = getSelectionModel();
+            c.reset();
+            while (c.next()) {
+                if (! c.wasRemoved()) continue;
+
+                List<? extends TableColumn<S,?>> removed = c.getRemoved();
+
+                // Fix for focus - we simply move focus to a cell to the left
+                // of the focused cell if the focused cell was located within
+                // a column that has been removed.
+                if (fm != null) {
+                    TablePosition<S, ?> focusedCell = fm.getFocusedCell();
+                    boolean match = false;
+                    for (TableColumn<S, ?> tc : removed) {
+                        match = focusedCell != null && focusedCell.getTableColumn() == tc;
+                        if (match) {
+                            break;
+                        }
+                    }
+
+                    if (match) {
+                        int matchingColumnIndex = lastKnownColumnIndex.getOrDefault(focusedCell.getTableColumn(), 0);
+                        int newFocusColumnIndex =
+                                matchingColumnIndex == 0 ? 0 :
+                                Math.min(getVisibleLeafColumns().size() - 1, matchingColumnIndex - 1);
+                        fm.focus(focusedCell.getRow(), getVisibleLeafColumn(newFocusColumnIndex));
+                    }
+                }
+
+                // Fix for selection - we remove selection from all cells that
+                // were within the removed column.
+                if (sm != null) {
+                    List<TablePosition> selectedCells = new ArrayList<>(sm.getSelectedCells());
+                    for (TablePosition selectedCell : selectedCells) {
+                        boolean match = false;
+                        for (TableColumn<S, ?> tc : removed) {
+                            match = selectedCell != null && selectedCell.getTableColumn() == tc;
+                            if (match) break;
+                        }
+
+                        if (match) {
+                            // we can't just use the selectedCell.getTableColumn(), as that
+                            // column no longer exists and therefore its index is not correct.
+                            int matchingColumnIndex = lastKnownColumnIndex.getOrDefault(selectedCell.getTableColumn(), -1);
+                            if (matchingColumnIndex == -1) continue;
+
+                            if (sm instanceof TableViewArrayListSelectionModel) {
+                                // Also, because the table column no longer exists in the columns
+                                // list at this point, we can't just call:
+                                // sm.clearSelection(selectedCell.getRow(), selectedCell.getTableColumn());
+                                // as the tableColumn would map to an index of -1, which means that
+                                // selection will not be cleared. Instead, we have to create
+                                // a new TablePosition with a fixed column index and use that.
+                                TablePosition<S,?> fixedTablePosition =
+                                        new TablePosition<S,Object>(TableView.this,
+                                                selectedCell.getRow(),
+                                                selectedCell.getTableColumn());
+                                fixedTablePosition.fixedColumnIndex = matchingColumnIndex;
+
+                                ((TableViewArrayListSelectionModel)sm).clearSelection(fixedTablePosition);
+                            } else {
+                                sm.clearSelection(selectedCell.getRow(), selectedCell.getTableColumn());
+                            }
+                        }
+                    }
+                }
+            }
+
+
+            // update the lastKnownColumnIndex map
+            lastKnownColumnIndex.clear();
+            for (TableColumn<S,?> tc : getColumns()) {
+                int index = getVisibleLeafIndex(tc);
+                if (index > -1) {
+                    lastKnownColumnIndex.put(tc, index);
+                }
+            }
+        }
+    };
+
+    private final WeakHashMap<TableColumn<S,?>, Integer> lastKnownColumnIndex = new WeakHashMap<>();
+    
+    private final InvalidationListener columnVisibleObserver = valueModel -> {
+        updateVisibleLeafColumns();
+    };
+    
+    private final InvalidationListener columnSortableObserver = valueModel -> {
+        Object col = ((Property<?>)valueModel).getBean();
+        if (! getSortOrder().contains(col)) return;
+        doSort(TableUtil.SortEventType.COLUMN_SORTABLE_CHANGE, col);
+    };
+
+    private final InvalidationListener columnSortTypeObserver = valueModel -> {
+        Object col = ((Property<?>)valueModel).getBean();
+        if (! getSortOrder().contains(col)) return;
+        doSort(TableUtil.SortEventType.COLUMN_SORT_TYPE_CHANGE, col);
+    };
+    
+    private final InvalidationListener columnComparatorObserver = valueModel -> {
+        Object col = ((Property<?>)valueModel).getBean();
+        if (! getSortOrder().contains(col)) return;
+        doSort(TableUtil.SortEventType.COLUMN_COMPARATOR_CHANGE, col);
+    };
+    
+    /* proxy pseudo-class state change from selectionModel's cellSelectionEnabledProperty */
+    private final InvalidationListener cellSelectionModelInvalidationListener = o -> {
+        final boolean isCellSelection = ((BooleanProperty)o).get();
+        pseudoClassStateChanged(PSEUDO_CLASS_CELL_SELECTION,  isCellSelection);
+        pseudoClassStateChanged(PSEUDO_CLASS_ROW_SELECTION,  !isCellSelection);
+    };
+    
+    
+    private final WeakInvalidationListener weakColumnVisibleObserver = 
+            new WeakInvalidationListener(columnVisibleObserver);
+    
+    private final WeakInvalidationListener weakColumnSortableObserver = 
+            new WeakInvalidationListener(columnSortableObserver);
+    
+    private final WeakInvalidationListener weakColumnSortTypeObserver = 
+            new WeakInvalidationListener(columnSortTypeObserver);
+    
+    private final WeakInvalidationListener weakColumnComparatorObserver = 
+            new WeakInvalidationListener(columnComparatorObserver);
+    
+    private final WeakListChangeListener<TableColumn<S,?>> weakColumnsObserver = 
+            new WeakListChangeListener<TableColumn<S,?>>(columnsObserver);
+    
+    private final WeakInvalidationListener weakCellSelectionModelInvalidationListener = 
+            new WeakInvalidationListener(cellSelectionModelInvalidationListener);
+
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+
+    // --- Items
+    /**
+     * The underlying data model for the TableView. Note that it has a generic
+     * type that must match the type of the TableView itself.
+     */
+    public final ObjectProperty<ObservableList<S>> itemsProperty() { return items; }
+    private ObjectProperty<ObservableList<S>> items = 
+        new SimpleObjectProperty<ObservableList<S>>(this, "items") {
+            WeakReference<ObservableList<S>> oldItemsRef;
+
+            @Override protected void invalidated() {
+                final ObservableList<S> oldItems = oldItemsRef == null ? null : oldItemsRef.get();
+                final ObservableList<S> newItems = getItems();
+
+                // Fix for RT-36425
+                if (newItems != null && newItems == oldItems) {
+                    return;
+                }
+
+                // Fix for RT-35763
+                if (! (newItems instanceof SortedList)) {
+                    getSortOrder().clear();
+                }
+
+                oldItemsRef = new WeakReference<>(newItems);
+            }
+        };
+    public final void setItems(ObservableList<S> value) { itemsProperty().set(value); }
+    public final ObservableList<S> getItems() {return items.get(); }
+    
+    
+    // --- Table menu button visible
+    private BooleanProperty tableMenuButtonVisible;
+    /**
+     * This controls whether a menu button is available when the user clicks
+     * in a designated space within the TableView, within which is a radio menu
+     * item for each TableColumn in this table. This menu allows for the user to
+     * show and hide all TableColumns easily.
+     */
+    public final BooleanProperty tableMenuButtonVisibleProperty() {
+        if (tableMenuButtonVisible == null) {
+            tableMenuButtonVisible = new SimpleBooleanProperty(this, "tableMenuButtonVisible");
+        }
+        return tableMenuButtonVisible;
+    }
+    public final void setTableMenuButtonVisible (boolean value) {
+        tableMenuButtonVisibleProperty().set(value);
+    }
+    public final boolean isTableMenuButtonVisible() {
+        return tableMenuButtonVisible == null ? false : tableMenuButtonVisible.get();
+    }
+    
+    
+    // --- Column Resize Policy
+    private ObjectProperty<Callback<ResizeFeatures, Boolean>> columnResizePolicy;
+    public final void setColumnResizePolicy(Callback<ResizeFeatures, Boolean> callback) {
+        columnResizePolicyProperty().set(callback);
+    }
+    public final Callback<ResizeFeatures, Boolean> getColumnResizePolicy() {
+        return columnResizePolicy == null ? UNCONSTRAINED_RESIZE_POLICY : columnResizePolicy.get();
+    }
+
+    /**
+     * This is the function called when the user completes a column-resize
+     * operation. The two most common policies are available as static functions
+     * in the TableView class: {@link #UNCONSTRAINED_RESIZE_POLICY} and
+     * {@link #CONSTRAINED_RESIZE_POLICY}.
+     */
+    public final ObjectProperty<Callback<ResizeFeatures, Boolean>> columnResizePolicyProperty() {
+        if (columnResizePolicy == null) {
+            columnResizePolicy = new SimpleObjectProperty<Callback<ResizeFeatures, Boolean>>(this, "columnResizePolicy", UNCONSTRAINED_RESIZE_POLICY) {
+                private Callback<ResizeFeatures, Boolean> oldPolicy;
+                
+                @Override protected void invalidated() {
+                    if (isInited) {
+                        get().call(new ResizeFeatures(TableView.this, null, 0.0));
+
+                        if (oldPolicy != null) {
+                            PseudoClass state = PseudoClass.getPseudoClass(oldPolicy.toString());
+                            pseudoClassStateChanged(state, false);
+                        }
+                        if (get() != null) {
+                            PseudoClass state = PseudoClass.getPseudoClass(get().toString());
+                            pseudoClassStateChanged(state, true);
+                        }
+                        oldPolicy = get();
+                    }
+                }
+            };
+        }
+        return columnResizePolicy;
+    }
+    
+    
+    // --- Row Factory
+    private ObjectProperty<Callback<TableView<S>, TableRow<S>>> rowFactory;
+
+    /**
+     * A function which produces a TableRow. The system is responsible for
+     * reusing TableRows. Return from this function a TableRow which
+     * might be usable for representing a single row in a TableView.
+     * <p>
+     * Note that a TableRow is <b>not</b> a TableCell. A TableRow is
+     * simply a container for a TableCell, and in most circumstances it is more
+     * likely that you'll want to create custom TableCells, rather than
+     * TableRows. The primary use case for creating custom TableRow
+     * instances would most probably be to introduce some form of column
+     * spanning support.
+     * <p>
+     * You can create custom TableCell instances per column by assigning the
+     * appropriate function to the cellFactory property in the TableColumn class.
+     */
+    public final ObjectProperty<Callback<TableView<S>, TableRow<S>>> rowFactoryProperty() {
+        if (rowFactory == null) {
+            rowFactory = new SimpleObjectProperty<Callback<TableView<S>, TableRow<S>>>(this, "rowFactory");
+        }
+        return rowFactory;
+    }
+    public final void setRowFactory(Callback<TableView<S>, TableRow<S>> value) {
+        rowFactoryProperty().set(value);
+    }
+    public final Callback<TableView<S>, TableRow<S>> getRowFactory() {
+        return rowFactory == null ? null : rowFactory.get();
+    }
+    
+    
+    // --- Placeholder Node
+    private ObjectProperty<Node> placeholder;
+    /**
+     * This Node is shown to the user when the table has no content to show.
+     * This may be the case because the table model has no data in the first
+     * place, that a filter has been applied to the table model, resulting
+     * in there being nothing to show the user, or that there are no currently
+     * visible columns.
+     */
+    public final ObjectProperty<Node> placeholderProperty() {
+        if (placeholder == null) {
+            placeholder = new SimpleObjectProperty<Node>(this, "placeholder");
+        }
+        return placeholder;
+    }
+    public final void setPlaceholder(Node value) {
+        placeholderProperty().set(value);
+    }
+    public final Node getPlaceholder() {
+        return placeholder == null ? null : placeholder.get();
+    }
+
+
+    // --- Selection Model
+    private ObjectProperty<TableViewSelectionModel<S>> selectionModel 
+            = new SimpleObjectProperty<TableViewSelectionModel<S>>(this, "selectionModel") {
+
+        TableViewSelectionModel<S> oldValue = null;
+        
+        @Override protected void invalidated() {
+            
+            if (oldValue != null) {
+                oldValue.cellSelectionEnabledProperty().removeListener(weakCellSelectionModelInvalidationListener);
+            }
+            
+            oldValue = get();
+            
+            if (oldValue != null) {
+                oldValue.cellSelectionEnabledProperty().addListener(weakCellSelectionModelInvalidationListener);
+                // fake an invalidation to ensure updated pseudo-class state
+                weakCellSelectionModelInvalidationListener.invalidated(oldValue.cellSelectionEnabledProperty());
+            } 
+        }
+    };
+    
+    /**
+     * The SelectionModel provides the API through which it is possible
+     * to select single or multiple items within a TableView, as  well as inspect
+     * which items have been selected by the user. Note that it has a generic
+     * type that must match the type of the TableView itself.
+     */
+    public final ObjectProperty<TableViewSelectionModel<S>> selectionModelProperty() {
+        return selectionModel;
+    }
+    public final void setSelectionModel(TableViewSelectionModel<S> value) {
+        selectionModelProperty().set(value);
+    }
+
+    public final TableViewSelectionModel<S> getSelectionModel() {
+        return selectionModel.get();
+    }
+
+    
+    // --- Focus Model
+    private ObjectProperty<TableViewFocusModel<S>> focusModel;
+    public final void setFocusModel(TableViewFocusModel<S> value) {
+        focusModelProperty().set(value);
+    }
+    public final TableViewFocusModel<S> getFocusModel() {
+        return focusModel == null ? null : focusModel.get();
+    }
+    /**
+     * Represents the currently-installed {@link TableViewFocusModel} for this
+     * TableView. Under almost all circumstances leaving this as the default
+     * focus model will suffice.
+     */
+    public final ObjectProperty<TableViewFocusModel<S>> focusModelProperty() {
+        if (focusModel == null) {
+            focusModel = new SimpleObjectProperty<TableViewFocusModel<S>>(this, "focusModel");
+        }
+        return focusModel;
+    }
+    
+    
+//    // --- Span Model
+//    private ObjectProperty<SpanModel<S>> spanModel 
+//            = new SimpleObjectProperty<SpanModel<S>>(this, "spanModel") {
+//
+//        @Override protected void invalidated() {
+//            ObservableList<String> styleClass = getStyleClass();
+//            if (getSpanModel() == null) {
+//                styleClass.remove(CELL_SPAN_TABLE_VIEW_STYLE_CLASS);
+//            } else if (! styleClass.contains(CELL_SPAN_TABLE_VIEW_STYLE_CLASS)) {
+//                styleClass.add(CELL_SPAN_TABLE_VIEW_STYLE_CLASS);
+//            }
+//        }
+//    };
+//
+//    public final ObjectProperty<SpanModel<S>> spanModelProperty() {
+//        return spanModel;
+//    }
+//    public final void setSpanModel(SpanModel<S> value) {
+//        spanModelProperty().set(value);
+//    }
+//
+//    public final SpanModel<S> getSpanModel() {
+//        return spanModel.get();
+//    }
+    
+    // --- Editable
+    private BooleanProperty editable;
+    public final void setEditable(boolean value) {
+        editableProperty().set(value);
+    }
+    public final boolean isEditable() {
+        return editable == null ? false : editable.get();
+    }
+    /**
+     * Specifies whether this TableView is editable - only if the TableView, the
+     * TableColumn (if applicable) and the TableCells within it are both 
+     * editable will a TableCell be able to go into their editing state.
+     */
+    public final BooleanProperty editableProperty() {
+        if (editable == null) {
+            editable = new SimpleBooleanProperty(this, "editable", false);
+        }
+        return editable;
+    }
+
+
+    // --- Fixed cell size
+    private DoubleProperty fixedCellSize;
+
+    /**
+     * Sets the new fixed cell size for this control. Any value greater than
+     * zero will enable fixed cell size mode, whereas a zero or negative value
+     * (or Region.USE_COMPUTED_SIZE) will be used to disabled fixed cell size
+     * mode.
+     *
+     * @param value The new fixed cell size value, or a value less than or equal
+     *              to zero (or Region.USE_COMPUTED_SIZE) to disable.
+     * @since JavaFX 8.0
+     */
+    public final void setFixedCellSize(double value) {
+        fixedCellSizeProperty().set(value);
+    }
+
+    /**
+     * Returns the fixed cell size value. A value less than or equal to zero is
+     * used to represent that fixed cell size mode is disabled, and a value
+     * greater than zero represents the size of all cells in this control.
+     *
+     * @return A double representing the fixed cell size of this control, or a
+     *      value less than or equal to zero if fixed cell size mode is disabled.
+     * @since JavaFX 8.0
+     */
+    public final double getFixedCellSize() {
+        return fixedCellSize == null ? Region.USE_COMPUTED_SIZE : fixedCellSize.get();
+    }
+    /**
+     * Specifies whether this control has cells that are a fixed height (of the
+     * specified value). If this value is less than or equal to zero,
+     * then all cells are individually sized and positioned. This is a slow
+     * operation. Therefore, when performance matters and developers are not
+     * dependent on variable cell sizes it is a good idea to set the fixed cell
+     * size value. Generally cells are around 24px, so setting a fixed cell size
+     * of 24 is likely to result in very little difference in visuals, but a
+     * improvement to performance.
+     *
+     * <p>To set this property via CSS, use the -fx-fixed-cell-size property.
+     * This should not be confused with the -fx-cell-size property. The difference
+     * between these two CSS properties is that -fx-cell-size will size all
+     * cells to the specified size, but it will not enforce that this is the
+     * only size (thus allowing for variable cell sizes, and preventing the
+     * performance gains from being possible). Therefore, when performance matters
+     * use -fx-fixed-cell-size, instead of -fx-cell-size. If both properties are
+     * specified in CSS, -fx-fixed-cell-size takes precedence.</p>
+     *
+     * @since JavaFX 8.0
+     */
+    public final DoubleProperty fixedCellSizeProperty() {
+        if (fixedCellSize == null) {
+            fixedCellSize = new StyleableDoubleProperty(Region.USE_COMPUTED_SIZE) {
+                @Override public CssMetaData<TableView<?>,Number> getCssMetaData() {
+                    return StyleableProperties.FIXED_CELL_SIZE;
+                }
+
+                @Override public Object getBean() {
+                    return TableView.this;
+                }
+
+                @Override public String getName() {
+                    return "fixedCellSize";
+                }
+            };
+        }
+        return fixedCellSize;
+    }
+
+
+    // --- Editing Cell
+    private ReadOnlyObjectWrapper<TablePosition<S,?>> editingCell;
+    private void setEditingCell(TablePosition<S,?> value) {
+        editingCellPropertyImpl().set(value);
+    }
+    public final TablePosition<S,?> getEditingCell() {
+        return editingCell == null ? null : editingCell.get();
+    }
+
+    /**
+     * Represents the current cell being edited, or null if
+     * there is no cell being edited.
+     */
+    public final ReadOnlyObjectProperty<TablePosition<S,?>> editingCellProperty() {
+        return editingCellPropertyImpl().getReadOnlyProperty();
+    }
+
+    private ReadOnlyObjectWrapper<TablePosition<S,?>> editingCellPropertyImpl() {
+        if (editingCell == null) {
+            editingCell = new ReadOnlyObjectWrapper<TablePosition<S,?>>(this, "editingCell");
+        }
+        return editingCell;
+    }
+
+    
+    // --- Comparator (built via sortOrder list, so read-only)
+    /**
+     * The comparator property is a read-only property that is representative of the
+     * current state of the {@link #getSortOrder() sort order} list. The sort
+     * order list contains the columns that have been added to it either programmatically
+     * or via a user clicking on the headers themselves.
+     * @since JavaFX 8.0
+     */
+    private ReadOnlyObjectWrapper<Comparator<S>> comparator;
+    private void setComparator(Comparator<S> value) {
+        comparatorPropertyImpl().set(value);
+    }
+    public final Comparator<S> getComparator() {
+        return comparator == null ? null : comparator.get();
+    }
+    public final ReadOnlyObjectProperty<Comparator<S>> comparatorProperty() {
+        return comparatorPropertyImpl().getReadOnlyProperty();
+    }
+    private ReadOnlyObjectWrapper<Comparator<S>> comparatorPropertyImpl() {
+        if (comparator == null) {
+            comparator = new ReadOnlyObjectWrapper<Comparator<S>>(this, "comparator");
+        }
+        return comparator;
+    }
+    
+    
+    // --- sortPolicy
+    /**
+     * The sort policy specifies how sorting in this TableView should be performed.
+     * For example, a basic sort policy may just call 
+     * {@code FXCollections.sort(tableView.getItems())}, whereas a more advanced
+     * sort policy may call to a database to perform the necessary sorting on the
+     * server-side.
+     * 
+     * <p>TableView ships with a {@link TableView#DEFAULT_SORT_POLICY default
+     * sort policy} that does precisely as mentioned above: it simply attempts
+     * to sort the items list in-place.
+     * 
+     * <p>It is recommended that rather than override the {@link TableView#sort() sort}
+     * method that a different sort policy be provided instead.
+     * @since JavaFX 8.0
+     */
+    private ObjectProperty<Callback<TableView<S>, Boolean>> sortPolicy;
+    public final void setSortPolicy(Callback<TableView<S>, Boolean> callback) {
+        sortPolicyProperty().set(callback);
+    }
+    @SuppressWarnings("unchecked") 
+    public final Callback<TableView<S>, Boolean> getSortPolicy() {
+        return sortPolicy == null ? 
+                (Callback<TableView<S>, Boolean>)(Object) DEFAULT_SORT_POLICY : 
+                sortPolicy.get();
+    }
+    @SuppressWarnings("unchecked")
+    public final ObjectProperty<Callback<TableView<S>, Boolean>> sortPolicyProperty() {
+        if (sortPolicy == null) {
+            sortPolicy = new SimpleObjectProperty<Callback<TableView<S>, Boolean>>(
+                    this, "sortPolicy", (Callback<TableView<S>, Boolean>)(Object) DEFAULT_SORT_POLICY) {
+                @Override protected void invalidated() {
+                    sort();
+                }
+            };
+        }
+        return sortPolicy;
+    }
+    
+    
+    // onSort
+    /**
+     * Called when there's a request to sort the control.
+     * @since JavaFX 8.0
+     */
+    private ObjectProperty<EventHandler<SortEvent<TableView<S>>>> onSort;
+    
+    public void setOnSort(EventHandler<SortEvent<TableView<S>>> value) {
+        onSortProperty().set(value);
+    }
+    
+    public EventHandler<SortEvent<TableView<S>>> getOnSort() {
+        if( onSort != null ) {
+            return onSort.get();
+        }
+        return null;
+    }
+    
+    public ObjectProperty<EventHandler<SortEvent<TableView<S>>>> onSortProperty() {
+        if( onSort == null ) {
+            onSort = new ObjectPropertyBase<EventHandler<SortEvent<TableView<S>>>>() {
+                @Override protected void invalidated() {
+                    EventType<SortEvent<TableView<S>>> eventType = SortEvent.sortEvent();
+                    EventHandler<SortEvent<TableView<S>>> eventHandler = get();
+                    setEventHandler(eventType, eventHandler);
+                }
+                
+                @Override public Object getBean() {
+                    return TableView.this;
+                }
+
+                @Override public String getName() {
+                    return "onSort";
+                }
+            };
+        }
+        return onSort;
+    }
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+    /**
+     * The TableColumns that are part of this TableView. As the user reorders
+     * the TableView columns, this list will be updated to reflect the current
+     * visual ordering.
+     *
+     * <p>Note: to display any data in a TableView, there must be at least one
+     * TableColumn in this ObservableList.</p>
+     */
+    public final ObservableList<TableColumn<S,?>> getColumns() {
+        return columns;
+    }
+    
+    /**
+     * The sortOrder list defines the order in which {@link TableColumn} instances
+     * are sorted. An empty sortOrder list means that no sorting is being applied
+     * on the TableView. If the sortOrder list has one TableColumn within it, 
+     * the TableView will be sorted using the 
+     * {@link TableColumn#sortTypeProperty() sortType} and
+     * {@link TableColumn#comparatorProperty() comparator} properties of this
+     * TableColumn (assuming 
+     * {@link TableColumn#sortableProperty() TableColumn.sortable} is true).
+     * If the sortOrder list contains multiple TableColumn instances, then
+     * the TableView is firstly sorted based on the properties of the first 
+     * TableColumn. If two elements are considered equal, then the second
+     * TableColumn in the list is used to determine ordering. This repeats until
+     * the results from all TableColumn comparators are considered, if necessary.
+     * 
+     * @return An ObservableList containing zero or more TableColumn instances.
+     */
+    public final ObservableList<TableColumn<S,?>> getSortOrder() {
+        return sortOrder;
+    }
+    
+    /**
+     * Scrolls the TableView so that the given index is visible within the viewport.
+     * @param index The index of an item that should be visible to the user.
+     */
+    public void scrollTo(int index) {
+       ControlUtils.scrollToIndex(this, index);
+    }
+    
+    /**
+     * Scrolls the TableView so that the given object is visible within the viewport.
+     * @param object The object that should be visible to the user.
+     * @since JavaFX 8.0
+     */
+    public void scrollTo(S object) {
+        if( getItems() != null ) {
+            int idx = getItems().indexOf(object);
+            if( idx >= 0 ) {
+                ControlUtils.scrollToIndex(this, idx);        
+            }
+        }
+    }
+    
+    /**
+     * Called when there's a request to scroll an index into view using {@link #scrollTo(int)}
+     * or {@link #scrollTo(Object)}
+     * @since JavaFX 8.0
+     */
+    private ObjectProperty<EventHandler<ScrollToEvent<Integer>>> onScrollTo;
+    
+    public void setOnScrollTo(EventHandler<ScrollToEvent<Integer>> value) {
+        onScrollToProperty().set(value);
+    }
+    
+    public EventHandler<ScrollToEvent<Integer>> getOnScrollTo() {
+        if( onScrollTo != null ) {
+            return onScrollTo.get();
+        }
+        return null;
+    }
+    
+    public ObjectProperty<EventHandler<ScrollToEvent<Integer>>> onScrollToProperty() {
+        if( onScrollTo == null ) {
+            onScrollTo = new ObjectPropertyBase<EventHandler<ScrollToEvent<Integer>>>() {
+                @Override
+                protected void invalidated() {
+                    setEventHandler(ScrollToEvent.scrollToTopIndex(), get());
+                }
+                @Override
+                public Object getBean() {
+                    return TableView.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "onScrollTo";
+                }
+            };
+        }
+        return onScrollTo;
+    }
+    
+    /**
+     * Scrolls the TableView so that the given column is visible within the viewport.
+     * @param column The column that should be visible to the user.
+     * @since JavaFX 8.0
+     */
+    public void scrollToColumn(TableColumn<S, ?> column) {
+        ControlUtils.scrollToColumn(this, column);
+    }
+    
+    /**
+     * Scrolls the TableView so that the given index is visible within the viewport.
+     * @param columnIndex The index of a column that should be visible to the user.
+     * @since JavaFX 8.0
+     */
+    public void scrollToColumnIndex(int columnIndex) {
+        if( getColumns() != null ) {
+            ControlUtils.scrollToColumn(this, getColumns().get(columnIndex));
+        }
+    }
+    
+    /**
+     * Called when there's a request to scroll a column into view using {@link #scrollToColumn(TableColumn)} 
+     * or {@link #scrollToColumnIndex(int)}
+     * @since JavaFX 8.0
+     */
+    private ObjectProperty<EventHandler<ScrollToEvent<TableColumn<S, ?>>>> onScrollToColumn;
+    
+    public void setOnScrollToColumn(EventHandler<ScrollToEvent<TableColumn<S, ?>>> value) {
+        onScrollToColumnProperty().set(value);
+    }
+    
+    public EventHandler<ScrollToEvent<TableColumn<S, ?>>> getOnScrollToColumn() {
+        if( onScrollToColumn != null ) {
+            return onScrollToColumn.get();
+        }
+        return null;
+    }
+    
+    public ObjectProperty<EventHandler<ScrollToEvent<TableColumn<S, ?>>>> onScrollToColumnProperty() {
+        if( onScrollToColumn == null ) {
+            onScrollToColumn = new ObjectPropertyBase<EventHandler<ScrollToEvent<TableColumn<S, ?>>>>() {
+                @Override protected void invalidated() {
+                    EventType<ScrollToEvent<TableColumn<S, ?>>> type = ScrollToEvent.scrollToColumn();
+                    setEventHandler(type, get());
+                }
+                
+                @Override public Object getBean() {
+                    return TableView.this;
+                }
+
+                @Override public String getName() {
+                    return "onScrollToColumn";
+                }
+            };
+        }
+        return onScrollToColumn;
+    }
+    
+    /**
+     * Applies the currently installed resize policy against the given column,
+     * resizing it based on the delta value provided.
+     */
+    public boolean resizeColumn(TableColumn<S,?> column, double delta) {
+        if (column == null || Double.compare(delta, 0.0) == 0) return false;
+
+        boolean allowed = getColumnResizePolicy().call(new ResizeFeatures<S>(TableView.this, column, delta));
+        if (!allowed) return false;
+
+        return true;
+    }
+
+    /**
+     * Causes the cell at the given row/column view indexes to switch into
+     * its editing state, if it is not already in it, and assuming that the 
+     * TableView and column are also editable.
+     *
+     * <p><strong>Note:</strong> This method will cancel editing if the given row
+     * value is less than zero and the given column is null.</p>
+     */
+    public void edit(int row, TableColumn<S,?> column) {
+        if (!isEditable() || (column != null && ! column.isEditable())) {
+            return;
+        }
+
+        if (row < 0 && column == null) {
+            setEditingCell(null);
+        } else {
+            setEditingCell(new TablePosition<>(this, row, column));
+        }
+    }
+    
+    /**
+     * Returns an unmodifiable list containing the currently visible leaf columns.
+     */
+    @ReturnsUnmodifiableCollection
+    public ObservableList<TableColumn<S,?>> getVisibleLeafColumns() {
+        return unmodifiableVisibleLeafColumns;
+    }
+    
+    /**
+     * Returns the position of the given column, relative to all other 
+     * visible leaf columns.
+     */
+    public int getVisibleLeafIndex(TableColumn<S,?> column) {
+        return visibleLeafColumns.indexOf(column);
+    }
+
+    /**
+     * Returns the TableColumn in the given column index, relative to all other
+     * visible leaf columns.
+     */
+    public TableColumn<S,?> getVisibleLeafColumn(int column) {
+        if (column < 0 || column >= visibleLeafColumns.size()) return null;
+        return visibleLeafColumns.get(column);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Skin<?> createDefaultSkin() {
+        return new TableViewSkin<S>(this);
+    }
+    
+    /**
+     * The sort method forces the TableView to re-run its sorting algorithm. More 
+     * often than not it is not necessary to call this method directly, as it is
+     * automatically called when the {@link #getSortOrder() sort order}, 
+     * {@link #sortPolicyProperty() sort policy}, or the state of the 
+     * TableColumn {@link TableColumn#sortTypeProperty() sort type} properties 
+     * change. In other words, this method should only be called directly when
+     * something external changes and a sort is required.
+     * @since JavaFX 8.0
+     */
+    public void sort() {
+        final ObservableList<? extends TableColumnBase<S,?>> sortOrder = getSortOrder();
+        
+        // update the Comparator property
+        final Comparator<S> oldComparator = getComparator();
+        setComparator(sortOrder.isEmpty() ? null : new TableColumnComparator(sortOrder));
+
+        // fire the onSort event and check if it is consumed, if
+        // so, don't run the sort
+        SortEvent<TableView<S>> sortEvent = new SortEvent<>(TableView.this, TableView.this);
+        fireEvent(sortEvent);
+        if (sortEvent.isConsumed()) {
+            // if the sort is consumed we could back out the last action (the code
+            // is commented out right below), but we don't as we take it as a 
+            // sign that the developer has decided to handle the event themselves.
+            
+            // sortLock = true;
+            // TableUtil.handleSortFailure(sortOrder, lastSortEventType, lastSortEventSupportInfo);
+            // sortLock = false;
+            return;
+        }
+
+        final List<TablePosition> prevState = new ArrayList<>(getSelectionModel().getSelectedCells());
+        final int itemCount = prevState.size();
+
+        // we set makeAtomic to true here, so that we don't fire intermediate
+        // sort events - instead we send a single permutation event at the end
+        // of this method.
+        getSelectionModel().startAtomic();
+
+        // get the sort policy and run it
+        Callback<TableView<S>, Boolean> sortPolicy = getSortPolicy();
+        if (sortPolicy == null) return;
+        Boolean success = sortPolicy.call(this);
+
+        getSelectionModel().stopAtomic();
+        
+        if (success == null || ! success) {
+            // the sort was a failure. Need to backout if possible
+            sortLock = true;
+            TableUtil.handleSortFailure(sortOrder, lastSortEventType, lastSortEventSupportInfo);
+            setComparator(oldComparator);
+            sortLock = false;
+        } else {
+            // sorting was a success, now we possibly fire an event on the
+            // selection model that the items list has 'permutated' to a new ordering
+
+            // FIXME we should support alternative selection model implementations!
+            if (getSelectionModel() instanceof TableViewArrayListSelectionModel) {
+                final TableViewArrayListSelectionModel<S> sm = (TableViewArrayListSelectionModel<S>) getSelectionModel();
+                final ObservableList<TablePosition<S,?>> newState = (ObservableList<TablePosition<S,?>>)(Object)sm.getSelectedCells();
+
+                List<TablePosition<S, ?>> removed = new ArrayList<>();
+                for (int i = 0; i < itemCount; i++) {
+                    TablePosition<S, ?> prevItem = prevState.get(i);
+                    if (!newState.contains(prevItem)) {
+                        removed.add(prevItem);
+                    }
+                }
+
+                if (!removed.isEmpty()) {
+                    // the sort operation effectively permutates the selectedCells list,
+                    // but we cannot fire a permutation event as we are talking about
+                    // TablePosition's changing (which may reside in the same list
+                    // position before and after the sort). Therefore, we need to fire
+                    // a single add/remove event to cover the added and removed positions.
+                    ListChangeListener.Change<TablePosition<S, ?>> c = new NonIterableChange.GenericAddRemoveChange<>(0, itemCount, removed, newState);
+                    sm.handleSelectedCellsListChangeEvent(c);
+                }
+            }
+        }
+    }
+
+    /**
+     * Calling {@code refresh()} forces the TableView control to recreate and
+     * repopulate the cells necessary to populate the visual bounds of the control.
+     * In other words, this forces the TableView to update what it is showing to
+     * the user. This is useful in cases where the underlying data source has
+     * changed in a way that is not observed by the TableView itself.
+     *
+     * @since JavaFX 8u60
+     */
+    public void refresh() {
+        getProperties().put(Properties.RECREATE, Boolean.TRUE);
+    }
+    
+    
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+    
+    private boolean sortLock = false;
+    private TableUtil.SortEventType lastSortEventType = null;
+    private Object[] lastSortEventSupportInfo = null;
+    
+    private void doSort(final TableUtil.SortEventType sortEventType, final Object... supportInfo) {
+        if (sortLock) {
+            return;
+        }
+        
+        this.lastSortEventType = sortEventType;
+        this.lastSortEventSupportInfo = supportInfo;
+        sort();
+        this.lastSortEventType = null;
+        this.lastSortEventSupportInfo = null;
+    }
+
+
+    // --- Content width
+    private void setContentWidth(double contentWidth) {
+        this.contentWidth = contentWidth;
+        if (isInited) {
+            // sometimes the current column resize policy will have to modify the
+            // column width of all columns in the table if the table width changes,
+            // so we short-circuit the resize function and just go straight there
+            // with a null TableColumn, which indicates to the resize policy function
+            // that it shouldn't actually do anything specific to one column.
+            getColumnResizePolicy().call(new ResizeFeatures<S>(TableView.this, null, 0.0));
+        }
+    }
+    
+    /**
+     * Recomputes the currently visible leaf columns in this TableView.
+     */
+    private void updateVisibleLeafColumns() {
+        // update visible leaf columns list
+        List<TableColumn<S,?>> cols = new ArrayList<TableColumn<S,?>>();
+        buildVisibleLeafColumns(getColumns(), cols);
+        visibleLeafColumns.setAll(cols);
+
+        // sometimes the current column resize policy will have to modify the
+        // column width of all columns in the table if the table width changes,
+        // so we short-circuit the resize function and just go straight there
+        // with a null TableColumn, which indicates to the resize policy function
+        // that it shouldn't actually do anything specific to one column.
+        getColumnResizePolicy().call(new ResizeFeatures<S>(TableView.this, null, 0.0));
+    }
+
+    private void buildVisibleLeafColumns(List<TableColumn<S,?>> cols, List<TableColumn<S,?>> vlc) {
+        for (TableColumn<S,?> c : cols) {
+            if (c == null) continue;
+
+            boolean hasChildren = ! c.getColumns().isEmpty();
+
+            if (hasChildren) {
+                buildVisibleLeafColumns(c.getColumns(), vlc);
+            } else if (c.isVisible()) {
+                vlc.add(c);
+            }
+        }
+    }
+    
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final String DEFAULT_STYLE_CLASS = "table-view";
+
+    private static final PseudoClass PSEUDO_CLASS_CELL_SELECTION =
+            PseudoClass.getPseudoClass("cell-selection");
+    private static final PseudoClass PSEUDO_CLASS_ROW_SELECTION =
+            PseudoClass.getPseudoClass("row-selection");
+
+    /** @treatAsPrivate */
+    private static class StyleableProperties {
+        private static final CssMetaData<TableView<?>,Number> FIXED_CELL_SIZE =
+                new CssMetaData<TableView<?>,Number>("-fx-fixed-cell-size",
+                                                    SizeConverter.getInstance(),
+                                                    Region.USE_COMPUTED_SIZE) {
+
+                    @Override public Double getInitialValue(TableView<?> node) {
+                        return node.getFixedCellSize();
+                    }
+
+                    @Override public boolean isSettable(TableView<?> n) {
+                        return n.fixedCellSize == null || !n.fixedCellSize.isBound();
+                    }
+
+                    @Override public StyleableProperty<Number> getStyleableProperty(TableView<?> n) {
+                        return (StyleableProperty<Number>) n.fixedCellSizeProperty();
+                    }
+                };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                    new ArrayList<CssMetaData<? extends Styleable, ?>>(Control.getClassCssMetaData());
+            styleables.add(FIXED_CELL_SIZE);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * @return The CssMetaData associated with this class, which may include the
+     * CssMetaData of its super classes.
+     * @since JavaFX 8.0
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.STYLEABLES;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @since JavaFX 8.0
+     */
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getControlCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    @Override
+    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case COLUMN_COUNT: return getVisibleLeafColumns().size();
+            case ROW_COUNT: return getItems().size();
+            case SELECTED_ITEMS: {
+                // TableViewSkin returns TableRows back to TableView.
+                // TableRowSkin returns TableCells back to TableRow.
+                @SuppressWarnings("unchecked")
+                ObservableList<TableRow<S>> rows = (ObservableList<TableRow<S>>)super.queryAccessibleAttribute(attribute, parameters);
+                List<Node> selection = new ArrayList<>();
+                for (TableRow<S> row : rows) {
+                    @SuppressWarnings("unchecked")
+                    ObservableList<Node> cells = (ObservableList<Node>)row.queryAccessibleAttribute(attribute, parameters);
+                    if (cells != null) selection.addAll(cells);
+                }
+                return FXCollections.observableArrayList(selection);
+            }
+            case FOCUS_ITEM: {
+                Node row = (Node)super.queryAccessibleAttribute(attribute, parameters);
+                if (row == null) return null;
+                Node cell = (Node)row.queryAccessibleAttribute(attribute, parameters);
+                /* cell equals to null means the row is a placeholder node */
+                return cell != null ?  cell : row;
+            }
+            case CELL_AT_ROW_COLUMN: {
+                @SuppressWarnings("unchecked")
+                TableRow<S> row = (TableRow<S>)super.queryAccessibleAttribute(attribute, parameters);
+                return row != null ? row.queryAccessibleAttribute(attribute, parameters) : null;
+            }
+            case MULTIPLE_SELECTION: {
+                MultipleSelectionModel<S> sm = getSelectionModel();
+                return sm != null && sm.getSelectionMode() == SelectionMode.MULTIPLE;
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support Interfaces                                                      *
+     *                                                                         *
+     **************************************************************************/
+
+     /**
+      * An immutable wrapper class for use in the TableView 
+     * {@link TableView#columnResizePolicyProperty() column resize} functionality.
+      * @since JavaFX 2.0
+      */
+     public static class ResizeFeatures<S> extends ResizeFeaturesBase<S> {
+        private TableView<S> table;
+
+        /**
+         * Creates an instance of this class, with the provided TableView, 
+         * TableColumn and delta values being set and stored in this immutable
+         * instance.
+         * 
+         * @param table The TableView upon which the resize operation is occurring.
+         * @param column The column upon which the resize is occurring, or null
+         *      if this ResizeFeatures instance is being created as a result of a
+         *      TableView resize operation.
+         * @param delta The amount of horizontal space added or removed in the 
+         *      resize operation.
+         */
+        public ResizeFeatures(TableView<S> table, TableColumn<S,?> column, Double delta) {
+            super(column, delta);
+            this.table = table;
+        }
+        
+        /**
+         * Returns the column upon which the resize is occurring, or null
+         * if this ResizeFeatures instance was created as a result of a
+         * TableView resize operation.
+         */
+        @Override public TableColumn<S,?> getColumn() { 
+            return (TableColumn<S,?>) super.getColumn(); 
+        }
+        
+        /**
+         * Returns the TableView upon which the resize operation is occurring.
+         */
+        public TableView<S> getTable() { 
+            return table; 
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support Classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+     
+    /**
+     * A simple extension of the {@link SelectionModel} abstract class to
+     * allow for special support for TableView controls.
+     * @since JavaFX 2.0
+     */
+    public static abstract class TableViewSelectionModel<S> extends TableSelectionModel<S> {
+
+        /***********************************************************************
+         *                                                                     *
+         * Private fields                                                      *
+         *                                                                     *
+         **********************************************************************/
+
+        private final TableView<S> tableView;
+
+        boolean blockFocusCall = false;
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Constructors                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * Builds a default TableViewSelectionModel instance with the provided
+         * TableView.
+         * @param tableView The TableView upon which this selection model should
+         *      operate.
+         * @throws NullPointerException TableView can not be null.
+         */
+        public TableViewSelectionModel(final TableView<S> tableView) {
+            if (tableView == null) {
+                throw new NullPointerException("TableView can not be null");
+            }
+
+            this.tableView = tableView;
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Abstract API                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * A read-only ObservableList representing the currently selected cells 
+         * in this TableView. Rather than directly modify this list, please
+         * use the other methods provided in the TableViewSelectionModel.
+         */
+        public abstract ObservableList<TablePosition> getSelectedCells();
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Generic (type erasure) bridging                                     *
+         *                                                                     *
+         **********************************************************************/
+
+        // --- isSelected
+        /** {@inheritDoc} */
+        @Override public boolean isSelected(int row, TableColumnBase<S, ?> column) {
+            return isSelected(row, (TableColumn<S,?>)column);
+        }
+
+        /**
+         * Convenience function which tests whether the given row and column index
+         * is currently selected in this table instance.
+         */
+        public abstract boolean isSelected(int row, TableColumn<S, ?> column);
+
+
+        // --- select
+        /** {@inheritDoc} */
+        @Override public void select(int row, TableColumnBase<S, ?> column) {
+            select(row, (TableColumn<S,?>)column);
+        }
+
+        /**
+         * Selects the cell at the given row/column intersection.
+         */
+        public abstract void select(int row, TableColumn<S, ?> column);
+
+
+        // --- clearAndSelect
+        /** {@inheritDoc} */
+        @Override public void clearAndSelect(int row, TableColumnBase<S,?> column) {
+            clearAndSelect(row, (TableColumn<S,?>) column);
+        }
+
+        /**
+         * Clears all selection, and then selects the cell at the given row/column
+         * intersection.
+         */
+        public abstract void clearAndSelect(int row, TableColumn<S,?> column);
+
+
+        // --- clearSelection
+        /** {@inheritDoc} */
+        @Override public void clearSelection(int row, TableColumnBase<S,?> column) {
+            clearSelection(row, (TableColumn<S,?>) column);
+        }
+
+        /**
+         * Removes selection from the specified row/column position (in view indexes).
+         * If this particular cell (or row if the column value is -1) is not selected,
+         * nothing happens.
+         */
+        public abstract void clearSelection(int row, TableColumn<S, ?> column);
+
+        /** {@inheritDoc} */
+        @Override public void selectRange(int minRow, TableColumnBase<S,?> minColumn,
+                                          int maxRow, TableColumnBase<S,?> maxColumn) {
+            final int minColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)minColumn);
+            final int maxColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)maxColumn);
+            for (int _row = minRow; _row <= maxRow; _row++) {
+                for (int _col = minColumnIndex; _col <= maxColumnIndex; _col++) {
+                    select(_row, tableView.getVisibleLeafColumn(_col));
+                }
+            }
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Public API                                                          *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * Returns the TableView instance that this selection model is installed in.
+         */
+        public TableView<S> getTableView() {
+            return tableView;
+        }
+
+        /**
+         * Convenience method that returns getTableView().getItems().
+         * @return The items list of the current TableView.
+         */
+        protected List<S> getTableModel()  {
+            return tableView.getItems();
+        }
+
+        /** {@inheritDoc} */
+        @Override protected S getModelItem(int index) {
+            if (index < 0 || index >= getItemCount()) return null;
+            return tableView.getItems().get(index);
+        }
+
+        /** {@inheritDoc} */
+        @Override protected int getItemCount() {
+            return getTableModel().size();
+        }
+
+        /** {@inheritDoc} */
+        @Override public void focus(int row) {
+            focus(row, null);
+        }
+
+        /** {@inheritDoc} */
+        @Override public int getFocusedIndex() {
+            return getFocusedCell().getRow();
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Private implementation                                              *
+         *                                                                     *
+         **********************************************************************/
+
+        void focus(int row, TableColumn<S,?> column) {
+            focus(new TablePosition<>(getTableView(), row, column));
+            getTableView().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_ITEM);
+        }
+
+        void focus(TablePosition<S,?> pos) {
+            if (blockFocusCall) return;
+            if (getTableView().getFocusModel() == null) return;
+
+            getTableView().getFocusModel().focus(pos.getRow(), pos.getTableColumn());
+        }
+
+        TablePosition<S,?> getFocusedCell() {
+            if (getTableView().getFocusModel() == null) {
+                return new TablePosition<>(getTableView(), -1, null);
+            }
+            return getTableView().getFocusModel().getFocusedCell();
+        }
+    }
+    
+    
+
+    /**
+     * A primitive selection model implementation, using a List<Integer> to store all
+     * selected indices.
+     */
+    // package for testing
+    static class TableViewArrayListSelectionModel<S> extends TableViewSelectionModel<S> {
+        
+        private int itemCount = 0;
+
+        private final MappingChange.Map<TablePosition<S,?>,S> cellToItemsMap = f -> getModelItem(f.getRow());
+
+        private final MappingChange.Map<TablePosition<S,?>,Integer> cellToIndicesMap = f -> f.getRow();
+
+        /***********************************************************************
+         *                                                                     *
+         * Constructors                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        public TableViewArrayListSelectionModel(final TableView<S> tableView) {
+            super(tableView);
+            this.tableView = tableView;
+
+            this.tableView.itemsProperty().addListener(new InvalidationListener() {
+                private WeakReference<ObservableList<S>> weakItemsRef = new WeakReference<>(tableView.getItems());
+
+                @Override public void invalidated(Observable observable) {
+                    ObservableList<S> oldItems = weakItemsRef.get();
+                    weakItemsRef = new WeakReference<>(tableView.getItems());
+                    updateItemsObserver(oldItems, tableView.getItems());
+                }
+            });
+
+            selectedCellsMap = new SelectedCellsMap<TablePosition<S,?>>(c -> handleSelectedCellsListChangeEvent(c)) {
+                @Override public boolean isCellSelectionEnabled() {
+                    return TableViewArrayListSelectionModel.this.isCellSelectionEnabled();
+                }
+            };
+
+            selectedItems = new ReadOnlyUnbackedObservableList<S>() {
+                @Override public S get(int i) {
+                    return getModelItem(getSelectedIndices().get(i));
+                }
+
+                @Override public int size() {
+                    return getSelectedIndices().size();
+                }
+            };
+            
+            selectedCellsSeq = new ReadOnlyUnbackedObservableList<TablePosition<S,?>>() {
+                @Override public TablePosition<S,?> get(int i) {
+                    return selectedCellsMap.get(i);
+                }
+
+                @Override public int size() {
+                    return selectedCellsMap.size();
+                }
+            };
+
+
+            /*
+             * The following listener is used in conjunction with
+             * SelectionModel.select(T obj) to allow for a developer to select
+             * an item that is not actually in the data model. When this occurs,
+             * we actively try to find an index that matches this object, going
+             * so far as to actually watch for all changes to the items list,
+             * rechecking each time.
+             */
+
+            // watching for changes to the items list content
+            ObservableList<S> items = getTableView().getItems();
+            if (items != null) {
+                items.addListener(weakItemsContentListener);
+            }
+
+
+            updateItemCount();
+
+            updateDefaultSelection();
+
+            cellSelectionEnabledProperty().addListener(o -> {
+                updateDefaultSelection();
+                TableCellBehaviorBase.setAnchor(tableView, getFocusedCell(), true);
+            });
+        }
+        
+        private final TableView<S> tableView;
+        
+        final ListChangeListener<S> itemsContentListener = c -> {
+            updateItemCount();
+
+            List<S> items1 = getTableModel();
+
+            while (c.next()) {
+                if (c.wasReplaced() || c.getAddedSize() == getItemCount()) {
+                    this.selectedItemChange = c;
+                    updateDefaultSelection();
+                    this.selectedItemChange = null;
+                    return;
+                }
+
+                final S selectedItem = getSelectedItem();
+                final int selectedIndex = getSelectedIndex();
+
+                if (items1 == null || items1.isEmpty()) {
+                    clearSelection();
+                } else if (getSelectedIndex() == -1 && getSelectedItem() != null) {
+                    int newIndex = items1.indexOf(getSelectedItem());
+                    if (newIndex != -1) {
+                        setSelectedIndex(newIndex);
+                    }
+                } else if (c.wasRemoved() &&
+                        c.getRemovedSize() == 1 &&
+                        ! c.wasAdded() &&
+                        selectedItem != null &&
+                        selectedItem.equals(c.getRemoved().get(0))) {
+                    // Bug fix for RT-28637
+                    if (getSelectedIndex() < getItemCount()) {
+                        final int previousRow = selectedIndex == 0 ? 0 : selectedIndex - 1;
+                        S newSelectedItem = getModelItem(previousRow);
+                        if (! selectedItem.equals(newSelectedItem)) {
+                            clearAndSelect(previousRow);
+                        }
+                    }
+                }
+            }
+
+            updateSelection(c);
+        };
+        
+        final WeakListChangeListener<S> weakItemsContentListener 
+                = new WeakListChangeListener<>(itemsContentListener);
+        
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Observable properties (and getters/setters)                         *
+         *                                                                     *
+         **********************************************************************/
+        
+        // the only 'proper' internal data structure, selectedItems and selectedIndices
+        // are both 'read-only and unbacked'.
+        private final SelectedCellsMap<TablePosition<S,?>> selectedCellsMap;
+
+        // used to represent the _row_ backing data for the selectedCells
+        private final ReadOnlyUnbackedObservableList<S> selectedItems;
+        @Override public ObservableList<S> getSelectedItems() {
+            return selectedItems;
+        }
+
+        // we create a ReadOnlyUnbackedObservableList of selectedCells here so
+        // that we can fire custom list change events.
+        private final ReadOnlyUnbackedObservableList<TablePosition<S,?>> selectedCellsSeq;
+        @Override public ObservableList<TablePosition> getSelectedCells() {
+            return (ObservableList<TablePosition>)(Object)selectedCellsSeq;
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Internal properties                                                 *
+         *                                                                     *
+         **********************************************************************/
+
+        private int previousModelSize = 0;
+        
+        // Listen to changes in the tableview items list, such that when it 
+        // changes we can update the selected indices list to refer to the 
+        // new indices.
+        private void updateSelection(ListChangeListener.Change<? extends S> c) {
+            c.reset();
+
+            int shift = 0;
+            int startRow = -1;
+            while (c.next()) {
+                if (c.wasReplaced()) {
+                    if (c.getList().isEmpty()) {
+                        // the entire items list was emptied - clear selection
+                        clearSelection();
+                    } else {
+                        int index = getSelectedIndex();
+                        
+                        if (previousModelSize == c.getRemovedSize()) {
+                            // all items were removed from the model
+                            clearSelection();
+                        } else if (index < getItemCount() && index >= 0) {
+                            // Fix for RT-18969: the list had setAll called on it
+                            // Use of makeAtomic is a fix for RT-20945
+                            startAtomic();
+                            clearSelection(index);
+                            stopAtomic();
+                            select(index);
+                        } else {
+                            // Fix for RT-22079
+                            clearSelection();
+                        }
+                    }
+                } else if (c.wasAdded() || c.wasRemoved()) {
+                    startRow = c.getFrom();
+                    shift += c.wasAdded() ? c.getAddedSize() : -c.getRemovedSize();
+                } else if (c.wasPermutated()) {
+                    // General approach:
+                    //   -- detected a sort has happened
+                    //   -- Create a permutation lookup map (1)
+                    //   -- dump all the selected indices into a list (2)
+                    //   -- create a list containing the new indices (3)
+                    //   -- for each previously-selected index (4)
+                    //     -- if index is in the permutation lookup map
+                    //       -- add the new index to the new indices list
+                    //   -- Perform batch selection (5)
+
+                    startAtomic();
+
+                    final int oldSelectedIndex = getSelectedIndex();
+
+                    // (1)
+                    int length = c.getTo() - c.getFrom();
+                    HashMap<Integer, Integer> pMap = new HashMap<> (length);
+                    for (int i = c.getFrom(); i < c.getTo(); i++) {
+                        pMap.put(i, c.getPermutation(i));
+                    }
+
+                    // (2)
+                    List<TablePosition<S,?>> selectedIndices = new ArrayList<>((ObservableList<TablePosition<S,?>>)(Object)getSelectedCells());
+
+                    // (3)
+                    List<TablePosition<S,?>> newIndices = new ArrayList<>(selectedIndices.size());
+
+                    // (4)
+                    boolean selectionIndicesChanged = false;
+                    for (int i = 0; i < selectedIndices.size(); i++) {
+                        final TablePosition<S,?> oldIndex = selectedIndices.get(i);
+                        final int oldRow = oldIndex.getRow();
+
+                        if (pMap.containsKey(oldRow)) {
+                            int newIndex = pMap.get(oldRow);
+
+                            selectionIndicesChanged = selectionIndicesChanged || newIndex != oldRow;
+
+                            newIndices.add(new TablePosition<>(oldIndex.getTableView(), newIndex, oldIndex.getTableColumn()));
+                        }
+                    }
+
+                    if (selectionIndicesChanged) {
+                        // (5)
+                        quietClearSelection();
+                        stopAtomic();
+
+                        selectedCellsMap.setAll(newIndices);
+
+                        if (oldSelectedIndex >= 0 && oldSelectedIndex < itemCount) {
+                            int newIndex = c.getPermutation(oldSelectedIndex);
+                            setSelectedIndex(newIndex);
+                            focus(newIndex);
+                        }
+                    } else {
+                        stopAtomic();
+                    }
+                }
+            }
+
+            if (shift != 0 && startRow >= 0) {
+                List<TablePosition<S,?>> newIndices = new ArrayList<>(selectedCellsMap.size());
+
+                for (int i = 0; i < selectedCellsMap.size(); i++) {
+                    final TablePosition<S,?> old = selectedCellsMap.get(i);
+                    final int oldRow = old.getRow();
+                    final int newRow = Math.max(0, oldRow < startRow ? oldRow : oldRow + shift);
+
+                    if (oldRow < startRow) {
+                        continue;
+                    }
+
+                    // Special case for RT-28637 (See unit test in TableViewTest).
+                    // Essentially the selectedItem was correct, but selectedItems
+                    // was empty.
+                    if (oldRow == 0 && shift == -1) {
+                        newIndices.add(new TablePosition<>(getTableView(), 0, old.getTableColumn()));
+                        continue;
+                    }
+
+                    newIndices.add(new TablePosition<>(getTableView(), newRow, old.getTableColumn()));
+                }
+
+                final int newIndicesSize = newIndices.size();
+
+                if ((c.wasRemoved() || c.wasAdded()) && newIndicesSize > 0) {
+                    TablePosition<S,?> anchor = TableCellBehavior.getAnchor(tableView, null);
+                    if (anchor != null) {
+                        boolean isAnchorSelected = isSelected(anchor.getRow(), anchor.getTableColumn());
+                        if (isAnchorSelected) {
+                            TablePosition<S,?> newAnchor = new TablePosition<>(tableView, anchor.getRow() + shift, anchor.getTableColumn());
+                            TableCellBehavior.setAnchor(tableView, newAnchor, false);
+                        }
+                    }
+
+                    quietClearSelection();
+
+                    // Fix for RT-22079
+                    blockFocusCall = true;
+                    for (int i = 0; i < newIndicesSize; i++) {
+                        TablePosition<S, ?> tp = newIndices.get(i);
+                        select(tp.getRow(), tp.getTableColumn());
+                    }
+                    blockFocusCall = false;
+                }
+            }
+            
+            previousModelSize = getItemCount();
+        }
+
+        /***********************************************************************
+         *                                                                     *
+         * Public selection API                                                *
+         *                                                                     *
+         **********************************************************************/
+
+        @Override public void clearAndSelect(int row) {
+            clearAndSelect(row, null);
+        }
+
+        @Override public void clearAndSelect(int row, TableColumn<S,?> column) {
+            if (row < 0 || row >= getItemCount()) return;
+
+            final TablePosition<S,?> newTablePosition = new TablePosition<>(getTableView(), row, column);
+            final boolean isCellSelectionEnabled = isCellSelectionEnabled();
+
+            // replace the anchor
+            TableCellBehavior.setAnchor(tableView, newTablePosition, false);
+
+            // if I'm in cell selection mode but the column is null, I don't want
+            // to select the whole row instead...
+            if (isCellSelectionEnabled && column == null) {
+                return;
+            }
+
+            final boolean wasSelected = isSelected(row, column);
+
+            // firstly we make a copy of the selection, so that we can send out
+            // the correct details in the selection change event.
+            List<TablePosition<S,?>> previousSelection = new ArrayList<>(selectedCellsMap.getSelectedCells());
+
+            if (wasSelected && previousSelection.size() == 1) {
+                // before we return, we double-check that the selected item
+                // is equal to the item in the given index
+                TablePosition<S,?> selectedCell = getSelectedCells().get(0);
+                if (getSelectedItem() == getModelItem(row)) {
+                    if (selectedCell.getRow() == row && selectedCell.getTableColumn() == column) {
+                        return;
+                    }
+                }
+            }
+
+            // RT-32411 We used to call quietClearSelection() here, but this
+            // resulted in the selectedItems and selectedIndices lists never
+            // reporting that they were empty.
+            // makeAtomic toggle added to resolve RT-32618
+            startAtomic();
+
+            // then clear the current selection
+            clearSelection();
+
+            // and select the new cell
+            select(row, column);
+
+            stopAtomic();
+
+
+            // We remove the new selection from the list seeing as it is not removed.
+            if (isCellSelectionEnabled) {
+                previousSelection.remove(newTablePosition);
+            } else {
+                for (TablePosition<S,?> tp : previousSelection) {
+                    if (tp.getRow() == row) {
+                        previousSelection.remove(tp);
+                        break;
+                    }
+                }
+            }
+
+            // fire off a single add/remove/replace notification (rather than
+            // individual remove and add notifications) - see RT-33324
+            ListChangeListener.Change<TablePosition<S, ?>> change;
+
+            /*
+             * getFrom() documentation:
+             *   If wasAdded is true, the interval contains all the values that were added.
+             *   If wasPermutated is true, the interval marks the values that were permutated.
+             *   If wasRemoved is true and wasAdded is false, getFrom() and getTo() should
+             *   return the same number - the place where the removed elements were positioned in the list.
+             */
+            if (wasSelected) {
+                change = ControlUtils.buildClearAndSelectChange(selectedCellsSeq, previousSelection, row);
+            } else {
+                final int changeIndex = selectedCellsSeq.indexOf(newTablePosition);
+                change = new NonIterableChange.GenericAddRemoveChange<>(
+                        changeIndex, changeIndex + 1, previousSelection, selectedCellsSeq);
+            }
+            handleSelectedCellsListChangeEvent(change);
+        }
+
+        @Override public void select(int row) {
+            select(row, null);
+        }
+
+        @Override
+        public void select(int row, TableColumn<S,?> column) {
+            if (row < 0 || row >= getItemCount()) return;
+
+            // if I'm in cell selection mode but the column is null, select each
+            // of the contained cells individually
+            if (isCellSelectionEnabled() && column == null) {
+                List<TableColumn<S,?>> columns = getTableView().getVisibleLeafColumns();
+                for (int i = 0; i < columns.size(); i++) {
+                    select(row, columns.get(i));
+                }
+                return;
+            }
+
+            TablePosition<S,?> pos = new TablePosition<>(getTableView(), row, column);
+            
+            if (getSelectionMode() == SelectionMode.SINGLE) {
+                startAtomic();
+                quietClearSelection();
+                stopAtomic();
+            }
+
+            if (TableCellBehavior.hasDefaultAnchor(tableView)) {
+                TableCellBehavior.removeAnchor(tableView);
+            }
+
+            selectedCellsMap.add(pos);
+
+            updateSelectedIndex(row);
+            focus(row, column);
+        }
+
+        @Override public void select(S obj) {
+            if (obj == null && getSelectionMode() == SelectionMode.SINGLE) {
+                clearSelection();
+                return;
+            }
+            
+            // We have no option but to iterate through the model and select the
+            // first occurrence of the given object. Once we find the first one, we
+            // don't proceed to select any others.
+            S rowObj = null;
+            for (int i = 0; i < getItemCount(); i++) {
+                rowObj = getModelItem(i);
+                if (rowObj == null) continue;
+
+                if (rowObj.equals(obj)) {
+                    if (isSelected(i)) {
+                        return;
+                    }
+
+                    if (getSelectionMode() == SelectionMode.SINGLE) {
+                        quietClearSelection();
+                    }
+
+                    select(i);
+                    return;
+                }
+            }
+
+            // if we are here, we did not find the item in the entire data model.
+            // Even still, we allow for this item to be set to the give object.
+            // We expect that in concrete subclasses of this class we observe the
+            // data model such that we check to see if the given item exists in it,
+            // whilst SelectedIndex == -1 && SelectedItem != null.
+            setSelectedIndex(-1);
+            setSelectedItem(obj);
+        }
+
+        @Override public void selectIndices(int row, int... rows) {
+            if (rows == null) {
+                select(row);
+                return;
+            }
+
+            /*
+             * Performance optimisation - if multiple selection is disabled, only
+             * process the end-most row index.
+             */
+            int rowCount = getItemCount();
+
+            if (getSelectionMode() == SelectionMode.SINGLE) {
+                quietClearSelection();
+
+                for (int i = rows.length - 1; i >= 0; i--) {
+                    int index = rows[i];
+                    if (index >= 0 && index < rowCount) {
+                        select(index);
+                        break;
+                    }
+                }
+
+                if (selectedCellsMap.isEmpty()) {
+                    if (row > 0 && row < rowCount) {
+                        select(row);
+                    }
+                }
+            } else {
+                int lastIndex = -1;
+                Set<TablePosition<S,?>> positions = new LinkedHashSet<>();
+
+                // --- firstly, we special-case the non-varargs 'row' argument
+                if (row >= 0 && row < rowCount) {
+                    // if I'm in cell selection mode, we want to select each
+                    // of the contained cells individually
+                    if (isCellSelectionEnabled()) {
+                        List<TableColumn<S,?>> columns = getTableView().getVisibleLeafColumns();
+                        for (int column = 0; column < columns.size(); column++) {
+                            if (! selectedCellsMap.isSelected(row, column)) {
+                                positions.add(new TablePosition<>(getTableView(), row, columns.get(column)));
+                                lastIndex = row;
+                            }
+                        }
+                    } else {
+                        boolean match = selectedCellsMap.isSelected(row, -1);
+                        if (!match) {
+                            positions.add(new TablePosition<>(getTableView(), row, null));
+                        }
+                    }
+
+                    lastIndex = row;
+                }
+
+                // --- now we iterate through all varargs values
+                for (int i = 0; i < rows.length; i++) {
+                    int index = rows[i];
+                    if (index < 0 || index >= rowCount) continue;
+                    lastIndex = index;
+
+                    if (isCellSelectionEnabled()) {
+                        List<TableColumn<S,?>> columns = getTableView().getVisibleLeafColumns();
+                        for (int column = 0; column < columns.size(); column++) {
+                            if (! selectedCellsMap.isSelected(index, column)) {
+                                positions.add(new TablePosition<>(getTableView(), index, columns.get(column)));
+                                lastIndex = index;
+                            }
+                        }
+                    } else {
+                        if (! selectedCellsMap.isSelected(index, -1)) {
+                            // if we are here then we have successfully gotten through the for-loop above
+                            positions.add(new TablePosition<>(getTableView(), index, null));
+                        }
+                    }
+                }
+
+                selectedCellsMap.addAll(positions);
+                
+                if (lastIndex != -1) {
+                    select(lastIndex);
+                }
+            }
+        }
+
+        @Override public void selectAll() {
+            if (getSelectionMode() == SelectionMode.SINGLE) return;
+
+            if (isCellSelectionEnabled()) {
+                List<TablePosition<S,?>> indices = new ArrayList<>();
+                TableColumn<S,?> column;
+                TablePosition<S,?> tp = null;
+                for (int col = 0; col < getTableView().getVisibleLeafColumns().size(); col++) {
+                    column = getTableView().getVisibleLeafColumns().get(col);
+                    for (int row = 0; row < getItemCount(); row++) {
+                        tp = new TablePosition<>(getTableView(), row, column);
+                        indices.add(tp);
+                    }
+                }
+                selectedCellsMap.setAll(indices);
+                
+                if (tp != null) {
+                    select(tp.getRow(), tp.getTableColumn());
+                    focus(tp.getRow(), tp.getTableColumn());
+                }
+            } else {
+                List<TablePosition<S,?>> indices = new ArrayList<>();
+                for (int i = 0; i < getItemCount(); i++) {
+                    indices.add(new TablePosition<>(getTableView(), i, null));
+                }
+                selectedCellsMap.setAll(indices);
+                
+                int focusedIndex = getFocusedIndex();
+                if (focusedIndex == -1) {
+                    final int itemCount = getItemCount();
+                    if (itemCount > 0) {
+                        select(itemCount - 1);
+                        focus(indices.get(indices.size() - 1));
+                    }
+                } else {
+                    select(focusedIndex);
+                    focus(focusedIndex);
+                }
+            }
+        }
+
+        @Override public void selectRange(int minRow, TableColumnBase<S,?> minColumn,
+                                          int maxRow, TableColumnBase<S,?> maxColumn) {
+            if (getSelectionMode() == SelectionMode.SINGLE) {
+                quietClearSelection();
+                select(maxRow, maxColumn);
+                return;
+            }
+
+            startAtomic();
+
+            final int itemCount = getItemCount();
+            final boolean isCellSelectionEnabled = isCellSelectionEnabled();
+
+            final int minColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)minColumn);
+            final int maxColumnIndex = tableView.getVisibleLeafIndex((TableColumn<S,?>)maxColumn);
+            final int _minColumnIndex = Math.min(minColumnIndex, maxColumnIndex);
+            final int _maxColumnIndex = Math.max(minColumnIndex, maxColumnIndex);
+
+            final int _minRow = Math.min(minRow, maxRow);
+            final int _maxRow = Math.max(minRow, maxRow);
+
+            List<TablePosition<S,?>> cellsToSelect = new ArrayList<>();
+
+            for (int _row = _minRow; _row <= _maxRow; _row++) {
+                // begin copy/paste of select(int, column) method (with some
+                // slight modifications)
+                if (_row < 0 || _row >= itemCount) continue;
+
+                if (! isCellSelectionEnabled) {
+                    cellsToSelect.add(new TablePosition<>(tableView, _row, (TableColumn<S,?>)minColumn));
+                } else {
+                    for (int _col = _minColumnIndex; _col <= _maxColumnIndex; _col++) {
+                        final TableColumn<S, ?> column = tableView.getVisibleLeafColumn(_col);
+
+                        // if I'm in cell selection mode but the column is null, I don't want
+                        // to select the whole row instead...
+                        if (column == null && isCellSelectionEnabled) continue;
+
+                        cellsToSelect.add(new TablePosition<>(tableView, _row, column));
+                        // end copy/paste
+                    }
+                }
+            }
+
+            // to prevent duplication we remove all currently selected cells from
+            // our list of cells to select.
+            cellsToSelect.removeAll(getSelectedCells());
+
+            selectedCellsMap.addAll(cellsToSelect);
+            stopAtomic();
+
+            // fire off events.
+            // Note that focus and selection always goes to maxRow, not _maxRow.
+            updateSelectedIndex(maxRow);
+            focus(maxRow, (TableColumn<S,?>)maxColumn);
+
+            final TableColumn<S,?> startColumn = (TableColumn<S,?>)minColumn;
+            final TableColumn<S,?> endColumn = isCellSelectionEnabled ? (TableColumn<S,?>)maxColumn : startColumn;
+            final int startChangeIndex = selectedCellsMap.indexOf(new TablePosition<>(tableView, minRow, startColumn));
+            final int endChangeIndex = selectedCellsMap.indexOf(new TablePosition<>(tableView, maxRow, endColumn));
+
+            if (startChangeIndex > -1 && endChangeIndex > -1) {
+                final int startIndex = Math.min(startChangeIndex, endChangeIndex);
+                final int endIndex = Math.max(startChangeIndex, endChangeIndex);
+                ListChangeListener.Change c = new NonIterableChange.SimpleAddChange<>(startIndex, endIndex + 1, selectedCellsSeq);
+                handleSelectedCellsListChangeEvent(c);
+            }
+        }
+
+        @Override public void clearSelection(int index) {
+            clearSelection(index, null);
+        }
+
+        @Override
+        public void clearSelection(int row, TableColumn<S,?> column) {
+            clearSelection(new TablePosition<>(getTableView(), row, column));
+        }
+
+        private void clearSelection(TablePosition<S,?> tp) {
+            final boolean csMode = isCellSelectionEnabled();
+            final int row = tp.getRow();
+
+            for (TablePosition pos : getSelectedCells()) {
+                if (! csMode) {
+                    if (pos.getRow() == row) {
+                        selectedCellsMap.remove(pos);
+                        break;
+                    }
+                } else {
+                    if (pos.equals(tp)) {
+                        selectedCellsMap.remove(tp);
+                        break;
+                    }
+                }
+            }
+
+            if (isEmpty() && ! isAtomic()) {
+                updateSelectedIndex(-1);
+                selectedCellsMap.clear();
+            }
+        }
+
+        @Override public void clearSelection() {
+            final List<TablePosition<S,?>> removed = new ArrayList<>((Collection)getSelectedCells());
+
+            quietClearSelection();
+
+            if (! isAtomic()) {
+                updateSelectedIndex(-1);
+                focus(-1);
+
+                if (!removed.isEmpty()) {
+                    ListChangeListener.Change<TablePosition<S, ?>> c = new NonIterableChange<TablePosition<S, ?>>(0, 0, selectedCellsSeq) {
+                        @Override
+                        public List<TablePosition<S, ?>> getRemoved() {
+                            return removed;
+                        }
+                    };
+                    handleSelectedCellsListChangeEvent(c);
+                }
+            }
+        }
+
+        private void quietClearSelection() {
+            startAtomic();
+            selectedCellsMap.clear();
+            stopAtomic();
+        }
+
+        @Override public boolean isSelected(int index) {
+            return isSelected(index, null);
+        }
+
+        @Override
+        public boolean isSelected(int row, TableColumn<S,?> column) {
+            // When in cell selection mode, we currently do NOT support selecting
+            // entire rows, so a isSelected(row, null) should always return false.
+            final boolean isCellSelectionEnabled = isCellSelectionEnabled();
+            if (isCellSelectionEnabled && column == null) return false;
+
+            int columnIndex = ! isCellSelectionEnabled || column == null ? -1 : tableView.getVisibleLeafIndex(column);
+            return selectedCellsMap.isSelected(row, columnIndex);
+        }
+
+        @Override public boolean isEmpty() {
+            return selectedCellsMap.isEmpty();
+        }
+
+        @Override public void selectPrevious() {
+            if (isCellSelectionEnabled()) {
+                // in cell selection mode, we have to wrap around, going from
+                // right-to-left, and then wrapping to the end of the previous line
+                TablePosition<S,?> pos = getFocusedCell();
+                if (pos.getColumn() - 1 >= 0) {
+                    // go to previous row
+                    select(pos.getRow(), getTableColumn(pos.getTableColumn(), -1));
+                } else if (pos.getRow() < getItemCount() - 1) {
+                    // wrap to end of previous row
+                    select(pos.getRow() - 1, getTableColumn(getTableView().getVisibleLeafColumns().size() - 1));
+                }
+            } else {
+                int focusIndex = getFocusedIndex();
+                if (focusIndex == -1) {
+                    select(getItemCount() - 1);
+                } else if (focusIndex > 0) {
+                    select(focusIndex - 1);
+                }
+            }
+        }
+
+        @Override public void selectNext() {
+            if (isCellSelectionEnabled()) {
+                // in cell selection mode, we have to wrap around, going from
+                // left-to-right, and then wrapping to the start of the next line
+                TablePosition<S,?> pos = getFocusedCell();
+                if (pos.getColumn() + 1 < getTableView().getVisibleLeafColumns().size()) {
+                    // go to next column
+                    select(pos.getRow(), getTableColumn(pos.getTableColumn(), 1));
+                } else if (pos.getRow() < getItemCount() - 1) {
+                    // wrap to start of next row
+                    select(pos.getRow() + 1, getTableColumn(0));
+                }
+            } else {
+                int focusIndex = getFocusedIndex();
+                if (focusIndex == -1) {
+                    select(0);
+                } else if (focusIndex < getItemCount() -1) {
+                    select(focusIndex + 1);
+                }
+            }
+        }
+
+        @Override public void selectAboveCell() {
+            TablePosition<S,?> pos = getFocusedCell();
+            if (pos.getRow() == -1) {
+                select(getItemCount() - 1);
+            } else if (pos.getRow() > 0) {
+                select(pos.getRow() - 1, pos.getTableColumn());
+            }
+        }
+
+        @Override public void selectBelowCell() {
+            TablePosition<S,?> pos = getFocusedCell();
+
+            if (pos.getRow() == -1) {
+                select(0);
+            } else if (pos.getRow() < getItemCount() -1) {
+                select(pos.getRow() + 1, pos.getTableColumn());
+            }
+        }
+
+        @Override public void selectFirst() {
+            TablePosition<S,?> focusedCell = getFocusedCell();
+
+            if (getSelectionMode() == SelectionMode.SINGLE) {
+                quietClearSelection();
+            }
+
+            if (getItemCount() > 0) {
+                if (isCellSelectionEnabled()) {
+                    select(0, focusedCell.getTableColumn());
+                } else {
+                    select(0);
+                }
+            }
+        }
+
+        @Override public void selectLast() {
+            TablePosition<S,?> focusedCell = getFocusedCell();
+
+            if (getSelectionMode() == SelectionMode.SINGLE) {
+                quietClearSelection();
+            }
+
+            int numItems = getItemCount();
+            if (numItems > 0 && getSelectedIndex() < numItems - 1) {
+                if (isCellSelectionEnabled()) {
+                    select(numItems - 1, focusedCell.getTableColumn());
+                } else {
+                    select(numItems - 1);
+                }
+            }
+        }
+
+        @Override
+        public void selectLeftCell() {
+            if (! isCellSelectionEnabled()) return;
+
+            TablePosition<S,?> pos = getFocusedCell();
+            if (pos.getColumn() - 1 >= 0) {
+                select(pos.getRow(), getTableColumn(pos.getTableColumn(), -1));
+            }
+        }
+
+        @Override
+        public void selectRightCell() {
+            if (! isCellSelectionEnabled()) return;
+
+            TablePosition<S,?> pos = getFocusedCell();
+            if (pos.getColumn() + 1 < getTableView().getVisibleLeafColumns().size()) {
+                select(pos.getRow(), getTableColumn(pos.getTableColumn(), 1));
+            }
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Support code                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        private void updateItemsObserver(ObservableList<S> oldList, ObservableList<S> newList) {
+            // the items list has changed, we need to observe
+            // the new list, and remove any observer we had from the old list
+            if (oldList != null) {
+                oldList.removeListener(weakItemsContentListener);
+            }
+            if (newList != null) {
+                newList.addListener(weakItemsContentListener);
+            }
+
+            updateItemCount();
+            updateDefaultSelection();
+        }
+
+        private void updateDefaultSelection() {
+            // when the items list totally changes, we should clear out
+            // the selection
+            int newSelectionIndex = -1;
+            int newFocusIndex = -1;
+            if (tableView.getItems() != null) {
+                S selectedItem = getSelectedItem();
+                if (selectedItem != null) {
+                    newSelectionIndex = tableView.getItems().indexOf(selectedItem);
+                }
+
+                // we put focus onto the first item, if there is at least
+                // one item in the list
+                if (newFocusIndex == -1) {
+                    newFocusIndex = tableView.getItems().size() > 0 ? 0 : -1;
+                }
+            }
+
+            clearSelection();
+            select(newSelectionIndex, isCellSelectionEnabled() ? getTableColumn(0) : null);
+            focus(newFocusIndex, isCellSelectionEnabled() ? getTableColumn(0) : null);
+        }
+        
+        private TableColumn<S,?> getTableColumn(int pos) {
+            return getTableView().getVisibleLeafColumn(pos);
+        }
+        
+        // Gets a table column to the left or right of the current one, given an offset
+        private TableColumn<S,?> getTableColumn(TableColumn<S,?> column, int offset) {
+            int columnIndex = getTableView().getVisibleLeafIndex(column);
+            int newColumnIndex = columnIndex + offset;
+            return getTableView().getVisibleLeafColumn(newColumnIndex);
+        }
+
+        private void updateSelectedIndex(int row) {
+            setSelectedIndex(row);
+            setSelectedItem(getModelItem(row));
+        }
+        
+        /** {@inheritDoc} */
+        @Override protected int getItemCount() {
+            return itemCount;
+        }
+
+        private void updateItemCount() {
+            if (tableView == null) {
+                itemCount = -1;
+            } else {
+                List<S> items = getTableModel();
+                itemCount = items == null ? -1 : items.size();
+            }
+        }
+
+        private void handleSelectedCellsListChangeEvent(ListChangeListener.Change<? extends TablePosition<S,?>> c) {
+            // RT-29313: because selectedIndices and selectedItems represent
+            // row-based selection, we need to update the
+            // selectedIndicesBitSet when the selectedCells changes to
+            // ensure that selectedIndices and selectedItems return only
+            // the correct values (and only once). The issue identified
+            // by RT-29313 is that the size and contents of selectedIndices
+            // and selectedItems can not simply defer to the
+            // selectedCells as selectedCells may be representing
+            // multiple cells from one row (e.g. selectedCells of
+            // [(0,1), (1,1), (1,2), (1,3)] should result in
+            // selectedIndices of [0,1], not [0,1,1,1]).
+            // An inefficient solution would rebuild the selectedIndicesBitSet
+            // every time the change happens, but we can do better than
+            // that. Inefficient solution:
+            //
+            // selectedIndicesBitSet.clear();
+            // for (int i = 0; i < selectedCells.size(); i++) {
+            //     final TablePosition<S,?> tp = selectedCells.get(i);
+            //     final int row = tp.getRow();
+            //     selectedIndicesBitSet.set(row);
+            // }
+            //
+            // A more efficient solution:
+            final List<Integer> newlySelectedRows = new ArrayList<>();
+            final List<Integer> newlyUnselectedRows = new ArrayList<>();
+
+            while (c.next()) {
+                if (c.wasRemoved()) {
+                    List<? extends TablePosition<S,?>> removed = c.getRemoved();
+                    for (int i = 0; i < removed.size(); i++) {
+                        final TablePosition<S,?> tp = removed.get(i);
+                        final int row = tp.getRow();
+
+                        if (selectedIndices.get(row)) {
+                            selectedIndices.clear(row);
+                            newlyUnselectedRows.add(row);
+                        }
+                    }
+                }
+                if (c.wasAdded()) {
+                    List<? extends TablePosition<S,?>> added = c.getAddedSubList();
+                    for (int i = 0; i < added.size(); i++) {
+                        final TablePosition<S,?> tp = added.get(i);
+                        final int row = tp.getRow();
+
+                        if (! selectedIndices.get(row)) {
+                            selectedIndices.set(row);
+                            newlySelectedRows.add(row);
+                        }
+                    }
+                }
+            }
+            c.reset();
+
+            if (isAtomic()) {
+                return;
+            }
+
+            // when the selectedCells observableArrayList changes, we manually call
+            // the observers of the selectedItems, selectedIndices and
+            // selectedCells lists.
+
+            // here we are considering whether to notify the observers of the
+            // selectedItems list. However, we can't just blindly do that, as
+            // noted below. This is a part of the fix for RT-37429.
+            c.next();
+            boolean fireChangeEvent;
+            outer: if (c.wasReplaced()) {
+                // if a replace happened, we need to check to see if the
+                // change actually impacts on the selected items - it may
+                // be that the index changed to the new location of the same
+                // item (i.e. if a sort occurred). Only if the item has changed
+                // should we fire an event to the observers of the selectedItems
+                // list
+                final int removedSize = c.getRemovedSize();
+                final int addedSize = c.getAddedSize();
+                if (removedSize != addedSize) {
+                    fireChangeEvent = true;
+                } else {
+                    for (int i = 0; i < removedSize; i++) {
+                        TablePosition<S, ?> removed = c.getRemoved().get(i);
+                        S removedItem = removed.getItem();
+
+                        boolean matchFound = false;
+                        for (int j = 0; j < addedSize; j++) {
+                            TablePosition<S, ?> added = c.getAddedSubList().get(j);
+                            S addedItem = added.getItem();
+
+                            if (removedItem.equals(addedItem)) {
+                                matchFound = true;
+                                break;
+                            }
+                        }
+
+                        if (!matchFound) {
+                            fireChangeEvent = true;
+                            break outer;
+                        }
+                    }
+                    fireChangeEvent = false;
+                }
+            } else {
+                fireChangeEvent = true;
+            }
+
+            if (fireChangeEvent) {
+                if (selectedItemChange != null) {
+                    selectedItems.callObservers(selectedItemChange);
+                } else {
+                    // create an on-demand list of the removed objects contained in the
+                    // given rows.
+                    selectedItems.callObservers(new MappingChange<>(c, cellToItemsMap, selectedItems));
+                }
+            }
+            c.reset();
+
+            // Fix for RT-31577 - the selectedItems list was going to
+            // empty, but the selectedItem property was staying non-null.
+            // There is a unit test for this, so if a more elegant solution
+            // can be found in the future and this code removed, the unit
+            // test will fail if it isn't fixed elsewhere.
+            // makeAtomic toggle added to resolve RT-32618
+            if (selectedItems.isEmpty() && getSelectedItem() != null) {
+                setSelectedItem(null);
+            }
+
+            final ReadOnlyUnbackedObservableList<Integer> selectedIndicesSeq =
+                    (ReadOnlyUnbackedObservableList<Integer>)getSelectedIndices();
+
+            if (! newlySelectedRows.isEmpty() && newlyUnselectedRows.isEmpty()) {
+                // need to come up with ranges based on the actualSelectedRows, and
+                // then fire the appropriate number of changes. We also need to
+                // translate from a desired row to select to where that row is
+                // represented in the selectedIndices list. For example,
+                // we may have requested to select row 5, and the selectedIndices
+                // list may therefore have the following: [1,4,5], meaning row 5
+                // is in position 2 of the selectedIndices list
+                ListChangeListener.Change<Integer> change = createRangeChange(selectedIndicesSeq, newlySelectedRows, false);
+                selectedIndicesSeq.callObservers(change);
+            } else {
+                selectedIndicesSeq.callObservers(new MappingChange<>(c, cellToIndicesMap, selectedIndicesSeq));
+                c.reset();
+            }
+
+            selectedCellsSeq.callObservers(new MappingChange<>(c, MappingChange.NOOP_MAP, selectedCellsSeq));
+            c.reset();
+        }
+    }
+    
+    
+    
+    
+    /**
+     * A {@link FocusModel} with additional functionality to support the requirements
+     * of a TableView control.
+     * 
+     * @see TableView
+     * @since JavaFX 2.0
+     */
+    public static class TableViewFocusModel<S> extends TableFocusModel<S, TableColumn<S, ?>> {
+
+        private final TableView<S> tableView;
+
+        private final TablePosition<S,?> EMPTY_CELL;
+
+        /**
+         * Creates a default TableViewFocusModel instance that will be used to
+         * manage focus of the provided TableView control.
+         * 
+         * @param tableView The tableView upon which this focus model operates.
+         * @throws NullPointerException The TableView argument can not be null.
+         */
+        public TableViewFocusModel(final TableView<S> tableView) {
+            if (tableView == null) {
+                throw new NullPointerException("TableView can not be null");
+            }
+
+            this.tableView = tableView;
+            this.EMPTY_CELL = new TablePosition<>(tableView, -1, null);
+
+            if (tableView.getItems() != null) {
+                this.tableView.getItems().addListener(weakItemsContentListener);
+            }
+
+            this.tableView.itemsProperty().addListener(new InvalidationListener() {
+                private WeakReference<ObservableList<S>> weakItemsRef = new WeakReference<>(tableView.getItems());
+
+                @Override public void invalidated(Observable observable) {
+                    ObservableList<S> oldItems = weakItemsRef.get();
+                    weakItemsRef = new WeakReference<>(tableView.getItems());
+                    updateItemsObserver(oldItems, tableView.getItems());
+                }
+            });
+
+            updateDefaultFocus();
+        }
+        
+        // Listen to changes in the tableview items list, such that when it
+        // changes we can update the focused index to refer to the new indices.
+        private final ListChangeListener<S> itemsContentListener = c -> {
+            c.next();
+            TablePosition<S,?> focusedCell = getFocusedCell();
+            final int focusedIndex = focusedCell.getRow();
+            if (focusedIndex == -1 || c.getFrom() > focusedIndex) {
+                return;
+            }
+            c.reset();
+            boolean added = false;
+            boolean removed = false;
+            int addedSize = 0;
+            int removedSize = 0;
+            while (c.next()) {
+                added |= c.wasAdded();
+                removed |= c.wasRemoved();
+                addedSize += c.getAddedSize();
+                removedSize += c.getRemovedSize();
+            }
+
+            if (added && ! removed) {
+                if (addedSize < c.getList().size()) {
+                    final int newFocusIndex = Math.min(getItemCount() - 1, getFocusedIndex() + addedSize);
+                    focus(newFocusIndex, focusedCell.getTableColumn());
+                }
+            } else if (!added && removed) {
+                final int newFocusIndex = Math.max(0, getFocusedIndex() - removedSize);
+                if (newFocusIndex < 0) {
+                    focus(0, focusedCell.getTableColumn());
+                } else {
+                    focus(newFocusIndex, focusedCell.getTableColumn());
+                }
+            }
+        };
+        
+        private WeakListChangeListener<S> weakItemsContentListener 
+                = new WeakListChangeListener<>(itemsContentListener);
+        
+        private void updateItemsObserver(ObservableList<S> oldList, ObservableList<S> newList) {
+            // the tableview items list has changed, we need to observe
+            // the new list, and remove any observer we had from the old list
+            if (oldList != null) oldList.removeListener(weakItemsContentListener);
+            if (newList != null) newList.addListener(weakItemsContentListener);
+
+            updateDefaultFocus();
+        }
+
+        /** {@inheritDoc} */
+        @Override protected int getItemCount() {
+            if (tableView.getItems() == null) return -1;
+            return tableView.getItems().size();
+        }
+
+        /** {@inheritDoc} */
+        @Override protected S getModelItem(int index) {
+            if (tableView.getItems() == null) return null;
+
+            if (index < 0 || index >= getItemCount()) return null;
+
+            return tableView.getItems().get(index);
+        }
+
+        /**
+         * The position of the current item in the TableView which has the focus.
+         */
+        private ReadOnlyObjectWrapper<TablePosition> focusedCell;
+        public final ReadOnlyObjectProperty<TablePosition> focusedCellProperty() {
+            return focusedCellPropertyImpl().getReadOnlyProperty();
+        }
+        private void setFocusedCell(TablePosition value) { focusedCellPropertyImpl().set(value);  }
+        public final TablePosition getFocusedCell() { return focusedCell == null ? EMPTY_CELL : focusedCell.get(); }
+
+        private ReadOnlyObjectWrapper<TablePosition> focusedCellPropertyImpl() {
+            if (focusedCell == null) {
+                focusedCell = new ReadOnlyObjectWrapper<TablePosition>(EMPTY_CELL) {
+                    private TablePosition old;
+                    @Override protected void invalidated() {
+                        if (get() == null) return;
+
+                        if (old == null || !old.equals(get())) {
+                            setFocusedIndex(get().getRow());
+                            setFocusedItem(getModelItem(getValue().getRow()));
+
+                            old = get();
+                        }
+                    }
+
+                    @Override
+                    public Object getBean() {
+                        return TableViewFocusModel.this;
+                    }
+
+                    @Override
+                    public String getName() {
+                        return "focusedCell";
+                    }
+                };
+            }
+            return focusedCell;
+        }
+
+
+        /**
+         * Causes the item at the given index to receive the focus.
+         *
+         * @param row The row index of the item to give focus to.
+         * @param column The column of the item to give focus to. Can be null.
+         */
+        @Override public void focus(int row, TableColumn<S,?> column) {
+            if (row < 0 || row >= getItemCount()) {
+                setFocusedCell(EMPTY_CELL);
+            } else {
+                TablePosition<S,?> oldFocusCell = getFocusedCell();
+                TablePosition<S,?> newFocusCell = new TablePosition<>(tableView, row, column);
+                setFocusedCell(newFocusCell);
+
+                if (newFocusCell.equals(oldFocusCell)) {
+                    // manually update the focus properties to ensure consistency
+                    setFocusedIndex(row);
+                    setFocusedItem(getModelItem(row));
+                }
+            }
+        }
+
+        /**
+         * Convenience method for setting focus on a particular row or cell
+         * using a {@link TablePosition}.
+         * 
+         * @param pos The table position where focus should be set.
+         */
+        public void focus(TablePosition pos) {
+            if (pos == null) return;
+            focus(pos.getRow(), pos.getTableColumn());
+        }
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Public API                                                          *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * Tests whether the row / cell at the given location currently has the
+         * focus within the TableView.
+         */
+        @Override public boolean isFocused(int row, TableColumn<S,?> column) {
+            if (row < 0 || row >= getItemCount()) return false;
+
+            TablePosition cell = getFocusedCell();
+            boolean columnMatch = column == null || column.equals(cell.getTableColumn());
+
+            return cell.getRow() == row && columnMatch;
+        }
+
+        /**
+         * Causes the item at the given index to receive the focus. This does not
+         * cause the current selection to change. Updates the focusedItem and
+         * focusedIndex properties such that <code>focusedIndex = -1</code> unless
+         * <pre><code>0 <= index < model size</code></pre>.
+         *
+         * @param index The index of the item to get focus.
+         */
+        @Override public void focus(int index) {
+            if (index < 0 || index >= getItemCount()) {
+                setFocusedCell(EMPTY_CELL);
+            } else {
+                setFocusedCell(new TablePosition<>(tableView, index, null));
+            }
+        }
+
+        /**
+         * Attempts to move focus to the cell above the currently focused cell.
+         */
+        @Override public void focusAboveCell() {
+            TablePosition cell = getFocusedCell();
+
+            if (getFocusedIndex() == -1) {
+                focus(getItemCount() - 1, cell.getTableColumn());
+            } else if (getFocusedIndex() > 0) {
+                focus(getFocusedIndex() - 1, cell.getTableColumn());
+            }
+        }
+
+        /**
+         * Attempts to move focus to the cell below the currently focused cell.
+         */
+        @Override public void focusBelowCell() {
+            TablePosition cell = getFocusedCell();
+            if (getFocusedIndex() == -1) {
+                focus(0, cell.getTableColumn());
+            } else if (getFocusedIndex() != getItemCount() -1) {
+                focus(getFocusedIndex() + 1, cell.getTableColumn());
+            }
+        }
+
+        /**
+         * Attempts to move focus to the cell to the left of the currently focused cell.
+         */
+        @Override public void focusLeftCell() {
+            TablePosition cell = getFocusedCell();
+            if (cell.getColumn() <= 0) return;
+            focus(cell.getRow(), getTableColumn(cell.getTableColumn(), -1));
+        }
+
+        /**
+         * Attempts to move focus to the cell to the right of the the currently focused cell.
+         */
+        @Override public void focusRightCell() {
+            TablePosition cell = getFocusedCell();
+            if (cell.getColumn() == getColumnCount() - 1) return;
+            focus(cell.getRow(), getTableColumn(cell.getTableColumn(), 1));
+        }
+
+        /** {@inheritDoc} */
+        @Override public void focusPrevious() {
+            if (getFocusedIndex() == -1) {
+                focus(0);
+            } else if (getFocusedIndex() > 0) {
+                focusAboveCell();
+            }
+        }
+
+        /** {@inheritDoc} */
+        @Override public void focusNext() {
+            if (getFocusedIndex() == -1) {
+                focus(0);
+            } else if (getFocusedIndex() != getItemCount() -1) {
+                focusBelowCell();
+            }
+        }
+
+        /***********************************************************************
+         *                                                                     *
+         * Private Implementation                                              *
+         *                                                                     *
+         **********************************************************************/
+
+        private void updateDefaultFocus() {
+            // when the items list totally changes, we should clear out
+            // the focus
+            int newValueIndex = -1;
+            if (tableView.getItems() != null) {
+                S focusedItem = getFocusedItem();
+                if (focusedItem != null) {
+                    newValueIndex = tableView.getItems().indexOf(focusedItem);
+                }
+
+                // we put focus onto the first item, if there is at least
+                // one item in the list
+                if (newValueIndex == -1) {
+                    newValueIndex = tableView.getItems().size() > 0 ? 0 : -1;
+                }
+            }
+
+            TablePosition<S,?> focusedCell = getFocusedCell();
+            TableColumn<S,?> focusColumn = focusedCell != null && !EMPTY_CELL.equals(focusedCell) ?
+               focusedCell.getTableColumn() : tableView.getVisibleLeafColumn(0);
+
+            focus(newValueIndex, focusColumn);
+        }
+
+        private int getColumnCount() {
+            return tableView.getVisibleLeafColumns().size();
+        }
+
+        // Gets a table column to the left or right of the current one, given an offset
+        private TableColumn<S,?> getTableColumn(TableColumn<S,?> column, int offset) {
+            int columnIndex = tableView.getVisibleLeafIndex(column);
+            int newColumnIndex = columnIndex + offset;
+            return tableView.getVisibleLeafColumn(newColumnIndex);
+        }
+    }
+}
--- old/modules/controls/src/main/java/javafx/scene/control/TextArea.java	2015-09-03 14:59:21.232777200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TextArea.java	2015-09-03 14:59:20.583740100 -0700
@@ -49,8 +49,8 @@
 import com.sun.javafx.binding.ExpressionHelper;
 import com.sun.javafx.collections.ListListenerHelper;
 import com.sun.javafx.collections.NonIterableChange;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.TextAreaSkin;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.TextAreaSkin;
 
 import javafx.css.Styleable;
 import javafx.scene.AccessibleRole;
--- old/modules/controls/src/main/java/javafx/scene/control/TextField.java	2015-09-03 14:59:28.659202000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TextField.java	2015-09-03 14:59:28.093169600 -0700
@@ -45,9 +45,9 @@
 import javafx.scene.AccessibleRole;
 
 import com.sun.javafx.binding.ExpressionHelper;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.TextFieldSkin;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.scene.control.skin.TextFieldSkin;
 
 import javafx.css.Styleable;
 
--- old/modules/controls/src/main/java/javafx/scene/control/TitledPane.java	2015-09-03 14:59:36.404645000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TitledPane.java	2015-09-03 14:59:35.802610600 -0700
@@ -43,8 +43,8 @@
 import javafx.css.StyleableBooleanProperty;
 import javafx.css.CssMetaData;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.scene.control.skin.TitledPaneSkin;
+import javafx.css.converter.BooleanConverter;
+import javafx.scene.control.skin.TitledPaneSkin;
 
 import javafx.beans.DefaultProperty;
 import javafx.css.Styleable;
--- old/modules/controls/src/main/java/javafx/scene/control/ToggleButton.java	2015-09-03 14:59:43.875072300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ToggleButton.java	2015-09-03 14:59:43.279038200 -0700
@@ -40,7 +40,7 @@
 import javafx.scene.Node;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.scene.control.skin.ToggleButtonSkin;
+import javafx.scene.control.skin.ToggleButtonSkin;
 
 import javafx.css.StyleableProperty;
 
--- old/modules/controls/src/main/java/javafx/scene/control/ToolBar.java	2015-09-03 14:59:51.675518500 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/ToolBar.java	2015-09-03 14:59:51.068483700 -0700
@@ -41,8 +41,8 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.scene.control.skin.ToolBarSkin;
+import javafx.css.converter.EnumConverter;
+import javafx.scene.control.skin.ToolBarSkin;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
--- old/modules/controls/src/main/java/javafx/scene/control/Tooltip.java	2015-09-03 14:59:59.117944100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/Tooltip.java	2015-09-03 14:59:58.527910400 -0700
@@ -36,11 +36,11 @@
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableStringProperty;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.scene.control.skin.TooltipSkin;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StringConverter;
+import javafx.scene.control.skin.TooltipSkin;
 
 import java.util.ArrayList;
 import java.util.Collections;
--- old/modules/controls/src/main/java/javafx/scene/control/TreeCell.java	2015-09-03 15:00:06.425362100 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TreeCell.java	2015-09-03 15:00:05.803326500 -0700
@@ -36,7 +36,7 @@
 import javafx.scene.AccessibleAttribute;
 import javafx.scene.AccessibleRole;
 import javafx.scene.Node;
-import com.sun.javafx.scene.control.skin.TreeCellSkin;
+import javafx.scene.control.skin.TreeCellSkin;
 import javafx.collections.WeakListChangeListener;
 import java.lang.ref.WeakReference;
 
--- old/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java	2015-09-03 15:00:13.945792200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TreeTableCell.java	2015-09-03 15:00:13.326756800 -0700
@@ -26,7 +26,7 @@
 package javafx.scene.control;
 
 import javafx.css.PseudoClass;
-import com.sun.javafx.scene.control.skin.TreeTableCellSkin;
+import javafx.scene.control.skin.TreeTableCellSkin;
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.value.ObservableValue;
--- old/modules/controls/src/main/java/javafx/scene/control/TreeTableColumn.java	2015-09-03 15:00:21.319214000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TreeTableColumn.java	2015-09-03 15:00:20.749181400 -0700
@@ -25,6 +25,7 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.scene.control.Properties;
 import javafx.css.CssMetaData;
 import java.util.Collections;
 import java.util.List;
@@ -46,7 +47,7 @@
 import javafx.scene.Node;
 import javafx.util.Callback;
 import javafx.css.Styleable;
-import com.sun.javafx.scene.control.skin.TableViewSkinBase;
+import javafx.scene.control.skin.TableViewSkinBase;
 /**
  * A {@link TreeTableView} is made up of a number of TreeTableColumn instances. Each
  * TreeTableColumn in a {@link TreeTableView} is responsible for displaying
@@ -411,10 +412,10 @@
                     TreeTableView<S> table = getTreeTableView();
                     if (table == null) return;
                     Map<Object,Object> properties = table.getProperties();
-                    if (properties.containsKey(TableViewSkinBase.RECREATE)) {
-                        properties.remove(TableViewSkinBase.RECREATE);
+                    if (properties.containsKey(Properties.RECREATE)) {
+                        properties.remove(Properties.RECREATE);
                     }
-                    properties.put(TableViewSkinBase.RECREATE, Boolean.TRUE);
+                    properties.put(Properties.RECREATE, Boolean.TRUE);
                 }
             };
     public final void setCellFactory(Callback<TreeTableColumn<S,T>, TreeTableCell<S,T>> value) {
--- old/modules/controls/src/main/java/javafx/scene/control/TreeTableRow.java	2015-09-03 15:00:28.639632700 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TreeTableRow.java	2015-09-03 15:00:28.055599300 -0700
@@ -26,7 +26,7 @@
 package javafx.scene.control;
 
 import javafx.css.PseudoClass;
-import com.sun.javafx.scene.control.skin.TreeTableRowSkin;
+import javafx.scene.control.skin.TreeTableRowSkin;
 import java.lang.ref.WeakReference;
 
 import javafx.beans.InvalidationListener;
--- old/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java	2015-09-03 15:00:36.291070300 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TreeTableView.java	2015-09-03 15:00:35.704036700 -0700
@@ -28,6 +28,7 @@
 import com.sun.javafx.collections.MappingChange;
 import com.sun.javafx.collections.NonIterableChange;
 import com.sun.javafx.collections.annotations.ReturnsUnmodifiableCollection;
+import com.sun.javafx.scene.control.Properties;
 import com.sun.javafx.scene.control.SelectedCellsMap;
 
 import com.sun.javafx.scene.control.behavior.TableCellBehaviorBase;
@@ -36,21 +37,29 @@
 import javafx.css.CssMetaData;
 import javafx.css.PseudoClass;
 
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
 import com.sun.javafx.scene.control.TableColumnComparatorBase;
-import com.sun.javafx.scene.control.skin.TableViewSkinBase;
 
 import javafx.css.Styleable;
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableProperty;
 import javafx.event.WeakEventHandler;
 
-import com.sun.javafx.scene.control.skin.TreeTableViewSkin;
+import javafx.scene.control.skin.TreeTableViewSkin;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
 
 import javafx.application.Platform;
 import javafx.beans.DefaultProperty;
@@ -1830,7 +1839,7 @@
      * @since JavaFX 8u60
      */
     public void refresh() {
-        getProperties().put(TableViewSkinBase.RECREATE, Boolean.TRUE);
+        getProperties().put(Properties.RECREATE, Boolean.TRUE);
     }
     
     
--- old/modules/controls/src/main/java/javafx/scene/control/TreeView.java	2015-09-03 15:00:44.541542200 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/TreeView.java	2015-09-03 15:00:43.931507300 -0700
@@ -26,10 +26,10 @@
 package javafx.scene.control;
 
 import com.sun.javafx.collections.NonIterableChange;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.Properties;
 import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
-import com.sun.javafx.scene.control.skin.ListViewSkin;
-import com.sun.javafx.scene.control.skin.TreeViewSkin;
+import javafx.scene.control.skin.TreeViewSkin;
 
 import javafx.application.Platform;
 import javafx.beans.DefaultProperty;
@@ -1027,7 +1027,7 @@
      * @since JavaFX 8u60
      */
     public void refresh() {
-        getProperties().put(TreeViewSkin.RECREATE, Boolean.TRUE);
+        getProperties().put(Properties.RECREATE, Boolean.TRUE);
     }
 
 
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/ListViewAnchorRetriever.java	2015-09-03 15:00:52.065972600 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/ListViewAnchorRetriever.java	2015-09-03 15:00:51.466938300 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/TableViewAnchorRetriever.java	2015-09-03 15:00:59.596403300 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/TableViewAnchorRetriever.java	2015-09-03 15:00:59.044371700 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/TreeTableViewAnchorRetriever.java	2015-09-03 15:01:07.314844800 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/TreeTableViewAnchorRetriever.java	2015-09-03 15:01:06.806815700 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/TreeViewAnchorRetriever.java	2015-09-03 15:01:14.102233000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/TreeViewAnchorRetriever.java	2015-09-03 15:01:13.488197900 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/infrastructure/KeyModifier.java	2015-09-03 15:01:21.759671000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/infrastructure/KeyModifier.java	2015-09-03 15:01:21.030629300 -0700
@@ -27,7 +27,6 @@
 
 import com.sun.javafx.util.Utils;
 import com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.scene.control.behavior.KeyBinding;
 import com.sun.javafx.tk.Toolkit;
 import javafx.scene.input.KeyCode;
 
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/infrastructure/VirtualFlowTestUtils.java	2015-09-03 15:01:29.233098400 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/infrastructure/VirtualFlowTestUtils.java	2015-09-03 15:01:28.643064700 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -26,13 +26,17 @@
 
 import static org.junit.Assert.assertNotNull;
 
-import com.sun.javafx.scene.control.skin.*;
 import javafx.geometry.Orientation;
-import javafx.scene.Group;
 import javafx.scene.Node;
-import javafx.scene.Scene;
 import javafx.scene.control.*;
-import javafx.stage.Stage;
+import javafx.scene.control.skin.ComboBoxListViewSkin;
+import com.sun.javafx.scene.control.LabeledText;
+import javafx.scene.control.skin.NestedTableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableHeaderRow;
+import javafx.scene.control.skin.TableViewSkinBase;
+import javafx.scene.control.skin.VirtualFlow;
+import com.sun.javafx.scene.control.VirtualScrollBar;
 import javafx.util.Callback;
 import java.util.List;
 
@@ -312,7 +316,7 @@
     public static void assertTableHeaderColumnExists(final Control control, final TableColumnBase column, boolean expected) {
         TableHeaderRow headerRow = getTableHeaderRow(control);
 
-        NestedTableColumnHeader rootHeader = headerRow.getRootHeader();
+        NestedTableColumnHeader rootHeader = getNestedTableColumnHeader(headerRow);
         boolean match = false;
         for (TableColumnHeader header : rootHeader.getColumnHeaders()) {
             match = column.equals(header.getTableColumn());
@@ -340,7 +344,7 @@
         if (control instanceof ComboBox) {
             final ComboBox cb = (ComboBox) control;
             final ComboBoxListViewSkin skin = (ComboBoxListViewSkin) cb.getSkin();
-            control = skin.getListView();
+            control = (ListView) skin.getPopupContent();
         }
 
         flow = (VirtualFlow<?>)control.lookup("#virtual-flow");
@@ -367,7 +371,7 @@
             throw new IllegalStateException("getTableHeaderRow requires the control to be visible in a stage");
         }
 
-        TableViewSkinBase<?,?,?,?,?,?> skin = (TableViewSkinBase) control.getSkin();
+        TableViewSkinBase<?,?,?,?,?> skin = (TableViewSkinBase) control.getSkin();
         TableHeaderRow headerRow = null;
         for (Node n : skin.getChildren()) {
             if (n instanceof TableHeaderRow) {
@@ -395,7 +399,7 @@
 
     public static TableColumnHeader getTableColumnHeader(Control table, TableColumnBase<?,?> column) {
         TableHeaderRow headerRow = VirtualFlowTestUtils.getTableHeaderRow(table);
-        return findColumnHeader(headerRow.getRootHeader(), column);
+        return findColumnHeader(getNestedTableColumnHeader(headerRow), column);
     }
 
     private static TableColumnHeader findColumnHeader(NestedTableColumnHeader nestedHeader, TableColumnBase<?,?> column) {
@@ -413,4 +417,15 @@
         }
         return null;
     }
+
+    public static NestedTableColumnHeader getNestedTableColumnHeader(TableHeaderRow headerRow) {
+        NestedTableColumnHeader rootHeader = null;
+
+        for (Node n : headerRow.getChildren()) {
+            if (n instanceof NestedTableColumnHeader) {
+                rootHeader = (NestedTableColumnHeader) n;
+            }
+        }
+        return rootHeader;
+    }
 }
--- old/modules/controls/src/test/java/javafx/scene/chart/XYChartTest.java	2015-09-03 15:01:36.855534400 -0700
+++ new/modules/controls/src/test/java/javafx/scene/chart/XYChartTest.java	2015-09-03 15:01:36.256500100 -0700
@@ -32,7 +32,7 @@
 import javafx.css.ParsedValue;
 import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CssParser;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.layout.StackPane;
@@ -79,7 +79,7 @@
         assertEquals(10, new Double(yaxis.measure.getFont().getSize()).intValue());
         
         // set tick label font via css and test if ticklabelfont, measure and tick textnode follow.
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-tick-label-font","0.916667em System");
+        ParsedValue pv = new CssParser().parseExpr("-fx-tick-label-font","0.916667em System");
         Object val = pv.convert(null);        
         CssMetaData prop = ((StyleableProperty)yaxis.tickLabelFontProperty()).getCssMetaData();
         try {
--- old/modules/controls/src/test/java/javafx/scene/control/ChoiceBoxTest.java	2015-09-03 15:01:44.657980700 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ChoiceBoxTest.java	2015-09-03 15:01:44.020944200 -0700
@@ -31,8 +31,8 @@
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassDoesNotExist;
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertPseudoClassExists;
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import com.sun.javafx.scene.control.skin.ChoiceBoxSkin;
-import com.sun.javafx.scene.control.skin.ChoiceBoxSkinNodesRetriever;
+import javafx.scene.control.skin.ChoiceBoxSkin;
+import javafx.scene.control.skin.ChoiceBoxSkinNodesRetriever;
 import javafx.application.Platform;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
--- old/modules/controls/src/test/java/javafx/scene/control/ColorPickerTest.java	2015-09-03 15:01:52.359421200 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ColorPickerTest.java	2015-09-03 15:01:51.799389100 -0700
@@ -38,9 +38,8 @@
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.scene.control.skin.ColorPalette;
-import com.sun.javafx.scene.control.skin.ColorPickerPaletteRetriever;
-import com.sun.javafx.scene.control.skin.ColorPickerSkin;
+import javafx.scene.control.skin.ColorPickerPaletteRetriever;
+import javafx.scene.control.skin.ColorPickerSkin;
 import com.sun.javafx.tk.Toolkit;
 import org.junit.Before;
 import org.junit.Test;
@@ -150,62 +149,4 @@
     @Test public void ensureOnActionPropertyReferencesBean() {
         assertEquals(colorPicker, colorPicker.onActionProperty().getBean());
     }
-    
-    @Test public void ensureCanSelectColorFromPalette() {
-         final MouseEventGenerator generator = new MouseEventGenerator();
-         ColorPickerSkin skin = (ColorPickerSkin)colorPicker.getSkin();
-         assertTrue(skin != null);
-         ColorPalette colorPalette = ColorPickerPaletteRetriever.getColorPalette(colorPicker);
-         colorPicker.show();
-         tk.firePulse();
-         assertTrue(colorPicker.isShowing());
-         GridPane grid = colorPalette.getColorGrid();
-         double xval = grid.getBoundsInLocal().getMinX();
-         double yval = grid.getBoundsInLocal().getMinY();
-        
-        Scene paletteScene = ColorPickerPaletteRetriever.getPopup(colorPicker).getScene();
-        paletteScene.getWindow().requestFocus();
-        
-        paletteScene.impl_processMouseEvent(
-                generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, xval+85, yval+40));
-        
-        paletteScene.impl_processMouseEvent(
-                generator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, xval+85, yval+40));
-        tk.firePulse();
-        
-        assertEquals(colorPicker.getValue().toString(), "0x330033ff");
-    }
-    
-    @Test public void testEscapeClosesCustomColorDialog() {
-//        final MouseEventGenerator generator = new MouseEventGenerator();
-        ColorPickerSkin skin = (ColorPickerSkin)colorPicker.getSkin();
-        assertTrue(skin != null);
-        ColorPalette colorPalette = ColorPickerPaletteRetriever.getColorPalette(colorPicker);
-        colorPicker.show();
-        tk.firePulse();
-        assertTrue(colorPicker.isShowing());
-        Hyperlink link = ColorPickerPaletteRetriever.getCustomColorLink(colorPalette);
-         
-        Scene paletteScene = ColorPickerPaletteRetriever.getPopup(colorPicker).getScene();
-        paletteScene.getWindow().requestFocus();
-        
-        //Click on CustomColor hyperlink to show the custom color dialog.
-        Hyperlink hyperlink = ColorPickerPaletteRetriever.getCustomColorLink(colorPalette);
-        MouseEventFirer mouse = new MouseEventFirer(hyperlink);
-        mouse.fireMousePressAndRelease();
-        mouse.dispose();
-
-        Stage dialog = ColorPickerPaletteRetriever.getCustomColorDialog(colorPalette);
-        assertNotNull(dialog);
-        assertTrue(dialog.isShowing());
-        
-        dialog.requestFocus();
-        tk.firePulse();
-        
-        // fire KeyEvent (Escape) on custom color dialog to close it
-        KeyEventFirer keyboard = new KeyEventFirer(dialog);
-        keyboard.doKeyPress(KeyCode.ESCAPE);
-        tk.firePulse();   
-        assertTrue(!dialog.isShowing());
-    }
 }
--- old/modules/controls/src/test/java/javafx/scene/control/ComboBoxTest.java	2015-09-03 15:01:59.691840600 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ComboBoxTest.java	2015-09-03 15:01:59.077805400 -0700
@@ -27,15 +27,12 @@
 
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import com.sun.javafx.scene.traversal.Direction;
 import com.sun.javafx.tk.Toolkit;
 import javafx.css.PseudoClass;
 
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.scene.control.skin.ComboBoxListViewSkin;
-import com.sun.javafx.scene.control.skin.ListViewSkin;
-import com.sun.javafx.scene.control.skin.VirtualFlow;
+import javafx.scene.control.skin.ComboBoxListViewSkin;
 
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 import static org.junit.Assert.*;
@@ -47,18 +44,14 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
-import javafx.event.Event;
 import javafx.event.EventHandler;
-import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.skin.VirtualFlow;
 import javafx.scene.input.KeyCode;
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
@@ -81,7 +74,7 @@
      ********************************************************************/    
     
     public ListView getListView() {
-        return ((ComboBoxListViewSkin)comboBox.getSkin()).getListView();
+        return (ListView) ((ComboBoxListViewSkin)comboBox.getSkin()).getPopupContent();
     }
     
     public Node getDisplayNode() {
@@ -1313,7 +1306,7 @@
         StageLoader sl = new StageLoader(cb);
         KeyEventFirer cbKeyboard = new KeyEventFirer(cb);
 
-        ListView listView = ((ComboBoxListViewSkin)cb.getSkin()).getListView();
+        ListView listView = (ListView) ((ComboBoxListViewSkin)cb.getSkin()).getPopupContent();
         assertNotNull(listView);
 
         KeyEventFirer lvKeyboard = new KeyEventFirer(listView);
@@ -1332,7 +1325,7 @@
         StageLoader sl = new StageLoader(cb);
         KeyEventFirer cbKeyboard = new KeyEventFirer(cb);
 
-        ListView listView = ((ComboBoxListViewSkin)cb.getSkin()).getListView();
+        ListView listView = (ListView) ((ComboBoxListViewSkin)cb.getSkin()).getPopupContent();
         assertNotNull(listView);
 
         KeyEventFirer lvKeyboard = new KeyEventFirer(listView);
@@ -1351,7 +1344,7 @@
         StageLoader sl = new StageLoader(cb);
         KeyEventFirer cbKeyboard = new KeyEventFirer(cb);
 
-        ListView listView = ((ComboBoxListViewSkin)cb.getSkin()).getListView();
+        ListView listView = (ListView) ((ComboBoxListViewSkin)cb.getSkin()).getPopupContent();
         assertNotNull(listView);
 
         KeyEventFirer lvKeyboard = new KeyEventFirer(listView);
@@ -1464,7 +1457,7 @@
         StageLoader sl = new StageLoader(cb);
         KeyEventFirer cbKeyboard = new KeyEventFirer(cb);
 
-        ListView listView = ((ComboBoxListViewSkin)cb.getSkin()).getListView();
+        ListView listView = (ListView) ((ComboBoxListViewSkin)cb.getSkin()).getPopupContent();
         assertNotNull(listView);
 
         KeyEventFirer lvKeyboard = new KeyEventFirer(listView);
@@ -1484,7 +1477,7 @@
         StageLoader sl = new StageLoader(cb);
         KeyEventFirer cbKeyboard = new KeyEventFirer(cb);
 
-        ListView listView = ((ComboBoxListViewSkin)cb.getSkin()).getListView();
+        ListView listView = (ListView) ((ComboBoxListViewSkin)cb.getSkin()).getPopupContent();
         assertNotNull(listView);
 
         KeyEventFirer lvKeyboard = new KeyEventFirer(listView);
@@ -1504,7 +1497,7 @@
         StageLoader sl = new StageLoader(cb);
         KeyEventFirer cbKeyboard = new KeyEventFirer(cb);
 
-        ListView listView = ((ComboBoxListViewSkin)cb.getSkin()).getListView();
+        ListView listView = (ListView) ((ComboBoxListViewSkin)cb.getSkin()).getPopupContent();
         assertNotNull(listView);
 
         KeyEventFirer lvKeyboard = new KeyEventFirer(listView);
--- old/modules/controls/src/test/java/javafx/scene/control/ContextMenuTest.java	2015-09-03 15:02:07.307276100 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ContextMenuTest.java	2015-09-03 15:02:06.605236000 -0700
@@ -35,7 +35,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static com.sun.javafx.scene.control.skin.ContextMenuContentRetriever.*;
+import static com.sun.javafx.scene.control.ContextMenuContentRetriever.*;
 
 public class ContextMenuTest {
     private MenuItem menuItem0, menuItem1, menuItem2, menuItem3;
--- old/modules/controls/src/test/java/javafx/scene/control/ControlTest.java	2015-09-03 15:02:14.986715400 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ControlTest.java	2015-09-03 15:02:14.394681500 -0700
@@ -1013,7 +1013,8 @@
         if (someClass.getEnclosingClass() != null) return;
 
         if (javafx.scene.control.Control.class.isAssignableFrom(someClass) &&
-                Modifier.isAbstract(someClass.getModifiers()) == false) {
+                Modifier.isAbstract(someClass.getModifiers()) == false &&
+                !Modifier.isPrivate(someClass.getModifiers()) == false) {
             String what = someClass.getName();
             try {
                 // should get NoSuchMethodException if ctor is not public
--- old/modules/controls/src/test/java/javafx/scene/control/DatePickerTest.java	2015-09-03 15:02:22.159125600 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/DatePickerTest.java	2015-09-03 15:02:21.560091400 -0700
@@ -37,8 +37,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.css.PseudoClass;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
@@ -50,10 +48,9 @@
 
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
 
-import com.sun.javafx.scene.control.skin.DatePickerSkin;
+import javafx.scene.control.skin.DatePickerSkin;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
--- old/modules/controls/src/test/java/javafx/scene/control/ListViewKeyInputTest.java	2015-09-03 15:02:29.985573300 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ListViewKeyInputTest.java	2015-09-03 15:02:29.399539800 -0700
@@ -26,14 +26,9 @@
 package javafx.scene.control;
 
 import com.sun.javafx.scene.control.behavior.ListCellBehavior;
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.event.EventHandler;
 import javafx.scene.input.KeyCode;
 import java.util.List;
 import com.sun.javafx.PlatformUtil;
@@ -220,7 +215,7 @@
         sm.clearAndSelect(0);
         assertTrue(fm.isFocused(0));
         keyboard.doRightArrowPress(KeyModifier.getShortcutKey());
-        assertTrue(fm.isFocused(0));
+        assertTrue(debug(), fm.isFocused(0));
         assertTrue(sm.isSelected(0));
     }
     
--- old/modules/controls/src/test/java/javafx/scene/control/ListViewMouseInputTest.java	2015-09-03 15:02:37.358995000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ListViewMouseInputTest.java	2015-09-03 15:02:36.723958700 -0700
@@ -33,18 +33,14 @@
 
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import com.sun.javafx.tk.Toolkit;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.sun.javafx.scene.control.behavior.ListViewAnchorRetriever;
-import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
--- old/modules/controls/src/test/java/javafx/scene/control/ListViewTest.java	2015-09-03 15:02:44.899426300 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ListViewTest.java	2015-09-03 15:02:44.082379600 -0700
@@ -41,40 +41,32 @@
 import java.util.List;
 
 import com.sun.javafx.scene.control.behavior.ListCellBehavior;
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
-import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.cell.CheckBoxListCell;
 import javafx.scene.control.cell.ComboBoxListCell;
 import javafx.scene.control.cell.TextFieldListCell;
-import javafx.scene.control.cell.TextFieldTableCell;
+import com.sun.javafx.scene.control.VirtualScrollBar;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
-import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.scene.control.skin.VirtualScrollBar;
 import com.sun.javafx.scene.control.test.Person;
 import com.sun.javafx.scene.control.test.RT_22463_Person;
 import com.sun.javafx.tk.Toolkit;
--- old/modules/controls/src/test/java/javafx/scene/control/MenuBarTest.java	2015-09-03 15:02:52.940886200 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/MenuBarTest.java	2015-09-03 15:02:52.350852500 -0700
@@ -29,12 +29,10 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import javafx.application.Application;
-import javafx.event.Event;
-import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.control.skin.MenuBarSkinRetriever;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.AnchorPane;
@@ -42,15 +40,14 @@
 import javafx.stage.Stage;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.scene.control.skin.ContextMenuContent;
-import com.sun.javafx.scene.control.skin.MenuBarMenuButtonRetriever;
-import com.sun.javafx.scene.control.skin.MenuBarSkin;
+import com.sun.javafx.scene.control.ContextMenuContent;
+import com.sun.javafx.scene.control.MenuBarMenuButtonRetriever;
+import javafx.scene.control.skin.MenuBarSkin;
 import com.sun.javafx.tk.Toolkit;
 
 
@@ -130,7 +127,7 @@
         double xval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinX();
         double yval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinY();
    
-        MenuButton mb = MenuBarMenuButtonRetriever.getNodeForMenu(skin, 0);
+        MenuButton mb = MenuBarSkinRetriever.getNodeForMenu(skin, 0);
         mb.getScene().getWindow().requestFocus();
         scene.impl_processMouseEvent(
             generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, xval+20, yval+20));
@@ -165,7 +162,7 @@
         double xval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinX();
         double yval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinY();
    
-        MenuButton mb = MenuBarMenuButtonRetriever.getNodeForMenu(skin, 0);
+        MenuButton mb = MenuBarSkinRetriever.getNodeForMenu(skin, 0);
         mb.getScene().getWindow().requestFocus();
         scene.impl_processMouseEvent(
             generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, xval+20, yval+20));
@@ -175,7 +172,7 @@
          /* ------------------------------------------------------------------ */
         
         // Show subMenu
-        ContextMenuContent menuContent = MenuBarMenuButtonRetriever.getMenuContent(mb); // ContextMenuContent
+        ContextMenuContent menuContent = MenuBarSkinRetriever.getMenuContent(mb); // ContextMenuContent
         Node displayNode = MenuBarMenuButtonRetriever.getDisplayNodeForMenuItem(menuContent, 0); // MenuItemContainer
         
         displayNode.getScene().getWindow().requestFocus();
@@ -231,7 +228,7 @@
         
         MenuBarSkin skin = (MenuBarSkin)menuBar.getSkin();
         assertTrue(skin != null);
-        MenuButton mb = MenuBarMenuButtonRetriever.getNodeForMenu(skin, 0);
+        MenuButton mb = MenuBarSkinRetriever.getNodeForMenu(skin, 0);
         mb.getScene().getWindow().requestFocus();
         
         double xval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinX();
@@ -245,7 +242,7 @@
          /* ------------------------------------------------------------------ */
         
         // Show Menu
-        ContextMenuContent menuContent = MenuBarMenuButtonRetriever.getMenuContent(mb); // ContextMenuContent
+        ContextMenuContent menuContent = MenuBarSkinRetriever.getMenuContent(mb); // ContextMenuContent
         Node displayNode = MenuBarMenuButtonRetriever.getDisplayNodeForMenuItem(menuContent, 0); // MenuItemContainer
         
         displayNode.getScene().getWindow().requestFocus();
@@ -265,7 +262,7 @@
         tk.firePulse();
         
         // check if focusedMenuIndex is reset to -1 so navigation happens.
-        int focusedIndex = MenuBarMenuButtonRetriever.getFocusedIndex(skin);
+        int focusedIndex = MenuBarSkinRetriever.getFocusedIndex(skin);
         assertEquals(focusedIndex, -1);
     }
     
@@ -291,7 +288,7 @@
         MenuBarSkin skin = (MenuBarSkin)menuBar.getSkin();
         assertTrue(skin != null);
         
-        MenuButton mb = MenuBarMenuButtonRetriever.getNodeForMenu(skin, 0);
+        MenuButton mb = MenuBarSkinRetriever.getNodeForMenu(skin, 0);
         mb.getScene().getWindow().requestFocus();
         assertTrue(mb.getScene().getWindow().isFocused());
         
@@ -335,7 +332,7 @@
         double xval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinX();
         double yval = (menuBar.localToScene(menuBar.getLayoutBounds())).getMinY();
    
-        MenuButton mb = MenuBarMenuButtonRetriever.getNodeForMenu(skin, 0);
+        MenuButton mb = MenuBarSkinRetriever.getNodeForMenu(skin, 0);
         mb.getScene().getWindow().requestFocus();
         scene.impl_processMouseEvent(
             MouseEventGenerator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, xval+20, yval+20));
@@ -378,7 +375,7 @@
             assertEquals(firstClick.booleanValue(), true);
         });
         
-        MenuButton mb = MenuBarMenuButtonRetriever.getNodeForMenu(skin, 0);
+        MenuButton mb = MenuBarSkinRetriever.getNodeForMenu(skin, 0);
         mb.getScene().getWindow().requestFocus();
         mb.requestFocus();
         assertTrue(mb.isFocused());
--- old/modules/controls/src/test/java/javafx/scene/control/MenuButtonTest.java	2015-09-03 15:03:00.499318600 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/MenuButtonTest.java	2015-09-03 15:02:59.919285400 -0700
@@ -25,11 +25,9 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.MenuButtonSkin;
+import javafx.scene.control.skin.MenuButtonSkin;
 import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.geometry.Side;
 import javafx.scene.Scene;
 import javafx.scene.layout.VBox;
--- old/modules/controls/src/test/java/javafx/scene/control/PopupControlTest.java	2015-09-03 15:03:07.766734200 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/PopupControlTest.java	2015-09-03 15:03:07.206702200 -0700
@@ -25,7 +25,7 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.skin.TooltipSkin;
+import javafx.scene.control.skin.TooltipSkin;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.DoublePropertyBase;
 import javafx.beans.property.SimpleStringProperty;
--- old/modules/controls/src/test/java/javafx/scene/control/ScrollBarTest.java	2015-09-03 15:03:15.534178500 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ScrollBarTest.java	2015-09-03 15:03:14.975146500 -0700
@@ -25,11 +25,11 @@
 
 package javafx.scene.control;
 
+import com.sun.javafx.scene.control.Properties;
 import javafx.css.CssMetaData;
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
 
 import com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.scene.control.skin.ScrollBarSkin;
 import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -71,11 +71,11 @@
     }
 
     @Test public void defaultWidth() {
-        assertEquals(scrollBar.getWidth(), ScrollBarSkin.DEFAULT_WIDTH, 0.0);
+        assertEquals(scrollBar.getWidth(), Properties.DEFAULT_WIDTH, 0.0);
     }
 
     @Test public void defaultHeight() {
-        assertEquals(scrollBar.getHeight(), ScrollBarSkin.DEFAULT_LENGTH, 0.0);
+        assertEquals(scrollBar.getHeight(), Properties.DEFAULT_LENGTH, 0.0);
     }
 
     @Test public void defaultMin() {
--- old/modules/controls/src/test/java/javafx/scene/control/SliderTest.java	2015-09-03 15:03:23.176615600 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/SliderTest.java	2015-09-03 15:03:22.579581500 -0700
@@ -28,7 +28,7 @@
 
 import javafx.css.ParsedValue;
 import javafx.css.CssMetaData;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CssParser;
 import com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
 import javafx.css.StyleableProperty;
@@ -70,7 +70,7 @@
         pane.getChildren().add(slider);
         startApp(pane);
         
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-minor-tick-count","2");
+        ParsedValue pv = new CssParser().parseExpr("-fx-minor-tick-count","2");
         Object val = pv.convert(null);        
         try {
             ((StyleableProperty)slider.minorTickCountProperty()).applyStyle(null, val);
--- old/modules/controls/src/test/java/javafx/scene/control/SpinnerTest.java	2015-09-03 15:03:30.325024500 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/SpinnerTest.java	2015-09-03 15:03:29.754991900 -0700
@@ -26,7 +26,7 @@
 
 import static junit.framework.Assert.*;
 
-import com.sun.javafx.scene.control.skin.SpinnerSkin;
+import javafx.scene.control.skin.SpinnerSkin;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import org.junit.Before;
--- old/modules/controls/src/test/java/javafx/scene/control/SplitPaneTest.java	2015-09-03 15:03:38.176473600 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/SplitPaneTest.java	2015-09-03 15:03:37.572439000 -0700
@@ -30,7 +30,7 @@
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
 
 import com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.scene.control.skin.SplitPaneSkin;
+import javafx.scene.control.skin.SplitPaneSkin;
 import com.sun.javafx.tk.Toolkit;
 import javafx.application.Platform;
 import javafx.beans.property.DoubleProperty;
@@ -48,7 +48,6 @@
 
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
--- old/modules/controls/src/test/java/javafx/scene/control/TabPaneTest.java	2015-09-03 15:03:46.064924800 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TabPaneTest.java	2015-09-03 15:03:45.331882800 -0700
@@ -44,11 +44,9 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.css.CssMetaData;
 import javafx.css.StyleableProperty;
 import javafx.event.Event;
-import javafx.event.EventHandler;
 import javafx.geometry.Bounds;
 import javafx.geometry.Side;
 import javafx.scene.Group;
@@ -66,7 +64,7 @@
 import com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.scene.control.skin.TabPaneSkin;
+import javafx.scene.control.skin.TabPaneSkin;
 import com.sun.javafx.scene.input.KeyCodeMap;
 import com.sun.javafx.tk.Toolkit;
 
--- old/modules/controls/src/test/java/javafx/scene/control/TableColumnTest.java	2015-09-03 15:03:53.022322700 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TableColumnTest.java	2015-09-03 15:03:52.435289100 -0700
@@ -27,16 +27,12 @@
 
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeader;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyIntegerProperty;
-import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
@@ -45,20 +41,15 @@
 import javafx.collections.ObservableList;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
-import javafx.geometry.Pos;
-import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Callback;
 
-import java.security.PublicKey;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import com.sun.javafx.property.PropertyReference;
 import com.sun.javafx.scene.control.test.Person;
 import org.junit.Before;
 import org.junit.Ignore;
--- old/modules/controls/src/test/java/javafx/scene/control/TableViewKeyInputTest.java	2015-09-03 15:03:59.840712700 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TableViewKeyInputTest.java	2015-09-03 15:03:59.149673200 -0700
@@ -25,7 +25,6 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.behavior.ListCellBehavior;
 import com.sun.javafx.scene.control.behavior.TableCellBehavior;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
@@ -2573,7 +2572,7 @@
 
         keyboard.doKeyPress(KeyCode.SPACE);
         Toolkit.getToolkit().firePulse();
-        assertEquals(2, getAnchor().getRow());
+        assertEquals(debug(), 2, getAnchor().getRow());
         assertEquals(2, fm.getFocusedIndex());
         assertEquals(2, sm.getSelectedIndex());
         assertTrue(isSelected(1, 2));
--- old/modules/controls/src/test/java/javafx/scene/control/TableViewTest.java	2015-09-03 15:04:07.157131200 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TableViewTest.java	2015-09-03 15:04:06.511094200 -0700
@@ -26,46 +26,43 @@
 package javafx.scene.control;
 
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.assertStyleClassContains;
-import static javafx.application.Platform.runLater;
 import static javafx.scene.control.TableColumn.SortType.ASCENDING;
 import static javafx.scene.control.TableColumn.SortType.DESCENDING;
 import static org.junit.Assert.*;
 
 import java.util.*;
-import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Supplier;
 
 import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
 import com.sun.javafx.scene.control.SelectedCellsMap;
-import com.sun.javafx.scene.control.behavior.ListCellBehavior;
 import com.sun.javafx.scene.control.behavior.TableCellBehavior;
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.scene.control.skin.*;
 import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.*;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
-import test.javafx.collections.MockSetObserver;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.SortedList;
-import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Orientation;
 import javafx.scene.Group;
 import javafx.scene.Scene;
 import javafx.scene.control.cell.*;
+import javafx.scene.control.skin.TableCellSkin;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.TableColumnHeaderRetriever;
+import javafx.scene.control.skin.TableHeaderRow;
+import javafx.scene.control.skin.TableHeaderRowRetriever;
+import javafx.scene.control.skin.VirtualFlow;
+import com.sun.javafx.scene.control.VirtualScrollBar;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
@@ -82,7 +79,7 @@
 import com.sun.javafx.scene.control.test.Person;
 import com.sun.javafx.scene.control.test.RT_22463_Person;
 
-import static com.sun.javafx.scene.control.skin.TableColumnHeaderRetriever.*;
+import static javafx.scene.control.skin.TableColumnHeaderRetriever.*;
 import static org.junit.Assert.assertEquals;
 
 public class TableViewTest {
@@ -2750,9 +2747,9 @@
 
         TableHeaderRow headerRow = VirtualFlowTestUtils.getTableHeaderRow(table);
 
-        TableColumnHeader nameHeader = headerRow.getColumnHeaderFor(name);
-        TableColumnHeader firstHeader = headerRow.getColumnHeaderFor(first);
-        TableColumnHeader lastHeader = headerRow.getColumnHeaderFor(last);
+        TableColumnHeader nameHeader = TableHeaderRowRetriever.getColumnHeaderFor(headerRow, name);
+        TableColumnHeader firstHeader = TableHeaderRowRetriever.getColumnHeaderFor(headerRow, first);
+        TableColumnHeader lastHeader = TableHeaderRowRetriever.getColumnHeaderFor(headerRow, last);
         assertNotNull(nameHeader);
         assertEquals(name, nameHeader.getTableColumn());
         assertNotNull(firstHeader);
@@ -3026,7 +3023,7 @@
         // start scrolling - we call VirtualFlow.adjustPixels, which is what
         // is called when the mouse wheel is scrolled
         VirtualFlow flow = VirtualFlowTestUtils.getVirtualFlow(tableView);
-        flow.adjustPixels(1000 * 24);
+        flow.scrollPixels(1000 * 24);
 
         assertEquals(cellCountAtStart, rt36556_instanceCount);
 
--- old/modules/controls/src/test/java/javafx/scene/control/TitledPaneTest.java	2015-09-03 15:04:14.265537700 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TitledPaneTest.java	2015-09-03 15:04:13.679504200 -0700
@@ -54,7 +54,7 @@
 import com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
-import com.sun.javafx.scene.control.skin.TitledPaneSkin;
+import javafx.scene.control.skin.TitledPaneSkin;
 import com.sun.javafx.tk.Toolkit;
 
 /**
--- old/modules/controls/src/test/java/javafx/scene/control/ToggleGroupTest.java	2015-09-03 15:04:20.460892100 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ToggleGroupTest.java	2015-09-03 15:04:19.867858200 -0700
@@ -478,28 +478,28 @@
         assertFalse(b2.isSelected());
         assertFalse(b3.isSelected());
 
-        EventUtil.fireEvent(new KeyEvent(null, null, KeyEvent.KEY_PRESSED, "", "", KeyCode.RIGHT, false, false, false, false),
+        EventUtil.fireEvent(new KeyEvent(null, b1, KeyEvent.KEY_PRESSED, "", "", KeyCode.RIGHT, false, false, false, false),
                 b1);
 
         assertFalse(b1.isSelected());
         assertTrue(b2.isSelected());
         assertFalse(b3.isSelected());
 
-        EventUtil.fireEvent(new KeyEvent(null, null, KeyEvent.KEY_PRESSED, "", "", KeyCode.DOWN, false, false, false, false),
+        EventUtil.fireEvent(new KeyEvent(null, b2, KeyEvent.KEY_PRESSED, "", "", KeyCode.DOWN, false, false, false, false),
                 b2);
 
         assertFalse(b1.isSelected());
         assertFalse(b2.isSelected());
         assertTrue(b3.isSelected());
 
-        EventUtil.fireEvent(new KeyEvent(null, null, KeyEvent.KEY_PRESSED, "", "", KeyCode.UP, false, false, false, false),
+        EventUtil.fireEvent(new KeyEvent(null, b3, KeyEvent.KEY_PRESSED, "", "", KeyCode.UP, false, false, false, false),
                 b3);
 
         assertFalse(b1.isSelected());
         assertTrue(b2.isSelected());
         assertFalse(b3.isSelected());
 
-        EventUtil.fireEvent(new KeyEvent(null, null, KeyEvent.KEY_PRESSED, "", "", KeyCode.LEFT, false, false, false, false),
+        EventUtil.fireEvent(new KeyEvent(null, b2, KeyEvent.KEY_PRESSED, "", "", KeyCode.LEFT, false, false, false, false),
                 b2);
 
         assertTrue(b1.isSelected());
--- old/modules/controls/src/test/java/javafx/scene/control/ToolbarTest.java	2015-09-03 15:04:26.844257200 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/ToolbarTest.java	2015-09-03 15:04:26.275224700 -0700
@@ -29,15 +29,13 @@
 import static com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;
 
 import com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.scene.control.skin.ToolBarSkin;
+import javafx.scene.control.skin.ToolBarSkin;
 import com.sun.javafx.tk.Toolkit;
 import java.util.ArrayList;
 import java.util.List;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.css.StyleableProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.geometry.Orientation;
 import javafx.scene.Node;
 import javafx.scene.shape.Rectangle;
--- old/modules/controls/src/test/java/javafx/scene/control/TreeTableColumnTest.java	2015-09-03 15:04:33.763653000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeTableColumnTest.java	2015-09-03 15:04:33.264624400 -0700
@@ -27,12 +27,9 @@
 
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.scene.control.skin.TableColumnHeader;
-import com.sun.javafx.scene.control.skin.TableViewSkin;
-import com.sun.javafx.scene.control.skin.TreeTableViewSkin;
-import com.sun.javafx.scene.control.skin.VirtualFlow;
+import javafx.scene.control.skin.TableColumnHeader;
+import javafx.scene.control.skin.VirtualFlow;
 import com.sun.javafx.scene.control.test.Person;
-import com.sun.javafx.tk.Toolkit;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -52,12 +49,6 @@
 import java.util.Comparator;
 import java.util.List;
 import javafx.beans.property.BooleanProperty;
-import javafx.collections.FXCollections;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.layout.Region;
-import javafx.stage.Stage;
 
 import org.junit.Before;
 import org.junit.Ignore;
--- old/modules/controls/src/test/java/javafx/scene/control/TreeTableViewKeyInputTest.java	2015-09-03 15:04:41.753109900 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeTableViewKeyInputTest.java	2015-09-03 15:04:41.155075700 -0700
@@ -25,7 +25,6 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
 import com.sun.javafx.scene.control.behavior.TreeTableCellBehavior;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.FXCollections;
--- old/modules/controls/src/test/java/javafx/scene/control/TreeTableViewMouseInputTest.java	2015-09-03 15:04:49.761568000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeTableViewMouseInputTest.java	2015-09-03 15:04:49.067528300 -0700
@@ -25,33 +25,21 @@
 
 package javafx.scene.control;
 
-import com.sun.javafx.PlatformUtil;
-import com.sun.javafx.util.Utils;
 import com.sun.javafx.scene.control.behavior.TreeTableViewAnchorRetriever;
 import com.sun.javafx.scene.control.infrastructure.*;
-import com.sun.javafx.scene.control.skin.TreeTableViewSkin;
 import com.sun.javafx.scene.control.test.Person;
 
 import static org.junit.Assert.*;
 
-import java.util.List;
-
 import com.sun.javafx.tk.Toolkit;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Scene;
-import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.control.cell.TreeItemPropertyValueFactory;
-import javafx.scene.input.KeyCode;
 
-import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
 import org.junit.After;
 
 import org.junit.Before;
--- old/modules/controls/src/test/java/javafx/scene/control/TreeTableViewTest.java	2015-09-03 15:04:57.426006400 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeTableViewTest.java	2015-09-03 15:04:56.799970600 -0700
@@ -34,17 +34,14 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Random;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
-import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
 import com.sun.javafx.scene.control.behavior.TreeTableCellBehavior;
 import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import com.sun.javafx.scene.control.skin.TreeTableCellSkin;
+import javafx.scene.control.skin.TreeTableCellSkin;
 import com.sun.javafx.scene.control.test.Data;
 
 import javafx.application.Platform;
@@ -54,7 +51,6 @@
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
-import javafx.beans.property.ReadOnlyIntegerWrapper;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleObjectProperty;
@@ -86,7 +82,7 @@
 import com.sun.javafx.scene.control.infrastructure.ControlTestUtils;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.scene.control.skin.VirtualScrollBar;
+import com.sun.javafx.scene.control.VirtualScrollBar;
 import com.sun.javafx.scene.control.test.Person;
 import com.sun.javafx.scene.control.test.RT_22463_Person;
 import com.sun.javafx.tk.Toolkit;
--- old/modules/controls/src/test/java/javafx/scene/control/TreeViewKeyInputTest.java	2015-09-03 15:05:04.858431500 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeViewKeyInputTest.java	2015-09-03 15:05:04.263397500 -0700
@@ -26,7 +26,6 @@
 package javafx.scene.control;
 
 import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
-import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
--- old/modules/controls/src/test/java/javafx/scene/control/TreeViewMouseInputTest.java	2015-09-03 15:05:12.287856400 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeViewMouseInputTest.java	2015-09-03 15:05:11.693822500 -0700
@@ -34,26 +34,18 @@
 
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import com.sun.javafx.tk.Toolkit;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
-import javafx.scene.Group;
 import javafx.scene.Scene;
-import javafx.scene.input.KeyCode;
 import javafx.scene.layout.VBox;
-import javafx.stage.Stage;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.sun.javafx.scene.control.behavior.TreeViewAnchorRetriever;
-import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.scene.control.skin.TreeViewSkin;
 
 //@Ignore("Disabling tests as they fail with OOM in continuous builds")
 public class TreeViewMouseInputTest {
--- old/modules/controls/src/test/java/javafx/scene/control/TreeViewTest.java	2015-09-03 15:05:20.186308200 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/TreeViewTest.java	2015-09-03 15:05:19.594274300 -0700
@@ -31,8 +31,7 @@
 import com.sun.javafx.scene.control.infrastructure.KeyModifier;
 import com.sun.javafx.scene.control.infrastructure.StageLoader;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.scene.control.skin.TextFieldSkin;
-import com.sun.javafx.scene.control.skin.VirtualScrollBar;
+import javafx.scene.control.skin.TextFieldSkin;
 import com.sun.javafx.scene.control.test.Employee;
 import com.sun.javafx.scene.control.test.Person;
 import com.sun.javafx.scene.control.test.RT_22463_Person;
@@ -51,7 +50,6 @@
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
-import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
@@ -62,6 +60,7 @@
 import javafx.scene.Scene;
 import javafx.scene.control.cell.CheckBoxTreeCell;
 import javafx.scene.control.cell.TextFieldTreeCell;
+import com.sun.javafx.scene.control.VirtualScrollBar;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.VBox;
--- old/modules/controls/src/test/java/javafx/scene/control/cell/TextFieldTableCellTest.java	2015-09-03 15:05:27.694737700 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/cell/TextFieldTableCellTest.java	2015-09-03 15:05:27.037700100 -0700
@@ -27,7 +27,7 @@
 
 import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
 import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import com.sun.javafx.scene.control.skin.VirtualFlow;
+import javafx.scene.control.skin.VirtualFlow;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
--- old/modules/fxml/src/main/java/javafx/fxml/FXMLLoader.java	2015-09-03 15:05:34.974154000 -0700
+++ new/modules/fxml/src/main/java/javafx/fxml/FXMLLoader.java	2015-09-03 15:05:34.402121300 -0700
@@ -77,7 +77,6 @@
 
 import com.sun.javafx.beans.IDProperty;
 import com.sun.javafx.fxml.BeanAdapter;
-import com.sun.javafx.fxml.LoadListener;
 import com.sun.javafx.fxml.ParseTraceElement;
 import com.sun.javafx.fxml.PropertyNotFoundException;
 import com.sun.javafx.fxml.expression.Expression;
@@ -85,7 +84,6 @@
 import com.sun.javafx.fxml.expression.KeyPath;
 import java.net.MalformedURLException;
 import java.security.AccessController;
-import java.security.AllPermission;
 import java.security.PrivilegedAction;
 import java.util.EnumMap;
 import java.util.Locale;
@@ -2376,11 +2374,8 @@
 
     /**
      * Returns this loader's load listener.
-     *
-     * @treatAsPrivate
-     * @deprecated
      */
-    public LoadListener impl_getLoadListener() {
+    public LoadListener getLoadListener() {
         // SB-dependency: RT-21228 has been filed to track this
         return loadListener;
     }
@@ -2389,11 +2384,8 @@
      * Sets this loader's load listener.
      *
      * @param loadListener
-     *
-     * @treatAsPrivate
-     * @deprecated
      */
-    public void impl_setLoadListener(LoadListener loadListener) {
+    public final void setLoadListener(LoadListener loadListener) {
         // SB-dependency: RT-21228 has been filed to track this
         this.loadListener = loadListener;
     }
--- old/modules/fxml/src/test/java/javafx/fxml/FXMLLoader_ScriptTest.java	2015-09-03 15:05:42.732597800 -0700
+++ new/modules/fxml/src/test/java/javafx/fxml/FXMLLoader_ScriptTest.java	2015-09-03 15:05:42.133563500 -0700
@@ -24,7 +24,6 @@
  * questions.
  */
 
-import com.sun.javafx.fxml.LoadListener;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -40,7 +39,7 @@
         fxmlLoader.impl_setStaticLoad(true);
         AtomicBoolean scriptCalled = new AtomicBoolean();
         AtomicBoolean scriptEndCalled = new AtomicBoolean();
-        fxmlLoader.impl_setLoadListener(new LoadListener() {
+        fxmlLoader.setLoadListener(new LoadListener() {
 
             @Override
             public void readImportProcessingInstruction(String target) {
--- old/modules/fxml/src/test/java/javafx/fxml/RT_18218Test.java	2015-09-03 15:05:50.039015700 -0700
+++ new/modules/fxml/src/test/java/javafx/fxml/RT_18218Test.java	2015-09-03 15:05:49.488984200 -0700
@@ -25,7 +25,6 @@
 
 package javafx.fxml;
 
-import com.sun.javafx.fxml.LoadListener;
 import java.io.IOException;
 import java.util.Map;
 import org.junit.Test;
@@ -38,7 +37,7 @@
     public void testStaticScriptLoad() throws IOException {
         FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("rt_18218.fxml"));
         fxmlLoader.impl_setStaticLoad(true);
-        fxmlLoader.impl_setLoadListener(new LoadListener() {
+        fxmlLoader.setLoadListener(new LoadListener() {
             private String unknownStaticPropertyElementName = null;
 
             @Override
--- old/modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html	2015-09-03 15:05:57.478441200 -0700
+++ new/modules/graphics/src/main/docs/javafx/scene/doc-files/cssref.html	2015-09-03 15:05:56.890407600 -0700
@@ -696,7 +696,7 @@
     <p>When the JavaFX CSS parser encounters a syntax error, a warning message
         is emitted which conveys as much information as is available to help
         resolve the error. For example </p>
-    <p class="example"> WARNING: com.sun.javafx.css.parser.CSSParser declaration
+    <p class="example"> WARNING: javafx.css.CssParser declaration
         Expected '&lt;percent&gt;' while parsing '-fx-background-color' at ?[1,49]
     </p>
     <p>The cryptic '<span class="p example">?[1,49]</span>' pertains to the
@@ -709,8 +709,7 @@
             position may not be accurate in releases prior to JavaFX 2.2.</em><br>
     </p>
     <p>Applications needing to detect errors from the parser can add a listener
-        to the errors property of com.sun.javafx.css.StyleManager. This is not
-        public API and is subject to change. <br>
+        to the errors property of javafx.css.CssParser. <br>
     </p>
     <h3><a name="introlimitations" id="introlimitations">Limitations</a></h3>
     <ol>
--- old/modules/graphics/src/main/java/com/sun/javafx/css/ParsedValueImpl.java	2015-09-03 15:06:05.718912500 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/ParsedValueImpl.java	2015-09-03 15:06:05.149880000 -0700
@@ -26,7 +26,10 @@
 package com.sun.javafx.css;
 
 import javafx.css.ParsedValue;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
 import javafx.css.StyleConverter;
+import javafx.css.StyleConverter.StringStore;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 
@@ -46,7 +49,7 @@
      * be looked up.
      */
     final private boolean lookup;
-    public final boolean isLookup() { return lookup; }
+    @Override public final boolean isLookup() { return lookup; }
 
     /**
      * If value is itself a ParsedValueImpl or sequence of values, and should any of
@@ -55,7 +58,7 @@
      * that this value contains a value that needs to be looked up.
      */
     final private boolean containsLookups;
-    public final boolean isContainsLookups() { return containsLookups; }
+    @Override public final boolean isContainsLookups() { return containsLookups; }
 
     private static boolean getContainsLookupsFlag(Object obj) {
 
@@ -431,14 +434,11 @@
 
         os.writeBoolean(lookup);
 
-        if (converter instanceof StyleConverterImpl) {
+        if (converter != null) {
             os.writeBoolean(true);
-            ((StyleConverterImpl)converter).writeBinary(os, stringStore);
+            converter.writeBinary(os, stringStore);
         } else {
             os.writeBoolean(false);
-            if (converter != null) {
-                System.err.println("cannot writeBinary " + converter.getClass().getName());
-            }
         }
 
         if (value instanceof ParsedValue) {
@@ -565,7 +565,7 @@
         final boolean lookup = is.readBoolean();
         final boolean hasType = is.readBoolean();
 
-        final StyleConverter converter = (hasType) ? StyleConverterImpl.readBinary(is, strings) : null;
+        final StyleConverter converter = (hasType) ? StyleConverter.readBinary(is, strings) : null;
 
         final int valType = is.readByte();
 
@@ -685,7 +685,7 @@
                 URL url = new URL(str);
                 return new ParsedValueImpl(url, converter, lookup);
             } catch (MalformedURLException malf) {
-                throw new InternalError("Excpeption in Value.readBinary: " + malf);
+                throw new InternalError("Exception in Value.readBinary: " + malf);
             }
 
         } else if (valType == NULL_VALUE) {
--- old/modules/graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java	2015-09-03 15:06:12.888322600 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/SelectorPartitioning.java	2015-09-03 15:06:12.323290300 -0700
@@ -25,6 +25,10 @@
 
 package com.sun.javafx.css;
 
+import javafx.css.CompoundSelector;
+import javafx.css.Selector;
+import javafx.css.SimpleSelector;
+import javafx.css.StyleClass;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -40,7 +44,7 @@
 public final class SelectorPartitioning {
 
     /** package accessible */
-    SelectorPartitioning() {}
+    public SelectorPartitioning() {}
 
     /*
      * Wrapper so that we can have Map<ParitionKey, Partition> even though
@@ -193,7 +197,7 @@
     private int ordinal;
     
     /** clear current partitioning */
-    void reset() {
+    public void reset() {
         idMap.clear();
         typeMap.clear();
         styleClassMap.clear();
@@ -225,7 +229,7 @@
     private static final PartitionKey WILDCARD = new PartitionKey<String>("*");
     
     /* Place this selector into the partitioning map. Package accessible */
-    void partition(Selector selector) {
+    public void partition(Selector selector) {
         
         SimpleSelector simpleSelector = null;
         if (selector instanceof CompoundSelector) {
@@ -300,7 +304,7 @@
     }
     
     /** Get the list of selectors that match this selector. Package accessible */
-    List<Selector> match(String selectorId, String selectorType, Set<StyleClass> selectorStyleClass) {
+    public List<Selector> match(String selectorId, String selectorType, Set<StyleClass> selectorStyleClass) {
         
         final boolean hasId = 
             (selectorId != null && selectorId.isEmpty() == false);
--- old/modules/graphics/src/main/java/com/sun/javafx/css/StyleClassSet.java	2015-09-03 15:06:20.524759400 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/StyleClassSet.java	2015-09-03 15:06:19.877722400 -0700
@@ -24,12 +24,15 @@
  */
 package com.sun.javafx.css;
 
+import javafx.css.StyleClass;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * States represents a set of State. A {@code Node} may be in more than
  * one pseudo-class state. {@code States} is used to aggregate the active
@@ -120,7 +123,7 @@
    
     /**
      */
-    static StyleClass getStyleClass(String styleClass) {
+    public static StyleClass getStyleClass(String styleClass) {
 
         if (styleClass == null || styleClass.trim().isEmpty()) {
             throw new IllegalArgumentException("styleClass cannot be null or empty String");
--- old/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java	2015-09-03 15:06:27.894180900 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/StyleManager.java	2015-09-03 15:06:27.311147500 -0700
@@ -25,14 +25,19 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.parser.CSSParser;
 import javafx.application.Application;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
+import javafx.css.CssParser;
+import javafx.css.FontFace;
 import javafx.css.PseudoClass;
+import javafx.css.Rule;
+import javafx.css.Selector;
 import javafx.css.StyleOrigin;
 import javafx.css.Styleable;
+import javafx.css.StyleConverter;
+import javafx.css.Stylesheet;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -156,8 +161,8 @@
      * Parent with author stylesheets. If a Scene or Parent is removed from the scene,
      * it's cache is annihilated.
      */
-    // package for testing
-    static final Map<Parent, CacheContainer> cacheContainerMap = new WeakHashMap<>();
+    // public for testing
+    public static final Map<Parent, CacheContainer> cacheContainerMap = new WeakHashMap<>();
 
     // package for testing
     CacheContainer getCacheContainer(Styleable styleable, SubScene subScene) {
@@ -231,17 +236,17 @@
      * The order of the entries in this list does not matter since a Scene or
      * SubScene will only have zero or one user-agent stylesheets.
      */
-    // package for testing
-    final List<StylesheetContainer> userAgentStylesheetContainers = new ArrayList<>();
+    // public for testing
+    public final List<StylesheetContainer> userAgentStylesheetContainers = new ArrayList<>();
     /**
      * A list of user-agent stylesheet urls from calling setDefaultUserAgentStylesheet and
      * addUserAgentStylesheet. The order of entries this list matters. The zeroth element is
      * _the_ platform default.
      */
-    // package for testing
-    final List<StylesheetContainer> platformUserAgentStylesheetContainers = new ArrayList<>();
-    // package for testing
-    boolean hasDefaultUserAgentStylesheet = false;
+    // public for testing
+    public final List<StylesheetContainer> platformUserAgentStylesheetContainers = new ArrayList<>();
+    // public for testing
+    public boolean hasDefaultUserAgentStylesheet = false;
 
     ////////////////////////////////////////////////////////////////////////////
     //
@@ -302,7 +307,8 @@
                 for (int r=0; r<rMax; r++) {
 
                     final Rule rule = rules.get(r);
-                    final List<Selector> selectors = rule.getUnobservedSelectorList();
+                    // final List<Selector> selectors = rule.getUnobservedSelectorList();
+                    final List<Selector> selectors = rule.getSelectors();
                     final int sMax = selectors == null || selectors.isEmpty() ? 0 : selectors.size();
                     for (int s=0; s < sMax; s++) {
 
@@ -419,8 +425,8 @@
      * This list is for author stylesheets and not for user-agent stylesheets. User-agent
      * stylesheets are either platformUserAgentStylesheetContainers or userAgentStylesheetContainers
      */
-    // package for unit testing
-    final Map<String,StylesheetContainer> stylesheetContainerMap = new HashMap<>();
+    // public for unit testing
+    public final Map<String,StylesheetContainer> stylesheetContainerMap = new HashMap<>();
 
 
     /**
@@ -1083,13 +1089,13 @@
                 // either we failed to load the .bss file, or parse
                 // was set to true.
                 if ((url != null) && parse) {
-                    stylesheet = new CSSParser().parse(url);
+                    stylesheet = new CssParser().parse(url);
                 }
 
                 if (stylesheet == null) {
                     if (errors != null) {
-                        CssError error =
-                            new CssError(
+                        CssParser.ParseError error =
+                            new CssParser.ParseError(
                                 "Resource \""+fname+"\" not found."
                             );
                         errors.add(error);
@@ -1104,13 +1110,15 @@
                 // load any fonts from @font-face
                 if (stylesheet != null) {
                     faceLoop: for(FontFace fontFace: stylesheet.getFontFaces()) {
-                        for(FontFace.FontFaceSrc src: fontFace.getSources()) {
-                            if (src.getType() == FontFace.FontFaceSrcType.URL) {
-                                Font loadedFont = Font.loadFont(src.getSrc(),10);
-                                if (loadedFont == null) {
-                                    getLogger().info("Could not load @font-face font [" + src.getSrc() + "]");
+                        if (fontFace instanceof FontFaceImpl) {
+                            for(FontFaceImpl.FontFaceSrc src: ((FontFaceImpl)fontFace).getSources()) {
+                                if (src.getType() == FontFaceImpl.FontFaceSrcType.URL) {
+                                    Font loadedFont = Font.loadFont(src.getSrc(),10);
+                                    if (loadedFont == null) {
+                                        getLogger().info("Could not load @font-face font [" + src.getSrc() + "]");
+                                    }
+                                    continue faceLoop;
                                 }
-                                continue faceLoop;
                             }
                         }
                     }
@@ -1120,8 +1128,8 @@
 
             } catch (FileNotFoundException fnfe) {
                 if (errors != null) {
-                    CssError error =
-                        new CssError(
+                    CssParser.ParseError error =
+                        new CssParser.ParseError(
                             "Stylesheet \""+fname+"\" not found."
                         );
                     errors.add(error);
@@ -1131,8 +1139,8 @@
                 }
             } catch (IOException ioe) {
                     if (errors != null) {
-                        CssError error =
-                            new CssError(
+                        CssParser.ParseError error =
+                            new CssParser.ParseError(
                                 "Could not load stylesheet: " + fname
                             );
                         errors.add(error);
@@ -1243,15 +1251,9 @@
         }
 
         synchronized (styleLock) {
-            // RT-20643
-            CssError.setCurrentScene(scene);
-
             if (_addUserAgentStylesheet(fname)) {
                 userAgentStylesheetsChanged();
             }
-
-            // RT-20643
-            CssError.setCurrentScene(null);
         }
     }
 
@@ -1302,18 +1304,12 @@
                 }
             }
 
-            // RT-20643
-            CssError.setCurrentScene(scene);
-
             platformUserAgentStylesheetContainers.add(new StylesheetContainer(fname, ua_stylesheet));
 
             if (ua_stylesheet != null) {
                 ua_stylesheet.setOrigin(StyleOrigin.USER_AGENT);
             }
             userAgentStylesheetsChanged();
-
-            // RT-20643
-            CssError.setCurrentScene(null);
         }
     }
 
@@ -1340,16 +1336,9 @@
         }
 
         synchronized (styleLock) {
-            // RT-20643
-
-            CssError.setCurrentScene(scene);
-
             if(_setDefaultUserAgentStylesheet(fname)) {
                 userAgentStylesheetsChanged();
             }
-
-            // RT-20643
-            CssError.setCurrentScene(null);
         }
     }
 
@@ -1487,7 +1476,7 @@
                 container.clearCache();
             }
 
-            StyleConverterImpl.clearCache();
+            StyleConverter.clearCache();
 
             for (Parent root : cacheContainerMap.keySet()) {
                 if (root == null) {
@@ -1573,15 +1562,7 @@
         }
 
         synchronized (styleLock) {
-            // RT-20643
-            CssError.setCurrentScene(parent.getScene());
-
-            final List<StylesheetContainer> list = processStylesheets(parentStylesheets, parent);
-
-            // RT-20643
-            CssError.setCurrentScene(null);
-
-            return list;
+            return processStylesheets(parentStylesheets, parent);
         }
     }
 
@@ -1601,15 +1582,7 @@
         }
 
         synchronized (styleLock) {
-            // RT-20643
-            CssError.setCurrentScene(scene);
-
-            final List<StylesheetContainer> list = processStylesheets(sceneStylesheets, scene.getRoot());
-
-            // RT-20643
-            CssError.setCurrentScene(null);
-
-            return list;
+            return processStylesheets(sceneStylesheets, scene.getRoot());
         }
     }
 
@@ -1852,7 +1825,7 @@
     //
     ////////////////////////////////////////////////////////////////////////////
 
-    private static ObservableList<CssError> errors = null;
+    private static ObservableList<CssParser.ParseError> errors = null;
     /**
      * Errors that may have occurred during css processing.
      * This list is null until errorsProperty() is called.
@@ -1864,7 +1837,7 @@
      *
      * @return
      */
-    public static ObservableList<CssError> errorsProperty() {
+    public static ObservableList<CssParser.ParseError> errorsProperty() {
         if (errors == null) {
             errors = FXCollections.observableArrayList();
         }
@@ -1879,7 +1852,7 @@
      * Not meant for general use - call errorsProperty() instead.
      * @return
      */
-    public static ObservableList<CssError> getErrors() {
+    public static ObservableList<CssParser.ParseError> getErrors() {
         return errors;
     }
 
@@ -2008,7 +1981,7 @@
             }
 
             final Stylesheet inlineStylesheet =
-                    new CSSParser().parse("*{"+inlineStyle+"}");
+                    new CssParser().parse("*{"+inlineStyle+"}");
 
             if (inlineStylesheet != null) {
 
@@ -2017,7 +1990,8 @@
                 List<Rule> rules = inlineStylesheet.getRules();
                 Rule rule = rules != null && !rules.isEmpty() ? rules.get(0) : null;
 
-                List<Selector> selectors = rule != null ? rule.getUnobservedSelectorList() : null;
+                //List<Selector> selectors = rule != null ? rule.getUnobservedSelectorList() : null;
+                List<Selector> selectors = rule != null ? rule.getSelectors() : null;
                 Selector selector = selectors != null && !selectors.isEmpty() ? selectors.get(0) : null;
 
                 // selector might be null if parser throws some exception
--- old/modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java	2015-09-03 15:06:35.777631800 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java	2015-09-03 15:06:35.153596100 -0700
@@ -32,6 +32,14 @@
 import java.util.List;
 import java.util.Map;
 
+import javafx.css.CascadingStyle;
+import javafx.css.Declaration;
+import javafx.css.Match;
+import javafx.css.Rule;
+import javafx.css.Selector;
+import javafx.css.Style;
+
+
 /**
  * A map of property name to the cascading styles that match a node.
  */
@@ -41,7 +49,7 @@
         new StyleMap(-1, Collections.<Selector>emptyList());
 
     /** Only StyleManager creates StyleMap */
-    StyleMap(int id, List<Selector> selectors) {
+    public StyleMap(int id, List<Selector> selectors) {
         this.id = id;
         this.selectors = selectors;
     }
@@ -85,15 +93,10 @@
                 for (int d = 0, dmax = rule.getDeclarations().size(); d < dmax; d++) {
                     final Declaration decl = rule.getDeclarations().get(d);
 
-                    final CascadingStyle s = new CascadingStyle(
-                            new Style(match.selector, decl),
-                            match.pseudoClasses,
-                            match.specificity,
-                            // ordinal increments at declaration level since
-                            // there may be more than one declaration for the
-                            // same attribute within a selector or within a stylesheet
-                            ordinal++
-                    );
+                    // ordinal increments at declaration level since
+                    // there may be more than one declaration for the
+                    // same attribute within a selector or within a stylesheet
+                    final CascadingStyle s = new CascadingStyle(decl, match, ordinal++);
 
                     cascadingStyleList.add(s);
 
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/Css2Bin.java	2015-09-03 15:06:43.100050600 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/parser/Css2Bin.java	2015-09-03 15:06:42.428012200 -0700
@@ -25,7 +25,7 @@
 
 package com.sun.javafx.css.parser;
 
-import com.sun.javafx.css.Stylesheet;
+import javafx.css.Stylesheet;
 
 import java.io.File;
 import java.io.IOException;
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/LexerState.java	2015-09-03 15:06:50.866494800 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/parser/LexerState.java	2015-09-03 15:06:50.229458400 -0700
@@ -26,7 +26,7 @@
 package com.sun.javafx.css.parser;
 
 
-class LexerState {
+public class LexerState {
 
     /**
      * Determine whether or not this state accepts the character. If the
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/Recognizer.java	2015-09-03 15:06:58.342922400 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/parser/Recognizer.java	2015-09-03 15:06:57.634881900 -0700
@@ -26,7 +26,7 @@
 package com.sun.javafx.css.parser;
 
 @FunctionalInterface
-interface Recognizer {
+public interface Recognizer {
 
     boolean recognize(int c);
 
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/Token.java	2015-09-03 15:07:05.633339400 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/parser/Token.java	2015-09-03 15:07:05.054306300 -0700
@@ -26,24 +26,24 @@
 package com.sun.javafx.css.parser;
 
 
-final class Token {
+public final class Token {
 
-    final static int EOF = -1;
-    final static int INVALID = 0;
-    final static int SKIP = 1;
+    public final static int EOF = -1;
+    public final static int INVALID = 0;
+    public final static int SKIP = 1;
 
-    final static Token EOF_TOKEN = new Token(EOF, "EOF");
-    final static Token INVALID_TOKEN = new Token(INVALID, "INVALID");
-    final static Token SKIP_TOKEN = new Token(SKIP, "SKIP");
+    public final static Token EOF_TOKEN = new Token(EOF, "EOF");
+    public final static Token INVALID_TOKEN = new Token(INVALID, "INVALID");
+    public final static Token SKIP_TOKEN = new Token(SKIP, "SKIP");
 
-    Token(int type, String text, int line, int offset) {
+    public Token(int type, String text, int line, int offset) {
         this.type = type;
         this.text = text;
         this.line = line;
         this.offset = offset;        
     }
     
-    Token(int type, String text) {
+    public Token(int type, String text) {
         this(type, text, -1, -1);
     }
 
@@ -55,15 +55,15 @@
         this(0, "INVALID");
     }
 
-    String getText() {
+    public String getText() {
         return text;
     }
 
-    int getType() {
+    public int getType() {
         return type;
     }
 
-    int getLine() {
+    public int getLine() {
         return line;
     }
 
@@ -71,7 +71,7 @@
         this.line = line;
     }
 
-    int getOffset() {
+    public int getOffset() {
         return offset;
     }
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BackgroundPositionConverter.java	2015-09-03 15:07:12.670741900 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BackgroundPositionConverter.java	2015-09-03 15:07:12.056706800 -0700
@@ -29,14 +29,14 @@
 import javafx.scene.layout.BackgroundPosition;
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
+import javafx.css.StyleConverter;
 
 /**
  * Given four Sizes from the Parser, this converter will produce a BackgroundPosition object.
  */
-public final class BackgroundPositionConverter extends StyleConverterImpl<ParsedValue[], BackgroundPosition> {
+public final class BackgroundPositionConverter extends StyleConverter<ParsedValue[], BackgroundPosition> {
     private static final BackgroundPositionConverter BACKGROUND_POSITION_CONVERTER =
             new BackgroundPositionConverter();
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BackgroundSizeConverter.java	2015-09-03 15:07:20.413184800 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BackgroundSizeConverter.java	2015-09-03 15:07:19.758147300 -0700
@@ -26,16 +26,16 @@
 package com.sun.javafx.scene.layout.region;
 
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
+import javafx.css.StyleConverter;
+import javafx.css.converter.BooleanConverter;
 import javafx.scene.layout.BackgroundSize;
 import javafx.scene.text.Font;
 
 /**
  */
-public final class BackgroundSizeConverter  extends StyleConverterImpl<ParsedValue[], BackgroundSize> {
+public final class BackgroundSizeConverter  extends StyleConverter<ParsedValue[], BackgroundSize> {
     private static final BackgroundSizeConverter BACKGROUND_SIZE_CONVERTER =
             new BackgroundSizeConverter();
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageSliceConverter.java	2015-09-03 15:07:27.657599100 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageSliceConverter.java	2015-09-03 15:07:27.129568900 -0700
@@ -28,13 +28,13 @@
 import javafx.scene.layout.BorderWidths;
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
+import javafx.css.StyleConverter;
 
 /**
  */
-public final class BorderImageSliceConverter extends StyleConverterImpl<ParsedValue[], BorderImageSlices> {
+public final class BorderImageSliceConverter extends StyleConverter<ParsedValue[], BorderImageSlices> {
 
     private static final BorderImageSliceConverter BORDER_IMAGE_SLICE_CONVERTER =
             new BorderImageSliceConverter();
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageWidthConverter.java	2015-09-03 15:07:35.176029200 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageWidthConverter.java	2015-09-03 15:07:34.578995000 -0700
@@ -28,16 +28,16 @@
 import javafx.scene.layout.BorderWidths;
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
+import javafx.css.StyleConverter;
 
 /**
  * User: richardbair
  * Date: 8/10/12
  * Time: 8:07 PM
  */
-public class BorderImageWidthConverter extends StyleConverterImpl<ParsedValue[], BorderWidths> {
+public class BorderImageWidthConverter extends StyleConverter<ParsedValue[], BorderWidths> {
     private static final BorderImageWidthConverter CONVERTER_INSTANCE = new BorderImageWidthConverter();
 
     public static BorderImageWidthConverter getInstance() {
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageWidthsSequenceConverter.java	2015-09-03 15:07:42.874469500 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderImageWidthsSequenceConverter.java	2015-09-03 15:07:42.219432000 -0700
@@ -26,8 +26,8 @@
 package com.sun.javafx.scene.layout.region;
 
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
-import com.sun.javafx.css.Size;
+import javafx.css.Size;
+import javafx.css.StyleConverter;
 import javafx.scene.layout.BorderWidths;
 import javafx.scene.text.Font;
 
@@ -36,7 +36,7 @@
  * Date: 8/10/12
  * Time: 8:27 PM
  */
-public class BorderImageWidthsSequenceConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], BorderWidths>[], BorderWidths[]> {
+public class BorderImageWidthsSequenceConverter extends StyleConverter<ParsedValue<ParsedValue[], BorderWidths>[], BorderWidths[]> {
     private static final BorderImageWidthsSequenceConverter CONVERTER =
             new BorderImageWidthsSequenceConverter();
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderStrokeStyleSequenceConverter.java	2015-09-03 15:07:50.254891600 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderStrokeStyleSequenceConverter.java	2015-09-03 15:07:49.594853900 -0700
@@ -28,14 +28,14 @@
 import javafx.scene.layout.BorderStrokeStyle;
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 
 /**
  * User: richardbair
  * Date: 8/10/12
  * Time: 7:31 AM
  */
-public final class BorderStrokeStyleSequenceConverter extends StyleConverterImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]> {
+public final class BorderStrokeStyleSequenceConverter extends StyleConverter<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]> {
     /**
      * Convert an array of border style values to an array of BorderStyle which
      * contains one BorderStyle element per border (top, right, bottom, left).
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderStyleConverter.java	2015-09-03 15:07:57.800323200 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/BorderStyleConverter.java	2015-09-03 15:07:57.191288400 -0700
@@ -35,12 +35,12 @@
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
 import com.sun.javafx.css.ParsedValueImpl;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
+import javafx.css.StyleConverter;
 
 /**
  */
-public class BorderStyleConverter  extends StyleConverterImpl<ParsedValue[], BorderStrokeStyle> {
+public class BorderStyleConverter  extends StyleConverter<ParsedValue[], BorderStrokeStyle> {
 //    private static final ParsedValue<ParsedValue<?,Size>[],Double[]> DASHED =
 //            new ParsedValue<ParsedValue<?,Size>[],Double[]>(
 //                    new ParsedValue[] {
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/CornerRadiiConverter.java	2015-09-03 15:08:05.545766200 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/CornerRadiiConverter.java	2015-09-03 15:08:04.980733900 -0700
@@ -25,17 +25,17 @@
 
 package com.sun.javafx.scene.layout.region;
 
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
 import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.text.Font;
 
 /**
  * Convert parsed value of &lt;size&gt;{1,4} [ '/' &lt;size&gt;{1,4}]? [',' &lt;size&gt;{1,4} [ '/' &lt;size&gt;{1,4}]?]? to CornerRadii
  */
-public final class CornerRadiiConverter extends StyleConverterImpl<ParsedValue<ParsedValue<?,Size>[][],CornerRadii>[], CornerRadii[]> {
+public final class CornerRadiiConverter extends StyleConverter<ParsedValue<ParsedValue<?,Size>[][],CornerRadii>[], CornerRadii[]> {
 
     private static final CornerRadiiConverter INSTANCE =
             new CornerRadiiConverter();
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBackgroundPositionConverter.java	2015-09-03 15:08:12.960190300 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBackgroundPositionConverter.java	2015-09-03 15:08:12.397158100 -0700
@@ -25,8 +25,8 @@
 
 package com.sun.javafx.scene.layout.region;
 
-import com.sun.javafx.css.StyleConverterImpl;
 import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
 import javafx.scene.layout.BackgroundPosition;
 import javafx.scene.text.Font;
 
@@ -38,7 +38,7 @@
  * ]
  * @see <a href="http://www.w3.org/TR/css3-background/#the-background-position">background-position</a>
  */
-public final class LayeredBackgroundPositionConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], BackgroundPosition>[], BackgroundPosition[]> {
+public final class LayeredBackgroundPositionConverter extends StyleConverter<ParsedValue<ParsedValue[], BackgroundPosition>[], BackgroundPosition[]> {
     private static final LayeredBackgroundPositionConverter LAYERED_BACKGROUND_POSITION_CONVERTER =
             new LayeredBackgroundPositionConverter();
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBackgroundSizeConverter.java	2015-09-03 15:08:20.564625200 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBackgroundSizeConverter.java	2015-09-03 15:08:20.002593100 -0700
@@ -26,7 +26,7 @@
 package com.sun.javafx.scene.layout.region;
 
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 import javafx.scene.layout.BackgroundSize;
 import javafx.scene.text.Font;
 
@@ -40,7 +40,7 @@
  * <bg-size> = [ <size> | auto ]{1,2} | cover | contain
  * @see <a href="http://www.w3.org/TR/css3-background/#the-background-size">background-size</a>
  */
-public final class LayeredBackgroundSizeConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], BackgroundSize>[], BackgroundSize[]> {
+public final class LayeredBackgroundSizeConverter extends StyleConverter<ParsedValue<ParsedValue[], BackgroundSize>[], BackgroundSize[]> {
     private static final LayeredBackgroundSizeConverter LAYERED_BACKGROUND_SIZE_CONVERTER =
             new LayeredBackgroundSizeConverter();
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBorderPaintConverter.java	2015-09-03 15:08:27.911045400 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBorderPaintConverter.java	2015-09-03 15:08:27.291010000 -0700
@@ -26,14 +26,14 @@
 package com.sun.javafx.scene.layout.region;
 
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 import javafx.scene.paint.Paint;
 import javafx.scene.text.Font;
 
 /*
  * border-color	<paint> | <paint> <paint> <paint> <paint> [ , [<paint> | <paint> <paint> <paint> <paint>] ]*	null
  */
-public final class LayeredBorderPaintConverter extends StyleConverterImpl<ParsedValue<ParsedValue<?,Paint>[],Paint[]>[], Paint[][]> {
+public final class LayeredBorderPaintConverter extends StyleConverter<ParsedValue<ParsedValue<?,Paint>[],Paint[]>[], Paint[][]> {
     /**
      * Convert layers of border paint values to an array of Paint[], where
      * each layer contains one Paint element per border.
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBorderStyleConverter.java	2015-09-03 15:08:35.324469500 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/LayeredBorderStyleConverter.java	2015-09-03 15:08:34.706434100 -0700
@@ -28,7 +28,7 @@
 import javafx.scene.layout.BorderStrokeStyle;
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 
 /**
  * User: richardbair
@@ -43,7 +43,7 @@
 * where <dash-style> = none | solid | dotted | dashed | segments(<size>[, <size>]+) ]
 */
 public final class LayeredBorderStyleConverter
-        extends StyleConverterImpl<ParsedValue<ParsedValue<ParsedValue[],BorderStrokeStyle>[], BorderStrokeStyle[]>[], BorderStrokeStyle[][]> {
+        extends StyleConverter<ParsedValue<ParsedValue<ParsedValue[],BorderStrokeStyle>[], BorderStrokeStyle[]>[], BorderStrokeStyle[][]> {
 
     /**
      * Convert layers of border style values to an array of BorderStyle[], where
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/Margins.java	2015-09-03 15:08:42.827898600 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/Margins.java	2015-09-03 15:08:42.204863000 -0700
@@ -27,10 +27,10 @@
 
 import javafx.scene.text.Font;
 
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
 import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
 import sun.util.logging.PlatformLogger;
 import sun.util.logging.PlatformLogger.Level;
 
@@ -78,7 +78,7 @@
     /**
      * Convert a sequence of sizes to an Margins
      */
-    public static final class Converter extends StyleConverterImpl<ParsedValue[], Margins> {
+    public static final class Converter extends StyleConverter<ParsedValue[], Margins> {
 
         public static Converter getInstance() {
             return Holder.CONVERTER_INSTANCE;
@@ -145,7 +145,7 @@
     /**
      * Convert a sequence of sizes to an Insets
      */
-    public static final class SequenceConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], Margins>[], Margins[]> {
+    public static final class SequenceConverter extends StyleConverter<ParsedValue<ParsedValue[], Margins>[], Margins[]> {
 
         public static SequenceConverter getInstance() {
             return Holder.SEQUENCE_CONVERTER_INSTANCE;
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/RepeatStructConverter.java	2015-09-03 15:08:50.425333200 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/RepeatStructConverter.java	2015-09-03 15:08:49.797297300 -0700
@@ -25,15 +25,15 @@
 
 package com.sun.javafx.scene.layout.region;
 
-import com.sun.javafx.css.converters.EnumConverter;
+import javafx.css.converter.EnumConverter;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 import javafx.scene.layout.BackgroundRepeat;
 import javafx.scene.text.Font;
 
 /**
  */
-public final class RepeatStructConverter extends StyleConverterImpl<ParsedValue<String, BackgroundRepeat>[][], RepeatStruct[]> {
+public final class RepeatStructConverter extends StyleConverter<ParsedValue<String, BackgroundRepeat>[][], RepeatStruct[]> {
 
     private static final RepeatStructConverter REPEAT_STRUCT_CONVERTER =
             new RepeatStructConverter();
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/SliceSequenceConverter.java	2015-09-03 15:08:57.433734000 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/SliceSequenceConverter.java	2015-09-03 15:08:56.861701300 -0700
@@ -27,12 +27,12 @@
 
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 
 /**
  * [<size> | <size> <size> <size> <size>] <fill>? [ , [ <size> | <size> <size> <size> <size>] <fill>? ]*
  */
-public final class SliceSequenceConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], BorderImageSlices>[], BorderImageSlices[]> {
+public final class SliceSequenceConverter extends StyleConverter<ParsedValue<ParsedValue[], BorderImageSlices>[], BorderImageSlices[]> {
     private static final SliceSequenceConverter BORDER_IMAGE_SLICE_SEQUENCE_CONVERTER =
             new SliceSequenceConverter();
 
--- old/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/StrokeBorderPaintConverter.java	2015-09-03 15:09:04.871159400 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/scene/layout/region/StrokeBorderPaintConverter.java	2015-09-03 15:09:04.245123600 -0700
@@ -29,11 +29,11 @@
 import javafx.scene.paint.Paint;
 import javafx.scene.text.Font;
 import javafx.css.ParsedValue;
-import com.sun.javafx.css.StyleConverterImpl;
+import javafx.css.StyleConverter;
 
 /**
  */
-public class StrokeBorderPaintConverter extends StyleConverterImpl<ParsedValue<?,Paint>[], Paint[]> {
+public class StrokeBorderPaintConverter extends StyleConverter<ParsedValue<?,Paint>[], Paint[]> {
     /**
      * Convert an array of border paint values to an array of Paint which
      * contains one Paint element per border (top, right, bottom, left).
--- old/modules/graphics/src/main/java/javafx/css/FontCssMetaData.java	2015-09-03 15:09:12.265582400 -0700
+++ new/modules/graphics/src/main/java/javafx/css/FontCssMetaData.java	2015-09-03 15:09:11.721551300 -0700
@@ -25,9 +25,9 @@
 
 package javafx.css;
 
-import com.sun.javafx.css.converters.FontConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.FontConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StringConverter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
--- old/modules/graphics/src/main/java/javafx/css/ParsedValue.java	2015-09-03 15:09:19.693007200 -0700
+++ new/modules/graphics/src/main/java/javafx/css/ParsedValue.java	2015-09-03 15:09:19.117974300 -0700
@@ -87,6 +87,24 @@
     }
     
     /**
+     * If value is itself a ParsedValue or sequence of values, and should any of
+     * those values need to be looked up, then this flag is set. This
+     * does not mean that this particular value needs to be looked up, but
+     * that this value contains a value that needs to be looked up.
+     *
+     * @since 9
+     */
+    public boolean isContainsLookups() { return false; }
+
+     /**
+     * If value references another property, then the real value needs to
+     * be looked up.
+     *
+     * @since 9
+     */
+    public boolean isLookup() { return false; }
+
+    /**
      * Create an instance of ParsedValue where the value type V is converted to
      * the target type T using the given converter.
      * If {@code converter} is null, then it is assumed that the type of value 
--- old/modules/graphics/src/main/java/javafx/css/StyleConverter.java	2015-09-03 15:09:27.410448600 -0700
+++ new/modules/graphics/src/main/java/javafx/css/StyleConverter.java	2015-09-03 15:09:26.772412100 -0700
@@ -25,17 +25,21 @@
 
 package javafx.css;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.ColorConverter;
-import com.sun.javafx.css.converters.DurationConverter;
-import com.sun.javafx.css.converters.EffectConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.FontConverter;
-import com.sun.javafx.css.converters.InsetsConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.css.converters.URLConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.ColorConverter;
+import javafx.css.converter.DeriveColorConverter;
+import javafx.css.converter.DeriveSizeConverter;
+import javafx.css.converter.DurationConverter;
+import javafx.css.converter.EffectConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.FontConverter;
+import javafx.css.converter.InsetsConverter;
+import javafx.css.converter.LadderConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StopConverter;
+import javafx.css.converter.StringConverter;
+import javafx.css.converter.URLConverter;
 import javafx.geometry.Insets;
 import javafx.scene.effect.Effect;
 import javafx.scene.paint.Color;
@@ -43,12 +47,35 @@
 import javafx.scene.text.Font;
 import javafx.util.Duration;
 
+import com.sun.javafx.scene.layout.region.CornerRadiiConverter;
+import com.sun.javafx.util.Logging;
+import sun.util.logging.PlatformLogger;
+import sun.util.logging.PlatformLogger.Level;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+
 /**
- * Converter converts {@code ParsedValue&tl;F,T&gt;} from type F to type T. the
+ * StyleConverter converts {@code ParsedValue&tl;F,T&gt;} from type F to type T. The
  * {@link CssMetaData} API requires a {@code StyleConverter} which is used
  * when computing a value for the {@see StyleableProperty}. There are
  * a number of predefined converters which are accessible by the static 
  * methods of this class.
+ *
+ * F is the type of the parsed value, T is the converted type of
+ * the ParsedValueImpl. For example, a converter from String to Color would
+ * be declared
+ * <p>&nbsp;&nbsp;&nbsp;&nbsp;
+ * <code>public Color convert(ParsedValueImpl&lt;String,Color&gt; value, Font font)</code>
+ * </p>
+ *
  * @see ParsedValue
  * @see StyleableProperty
  * @since JavaFX 8.0
@@ -185,4 +212,328 @@
     }
     
 
+
+
+    /**
+     * Convert from the constituent values to the target property type.
+     * Implemented by Types that have Keys with subKeys.
+     *
+     * @since 9
+     */
+    public T convert(Map<CssMetaData<? extends Styleable, ?>,Object> convertedValues) {
+        return null;
+    }
+
+    /**
+     *
+     * @since 9
+     */
+    public void writeBinary(DataOutputStream os, StringStore sstore)
+            throws IOException {
+
+        String cname = getClass().getName();
+        int index = sstore.addString(cname);
+        os.writeShort(index);
+    }
+
+    private static Map<ParsedValue, Object> cache;
+
+    /**
+     *
+     * @since 9
+     */
+    public static void clearCache() { 
+        if (cache != null) {
+            cache.clear(); 
+        }
+    }
+
+    /**
+     *
+     * @since 9
+     */
+    protected T getCachedValue(ParsedValue key) {
+        if (cache != null) {
+            return (T)cache.get(key);
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @since 9
+     */
+    protected void cacheValue(ParsedValue key, Object value) {
+        if (cache == null) cache = new WeakHashMap<>();
+        cache.put(key, value);
+    }
+
+    // map of StyleConverter class name to StyleConverter
+    private static Map<String,StyleConverter<?, ?>> tmap;
+
+    /**
+     *
+     * @since 9
+     */
+    @SuppressWarnings("rawtypes")
+    public static StyleConverter<?,?> readBinary(DataInputStream is, String[] strings)
+            throws IOException {
+
+        int index = is.readShort();
+        String cname = strings[index];
+
+        if (cname == null || cname.isEmpty()) return null;
+
+        if (cname.startsWith("com.sun.javafx.css.converters.")) {
+            // JavaFX 9: converter classes were moved from
+            // com.sun.javafx.css.converters.* to javafx.css.converter.*
+            // Note: the word 'converters' has become 'converter'.
+            cname = "javafx.css.converter." + cname.substring("com.sun.javafx.css.converters.".length());
+        }
+        if (cname.startsWith("javafx.css.converter.EnumConverter")) {
+            return (StyleConverter)javafx.css.converter.EnumConverter.readBinary(is, strings);
+        }
+
+        // Make a new entry in tmap, if necessary
+        if (tmap == null || !tmap.containsKey(cname)) {
+            StyleConverter<?,?> converter = getInstance(cname);
+            if (converter == null) {
+                final PlatformLogger logger = Logging.getCSSLogger();
+                if (logger.isLoggable(Level.SEVERE)) {
+                    logger.severe("could not deserialize " + cname);
+                }
+            }
+            if (converter == null) {
+                System.err.println("could not deserialize " + cname);
+            }
+            if (tmap == null) tmap = new HashMap<String,StyleConverter<?,?>>();
+            tmap.put(cname, converter);
+            return converter;
+        }
+        return tmap.get(cname);
+    }
+
+    // package for unit test purposes
+    static StyleConverter<?,?> getInstance(final String converterClass) {
+
+        StyleConverter<?,?> styleConverter = null;
+
+        switch(converterClass) {
+        case "javafx.css.converter.BooleanConverter" :
+            styleConverter = javafx.css.converter.BooleanConverter.getInstance();
+            break;
+        case "javafx.css.converter.ColorConverter" :
+            styleConverter = javafx.css.converter.ColorConverter.getInstance();
+            break;
+        case "javafx.css.converter.CursorConverter" :
+            styleConverter = javafx.css.converter.CursorConverter.getInstance();
+            break;
+        case "javafx.css.converter.EffectConverter" :
+            styleConverter = javafx.css.converter.EffectConverter.getInstance();
+            break;
+        case "javafx.css.converter.EffectConverter$DropShadowConverter" :
+            styleConverter = javafx.css.converter.EffectConverter.DropShadowConverter.getInstance();
+            break;
+        case "javafx.css.converter.EffectConverter$InnerShadowConverter" :
+            styleConverter = javafx.css.converter.EffectConverter.InnerShadowConverter.getInstance();
+            break;
+        case "javafx.css.converter.FontConverter" :
+            styleConverter = javafx.css.converter.FontConverter.getInstance();
+            break;
+        case "javafx.css.converter.FontConverter$FontStyleConverter" :
+        case "javafx.css.converter.FontConverter$StyleConverter" :
+            styleConverter = javafx.css.converter.FontConverter.FontStyleConverter.getInstance();
+            break;
+        case "javafx.css.converter.FontConverter$FontWeightConverter" :
+        case "javafx.css.converter.FontConverter$WeightConverter" :
+            styleConverter = javafx.css.converter.FontConverter.FontWeightConverter.getInstance();
+            break;
+        case "javafx.css.converter.FontConverter$FontSizeConverter" :
+        case "javafx.css.converter.FontConverter$SizeConverter" :
+            styleConverter = javafx.css.converter.FontConverter.FontSizeConverter.getInstance();
+            break;
+
+        case "javafx.css.converter.InsetsConverter" :
+            styleConverter = javafx.css.converter.InsetsConverter.getInstance();
+            break;
+        case "javafx.css.converter.InsetsConverter$SequenceConverter" :
+            styleConverter = javafx.css.converter.InsetsConverter.SequenceConverter.getInstance();
+            break;
+
+        case "javafx.css.converter.PaintConverter" :
+            styleConverter = javafx.css.converter.PaintConverter.getInstance();
+            break;
+        case "javafx.css.converter.PaintConverter$SequenceConverter" :
+            styleConverter = javafx.css.converter.PaintConverter.SequenceConverter.getInstance();
+            break;
+        case "javafx.css.converter.PaintConverter$LinearGradientConverter" :
+            styleConverter = javafx.css.converter.PaintConverter.LinearGradientConverter.getInstance();
+            break;
+        case "javafx.css.converter.PaintConverter$RadialGradientConverter" :
+            styleConverter = javafx.css.converter.PaintConverter.RadialGradientConverter.getInstance();
+            break;
+
+        case "javafx.css.converter.SizeConverter" :
+            styleConverter = javafx.css.converter.SizeConverter.getInstance();
+            break;
+        case "javafx.css.converter.SizeConverter$SequenceConverter" :
+            styleConverter = javafx.css.converter.SizeConverter.SequenceConverter.getInstance();
+            break;
+
+        case "javafx.css.converter.StringConverter" :
+            styleConverter = javafx.css.converter.StringConverter.getInstance();
+            break;
+        case "javafx.css.converter.StringConverter$SequenceConverter" :
+            styleConverter = javafx.css.converter.StringConverter.SequenceConverter.getInstance();
+            break;
+        case "javafx.css.converter.URLConverter" :
+            styleConverter = javafx.css.converter.URLConverter.getInstance();
+            break;
+        case "javafx.css.converter.URLConverter$SequenceConverter" :
+            styleConverter = javafx.css.converter.URLConverter.SequenceConverter.getInstance();
+            break;
+
+        // Region stuff  - including 2.x class names
+        case "com.sun.javafx.scene.layout.region.BackgroundPositionConverter" :
+        case "com.sun.javafx.scene.layout.region.BackgroundImage$BackgroundPositionConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BackgroundPositionConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.BackgroundSizeConverter" :
+        case "com.sun.javafx.scene.layout.region.BackgroundImage$BackgroundSizeConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BackgroundSizeConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.BorderImageSliceConverter" :
+        case "com.sun.javafx.scene.layout.region.BorderImage$SliceConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BorderImageSliceConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.BorderImageWidthConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BorderImageWidthConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.BorderImageWidthsSequenceConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BorderImageWidthsSequenceConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.BorderStrokeStyleSequenceConverter" :
+        case "com.sun.javafx.scene.layout.region.StrokeBorder$BorderStyleSequenceConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BorderStrokeStyleSequenceConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.BorderStyleConverter" :
+        case "com.sun.javafx.scene.layout.region.StrokeBorder$BorderStyleConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.BorderStyleConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter" :
+        case "com.sun.javafx.scene.layout.region.BackgroundImage$LayeredBackgroundPositionConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter" :
+        case "com.sun.javafx.scene.layout.region.BackgroundImage$LayeredBackgroundSizeConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.LayeredBorderPaintConverter" :
+        case "com.sun.javafx.scene.layout.region.StrokeBorder$LayeredBorderPaintConverter" :
+           styleConverter = com.sun.javafx.scene.layout.region.LayeredBorderPaintConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.LayeredBorderStyleConverter" :
+        case "com.sun.javafx.scene.layout.region.StrokeBorder$LayeredBorderStyleConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.LayeredBorderStyleConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.RepeatStructConverter" :
+        case "com.sun.javafx.scene.layout.region.BackgroundImage$BackgroundRepeatConverter" :
+        case "com.sun.javafx.scene.layout.region.BorderImage$RepeatConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.RepeatStructConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.SliceSequenceConverter" :
+        case "com.sun.javafx.scene.layout.region.BorderImage$SliceSequenceConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.SliceSequenceConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.StrokeBorderPaintConverter" :
+        case "com.sun.javafx.scene.layout.region.StrokeBorder$BorderPaintConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.StrokeBorderPaintConverter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.Margins$Converter" :
+            styleConverter = com.sun.javafx.scene.layout.region.Margins.Converter.getInstance();
+            break;
+        case "com.sun.javafx.scene.layout.region.Margins$SequenceConverter" :
+            styleConverter = com.sun.javafx.scene.layout.region.Margins.SequenceConverter.getInstance();
+            break;
+        case "javafx.scene.layout.CornerRadiiConverter" :  // Fix for RT-39665
+        case "com.sun.javafx.scene.layout.region.CornerRadiiConverter" :
+            styleConverter = CornerRadiiConverter.getInstance();
+            break;
+
+        // parser stuff
+        case "javafx.css.converter.DeriveColorConverter":
+        case "com.sun.javafx.css.parser.DeriveColorConverter" :
+            styleConverter = DeriveColorConverter.getInstance();
+            break;
+        case "javafx.css.converter.DeriveSizeConverter":
+        case "com.sun.javafx.css.parser.DeriveSizeConverter" :
+            styleConverter = DeriveSizeConverter.getInstance();
+            break;
+        case "javafx.css.converter.LadderConverter":
+        case "com.sun.javafx.css.parser.LadderConverter" :
+            styleConverter = LadderConverter.getInstance();
+            break;
+        case "javafx.css.converter.StopConverter":
+        case "com.sun.javafx.css.parser.StopConverter" :
+            styleConverter = StopConverter.getInstance();
+            break;
+
+            default :
+            final PlatformLogger logger = Logging.getCSSLogger();
+            if (logger.isLoggable(Level.SEVERE)) {
+                logger.severe("StyleConverter : converter Class is null for : "+converterClass);
+            }
+            break;
+        }
+
+        return styleConverter;
+    }
+
+
+    /**
+     *
+     * @since 9
+     */
+    public static class StringStore {
+        private final Map<String,Integer> stringMap = new HashMap<String,Integer>();
+        public final List<String> strings = new ArrayList<String>();
+
+        public int addString(String s) {
+            Integer index = stringMap.get(s);
+            if (index == null) {
+                index = strings.size();
+                strings.add(s);
+                stringMap.put(s,index);
+            }
+            return index;
+        }
+
+        public void writeBinary(DataOutputStream os) throws IOException {
+            os.writeShort(strings.size());
+            if (stringMap.containsKey(null)) {
+                Integer index = stringMap.get(null);
+                os.writeShort(index);
+            } else {
+                os.writeShort(-1);
+            }
+            for (int n=0; n<strings.size(); n++) {
+                String s = strings.get(n);
+                if (s == null) continue;
+                os.writeUTF(s);
+            }
+        }
+
+        // TODO: this isn't parallel with writeBinary
+        public static String[] readBinary(DataInputStream is) throws IOException {
+            int nStrings = is.readShort();
+            int nullIndex = is.readShort();
+            String[] strings = new String[nStrings];
+            java.util.Arrays.fill(strings, null);
+            for (int n=0; n<nStrings; n++) {
+                if (n == nullIndex) continue;
+                strings[n] = is.readUTF();
+            }
+            return strings;
+        }
+    }
 }
--- old/modules/graphics/src/main/java/javafx/css/StyleablePropertyFactory.java	2015-09-03 15:09:34.878875800 -0700
+++ new/modules/graphics/src/main/java/javafx/css/StyleablePropertyFactory.java	2015-09-03 15:09:34.278841500 -0700
@@ -25,7 +25,7 @@
 
 package javafx.css;
 
-import com.sun.javafx.css.converters.EnumConverter;
+import javafx.css.converter.EnumConverter;
 import javafx.beans.property.Property;
 import javafx.geometry.Insets;
 import javafx.scene.effect.Effect;
--- old/modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java	2015-09-03 15:09:42.353303300 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/CssStyleHelper.java	2015-09-03 15:09:41.770269900 -0700
@@ -37,36 +37,37 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.WritableValue;
+import javafx.css.CascadingStyle;
 import javafx.css.CssMetaData;
+import javafx.css.CssParser;
 import javafx.css.FontCssMetaData;
 import javafx.css.ParsedValue;
 import javafx.css.PseudoClass;
+import javafx.css.Rule;
+import javafx.css.Selector;
+import javafx.css.Style;
 import javafx.css.StyleConverter;
 import javafx.css.StyleOrigin;
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
+import javafx.css.Stylesheet;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontPosture;
 import javafx.scene.text.FontWeight;
-import com.sun.javafx.util.Logging;
-import com.sun.javafx.util.Utils;
+
 import com.sun.javafx.css.CalculatedValue;
-import com.sun.javafx.css.CascadingStyle;
-import com.sun.javafx.css.CssError;
 import com.sun.javafx.css.ParsedValueImpl;
 import com.sun.javafx.css.PseudoClassState;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Selector;
-import com.sun.javafx.css.Style;
 import com.sun.javafx.css.StyleCache;
 import com.sun.javafx.css.StyleCacheEntry;
-import com.sun.javafx.css.StyleConverterImpl;
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.css.StyleMap;
-import com.sun.javafx.css.Stylesheet;
-import com.sun.javafx.css.converters.FontConverter;
-import sun.util.logging.PlatformLogger;
+import javafx.css.converter.FontConverter;
+import com.sun.javafx.util.Logging;
+import com.sun.javafx.util.Utils;
+
 import sun.util.logging.PlatformLogger.Level;
+import sun.util.logging.PlatformLogger;
 
 import static com.sun.javafx.css.CalculatedValue.*;
 
@@ -632,9 +633,6 @@
         final boolean isForceSlowpath = cacheContainer.forceSlowpath;
         cacheContainer.forceSlowpath = false;
 
-        // RT-20643
-        CssError.setCurrentScene(node.getScene());
-
         // For each property that is settable, we need to do a lookup and
         // transition to that value.
         for(int n=0; n<max; n++) {
@@ -788,9 +786,9 @@
                 final String msg = String.format("Failed to set css [%s] on [%s] due to '%s'\n",
                         cssMetaData.getProperty(), styleableProperty, e.getMessage());
 
-                List<CssError> errors = null;
+                List<CssParser.ParseError> errors = null;
                 if ((errors = StyleManager.getErrors()) != null) {
-                    final CssError error = new CssError.PropertySetError(cssMetaData, node, msg);
+                    final CssParser.ParseError error = new CssParser.ParseError.PropertySetError(cssMetaData, node, msg);
                     errors.add(error);
                 }
 
@@ -822,10 +820,6 @@
             }
 
         }
-
-        // RT-20643
-        CssError.setCurrentScene(null);
-
     }
 
     /**
@@ -964,18 +958,13 @@
 
                 try {
                     final StyleConverter keyType = cssMetaData.getConverter();
-                    if (keyType instanceof StyleConverterImpl) {
-                        Object ret = ((StyleConverterImpl)keyType).convert(subs);
-                        return new CalculatedValue(ret, origin, isRelative);
-                    } else {
-                        assert false; // TBD: should an explicit exception be thrown here?
-                        return SKIP;
-                    }
+                    Object ret = keyType.convert(subs);
+                    return new CalculatedValue(ret, origin, isRelative);
                 } catch (ClassCastException cce) {
                     final String msg = formatExceptionMessage(styleable, cssMetaData, null, cce);
-                    List<CssError> errors = null;
+                    List<CssParser.ParseError> errors = null;
                     if ((errors = StyleManager.getErrors()) != null) {
-                        final CssError error = new CssError.PropertySetError(cssMetaData, styleable, msg);
+                        final CssParser.ParseError error = new CssParser.ParseError.PropertySetError(cssMetaData, styleable, msg);
                         errors.add(error);
                     }
                     if (LOGGER.isLoggable(Level.WARNING)) {
@@ -1006,7 +995,7 @@
 
             // If there was a style found, then we want to check whether the
             // value was "inherit". If so, then we will simply inherit.
-            final ParsedValueImpl cssValue = style.getParsedValueImpl();
+            final ParsedValue cssValue = style.getParsedValue();
             if (cssValue != null && "inherit".equals(cssValue.getValue())) {
                 style = getInheritedStyle(styleable, property);
                 if (style == null) return SKIP;
@@ -1080,7 +1069,7 @@
 
                 if (cascadingStyle != null) {
 
-                    final ParsedValueImpl cssValue = cascadingStyle.getParsedValueImpl();
+                    final ParsedValue cssValue = cascadingStyle.getParsedValue();
 
                     if ("inherit".equals(cssValue.getValue())) {
                         return getInheritedStyle(parent, property);
@@ -1148,9 +1137,9 @@
     }
 
     // to resolve a lookup, we just need to find the parsed value.
-    private ParsedValueImpl resolveLookups(
+    private ParsedValue resolveLookups(
             final Styleable styleable,
-            final ParsedValueImpl parsedValue,
+            final ParsedValue parsedValue,
             final StyleMap styleMap, Set<PseudoClass> states,
             final ObjectProperty<StyleOrigin> whence,
             Set<ParsedValue> resolves) {
@@ -1172,7 +1161,7 @@
 
                 if (resolved != null) {
 
-                    if (resolves.contains(resolved.getParsedValueImpl())) {
+                    if (resolves.contains(resolved.getParsedValue())) {
 
                         if (LOGGER.isLoggable(Level.WARNING)) {
                             LOGGER.warning("Loop detected in " + resolved.getRule().toString() + " while resolving '" + sval + "'");
@@ -1198,7 +1187,7 @@
                     // the resolved value may itself need to be resolved.
                     // For example, if the value "color" resolves to "base",
                     // then "base" will need to be resolved as well.
-                    ParsedValueImpl pv = resolveLookups(styleable, resolved.getParsedValueImpl(), styleMap, states, whence, resolves);
+                    ParsedValue pv = resolveLookups(styleable, resolved.getParsedValue(), styleMap, states, whence, resolves);
 
                     if (resolves != null) {
                         resolves.remove(parsedValue);
@@ -1217,13 +1206,13 @@
 
         final Object val = parsedValue.getValue();
 
-        if (val instanceof ParsedValueImpl[][]) {
+        if (val instanceof ParsedValue[][]) {
 
-            // If ParsedValueImpl is a layered sequence of values, resolve the lookups for each.
-            final ParsedValueImpl[][] layers = (ParsedValueImpl[][])val;
-            ParsedValueImpl[][] resolved = new ParsedValueImpl[layers.length][0];
+            // If ParsedValue is a layered sequence of values, resolve the lookups for each.
+            final ParsedValue[][] layers = (ParsedValue[][])val;
+            ParsedValue[][] resolved = new ParsedValue[layers.length][0];
             for (int l=0; l<layers.length; l++) {
-                resolved[l] = new ParsedValueImpl[layers[l].length];
+                resolved[l] = new ParsedValue[layers[l].length];
                 for (int ll=0; ll<layers[l].length; ll++) {
                     if (layers[l][ll] == null) continue;
                     resolved[l][ll] =
@@ -1237,9 +1226,9 @@
 
         } else if (val instanceof ParsedValueImpl[]) {
 
-            // If ParsedValueImpl is a sequence of values, resolve the lookups for each.
-            final ParsedValueImpl[] layer = (ParsedValueImpl[])val;
-            ParsedValueImpl[] resolved = new ParsedValueImpl[layer.length];
+            // If ParsedValue is a sequence of values, resolve the lookups for each.
+            final ParsedValue[] layer = (ParsedValue[])val;
+            ParsedValue[] resolved = new ParsedValue[layer.length];
             for (int l=0; l<layer.length; l++) {
                 if (layer[l] == null) continue;
                 resolved[l] =
@@ -1256,7 +1245,7 @@
 
     }
 
-    private String getUnresolvedLookup(final ParsedValueImpl resolved) {
+    private String getUnresolvedLookup(final ParsedValue resolved) {
 
         Object value = resolved.getValue();
 
@@ -1264,8 +1253,8 @@
             return (String)value;
         }
 
-        if (value instanceof ParsedValueImpl[][]) {
-            final ParsedValueImpl[][] layers = (ParsedValueImpl[][])value;
+        if (value instanceof ParsedValue[][]) {
+            final ParsedValue[][] layers = (ParsedValue[][])value;
             for (int l=0; l<layers.length; l++) {
                 for (int ll=0; ll<layers[l].length; ll++) {
                     if (layers[l][ll] == null) continue;
@@ -1274,9 +1263,9 @@
                 }
             }
 
-        } else if (value instanceof ParsedValueImpl[]) {
-        // If ParsedValueImpl is a sequence of values, resolve the lookups for each.
-            final ParsedValueImpl[] layer = (ParsedValueImpl[])value;
+        } else if (value instanceof ParsedValue[]) {
+        // If ParsedValue is a sequence of values, resolve the lookups for each.
+            final ParsedValue[] layer = (ParsedValue[])value;
             for (int l=0; l<layer.length; l++) {
                 if (layer[l] == null) continue;
                 String unresolvedLookup = getUnresolvedLookup(layer[l]);
@@ -1287,7 +1276,7 @@
         return null;
     }
 
-    private String formatUnresolvedLookupMessage(Styleable styleable, CssMetaData cssMetaData, Style style, ParsedValueImpl resolved, ClassCastException cce) {
+    private String formatUnresolvedLookupMessage(Styleable styleable, CssMetaData cssMetaData, Style style, ParsedValue resolved, ClassCastException cce) {
 
         // Find value that could not be looked up. If the resolved value does not contain lookups, then the
         // ClassCastException is not because of trying to convert a String (which is the missing lookup)
@@ -1372,10 +1361,10 @@
             final Styleable originatingStyleable,
             final CalculatedValue fontFromCacheEntry) {
 
-        final ParsedValueImpl cssValue = style.getParsedValueImpl();
+        final ParsedValue cssValue = style.getParsedValue();
         if (cssValue != null && !("null".equals(cssValue.getValue()) || "none".equals(cssValue.getValue()))) {
 
-            ParsedValueImpl resolved = null;
+            ParsedValue resolved = null;
             try {
 
                 ObjectProperty<StyleOrigin> whence = new SimpleObjectProperty<>(style.getOrigin());
@@ -1453,14 +1442,14 @@
 
                 final StyleConverter cssMetaDataConverter = cssMetaData.getConverter();
                 // RT-37727 - handling of properties that are insets is wonky. If the property is -fx-inset, then
-                // there isn't an issue because the converter assigns the InsetsConverter to the ParsedValueImpl.
+                // there isn't an issue because the converter assigns the InsetsConverter to the ParsedValue.
                 // But -my-insets will parse as an array of numbers and the parser will assign the Size sequence
                 // converter to it. So, if the CssMetaData says it uses InsetsConverter, use the InsetsConverter
                 // and not the parser assigned converter.
                 if (cssMetaDataConverter == StyleConverter.getInsetsConverter()) {
                     if (resolved.getValue() instanceof ParsedValue) {
-                        // If you give the parser "-my-insets: 5;" you end up with a ParsedValueImpl<ParsedValue<?,Size>, Number>
-                        // and not a ParsedValueImpl<ParsedValue[], Number[]> so here we wrap the value into an array
+                        // If you give the parser "-my-insets: 5;" you end up with a ParsedValue<ParsedValue<?,Size>, Number>
+                        // and not a ParsedValue<ParsedValue[], Number[]> so here we wrap the value into an array
                         // to make the InsetsConverter happy.
                         resolved = new ParsedValueImpl(new ParsedValue[] {(ParsedValue)resolved.getValue()}, null, false);
                     }
@@ -1476,9 +1465,9 @@
 
             } catch (ClassCastException cce) {
                 final String msg = formatUnresolvedLookupMessage(styleable, cssMetaData, style.getStyle(),resolved, cce);
-                List<CssError> errors = null;
+                List<CssParser.ParseError> errors = null;
                 if ((errors = StyleManager.getErrors()) != null) {
-                    final CssError error = new CssError.PropertySetError(cssMetaData, styleable, msg);
+                    final CssParser.ParseError error = new CssParser.ParseError.PropertySetError(cssMetaData, styleable, msg);
                     errors.add(error);
                 }
                 if (LOGGER.isLoggable(Level.WARNING)) {
@@ -1490,9 +1479,9 @@
                 return SKIP;
             } catch (IllegalArgumentException iae) {
                 final String msg = formatExceptionMessage(styleable, cssMetaData, style.getStyle(), iae);
-                List<CssError> errors = null;
+                List<CssParser.ParseError> errors = null;
                 if ((errors = StyleManager.getErrors()) != null) {
-                    final CssError error = new CssError.PropertySetError(cssMetaData, styleable, msg);
+                    final CssParser.ParseError error = new CssParser.ParseError.PropertySetError(cssMetaData, styleable, msg);
                     errors.add(error);
                 }
                 if (LOGGER.isLoggable(Level.WARNING)) {
@@ -1504,9 +1493,9 @@
                 return SKIP;
             } catch (NullPointerException npe) {
                 final String msg = formatExceptionMessage(styleable, cssMetaData, style.getStyle(), npe);
-                List<CssError> errors = null;
+                List<CssParser.ParseError> errors = null;
                 if ((errors = StyleManager.getErrors()) != null) {
-                    final CssError error = new CssError.PropertySetError(cssMetaData, styleable, msg);
+                    final CssParser.ParseError error = new CssParser.ParseError.PropertySetError(cssMetaData, styleable, msg);
                     errors.add(error);
                 }
                 if (LOGGER.isLoggable(Level.WARNING)) {
@@ -1732,7 +1721,7 @@
 
                     if (cascadingStyle != null) {
 
-                        final ParsedValueImpl cssValue = cascadingStyle.getParsedValueImpl();
+                        final ParsedValue cssValue = cascadingStyle.getParsedValue();
 
                         if ("inherit".equals(cssValue.getValue()) == false) {
                             fontShorthand = cascadingStyle;
@@ -1990,7 +1979,7 @@
                         }
                     }
 
-                    final ParsedValueImpl cssValue = cascadingStyle.getParsedValueImpl();
+                    final ParsedValue cssValue = cascadingStyle.getParsedValue();
 
                     if ("inherit".equals(cssValue.getValue()) == false) {
                         return cascadingStyle;
@@ -2089,7 +2078,7 @@
                 CascadingStyle cascadingStyle = getStyle(node, styleableProperty.getProperty(), smap, _node.pseudoClassStates);
                 if (cascadingStyle != null) {
                     styleList.add(cascadingStyle);
-                    final ParsedValueImpl parsedValue = cascadingStyle.getParsedValueImpl();
+                    final ParsedValue parsedValue = cascadingStyle.getParsedValue();
                     getMatchingLookupStyles(node, parsedValue, styleList, matchState);
                 }
             }  else {
@@ -2102,7 +2091,7 @@
                     styleList.addAll(styles);
                     for (int n=0, nMax=styles.size(); n<nMax; n++) {
                         final CascadingStyle style = styles.get(n);
-                        final ParsedValueImpl parsedValue = style.getParsedValueImpl();
+                        final ParsedValue parsedValue = style.getParsedValue();
                         getMatchingLookupStyles(node, parsedValue, styleList, matchState);
                     }
                 }
@@ -2126,7 +2115,7 @@
     }
 
     // Pretty much a duplicate of resolveLookups, but without the state
-    private void getMatchingLookupStyles(final Styleable node, final ParsedValueImpl parsedValue, final List<CascadingStyle> styleList, boolean matchState) {
+    private void getMatchingLookupStyles(final Styleable node, final ParsedValue parsedValue, final List<CascadingStyle> styleList, boolean matchState) {
 
         if (parsedValue.isLookup()) {
 
@@ -2170,7 +2159,7 @@
 
                         for (int index=start; index<end; index++) {
                             final CascadingStyle style = styleList.get(index);
-                            getMatchingLookupStyles(parent, style.getParsedValueImpl(), styleList, matchState);
+                            getMatchingLookupStyles(parent, style.getParsedValue(), styleList, matchState);
                         }
                     }
 
@@ -2185,9 +2174,9 @@
         }
 
         final Object val = parsedValue.getValue();
-        if (val instanceof ParsedValueImpl[][]) {
-        // If ParsedValueImpl is a layered sequence of values, resolve the lookups for each.
-            final ParsedValueImpl[][] layers = (ParsedValueImpl[][])val;
+        if (val instanceof ParsedValue[][]) {
+        // If ParsedValue is a layered sequence of values, resolve the lookups for each.
+            final ParsedValue[][] layers = (ParsedValue[][])val;
             for (int l=0; l<layers.length; l++) {
                 for (int ll=0; ll<layers[l].length; ll++) {
                     if (layers[l][ll] == null) continue;
@@ -2195,9 +2184,9 @@
                 }
             }
 
-        } else if (val instanceof ParsedValueImpl[]) {
-        // If ParsedValueImpl is a sequence of values, resolve the lookups for each.
-            final ParsedValueImpl[] layer = (ParsedValueImpl[])val;
+        } else if (val instanceof ParsedValue[]) {
+        // If ParsedValue is a sequence of values, resolve the lookups for each.
+            final ParsedValue[] layer = (ParsedValue[])val;
             for (int l=0; l<layer.length; l++) {
                 if (layer[l] == null) continue;
                     getMatchingLookupStyles(node, layer[l], styleList, matchState);
--- old/modules/graphics/src/main/java/javafx/scene/Node.java	2015-09-03 15:09:49.780728100 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/Node.java	2015-09-03 15:09:49.149692000 -0700
@@ -122,13 +122,13 @@
 import com.sun.javafx.collections.TrackableObservableList;
 import com.sun.javafx.collections.UnmodifiableListSet;
 import com.sun.javafx.css.PseudoClassState;
-import com.sun.javafx.css.Selector;
-import com.sun.javafx.css.Style;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.CursorConverter;
-import com.sun.javafx.css.converters.EffectConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.Selector;
+import javafx.css.Style;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.CursorConverter;
+import javafx.css.converter.EffectConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.effect.EffectDirtyBits;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.BoxBounds;
@@ -1585,6 +1585,29 @@
         return getMiscProperties().disableProperty();
     }
 
+
+//    /**
+//     * TODO document - null by default, could be non-null in subclasses (e.g. Control)
+//     */
+//    public final ObjectProperty<InputMap<?>> inputMapProperty() {
+//        if (inputMap == null) {
+//            inputMap = new SimpleObjectProperty<InputMap<?>>(this, "inputMap") {
+//                private InputMap<?> currentMap = get();
+//                @Override protected void invalidated() {
+//                    if (currentMap != null) {
+//                        currentMap.dispose();
+//                    }
+//                    currentMap = get();
+//                }
+//            };
+//        }
+//        return inputMap;
+//    }
+//    public final void setInputMap(InputMap<?> value) { inputMapProperty().set(value); }
+//    public final InputMap<?> getInputMap() { return inputMapProperty().getValue(); }
+//    private ObjectProperty<InputMap<?>> inputMap;
+
+
     /**************************************************************************
      *                                                                        *
      *
--- old/modules/graphics/src/main/java/javafx/scene/Parent.java	2015-09-03 15:09:57.548172400 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/Parent.java	2015-09-03 15:09:56.912136000 -0700
@@ -44,7 +44,7 @@
 import com.sun.javafx.collections.TrackableObservableList;
 import com.sun.javafx.collections.VetoableListDecorator;
 import com.sun.javafx.collections.annotations.ReturnsUnmodifiableCollection;
-import com.sun.javafx.css.Selector;
+import javafx.css.Selector;
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.PickRay;
--- old/modules/graphics/src/main/java/javafx/scene/image/ImageView.java	2015-09-03 15:10:05.236612100 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/image/ImageView.java	2015-09-03 15:10:04.681580400 -0700
@@ -27,7 +27,7 @@
 
 import com.sun.javafx.beans.event.AbstractNotifyListener;
 import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.converters.URLConverter;
+import javafx.css.converter.URLConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.jmx.MXNodeAlgorithm;
--- old/modules/graphics/src/main/java/javafx/scene/layout/Background.java	2015-09-03 15:10:11.996998800 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/Background.java	2015-09-03 15:10:11.464968400 -0700
@@ -38,9 +38,9 @@
 import java.util.List;
 import com.sun.javafx.UnmodifiableArrayList;
 import com.sun.javafx.css.SubCssMetaData;
-import com.sun.javafx.css.converters.InsetsConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.URLConverter;
+import javafx.css.converter.InsetsConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.URLConverter;
 import com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter;
 import com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter;
 import com.sun.javafx.scene.layout.region.CornerRadiiConverter;
--- old/modules/graphics/src/main/java/javafx/scene/layout/BackgroundConverter.java	2015-09-03 15:10:19.166408900 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/BackgroundConverter.java	2015-09-03 15:10:18.589375900 -0700
@@ -25,7 +25,6 @@
 
 package javafx.scene.layout;
 
-import com.sun.javafx.css.StyleConverterImpl;
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.scene.layout.region.RepeatStruct;
 import java.util.Map;
@@ -33,6 +32,7 @@
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import javafx.css.Styleable;
+import javafx.css.StyleConverter;
 import javafx.geometry.Insets;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Paint;
@@ -40,7 +40,7 @@
 /**
  * Converts the CSS for -fx-background items into a Background.
  */
-class BackgroundConverter extends StyleConverterImpl<ParsedValue[], Background> {
+class BackgroundConverter extends StyleConverter<ParsedValue[], Background> {
 
     static final StyleConverter<ParsedValue[], Background> INSTANCE = new BackgroundConverter();
 
--- old/modules/graphics/src/main/java/javafx/scene/layout/Border.java	2015-09-03 15:10:27.231870200 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/Border.java	2015-09-03 15:10:26.587833400 -0700
@@ -36,8 +36,8 @@
 import com.sun.javafx.UnmodifiableArrayList;
 import javafx.css.CssMetaData;
 import com.sun.javafx.css.SubCssMetaData;
-import com.sun.javafx.css.converters.InsetsConverter;
-import com.sun.javafx.css.converters.URLConverter;
+import javafx.css.converter.InsetsConverter;
+import javafx.css.converter.URLConverter;
 import com.sun.javafx.scene.layout.region.BorderImageSlices;
 import com.sun.javafx.scene.layout.region.BorderImageWidthConverter;
 import com.sun.javafx.scene.layout.region.CornerRadiiConverter;
--- old/modules/graphics/src/main/java/javafx/scene/layout/BorderConverter.java	2015-09-03 15:10:34.660295100 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/BorderConverter.java	2015-09-03 15:10:34.037259400 -0700
@@ -25,7 +25,6 @@
 
 package javafx.scene.layout;
 
-import com.sun.javafx.css.StyleConverterImpl;
 import com.sun.javafx.css.StyleManager;
 import com.sun.javafx.scene.layout.region.BorderImageSlices;
 import com.sun.javafx.scene.layout.region.Margins;
@@ -34,6 +33,7 @@
 import javafx.css.CssMetaData;
 import javafx.css.ParsedValue;
 import javafx.css.Styleable;
+import javafx.css.StyleConverter;
 import javafx.geometry.Insets;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
@@ -41,7 +41,7 @@
 
 /**
  */
-class BorderConverter extends StyleConverterImpl<ParsedValue[], Border> {
+class BorderConverter extends StyleConverter<ParsedValue[], Border> {
 
     private static final BorderConverter BORDER_IMAGE_CONVERTER =
             new BorderConverter();
--- old/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	2015-09-03 15:10:42.318733100 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/FlowPane.java	2015-09-03 15:10:41.618693100 -0700
@@ -41,9 +41,8 @@
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import java.util.function.Function;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import javafx.css.Styleable;
 
 import static javafx.geometry.Orientation.*;
--- old/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	2015-09-03 15:10:50.025173900 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/GridPane.java	2015-09-03 15:10:49.448140900 -0700
@@ -47,9 +47,9 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.CssMetaData;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Iterator;
@@ -58,17 +58,12 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.function.Function;
-import javafx.beans.InvalidationListener;
+
 import javafx.beans.Observable;
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
 import javafx.geometry.BoundingBox;
 import javafx.geometry.Bounds;
-import static javafx.scene.layout.Priority.ALWAYS;
-import static javafx.scene.layout.Priority.SOMETIMES;
-import static javafx.scene.layout.Region.USE_COMPUTED_SIZE;
-import static javafx.scene.layout.Region.boundedSize;
 import javafx.util.Callback;
 
 
--- old/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	2015-09-03 15:10:57.555604600 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	2015-09-03 15:10:57.019574000 -0700
@@ -41,11 +41,9 @@
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import java.util.Iterator;
-import java.util.function.Function;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import javafx.css.Styleable;
 import javafx.geometry.HPos;
 import javafx.util.Callback;
--- old/modules/graphics/src/main/java/javafx/scene/layout/Region.java	2015-09-03 15:11:04.587006800 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/Region.java	2015-09-03 15:11:04.001973300 -0700
@@ -25,7 +25,6 @@
 
 package javafx.scene.layout;
 
-import com.sun.javafx.util.Utils;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
@@ -64,10 +63,10 @@
 import com.sun.javafx.util.Logging;
 import com.sun.javafx.util.TempState;
 import com.sun.javafx.binding.ExpressionHelper;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.InsetsConverter;
-import com.sun.javafx.css.converters.ShapeConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.InsetsConverter;
+import javafx.css.converter.ShapeConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.PickRay;
 import com.sun.javafx.geom.RectBounds;
--- old/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java	2015-09-03 15:11:12.314448800 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/StackPane.java	2015-09-03 15:11:11.749416500 -0700
@@ -37,8 +37,7 @@
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import com.sun.javafx.css.converters.EnumConverter;
-import java.util.function.Function;
+import javafx.css.converter.EnumConverter;
 import javafx.css.Styleable;
 import javafx.geometry.HPos;
 import javafx.util.Callback;
--- old/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java	2015-09-03 15:11:19.937884800 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/TilePane.java	2015-09-03 15:11:19.336850400 -0700
@@ -33,7 +33,6 @@
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.beans.property.ReadOnlyDoubleWrapper;
 import javafx.css.CssMetaData;
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableIntegerProperty;
@@ -45,9 +44,8 @@
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import java.util.function.Function;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import javafx.beans.InvalidationListener;
 import javafx.beans.value.ChangeListener;
 import javafx.css.Styleable;
--- old/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	2015-09-03 15:11:27.462315200 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	2015-09-03 15:11:26.905283300 -0700
@@ -42,9 +42,9 @@
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
 import javafx.scene.Node;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import javafx.css.Styleable;
 import javafx.util.Callback;
 
--- old/modules/graphics/src/main/java/javafx/scene/shape/Rectangle.java	2015-09-03 15:11:34.695728900 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/shape/Rectangle.java	2015-09-03 15:11:34.089694200 -0700
@@ -37,7 +37,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.RoundRectangle2D;
 import com.sun.javafx.geom.transform.BaseTransform;
--- old/modules/graphics/src/main/java/javafx/scene/shape/Shape.java	2015-09-03 15:11:42.230159900 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/shape/Shape.java	2015-09-03 15:11:41.655127000 -0700
@@ -47,10 +47,10 @@
 import com.sun.javafx.util.Utils;
 import com.sun.javafx.beans.event.AbstractNotifyListener;
 import com.sun.javafx.collections.TrackableObservableList;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.Area;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.PathIterator;
--- old/modules/graphics/src/main/java/javafx/scene/text/Text.java	2015-09-03 15:11:49.767591000 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/text/Text.java	2015-09-03 15:11:49.185557700 -0700
@@ -25,9 +25,9 @@
 
 package javafx.scene.text;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.Path2D;
 import com.sun.javafx.geom.RectBounds;
--- old/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java	2015-09-03 15:11:57.250018900 -0700
+++ new/modules/graphics/src/main/java/javafx/scene/text/TextFlow.java	2015-09-03 15:11:56.576980400 -0700
@@ -42,8 +42,8 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.CssMetaData;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.Point2D;
 import com.sun.javafx.geom.RectBounds;
--- old/modules/graphics/src/test/java/com/sun/javafx/css/BooleanTypeTest.java	2015-09-03 15:12:04.784449900 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/BooleanTypeTest.java	2015-09-03 15:12:04.122412000 -0700
@@ -31,7 +31,7 @@
 
 import org.junit.Test;
 
-import com.sun.javafx.css.converters.BooleanConverter;
+import javafx.css.converter.BooleanConverter;
 
 
 public class BooleanTypeTest {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/CursorTypeTest.java	2015-09-03 15:12:12.147871100 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/CursorTypeTest.java	2015-09-03 15:12:11.413829100 -0700
@@ -32,7 +32,7 @@
 
 import org.junit.Test;
 
-import com.sun.javafx.css.converters.CursorConverter;
+import javafx.css.converter.CursorConverter;
 
 
 public class CursorTypeTest {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/EffectTypeTest.java	2015-09-03 15:12:19.466289600 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/EffectTypeTest.java	2015-09-03 15:12:18.902257400 -0700
@@ -27,6 +27,8 @@
 
 import static org.junit.Assert.assertEquals;
 import javafx.css.ParsedValue;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
 import javafx.scene.effect.BlurType;
 import javafx.scene.effect.DropShadow;
 import javafx.scene.effect.Effect;
@@ -36,8 +38,8 @@
 
 import org.junit.Test;
 
-import com.sun.javafx.css.converters.EffectConverter;
-import com.sun.javafx.css.parser.DeriveColorConverter;
+import javafx.css.converter.EffectConverter;
+import javafx.css.converter.DeriveColorConverter;
 
 
 public class EffectTypeTest {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/EnumTypeTest.java	2015-09-03 15:12:27.077725000 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/EnumTypeTest.java	2015-09-03 15:12:26.459689600 -0700
@@ -28,12 +28,13 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import javafx.css.ParsedValue;
+import javafx.css.SizeUnits;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
 
 import org.junit.Test;
 
-import com.sun.javafx.css.converters.EnumConverter;
+import javafx.css.converter.EnumConverter;
 
 
 public class EnumTypeTest {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/FontSizeTypeTest.java	2015-09-03 15:12:34.574153800 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/FontSizeTypeTest.java	2015-09-03 15:12:34.009121400 -0700
@@ -25,8 +25,10 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 import javafx.css.ParsedValue;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
 import javafx.scene.text.Font;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
--- old/modules/graphics/src/test/java/com/sun/javafx/css/SizeTypeTest.java	2015-09-03 15:12:42.007578900 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/SizeTypeTest.java	2015-09-03 15:12:41.338540700 -0700
@@ -28,6 +28,8 @@
 import static org.junit.Assert.assertEquals;
 
 import javafx.css.ParsedValue;
+import javafx.css.Size;
+import javafx.css.SizeUnits;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
 
--- old/modules/graphics/src/test/java/com/sun/javafx/css/StringTypeTest.java	2015-09-03 15:12:50.091041300 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/StringTypeTest.java	2015-09-03 15:12:49.474006000 -0700
@@ -25,7 +25,7 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.StringConverter;
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
--- old/modules/graphics/src/test/java/com/sun/javafx/css/StyleManagerTest.java	2015-09-03 15:12:57.625472200 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/StyleManagerTest.java	2015-09-03 15:12:57.054439600 -0700
@@ -25,9 +25,11 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CascadingStyle;
+import javafx.css.CssParser;
 import javafx.css.StyleOrigin;
 import javafx.css.StyleableProperty;
+import javafx.css.Stylesheet;
 import javafx.scene.Group;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -187,7 +189,7 @@
         try {
             StyleManager sm = StyleManager.getInstance();
             URL ua0_url = StyleManagerTest.class.getResource("ua0.css");
-            Stylesheet stylesheet = CSSParser.getInstance().parse(ua0_url);
+            Stylesheet stylesheet = new CssParser().parse(ua0_url);
             sm.addUserAgentStylesheet(null,stylesheet);
 
             assertEquals(1, sm.platformUserAgentStylesheetContainers.size());
@@ -208,11 +210,11 @@
             StyleManager sm = StyleManager.getInstance();
 
             URL ua1_url = StyleManagerTest.class.getResource("ua1.css");
-            Stylesheet stylesheet = CSSParser.getInstance().parse(ua1_url);
+            Stylesheet stylesheet = new CssParser().parse(ua1_url);
             sm.addUserAgentStylesheet(null,stylesheet);
 
             URL ua0_url = StyleManagerTest.class.getResource("ua0.css");
-            stylesheet = CSSParser.getInstance().parse(ua0_url);
+            stylesheet = new CssParser().parse(ua0_url);
             sm.setDefaultUserAgentStylesheet(stylesheet);
 
             assertEquals(2, sm.platformUserAgentStylesheetContainers.size());
@@ -695,7 +697,7 @@
         List<CascadingStyle> styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.RED, obj);
     }
 
@@ -721,7 +723,7 @@
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.YELLOW, obj);
     }
 
@@ -749,7 +751,7 @@
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(2, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.GREEN, obj);
 
         // ua0.css and ua2.css have fill, but we shouldn't get anything from ua0
@@ -757,7 +759,7 @@
         styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        obj = styles.get(0).getParsedValueImpl().convert(null);
+        obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.BLUE, obj);
     }
 
@@ -785,7 +787,7 @@
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.YELLOW, obj);
     }
 
@@ -816,7 +818,7 @@
         List<CascadingStyle> styles = styleMap.get("-fx-stroke");
         assertEquals(2, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.GREEN, obj);
 
         // ua0.css and ua2.css have fill, but we shouldn't get anything from ua0
@@ -824,7 +826,7 @@
         styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        obj = styles.get(0).getParsedValueImpl().convert(null);
+        obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.BLUE, obj);
     }
 
@@ -852,7 +854,7 @@
         List<CascadingStyle> styles = styleMap.get("-fx-fill");
         assertEquals(1, styles.size());
 
-        Object obj = styles.get(0).getParsedValueImpl().convert(null);
+        Object obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.RED, obj);
 
         sm.setDefaultUserAgentStylesheet("/com/sun/javafx/css/ua1.css");
@@ -867,7 +869,7 @@
         styles = styleMap.get("-fx-stroke");
         assertEquals(1, styles.size());
 
-        obj = styles.get(0).getParsedValueImpl().convert(null);
+        obj = styles.get(0).getParsedValue().convert(null);
         assertEquals(Color.YELLOW, obj);
     }
 
--- old/modules/graphics/src/test/java/com/sun/javafx/css/TestNode.java	2015-09-03 15:13:05.422918200 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/TestNode.java	2015-09-03 15:13:04.861886100 -0700
@@ -25,7 +25,7 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.SizeConverter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -34,10 +34,9 @@
 import javafx.css.Styleable;
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableProperty;
-import javafx.scene.Node;
 
 /** Test Node with styleable property but no getClassCssMetaData method */
-class TestNode extends TestNodeBase {
+public class TestNode extends TestNodeBase {
 
     private DoubleProperty xyzzy;
     private DoubleProperty xyzzyProperty() {
@@ -76,9 +75,9 @@
         super();
     }
     
-     static class StyleableProperties {
+    public static class StyleableProperties {
 
-         static final CssMetaData<TestNode, Number> XYZZY = 
+         public static final CssMetaData<TestNode, Number> XYZZY = 
              new CssMetaData<TestNode, Number>("-fx-xyzzy",
                  SizeConverter.getInstance(),
                  .5) {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/TestNodeBase.java	2015-09-03 15:13:12.610329300 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/TestNodeBase.java	2015-09-03 15:13:12.050297300 -0700
@@ -25,9 +25,9 @@
 
 package com.sun.javafx.css;
 
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.StringConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StringConverter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -50,7 +50,7 @@
 import javafx.css.StyleableProperty;
 
 /** Test Node with styleable properties and an getClassCssMetaData method */
-class TestNodeBase extends Node {
+public class TestNodeBase extends Node {
 
     protected TestNodeBase() {
     }
@@ -170,7 +170,7 @@
     }
     
 
-    static class StyleableProperties {
+    public static class StyleableProperties {
         public final static CssMetaData<TestNodeBase,Boolean> TEST =
                 new CssMetaData<TestNodeBase,Boolean>("-fx-test", 
                 BooleanConverter.getInstance(), Boolean.TRUE) {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/URLTypeTest.java	2015-09-03 15:13:19.910746900 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/URLTypeTest.java	2015-09-03 15:13:19.343714400 -0700
@@ -28,17 +28,13 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-
 import javafx.css.ParsedValue;
 import javafx.scene.text.Font;
 
-import org.junit.Before;
 import org.junit.Test;
 
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.css.converters.URLConverter;
+import javafx.css.converter.StringConverter;
+import javafx.css.converter.URLConverter;
 
 
 public class URLTypeTest {
--- old/modules/graphics/src/test/java/com/sun/javafx/css/converters/URLConverterTest.java	2015-09-03 15:13:27.789197500 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/css/converters/URLConverterTest.java	2015-09-03 15:13:27.190163200 -0700
@@ -23,9 +23,8 @@
  * questions.
  */
 
-package com.sun.javafx.css.converters;
+package javafx.css.converter;
 
-import java.net.URL;
 import javafx.css.ParsedValue;
 import javafx.css.StyleConverter;
 import javafx.scene.text.Font;
@@ -55,7 +54,7 @@
     public void testConvertWithNullBaseURL() {
         
         ParsedValue[] values = new ParsedValue[] {
-            new ParsedValueImpl<String,String>("com/sun/javafx/css/converters/some.txt", null),
+            new ParsedValueImpl<String,String>("javafx/css/converter/some.txt", null),
             new ParsedValueImpl<String,String>(null,null)
         };
         ParsedValueImpl<ParsedValue[], String> value = 
@@ -63,7 +62,7 @@
                 
         Font font = null;
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         String result = value.convert(font);
         assertEquals(expResult, result);
     }
@@ -72,14 +71,14 @@
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         String base = cl.getResource("com/..").toExternalForm();
         ParsedValue[] values = new ParsedValue[] {
-            new ParsedValueImpl<String,String>("com/sun/javafx/css/converters/some.txt", null),
+            new ParsedValueImpl<String,String>("javafx/css/converter/some.txt", null),
             new ParsedValueImpl<String,String>(base,null)
         };
         ParsedValueImpl<ParsedValue[], String> value = 
             new ParsedValueImpl<ParsedValue[], String>(values, URLConverter.getInstance());
                 
         Font font = null;
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         String result = value.convert(font);
         assertEquals(expResult, result);
     }
@@ -88,7 +87,7 @@
     public void testConvertWithAbsoluteURLAndNullBaseURL() {
         
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         ParsedValue[] values = new ParsedValue[] {
             new ParsedValueImpl<String,String>(expResult, null),
             new ParsedValueImpl<String,String>(null,null)
@@ -106,7 +105,7 @@
         
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         String baseURL = cl.getResource("com/..").toExternalForm();
-        String expResult = cl.getResource("com/sun/javafx/css/converters/some.txt").toExternalForm();
+        String expResult = cl.getResource("javafx/css/converter/some.txt").toExternalForm();
         ParsedValue[] values = new ParsedValue[] {
             new ParsedValueImpl<String,String>(expResult, null),
             new ParsedValueImpl<String,String>(baseURL,null)
--- old/modules/graphics/src/test/java/com/sun/javafx/scene/layout/RegionTest.java	2015-09-03 15:13:35.265625100 -0700
+++ new/modules/graphics/src/test/java/com/sun/javafx/scene/layout/RegionTest.java	2015-09-03 15:13:34.643589500 -0700
@@ -79,7 +79,7 @@
 //        };
 //
 //
-//        Stylesheet stylesheet = CSSParser.getInstance().parse(
+//        Stylesheet stylesheet = new CssParser().parse(
 //                    "* { " +
 //                        "-fx-background-color: #ff0000, #00ff00, #0000ff;" +
 //                        "-fx-background-radius: -1, 0, 1; " +
@@ -182,7 +182,7 @@
 //            {dashed, dotted, BorderStyle.SOLID, BorderStyle.NONE},
 //        };
 //
-//        Stylesheet stylesheet = CSSParser.getInstance().parse(
+//        Stylesheet stylesheet = new CssParser().parse(
 //                    "* { " +
 //                        "-fx-border-color: red, " +
 //                            "yellow blue green red," +
@@ -286,7 +286,7 @@
 //            BackgroundSize.COVER,
 //        };
 //
-//        Stylesheet stylesheet = CSSParser.getInstance().parse(
+//        Stylesheet stylesheet = new CssParser().parse(
 //                    "* { " +
 //                        "-fx-background-image: url(\"http://sipi.usc.edu/database/misc/4.2.04.tiff\"), url(\"javafx/scene/image/doc-files/imageview.png\");" +
 //                        "-fx-background-repeat: repeat no-repeat, no-repeat;" +
@@ -393,7 +393,7 @@
 //            new Insets(1f, 1f, 1f, 1f)
 //        };
 //
-//        Stylesheet stylesheet = CSSParser.getInstance().parse(
+//        Stylesheet stylesheet = new CssParser().parse(
 //                    "* { " +
 ////                        "-fx-border-image-source: url(\"http://sipi.usc.edu/database/misc/4.2.04.tiff\"), url(\"scenic-view.png\");" +
 //                        "-fx-border-image-source: url(\"http://sipi.usc.edu/database/misc/4.2.04.tiff\"), url(\"http://sipi.usc.edu/database/misc/4.2.03.tiff\");" +
--- old/modules/graphics/src/test/java/javafx/scene/CSSNode.java	2015-09-03 15:13:42.878060500 -0700
+++ new/modules/graphics/src/test/java/javafx/scene/CSSNode.java	2015-09-03 15:13:42.309028000 -0700
@@ -25,8 +25,8 @@
 
 package javafx.scene;
 
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.jmx.MXNodeAlgorithm;
--- old/modules/graphics/src/test/java/javafx/scene/Node_effectiveOrientation_Css_Test.java	2015-09-03 15:13:50.032469700 -0700
+++ new/modules/graphics/src/test/java/javafx/scene/Node_effectiveOrientation_Css_Test.java	2015-09-03 15:13:49.476437900 -0700
@@ -26,8 +26,8 @@
 package javafx.scene;
 
 import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.Stylesheet;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.Stylesheet;
+import javafx.css.CssParser;
 import com.sun.javafx.tk.Toolkit;
 import static javafx.geometry.NodeOrientation.*;
 import javafx.scene.paint.Color;
@@ -68,7 +68,7 @@
     
     @Test
     public void test_SimpleSelector_dir_pseudoClass_with_scene_effective_orientation_ltr() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
                 ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
                 ".rect { -fx-fill: #0000ff; }" 
@@ -88,7 +88,7 @@
     
     @Test
     public void test_SimpleSelector_dir_pseudoClass_with_scene_effective_orientation_rtl() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
                 ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
                 ".rect { -fx-fill: #0000ff; }" 
@@ -109,7 +109,7 @@
 
     @Test
     public void test_CompounSelector_dir_pseudoClass_on_parent_with_scene_effective_orientation_ltr() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".root:dir(rtl) .rect { -fx-fill: #ff0000; }" +
                 ".root:dir(ltr) .rect { -fx-fill: #00ff00; }" +
                 ".root .rect { -fx-fill: #0000ff; }" 
@@ -129,7 +129,7 @@
     
     @Test
     public void test_CompoundSelector_dir_pseudoClass_on_parent_with_scene_effective_orientation_rtl() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".root:dir(rtl) .rect { -fx-fill: #ff0000; }" +
                 ".root:dir(ltr) .rect { -fx-fill: #00ff00; }" +
                 ".root .rect { -fx-fill: #0000ff; }" 
@@ -150,7 +150,7 @@
 
     @Test
     public void test_CompounSelector_dir_pseudoClass_on_child_with_scene_effective_orientation_ltr() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".root .rect:dir(rtl) { -fx-fill: #ff0000; }" +
                 ".root .rect:dir(ltr) { -fx-fill: #00ff00; }" +
                 ".root .rect { -fx-fill: #0000ff; }" 
@@ -170,7 +170,7 @@
     
     @Test
     public void test_CompoundSelector_dir_pseudoClass_on_child_with_scene_effective_orientation_rtl() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".root .rect:dir(rtl) { -fx-fill: #ff0000; }" +
                 ".root .rect:dir(ltr) { -fx-fill: #00ff00; }" +
                 ".root .rect { -fx-fill: #0000ff; }" 
@@ -191,7 +191,7 @@
     
     @Test
     public void test_dir_pseudoClass_functions_on_scene_effective_orientation_not_node() {
-        Stylesheet stylesheet = CSSParser.getInstance().parse(
+        Stylesheet stylesheet = new CssParser().parse(
                 ".rect:dir(rtl) { -fx-fill: #ff0000; }" +
                 ".rect:dir(ltr) { -fx-fill: #00ff00; }" +
                 ".rect { -fx-fill: #0000ff; }" 
--- old/modules/graphics/src/test/java/javafx/scene/layout/TilePaneTest.java	2015-09-03 15:13:57.190879200 -0700
+++ new/modules/graphics/src/test/java/javafx/scene/layout/TilePaneTest.java	2015-09-03 15:13:56.604845600 -0700
@@ -27,7 +27,7 @@
 
 import javafx.css.ParsedValue;
 import javafx.css.CssMetaData;
-import com.sun.javafx.css.parser.CSSParser;
+import javafx.css.CssParser;
 import javafx.css.StyleableProperty;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -1026,7 +1026,7 @@
         stage.setScene(scene);
         stage.show();
 
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-perf-tile-width","67.0");
+        ParsedValue pv = new CssParser().parseExpr("-fx-perf-tile-width","67.0");
         Object val = pv.convert(null);
         try {
             ((StyleableProperty)tilepane.prefTileWidthProperty()).applyStyle(null, val);
@@ -1042,7 +1042,7 @@
         stage.setScene(scene);
         stage.show();
 
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-perf-rows","2");
+        ParsedValue pv = new CssParser().parseExpr("-fx-perf-rows","2");
         Object val = pv.convert(null);
         try {
             ((StyleableProperty)tilepane.prefRowsProperty()).applyStyle(null, val);
@@ -1059,7 +1059,7 @@
         stage.setScene(scene);
         stage.show();
 
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-pref-columns","2");
+        ParsedValue pv = new CssParser().parseExpr("-fx-pref-columns","2");
         Object val = pv.convert(null);
         CssMetaData prop = ((StyleableProperty)tilepane.prefColumnsProperty()).getCssMetaData();
         try {
--- old/modules/web/src/android/java/javafx/scene/web/WebView.java	2015-09-03 15:14:04.971324200 -0700
+++ new/modules/web/src/android/java/javafx/scene/web/WebView.java	2015-09-03 15:14:04.381290400 -0700
@@ -25,9 +25,9 @@
 package javafx.scene.web;
 
 import com.sun.webkit.WebPage;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.scene.DirtyBits;
 import javafx.css.Styleable;
--- old/modules/web/src/ios/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java	2015-09-03 15:14:12.566758600 -0700
+++ new/modules/web/src/ios/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java	2015-09-03 15:14:11.962724100 -0700
@@ -72,7 +72,7 @@
 import javafx.scene.web.WebView;
 import javafx.util.Callback;
 
-import com.sun.javafx.scene.control.skin.ColorPickerSkin;
+import javafx.scene.control.skin.ColorPickerSkin;
 import com.sun.javafx.scene.control.skin.FXVK;
 import com.sun.javafx.scene.web.behavior.HTMLEditorBehavior;
 import com.sun.javafx.scene.traversal.TraversalEngine;
--- old/modules/web/src/ios/java/javafx/scene/web/WebView.java	2015-09-03 15:14:19.787171600 -0700
+++ new/modules/web/src/ios/java/javafx/scene/web/WebView.java	2015-09-03 15:14:19.159135700 -0700
@@ -31,9 +31,9 @@
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableObjectProperty;
 import javafx.css.StyleableProperty;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.PickRay;
 import com.sun.javafx.geom.transform.Affine3D;
--- old/modules/web/src/main/java/com/sun/javafx/scene/web/behavior/HTMLEditorBehavior.java	2015-09-03 15:14:26.670565300 -0700
+++ new/modules/web/src/main/java/com/sun/javafx/scene/web/behavior/HTMLEditorBehavior.java	2015-09-03 15:14:26.110533300 -0700
@@ -25,49 +25,45 @@
 
 package com.sun.javafx.scene.web.behavior;
 
-import javafx.scene.web.HTMLEditor;
-import java.util.ArrayList;
-import java.util.List;
 import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.behavior.KeyBinding;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import javafx.scene.web.HTMLEditor;
 import com.sun.javafx.scene.web.skin.HTMLEditorSkin;
-import static javafx.scene.input.KeyCode.B;
-import static javafx.scene.input.KeyCode.F12;
-import static javafx.scene.input.KeyCode.I;
-import static javafx.scene.input.KeyCode.TAB;
-import static javafx.scene.input.KeyCode.U;
+import com.sun.javafx.scene.control.behavior.FocusTraversalInputMap;
 
+import static javafx.scene.input.KeyCode.*;
+import static com.sun.javafx.scene.control.inputmap.InputMap.KeyMapping;
 
 /**
  * HTML editor behavior.
  */
 public class HTMLEditorBehavior extends BehaviorBase<HTMLEditor> {
-    protected static final List<KeyBinding> HTML_EDITOR_BINDINGS = new ArrayList<KeyBinding>();
+    private final InputMap<HTMLEditor> inputMap;
 
-    static {
-        HTML_EDITOR_BINDINGS.add(new KeyBinding(B, "bold").shortcut());
-        HTML_EDITOR_BINDINGS.add(new KeyBinding(I, "italic").shortcut());
-        HTML_EDITOR_BINDINGS.add(new KeyBinding(U, "underline").shortcut());
-        
-        HTML_EDITOR_BINDINGS.add(new KeyBinding(F12, "F12"));
-        HTML_EDITOR_BINDINGS.add(new KeyBinding(TAB, "TraverseNext").ctrl());
-        HTML_EDITOR_BINDINGS.add(new KeyBinding(TAB, "TraversePrevious").ctrl().shift());
-    }
 
     public HTMLEditorBehavior(HTMLEditor htmlEditor) {
-        super(htmlEditor, HTML_EDITOR_BINDINGS);
+        super(htmlEditor);
+
+        this.inputMap = createInputMap();
+        addDefaultMapping(inputMap,
+            new KeyMapping(new KeyBinding(B).shortcut(), e -> keyboardShortcuts("bold")),
+            new KeyMapping(new KeyBinding(I).shortcut(), e -> keyboardShortcuts("italic")),
+            new KeyMapping(new KeyBinding(U).shortcut(), e -> keyboardShortcuts("underline")),
+
+            new KeyMapping(new KeyBinding(F12), e -> getNode().getImpl_traversalEngine().selectFirst().requestFocus()),
+            new KeyMapping(new KeyBinding(TAB).ctrl(), FocusTraversalInputMap::traverseNext),
+            new KeyMapping(new KeyBinding(TAB).ctrl().shift(), FocusTraversalInputMap::traversePrevious)
+        );
+    }
+
+    @Override public InputMap<HTMLEditor> getInputMap() {
+        return inputMap;
     }
 
-    @Override
-    protected void callAction(String name) {
-        if ("bold".equals(name) || "italic".equals(name) || "underline".equals(name)) {
-            HTMLEditor editor = getControl();
-            HTMLEditorSkin editorSkin = (HTMLEditorSkin)editor.getSkin();
-            editorSkin.keyboardShortcuts(name);
-        } else if ("F12".equals(name)) {
-            getControl().getImpl_traversalEngine().selectFirst().requestFocus();
-        } else {
-            super.callAction(name);
-        }
+    private void keyboardShortcuts(String name) {
+        HTMLEditor editor = getNode();
+        HTMLEditorSkin editorSkin = (HTMLEditorSkin)editor.getSkin();
+        editorSkin.keyboardShortcuts(name);
     }
 }
--- old/modules/web/src/main/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java	2015-09-03 15:14:34.136992400 -0700
+++ new/modules/web/src/main/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java	2015-09-03 15:14:33.536958000 -0700
@@ -39,13 +39,9 @@
 
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.css.StyleableProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
@@ -72,7 +68,7 @@
 import javafx.scene.web.WebView;
 import javafx.util.Callback;
 
-import com.sun.javafx.scene.control.skin.ColorPickerSkin;
+import javafx.scene.control.skin.ColorPickerSkin;
 import com.sun.javafx.scene.control.skin.FXVK;
 import com.sun.javafx.scene.web.behavior.HTMLEditorBehavior;
 import com.sun.webkit.WebPage;
@@ -87,7 +83,6 @@
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
 import javafx.collections.ListChangeListener;
 
 import static javafx.geometry.NodeOrientation.*;
@@ -96,7 +91,7 @@
 /**
  * HTML editor skin.
  */
-public class HTMLEditorSkin extends BehaviorSkinBase<HTMLEditor, HTMLEditorBehavior> {
+public class HTMLEditorSkin extends SkinBase<HTMLEditor> {
     private GridPane gridPane;
 
     private ToolBar toolbar1;
@@ -251,7 +246,11 @@
         }
     };
     public HTMLEditorSkin(HTMLEditor htmlEditor) {
-        super(htmlEditor, new HTMLEditorBehavior(htmlEditor));
+        super(htmlEditor);
+
+        // install default input map for the HTMLEditor control
+        HTMLEditorBehavior behavior = new HTMLEditorBehavior(htmlEditor);
+//        htmlEditor.setInputMap(behavior.getInputMap());
 
         getChildren().clear();
 
@@ -718,10 +717,11 @@
         fgColorButton.setFocusTraversable(false);
         toolbar1.getItems().add(fgColorButton);
 
-        fgColorButton.applyCss();
-        ColorPickerSkin fgColorPickerSkin = (ColorPickerSkin) fgColorButton.getSkin();
-        String fgIcon = AccessController.doPrivileged((PrivilegedAction<String>) () -> HTMLEditorSkin.class.getResource(resources.getString("foregroundColorIcon")).toString());
-        ((StyleableProperty)fgColorPickerSkin.imageUrlProperty()).applyStyle(null,fgIcon);
+        // JDK-8115747: Icon URLs are now specified in CSS.
+        // fgColorButton.applyCss();
+        // ColorPickerSkin fgColorPickerSkin = (ColorPickerSkin) fgColorButton.getSkin();
+        // String fgIcon = AccessController.doPrivileged((PrivilegedAction<String>) () -> HTMLEditorSkin.class.getResource(resources.getString("foregroundColorIcon")).toString());
+        // ((StyleableProperty)fgColorPickerSkin.imageUrlProperty()).applyStyle(null,fgIcon);
 
         fgColorButton.setValue(DEFAULT_FG_COLOR);
         fgColorButton.setTooltip(new Tooltip(resources.getString("foregroundColor")));
@@ -738,10 +738,11 @@
         bgColorButton.setFocusTraversable(false);
         toolbar1.getItems().add(bgColorButton);
 
-        bgColorButton.applyCss();
-        ColorPickerSkin  bgColorPickerSkin = (ColorPickerSkin) bgColorButton.getSkin();
-        String bgIcon = AccessController.doPrivileged((PrivilegedAction<String>) () -> HTMLEditorSkin.class.getResource(resources.getString("backgroundColorIcon")).toString());
-        ((StyleableProperty)bgColorPickerSkin.imageUrlProperty()).applyStyle(null,bgIcon);
+        // JDK-8115747: Icon URLs are now specified in CSS.
+        // bgColorButton.applyCss();
+        // ColorPickerSkin  bgColorPickerSkin = (ColorPickerSkin) bgColorButton.getSkin();
+        // String bgIcon = AccessController.doPrivileged((PrivilegedAction<String>) () -> HTMLEditorSkin.class.getResource(resources.getString("backgroundColorIcon")).toString());
+        // ((StyleableProperty)bgColorPickerSkin.imageUrlProperty()).applyStyle(null,bgIcon);
 
         bgColorButton.setValue(DEFAULT_BG_COLOR);
         bgColorButton.setTooltip(new Tooltip(resources.getString("backgroundColor")));
--- old/modules/web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java	2015-09-03 15:14:41.537415600 -0700
+++ new/modules/web/src/main/java/com/sun/javafx/webkit/theme/RenderThemeImpl.java	2015-09-03 15:14:40.971383300 -0700
@@ -35,6 +35,7 @@
 import javafx.scene.control.Control;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.RadioButton;
+import javafx.scene.control.SkinBase;
 import javafx.scene.control.Slider;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.BorderPane;
@@ -50,8 +51,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.LinkedHashMap;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
 import com.sun.javafx.webkit.Accessor;
 import com.sun.webkit.LoadListenerClient;
 import com.sun.webkit.graphics.Ref;
@@ -575,10 +574,9 @@
             setTranslateX(-width);
         }
 
-        private final class Skin extends BehaviorSkinBase {
+        private final class Skin extends SkinBase {
             Skin() {
-                super(FormMenuListButton.this,
-                      new BehaviorBase<>(FormMenuListButton.this, Collections.EMPTY_LIST));
+                super(FormMenuListButton.this);
                 
                 Region arrow = new Region();
                 arrow.getStyleClass().add("arrow");
--- old/modules/web/src/main/java/com/sun/javafx/webkit/theme/ScrollBarThemeImpl.java	2015-09-03 15:14:49.136850300 -0700
+++ new/modules/web/src/main/java/com/sun/javafx/webkit/theme/ScrollBarThemeImpl.java	2015-09-03 15:14:48.569817900 -0700
@@ -36,7 +36,7 @@
 import javafx.scene.control.Control;
 import javafx.scene.control.ScrollBar;
 
-import com.sun.javafx.scene.control.skin.ScrollBarSkin;
+import javafx.scene.control.skin.ScrollBarSkin;
 import com.sun.webkit.graphics.Ref;
 import com.sun.webkit.graphics.ScrollBarTheme;
 import com.sun.webkit.graphics.WCGraphicsContext;
@@ -406,18 +406,31 @@
     }
 
     private static Node getThumb(ScrollBar scrollBar) {
-        return ((ScrollBarSkin)scrollBar.getSkin()).getThumb();
+//        return ((ScrollBarSkin)scrollBar.getSkin()).getThumb();
+        return findNode(scrollBar, "thumb");
     }
 
     private static Node getTrack(ScrollBar scrollBar) {
-        return ((ScrollBarSkin)scrollBar.getSkin()).getTrack();
+//        return ((ScrollBarSkin)scrollBar.getSkin()).getTrack();
+        return findNode(scrollBar, "track");
     }
 
     private static Node getIncButton(ScrollBar scrollBar) {
-        return ((ScrollBarSkin)scrollBar.getSkin()).getIncButton();
+//        return ((ScrollBarSkin)scrollBar.getSkin()).getIncrementButton();
+        return findNode(scrollBar, "increment-button");
     }
 
     private static Node getDecButton(ScrollBar scrollBar) {
-        return ((ScrollBarSkin)scrollBar.getSkin()).getDecButton();
+//        return ((ScrollBarSkin)scrollBar.getSkin()).getDecrementButton();
+        return findNode(scrollBar, "decrement-button");
+    }
+
+    private static Node findNode(ScrollBar scrollBar, String styleclass) {
+        for (Node n : scrollBar.getChildrenUnmodifiable()) {
+            if (n.getStyleClass().contains(styleclass)) {
+                return n;
+            }
+        }
+        return null;
     }
 }
--- old/modules/web/src/main/java/javafx/scene/web/WebView.java	2015-09-03 15:14:56.905294600 -0700
+++ new/modules/web/src/main/java/javafx/scene/web/WebView.java	2015-09-03 15:14:56.286259200 -0700
@@ -30,8 +30,6 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyDoubleProperty;
 import javafx.beans.property.ReadOnlyDoubleWrapper;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
@@ -62,9 +60,9 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
 import com.sun.javafx.geom.BaseBounds;
 import com.sun.javafx.geom.PickRay;
 import com.sun.javafx.geom.transform.BaseTransform;
--- old/tests/system/src/test/java/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java	2015-09-03 15:15:04.941754300 -0700
+++ new/tests/system/src/test/java/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java	2015-09-03 15:15:04.288716900 -0700
@@ -1,11 +1,11 @@
 package com.sun.javafx.css;
 
 
-import com.sun.javafx.css.Declaration;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Selector;
+import javafx.css.Declaration;
+import javafx.css.Rule;
+import javafx.css.Selector;
 import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.Stylesheet;
+import javafx.css.Stylesheet;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ContextMenuContent.java	2015-09-03 15:15:13.059218600 -0700
+++ /dev/null	2015-09-03 15:15:14.000000000 -0700
@@ -1,1614 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 com.sun.javafx.scene.control.MultiplePropertyChangeListenerHandler;
-import com.sun.javafx.scene.control.behavior.TwoLevelFocusPopupBehavior;
-import javafx.animation.Animation.Status;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.beans.InvalidationListener;
-import javafx.beans.WeakInvalidationListener;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.css.CssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.*;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.control.*;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Window;
-import javafx.util.Duration;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * This is a the SkinBase for ContextMenu based controls so that the CSS parts
- * work right, because otherwise we would have to copy the Keys from there to here.
- */
-public class ContextMenuContent extends Region {
-
-    private ContextMenu contextMenu;
-
-    /***************************************************************************
-     * UI subcomponents
-     **************************************************************************/
-
-    private double maxGraphicWidth = 0; // we keep this margin to left for graphic
-    private double maxRightWidth = 0;
-    private double maxLabelWidth = 0;
-    private double maxRowHeight = 0;
-    private double maxLeftWidth = 0;
-    private double oldWidth = 0;
-
-    private Rectangle clipRect;
-    MenuBox itemsContainer;
-    private ArrowMenuItem upArrow;
-    private ArrowMenuItem downArrow;
-
-    /*
-     * We maintain a current focused index which is used
-     * in keyboard navigation of menu items.
-     */
-    private int currentFocusedIndex = -1;
-    
-    private boolean itemsDirty = true;
-    private InvalidationListener popupShowingListener = arg0 -> {
-        updateItems();
-    };
-    private WeakInvalidationListener weakPopupShowingListener = 
-            new WeakInvalidationListener(popupShowingListener);
-
-    /***************************************************************************
-     * Constructors
-     **************************************************************************/
-    public ContextMenuContent(final ContextMenu popupMenu) {
-        this.contextMenu = popupMenu;
-        clipRect = new Rectangle();
-         clipRect.setSmooth(false);
-        itemsContainer = new MenuBox();
-//        itemsContainer = new VBox();
-        itemsContainer.setClip(clipRect);
-        
-        upArrow = new ArrowMenuItem(this);
-        upArrow.setUp(true);
-        upArrow.setFocusTraversable(false);
-
-        downArrow = new ArrowMenuItem(this);
-        downArrow.setUp(false);
-        downArrow.setFocusTraversable(false);
-        getChildren().add(itemsContainer);
-        getChildren().add(upArrow);
-        getChildren().add(downArrow);
-        initialize();
-        setUpBinds();
-        updateItems();
-        // RT-20197 add menuitems only on first show.
-        popupMenu.showingProperty().addListener(weakPopupShowingListener);
-
-        /*
-        ** only add this if we're on an embedded
-        ** platform that supports 5-button navigation 
-        */
-        if (Utils.isTwoLevelFocus()) {
-            new TwoLevelFocusPopupBehavior(this);
-        }
-    }
-    
-    //For access from controls
-    public VBox getItemsContainer() {
-        return itemsContainer;
-    }
-    //For testing purpose only
-    int getCurrentFocusIndex() {
-        return currentFocusedIndex;
-    }
-    //For testing purpose only
-    void setCurrentFocusedIndex(int index) {
-        if (index < itemsContainer.getChildren().size()) {
-            currentFocusedIndex = index;
-        }
-    }
-    
-    private void updateItems() {
-        if (itemsDirty) {
-            updateVisualItems();
-            itemsDirty = false;
-        }
-    }
-
-    private void computeVisualMetrics() {
-        maxRightWidth = 0;
-        maxLabelWidth = 0;
-        maxRowHeight = 0;
-        maxGraphicWidth = 0;
-        maxLeftWidth = 0;
-
-        for (int i = 0; i < itemsContainer.getChildren().size(); i++) {
-            Node child = itemsContainer.getChildren().get(i);
-            if (child instanceof MenuItemContainer) {
-                final MenuItemContainer menuItemContainer = (MenuItemContainer)itemsContainer.getChildren().get(i);
-                
-                if (! menuItemContainer.isVisible()) continue;
-                
-                double alt = -1;
-                Node n = menuItemContainer.left;
-                if (n != null) {
-                    if (n.getContentBias() == Orientation.VERTICAL) { // width depends on height
-                        alt = snapSize(n.prefHeight(-1));
-                    } else alt = -1;
-                    maxLeftWidth = Math.max(maxLeftWidth, snapSize(n.prefWidth(alt)));
-                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
-                }
-
-                n = menuItemContainer.graphic;
-                if (n != null) {
-                    if (n.getContentBias() == Orientation.VERTICAL) { // width depends on height
-                        alt = snapSize(n.prefHeight(-1));
-                    } else alt = -1;
-                    maxGraphicWidth = Math.max(maxGraphicWidth, snapSize(n.prefWidth(alt)));
-                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
-                }
-
-                n = menuItemContainer.label;
-                if (n != null) {
-                    if (n.getContentBias() == Orientation.VERTICAL) {
-                        alt = snapSize(n.prefHeight(-1));
-                    } else alt = -1;
-                    maxLabelWidth = Math.max(maxLabelWidth, snapSize(n.prefWidth(alt)));
-                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
-                }
-
-                n = menuItemContainer.right;
-                if (n != null) {
-                    if (n.getContentBias() == Orientation.VERTICAL) { // width depends on height
-                        alt = snapSize(n.prefHeight(-1));
-                    } else alt = -1;
-                    maxRightWidth = Math.max(maxRightWidth, snapSize(n.prefWidth(alt)));
-                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
-                }
-            }
-        }
-
-        // Fix for RT-38838.
-        // This fixes the issue where CSS is applied to a menu after it has been
-        // showing, resulting in its bounds changing. In this case, we need to
-        // shift the submenu such that it is properly aligned with its parent menu.
-        //
-        // To do this, we must firstly determine if the open submenu is shifted
-        // horizontally to appear on the other side of this menu, as this is the
-        // only situation where shifting has to happen. If so, we need to check
-        // if we should shift the submenu due to changes in width.
-        //
-        // We need to get the parent menu of this contextMenu, so that we only
-        // modify the X value in the following conditions:
-        // 1) There exists a parent menu
-        // 2) The parent menu is in the correct position (i.e. to the left of this
-        //    menu in normal LTR systems).
-        final double newWidth = maxRightWidth + maxLabelWidth + maxGraphicWidth + maxLeftWidth;
-        Window ownerWindow = contextMenu.getOwnerWindow();
-        if (ownerWindow instanceof ContextMenu) {
-            if (contextMenu.getX() < ownerWindow.getX()) {
-                if (oldWidth != newWidth) {
-                    contextMenu.setX(contextMenu.getX() + oldWidth - newWidth);
-                }
-            }
-        }
-
-        oldWidth = newWidth;
-    }
-    
-    private void updateVisualItems() {
-        ObservableList<Node> itemsContainerChilder = itemsContainer.getChildren();
-
-        disposeVisualItems();
-        
-        for (int row = 0; row < getItems().size(); row++) {
-            final MenuItem item = getItems().get(row);
-            if (item instanceof CustomMenuItem && ((CustomMenuItem) item).getContent() == null) {
-                continue;
-            }
-            
-            if (item instanceof SeparatorMenuItem) {
-                // we don't want the hover highlight for separators, so for
-                // now this is the simplest approach - just remove the
-                // background entirely. This may cause issues if people
-                // intend to style the background differently.
-                Node node = ((CustomMenuItem) item).getContent();
-                node.visibleProperty().bind(item.visibleProperty());
-                itemsContainerChilder.add(node);
-                // Add the (separator) menu item to properties map of this node.
-                // Special casing this for separator :
-                // This allows associating this container with SeparatorMenuItem.
-                node.getProperties().put(MenuItem.class, item);
-            } else {
-                MenuItemContainer menuItemContainer = new MenuItemContainer(item);
-                menuItemContainer.visibleProperty().bind(item.visibleProperty());
-                itemsContainerChilder.add(menuItemContainer);
-            }
-        }
-        
-        // Add the Menu to properties map of this skin. Used by QA for testing
-        // This enables associating a parent menu for this skin showing menu items.
-        if (getItems().size() > 0) {
-            final MenuItem item = getItems().get(0);
-            getProperties().put(Menu.class, item.getParentMenu());
-        }
-
-        // RT-36513 made this applyCss(). Modified by RT-36995 to impl_reapplyCSS()
-        impl_reapplyCSS();
-    }
-
-    private void disposeVisualItems() {
-        // clean up itemsContainer
-        ObservableList<Node> itemsContainerChilder = itemsContainer.getChildren();
-        for (int i = 0, max = itemsContainerChilder.size(); i < max; i++) {
-            Node n = itemsContainerChilder.get(i);
-
-            if (n instanceof MenuItemContainer) {
-                MenuItemContainer container = (MenuItemContainer) n;
-                container.visibleProperty().unbind();
-                container.dispose();
-            }
-        }
-        itemsContainerChilder.clear();
-    }
-
-    /**
-     * Can be called by Skins when they need to clean up the content of any 
-     * ContextMenu instances they might have created. This ensures that contents 
-     * of submenus if any, also get cleaned up.
-     */
-    public void dispose() {
-        disposeBinds();
-        disposeVisualItems();
-
-        disposeContextMenu(submenu);
-        submenu = null;
-        openSubmenu = null;
-        selectedBackground = null;
-        if (contextMenu != null) {
-            contextMenu.getItems().clear();
-            contextMenu = null;
-        }
-    }
-
-    public void disposeContextMenu(ContextMenu menu) {
-        if (menu == null) return;
-
-        Skin<?> skin = menu.getSkin();
-        if (skin == null) return;
-
-        ContextMenuContent cmContent = (ContextMenuContent)skin.getNode();
-        if (cmContent == null) return;
-
-        cmContent.dispose(); // recursive call to dispose submenus.
-    }
-
-    @Override protected void layoutChildren() {
-        if (itemsContainer.getChildren().size() == 0) return;
-        final double x = snappedLeftInset();
-        final double y = snappedTopInset();
-        final double w = getWidth() - x - snappedRightInset();
-        final double h = getHeight() - y - snappedBottomInset();
-        final double contentHeight =  snapSize(getContentHeight()); // itemsContainer.prefHeight(-1);
-
-        itemsContainer.resize(w,contentHeight);
-        itemsContainer.relocate(x, y);
-
-        if (isFirstShow && ty == 0) {
-            upArrow.setVisible(false);
-            isFirstShow = false;
-        } else {
-            upArrow.setVisible(ty < y && ty < 0);
-        }
-        downArrow.setVisible(ty + contentHeight > (y + h));
-
-        clipRect.setX(0);
-        clipRect.setY(0);
-        clipRect.setWidth(w);
-        clipRect.setHeight(h);
-
-        if (upArrow.isVisible()) {
-            final double prefHeight = snapSize(upArrow.prefHeight(-1));
-            clipRect.setHeight(snapSize(clipRect.getHeight() - prefHeight));
-            clipRect.setY(snapSize(clipRect.getY()) + prefHeight);
-            upArrow.resize(snapSize(upArrow.prefWidth(-1)), prefHeight);
-            positionInArea(upArrow, x, y, w, prefHeight, /*baseline ignored*/0,
-                    HPos.CENTER, VPos.CENTER);
-        }
-
-        if (downArrow.isVisible()) {
-            final double prefHeight = snapSize(downArrow.prefHeight(-1));
-            clipRect.setHeight(snapSize(clipRect.getHeight()) - prefHeight);
-            downArrow.resize(snapSize(downArrow.prefWidth(-1)), prefHeight);
-            positionInArea(downArrow, x, (y + h - prefHeight), w, prefHeight, /*baseline ignored*/0,
-                    HPos.CENTER, VPos.CENTER);
-        }
-    }
-
-     @Override protected double computePrefWidth(double height) {
-         computeVisualMetrics();
-         double prefWidth = 0;
-         if (itemsContainer.getChildren().size() == 0) return 0;
-         for (Node n : itemsContainer.getChildren()) {
-             if (! n.isVisible()) continue;
-             prefWidth = Math.max(prefWidth, snapSize(n.prefWidth(-1)));
-         }
-         return snappedLeftInset() + snapSize(prefWidth) + snappedRightInset();
-    }
-
-    @Override protected double computePrefHeight(double width) {
-        if (itemsContainer.getChildren().size() == 0) return 0;
-        final double screenHeight = getScreenHeight();
-        final double contentHeight = getContentHeight(); // itemsContainer.prefHeight(width);
-        double totalHeight = snappedTopInset() + snapSize(contentHeight) + snappedBottomInset();
-        // the pref height of this menu is the smaller value of the
-        // actual pref height and the height of the screens _visual_ bounds.
-        double prefHeight = (screenHeight <= 0) ? (totalHeight) : (Math.min(totalHeight, screenHeight));
-        return prefHeight;
-    }
-
-    @Override protected double computeMinHeight(double width) {
-        return 0.0;
-    }
-
-    @Override protected double computeMaxHeight(double height) {
-        return getScreenHeight();
-    }
-
-    private double getScreenHeight() {
-        if (contextMenu == null || contextMenu.getOwnerWindow() == null ||
-                contextMenu.getOwnerWindow().getScene() == null) {
-            return -1;
-        }
-        return snapSize(com.sun.javafx.util.Utils.getScreen(
-            contextMenu.getOwnerWindow().getScene().getRoot()).getVisualBounds().getHeight());
-        
-    }
-
-    private double getContentHeight() {
-        double h = 0.0d;
-        for (Node i : itemsContainer.getChildren()) {
-            if (i.isVisible()) {
-               h += snapSize(i.prefHeight(-1));
-            }
-        }
-        return h;
-    }
-  
-    // This handles shifting ty when doing keyboard navigation.
-    private void ensureFocusedMenuItemIsVisible(Node node) {
-        if (node == null) return;
-
-        final Bounds nodeBounds = node.getBoundsInParent();
-        final Bounds clipBounds = clipRect.getBoundsInParent();
-
-        if (nodeBounds.getMaxY() >= clipBounds.getMaxY()) {
-            // this is for moving down the menu
-            scroll(-nodeBounds.getMaxY() + clipBounds.getMaxY());
-        } else if (nodeBounds.getMinY() <= clipBounds.getMinY()) {
-            // this is for moving up the menu
-            scroll(-nodeBounds.getMinY() + clipBounds.getMinY());
-        }
-    }
-    
-    protected ObservableList<MenuItem> getItems() {
-        return contextMenu.getItems();
-    }
-
-    /**
-     * Finds the index of currently focused item.
-     */
-    private int findFocusedIndex() {
-         for (int i = 0; i < itemsContainer.getChildren().size(); i++) {
-            Node n = itemsContainer.getChildren().get(i);
-            if (n.isFocused()) {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    private boolean isFirstShow = true;
-    private double ty;
-
-    private void initialize() {
-        // keyboard navigation support. Initially focus goes to this ContextMenu,
-        // but when the user first hits the up or down arrow keys, the focus
-        // is transferred to the first or last item respectively. Once this
-        // happens, it is up to the menu items to navigate between themselves.
-        contextMenu.focusedProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                // initialize the focused index for keyboard navigation.
-                currentFocusedIndex = -1;
-                requestFocus();
-            }
-        });
-        
-        // RT-19624 calling requestFocus inside layout was casuing repeated layouts.
-        contextMenu.addEventHandler(Menu.ON_SHOWN, event -> {
-            for (Node child : itemsContainer.getChildren()) {
-                if (child instanceof MenuItemContainer) {
-                    final MenuItem item = ((MenuItemContainer)child).item;
-                    // When the choiceBox popup is shown, if this menu item is selected
-                    // do a requestFocus so CSS kicks in and the item is highlighted.
-                    if ("choice-box-menu-item".equals(item.getId())) {
-                        if (((RadioMenuItem)item).isSelected()) {
-                            child.requestFocus();
-                            break;
-                        }
-                    }
-                }
-
-            }
-        });
-
-//        // FIXME For some reason getSkinnable()Behavior traversal functions don't
-//        // get called as expected, so I've just put the important code below.
-        // We use setOnKeyPressed here as we are not adding a listener to a public
-        // event type (ContextMenuContent is not public API), and without this
-        // we get the issue shown in RT-34429
-        setOnKeyPressed(new EventHandler<KeyEvent>() {
-            @Override public void handle(KeyEvent ke) {
-                switch (ke.getCode()) {
-                    case LEFT:
-                        if (getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                            processRightKey(ke);
-                        } else {
-                            processLeftKey(ke);
-                        }
-                        break;
-                    case RIGHT:
-                        if (getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-                            processLeftKey(ke);
-                        } else {
-                            processRightKey(ke);
-                        }
-                        break;
-                    case CANCEL:
-                        ke.consume();
-                        break;
-                    case ESCAPE:
-                        // if the owner is not a menubar button, just close the
-                        // menu - this will move focus up to the parent menu
-                        // as required. In the case of the parent being a
-                        // menubar button we special case in the conditional code
-                        // beneath this switch statement. See RT-34429 for more context.
-                        final Node ownerNode = contextMenu.getOwnerNode();
-                        if (! (ownerNode instanceof MenuBarSkin.MenuBarButton)) {
-                            contextMenu.hide();
-                            ke.consume();
-                        }
-                        break;
-                    case DOWN:
-                        // move to the next sibling
-                        moveToNextSibling();
-                        ke.consume();
-                        break;
-                    case UP:
-                        // move to previous sibling
-                        moveToPreviousSibling();
-                        ke.consume();
-                        break;
-                    case SPACE:
-                    case ENTER:
-                        // select the menuitem
-                        selectMenuItem();
-                        ke.consume();
-                        break;
-                    default:
-                        break;
-                }
-
-                if (!ke.isConsumed()) {
-                    final Node ownerNode = contextMenu.getOwnerNode();
-                    if (ownerNode instanceof MenuItemContainer) {
-                        // Forward to parent menu
-                        Parent parent = ownerNode.getParent();
-                        while (parent != null && !(parent instanceof ContextMenuContent)) {
-                            parent = parent.getParent();
-                        }
-                        if (parent instanceof ContextMenuContent) {
-                            parent.getOnKeyPressed().handle(ke);
-                        }
-                    } else if (ownerNode instanceof MenuBarSkin.MenuBarButton) {
-                        // This is a top-level MenuBar Menu, so forward event to MenuBar
-                        MenuBarSkin mbs = ((MenuBarSkin.MenuBarButton)ownerNode).getMenuBarSkin();
-                        if (mbs != null && mbs.getKeyEventHandler() != null) {
-                            mbs.getKeyEventHandler().handle(ke);
-                        }
-                    }
-                }
-            }
-        });
-
-        addEventHandler(ScrollEvent.SCROLL, event -> {
-            /*
-             * we'll only scroll if the arrows are visible in the direction
-             * that we're going, otherwise we go into empty space.
-             */
-            final double textDeltaY = event.getTextDeltaY();
-            final double deltaY = event.getDeltaY();
-            if ((downArrow.isVisible() && (textDeltaY < 0.0 || deltaY < 0.0)) ||
-                (upArrow.isVisible() && (textDeltaY > 0.0 || deltaY > 0.0))) {
-
-                switch(event.getTextDeltaYUnits()) {
-                  case LINES:
-                      /*
-                      ** scroll lines, use the row height of selected row,
-                      ** or row 0 if none selected
-                      */
-                      int focusedIndex = findFocusedIndex();
-                      if (focusedIndex == -1) {
-                          focusedIndex = 0;
-                      }
-                      double rowHeight = itemsContainer.getChildren().get(focusedIndex).prefHeight(-1);
-                      scroll(textDeltaY * rowHeight);
-                      break;
-                  case PAGES:
-                      /*
-                      ** page scroll, scroll the menu height
-                      */
-                      scroll(textDeltaY * itemsContainer.getHeight());
-                      break;
-                  case NONE:
-                      /*
-                      ** pixel scroll
-                      */
-                      scroll(deltaY);
-                      break;
-                }
-                event.consume();
-            }
-        });
-    }
-
-    private void processLeftKey(KeyEvent ke) {
-        if (currentFocusedIndex != -1) {
-            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
-            if (n instanceof MenuItemContainer) {
-                MenuItem item = ((MenuItemContainer)n).item;
-                if (item instanceof Menu) {
-                    final Menu menu = (Menu) item;
-
-                    // if the submenu for this menu is showing, hide it
-                    if (menu == openSubmenu && submenu != null && submenu.isShowing()) {
-                        hideSubmenu();
-                        ke.consume();
-                    }
-                }
-            }
-        }
-    }
-
-    private void processRightKey(KeyEvent ke) {
-        if (currentFocusedIndex != -1) {
-            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
-            if (n instanceof MenuItemContainer) {
-                MenuItem item = ((MenuItemContainer)n).item;
-                if (item instanceof Menu) {
-                    final Menu menu = (Menu) item;
-                    if (menu.isDisable()) return;
-                    selectedBackground = ((MenuItemContainer)n);
-
-                    // RT-15103
-                    // if submenu for this menu is already showing then do nothing
-                    // Menubar will process the right key and move to the next menu
-                    if (openSubmenu == menu && submenu != null && submenu.isShowing()) {
-                        return;
-                    }
-
-                    showMenu(menu);
-                    ke.consume();
-                }
-            }
-        }
-    }
-
-    private void showMenu(Menu menu) {
-        menu.show();
-        // request focus on the first item of the submenu after it is shown
-        ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
-        if (cmContent != null) {
-           if (cmContent.itemsContainer.getChildren().size() > 0) {
-               cmContent.itemsContainer.getChildren().get(0).requestFocus();
-               cmContent.currentFocusedIndex = 0;
-           } else {
-               cmContent.requestFocus();
-           }
-        }
-    }
-
-    private void selectMenuItem() {
-        if (currentFocusedIndex != -1) {
-            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
-            if (n instanceof MenuItemContainer) {
-                MenuItem item = ((MenuItemContainer)n).item;
-                if (item instanceof Menu) {
-                    final Menu menu = (Menu) item;
-                    if (openSubmenu != null) {
-                        hideSubmenu();
-                    }
-                    if (menu.isDisable()) return;
-                    selectedBackground = ((MenuItemContainer)n);
-                    menu.show();
-                } else {
-                    ((MenuItemContainer)n).doSelect();
-                }
-            }
-        }
-    }
-    /*
-     * Find the index of the next MenuItemContainer in the itemsContainer children.
-     */
-    private int findNext(int from) {
-        for (int i = from; i < itemsContainer.getChildren().size(); i++) {
-            Node n = itemsContainer.getChildren().get(i);
-            if (n instanceof MenuItemContainer) {
-                return i;
-            }
-        }
-        // find from top
-        for (int i = 0; i < from; i++) {
-            Node n = itemsContainer.getChildren().get(i);
-            if (n instanceof MenuItemContainer) {
-                return i;
-            }
-        }
-        return -1; // should not happen
-    }
-    
-    private void moveToNextSibling() {
-        // If focusedIndex is -1 then start from 0th menu item.
-        // Note that this will cycle through such that when you move to last item,
-        // it will move to 1st item on the next Down key press.
-        if (currentFocusedIndex != -1) {
-            currentFocusedIndex = findNext(currentFocusedIndex + 1);
-        } else if (currentFocusedIndex == -1 || currentFocusedIndex == (itemsContainer.getChildren().size() - 1)) {
-            currentFocusedIndex = findNext(0);
-        }
-
-        // request focus on the next sibling which currentFocusIndex points to
-        if (currentFocusedIndex != -1) {
-            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
-            selectedBackground = ((MenuItemContainer)n);
-            n.requestFocus();
-            ensureFocusedMenuItemIsVisible(n);
-        }
-    }
-    
-    /*
-     * Find the index the previous MenuItemContaner in the itemsContainer children.
-     */
-    private int findPrevious(int from) {
-        for (int i = from; i >= 0; i--) {
-            Node n = itemsContainer.getChildren().get(i);
-            if (n instanceof MenuItemContainer) {
-                return(i);
-            }
-        }
-        for (int i = itemsContainer.getChildren().size() - 1 ; i > from; i--) {
-            Node n = itemsContainer.getChildren().get(i);
-            if (n instanceof MenuItemContainer) {
-                return(i);
-            }
-        }
-        return -1;
-    }
-
-     private void moveToPreviousSibling() {
-        // If focusedIndex is -1 then start from the last menu item to go up.
-        // Note that this will cycle through such that when you move to first item,
-        // it will move to last item on the next Up key press.
-        if (currentFocusedIndex != -1) {
-            currentFocusedIndex = findPrevious(currentFocusedIndex - 1);
-        } else if(currentFocusedIndex == -1 || currentFocusedIndex == 0) {
-            currentFocusedIndex = findPrevious(itemsContainer.getChildren().size() - 1);
-        }
-
-        // request focus on the previous sibling which currentFocusIndex points to
-        if (currentFocusedIndex != -1) {
-            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
-            selectedBackground = ((MenuItemContainer)n);
-            n.requestFocus();
-            ensureFocusedMenuItemIsVisible(n);
-        }
-    }
-
-    /*
-     * Get the Y offset from the top of the popup to the menu item whose index
-     * is given.
-     */
-    double getMenuYOffset(int menuIndex) {
-        double offset = 0;
-        if (itemsContainer.getChildren().size() > menuIndex) {
-            offset = snappedTopInset();
-            Node menuitem = itemsContainer.getChildren().get(menuIndex);
-            offset += menuitem.getLayoutY() + menuitem.prefHeight(-1);
-        }
-        return offset;
-    }
-
-    private void setUpBinds() {
-        updateMenuShowingListeners(contextMenu.getItems(), true);
-        contextMenu.getItems().addListener(contextMenuItemsListener);
-    }
-
-    private void disposeBinds() {
-        updateMenuShowingListeners(contextMenu.getItems(), false);
-        contextMenu.getItems().removeListener(contextMenuItemsListener);
-    }
-
-    private ChangeListener<Boolean> menuShowingListener = (observable, wasShowing, isShowing) -> {
-        ReadOnlyBooleanProperty isShowingProperty = (ReadOnlyBooleanProperty) observable;
-        Menu menu = (Menu) isShowingProperty.getBean();
-
-        if (wasShowing && ! isShowing) {
-            // hide the submenu popup
-            hideSubmenu();
-        } else if (! wasShowing && isShowing) {
-            // show the submenu popup
-            showSubmenu(menu);
-        }
-    };
-
-    private ListChangeListener<MenuItem> contextMenuItemsListener = (ListChangeListener<MenuItem>) c -> {
-        // Add listeners to the showing property of all menus that have
-        // been added, and remove listeners from menus that have been removed
-        // FIXME this is temporary - we should be adding and removing
-        // listeners such that they use the one listener defined above
-        // - but that can't be done until we have the bean in the
-        // ObservableValue
-        while (c.next()) {
-            updateMenuShowingListeners(c.getRemoved(), false);
-            updateMenuShowingListeners(c.getAddedSubList(), true);
-        }
-
-        // Listener to items in PopupMenu to update items in PopupMenuContent
-        itemsDirty = true;
-        updateItems(); // RT-29761
-    };
-
-    private ChangeListener<Boolean> menuItemVisibleListener = (observable, oldValue, newValue) -> {
-        // re layout as item's visibility changed
-        requestLayout();
-    };
-
-    private void updateMenuShowingListeners(List<? extends MenuItem> items, boolean addListeners) {
-        for (MenuItem item : items) {
-            if (item instanceof Menu) {
-                final Menu menu = (Menu) item;
-
-                if (addListeners) {
-                    menu.showingProperty().addListener(menuShowingListener);
-                } else {
-                    menu.showingProperty().removeListener(menuShowingListener);
-                }
-            }
-
-             // listen to menu items's visible property.
-            if (addListeners) {
-                item.visibleProperty().addListener(menuItemVisibleListener);
-            } else {
-                item.visibleProperty().removeListener(menuItemVisibleListener);
-            }
-        }
-    }
-
-    // For test purpose only
-    ContextMenu getSubMenu() {
-        return submenu;
-    }
-
-    Menu getOpenSubMenu() {
-        return openSubmenu;
-    }
-
-    private void createSubmenu() {
-        if (submenu == null) {
-            submenu = new ContextMenu();
-            submenu.showingProperty().addListener(new ChangeListener<Boolean>() {
-                @Override public void changed(ObservableValue<? extends Boolean> observable,
-                                              Boolean oldValue, Boolean newValue) {
-                    if (!submenu.isShowing()) {
-                        // Maybe user clicked outside or typed ESCAPE.
-                        // Make sure menus are in sync.
-                        for (Node node : itemsContainer.getChildren()) {
-                            if (node instanceof MenuItemContainer
-                                  && ((MenuItemContainer)node).item instanceof Menu) {
-                                Menu menu = (Menu)((MenuItemContainer)node).item;
-                                if (menu.isShowing()) {
-                                    menu.hide();
-                                }
-                            }
-                        }
-                    }
-                }
-            });
-        }
-    }
-   
-    private void showSubmenu(Menu menu) {
-        openSubmenu = menu;
-        createSubmenu();
-        submenu.getItems().setAll(menu.getItems());
-        submenu.show(selectedBackground, Side.RIGHT, 0, 0);
-    }
-    
-    private void hideSubmenu() {
-        if (submenu == null) return;
-
-        submenu.hide();
-        openSubmenu = null;
-
-        // Fix for RT-37022 - we dispose content so that we do not process CSS
-        // on hidden submenus
-        disposeContextMenu(submenu);
-        submenu = null;
-    }
-    
-    private void hideAllMenus(MenuItem item) {
-        if (contextMenu != null) contextMenu.hide();
-        
-        Menu parentMenu;
-        while ((parentMenu = item.getParentMenu()) != null) {
-            parentMenu.hide();
-            item = parentMenu;
-        }
-        if (item.getParentPopup() != null) {
-            item.getParentPopup().hide();
-        }
-    }
-    
-    private Menu openSubmenu;
-    private ContextMenu submenu;
-    
-    // FIXME: HACKY. We use this so that a submenu knows where to open from
-    // but this will only work for mouse hovers currently - and won't work
-    // programmatically.
-    // package protected for testing only!
-    Region selectedBackground;
-    
-    void scroll(double delta) {
-        double newTy = ty + delta;
-        if (ty == newTy) return;
-
-        // translation should never be positive (this would mean the top of the
-        // menu content is detaching from the top of the menu!)
-        if (newTy > 0.0) {
-            newTy = 0.0;
-        }
-
-        // translation should never be greater than the preferred height of the
-        // menu content (otherwise the menu content will be detaching from the
-        // bottom of the menu).
-        // RT-37185: We check the direction of the scroll, to prevent it locking
-        // up when scrolling upwards from the very bottom (using the on-screen
-        // up arrow).
-        if (delta < 0 && (getHeight() - newTy) > itemsContainer.getHeight() - downArrow.getHeight()) {
-            newTy = getHeight() - itemsContainer.getHeight() - downArrow.getHeight();
-        }
-
-        ty = newTy;
-        itemsContainer.requestLayout();
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                         Stylesheet Handling                             *
-     *                                                                         *
-     **************************************************************************/
-    @Override public Styleable getStyleableParent() {
-        return contextMenu;
-    }
-
-     /** @treatAsPrivate */
-    private static class StyleableProperties {
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(Region.getClassCssMetaData());
-
-            //
-            // SkinBase only has Region's unique StlyleableProperty's, none of Nodes
-            // So, we need to add effect back in. The effect property is in a
-            // private inner class, so get the property from Node the hard way.
-            final List<CssMetaData<? extends Styleable, ?>> nodeStyleables = Node.getClassCssMetaData();
-            for(int n=0, max=nodeStyleables.size(); n<max; n++) {
-                CssMetaData<? extends Styleable, ?> styleable = nodeStyleables.get(n);
-                if ("effect".equals(styleable.getProperty())) {
-                    styleables.add(styleable);
-                    break;
-                }
-            }
-            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();
-    }
-    
-    protected Label getLabelAt(int index) {
-        return ((MenuItemContainer)itemsContainer.getChildren().get(index)).getLabel();
-    }
-
-    /**
-     * Custom VBox to enable scrolling of items. Scrolling effect is achieved by
-     * controlling the translate Y coordinate of the menu item "ty" which is set by a
-     * timeline when mouse is over up/down arrow.
-     */
-    class MenuBox extends VBox {
-        MenuBox() {
-            setAccessibleRole(AccessibleRole.CONTEXT_MENU);
-        }
-
-        @Override protected void layoutChildren() {
-            double yOffset = ty;
-            for (Node n : getChildren()) {
-                if (n.isVisible()) {
-                    final double prefHeight = snapSize(n.prefHeight(-1));
-                    n.resize(snapSize(getWidth()), prefHeight);
-                    n.relocate(snappedLeftInset(), yOffset);
-                    yOffset += prefHeight;
-                }
-            }
-        }
-
-        @Override
-        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-            switch (attribute) {
-                case VISIBLE: return contextMenu.isShowing();
-                case PARENT_MENU: return contextMenu.getOwnerNode();
-                default: return super.queryAccessibleAttribute(attribute, parameters); 
-            }
-        }
-    }
-
-    class ArrowMenuItem extends StackPane {
-         private StackPane upDownArrow;
-         private ContextMenuContent popupMenuContent;
-         private boolean up = false;
-         public final boolean isUp() { return up; }
-         public void setUp(boolean value) {
-            up = value;
-            upDownArrow.getStyleClass().setAll(isUp() ? "menu-up-arrow" : "menu-down-arrow");
-        }
-
-        // used to automatically scroll through menu items when the user performs
-        // certain interactions, e.g. pressing and holding the arrow buttons
-        private Timeline scrollTimeline;
-
-        public ArrowMenuItem(ContextMenuContent pmc) {
-            getStyleClass().setAll("scroll-arrow");
-            upDownArrow = new StackPane();
-            this.popupMenuContent = pmc;
-            upDownArrow.setMouseTransparent(true);
-            upDownArrow.getStyleClass().setAll(isUp() ? "menu-up-arrow" : "menu-down-arrow");
-    //        setMaxWidth(Math.max(upDownArrow.prefWidth(-1), getWidth()));
-            addEventHandler(MouseEvent.MOUSE_ENTERED, me -> {
-                if (scrollTimeline != null && (scrollTimeline.getStatus() != Status.STOPPED)) {
-                    return;
-                }
-                startTimeline();
-            });
-            addEventHandler(MouseEvent.MOUSE_EXITED, me -> {
-                stopTimeline();
-            });
-            setVisible(false);
-            setManaged(false);
-            getChildren().add(upDownArrow);
-        }
-
-        @Override protected double computePrefWidth(double height) {
-//            return snapSize(getInsets().getLeft()) + snapSize(getInsets().getRight());
-            return itemsContainer.getWidth();
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            return snappedTopInset() + upDownArrow.prefHeight(-1) + snappedBottomInset();
-        }
-
-        @Override protected void layoutChildren() {
-            double w = snapSize(upDownArrow.prefWidth(-1));
-            double h = snapSize(upDownArrow.prefHeight(-1));
-
-            upDownArrow.resize(w, h);
-            positionInArea(upDownArrow, 0, 0, getWidth(), getHeight(),
-                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-        }
-
-        private void adjust() {
-            if(up) popupMenuContent.scroll(12); else popupMenuContent.scroll(-12);
-        }
-
-        private void startTimeline() {
-            scrollTimeline = new Timeline();
-            scrollTimeline.setCycleCount(Timeline.INDEFINITE);
-            KeyFrame kf = new KeyFrame(
-                Duration.millis(60),
-                    event -> {
-                        adjust();
-                    }
-            );
-            scrollTimeline.getKeyFrames().clear();
-            scrollTimeline.getKeyFrames().add(kf);
-            scrollTimeline.play();
-        }
-
-        private void stopTimeline() {
-            scrollTimeline.stop();
-            scrollTimeline = null;
-        }
-    }
-    
-    /*
-     * Container responsible for laying out a single row in the menu - in other
-     * words, this contains and lays out a single MenuItem, regardless of it's 
-     * specific subtype.
-     */
-    public class MenuItemContainer extends Region {
-
-        private final MenuItem item;
-
-        private Node left;
-        private Node graphic;
-        private Node label;
-        private Node right;
-
-        private final MultiplePropertyChangeListenerHandler listener = 
-            new MultiplePropertyChangeListenerHandler(param -> {
-                handlePropertyChanged(param);
-                return null;
-            });
-
-        private EventHandler<MouseEvent> mouseEnteredEventHandler;
-        private EventHandler<MouseEvent> mouseReleasedEventHandler;
-
-        private EventHandler<ActionEvent> actionEventHandler;
-
-        protected Label getLabel(){
-            return (Label) label;
-        }
-        
-        public MenuItem getItem() {
-            return item;
-        }
-
-        public MenuItemContainer(MenuItem item){
-            if (item == null) {
-                throw new NullPointerException("MenuItem can not be null");
-            }
-            
-            getStyleClass().addAll(item.getStyleClass());
-            setId(item.getId());
-            setFocusTraversable(!(item instanceof CustomMenuItem));
-            this.item = item;
-
-            createChildren();
-            
-            // listen to changes in the state of certain MenuItem types
-            ReadOnlyBooleanProperty pseudoProperty;
-            if (item instanceof Menu) {
-                pseudoProperty = ((Menu)item).showingProperty();
-                listener.registerChangeListener(pseudoProperty, "MENU_SHOWING");
-                pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, pseudoProperty.get());
-                setAccessibleRole(AccessibleRole.MENU);
-            } else if (item instanceof RadioMenuItem) {
-                pseudoProperty = ((RadioMenuItem)item).selectedProperty();
-                listener.registerChangeListener(pseudoProperty, "RADIO_ITEM_SELECTED");
-                pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, pseudoProperty.get());
-                setAccessibleRole(AccessibleRole.RADIO_MENU_ITEM);
-            } else if (item instanceof CheckMenuItem) {
-                pseudoProperty = ((CheckMenuItem)item).selectedProperty();
-                listener.registerChangeListener(pseudoProperty, "CHECK_ITEM_SELECTED");
-                pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, pseudoProperty.get());
-                setAccessibleRole(AccessibleRole.CHECK_MENU_ITEM);
-            } else {
-                setAccessibleRole(AccessibleRole.MENU_ITEM);
-            }
-            
-            pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, item.disableProperty().get());
-            listener.registerChangeListener(item.disableProperty(), "DISABLE");
-            
-            // Add the menu item to properties map of this node. Used by QA for testing
-            // This allows associating this container with corresponding MenuItem.
-            getProperties().put(MenuItem.class, item);
-            
-            listener.registerChangeListener(item.graphicProperty(), "GRAPHIC");
-
-            actionEventHandler = e -> {
-                if (item instanceof Menu) {
-                    final Menu menu = (Menu) item;
-                    if (openSubmenu == menu && submenu.isShowing()) return;
-                    if (openSubmenu != null) {
-                        hideSubmenu();
-                    }
-
-                    selectedBackground = MenuItemContainer.this;
-                    showMenu(menu);
-                } else {
-                    doSelect();
-                }
-            };
-            addEventHandler(ActionEvent.ACTION, actionEventHandler);
-        }
-        
-        public void dispose() {
-            if (item instanceof CustomMenuItem) {
-                Node node = ((CustomMenuItem)item).getContent();
-                if (node != null) {
-                    node.removeEventHandler(MouseEvent.MOUSE_CLICKED, customMenuItemMouseClickedHandler);
-                }
-            }
-
-            listener.dispose();
-            removeEventHandler(ActionEvent.ACTION, actionEventHandler);
-            
-            if (label != null) {
-                ((Label)label).textProperty().unbind();
-            }
-            
-            left = null;
-            graphic = null;
-            label = null;
-            right = null;
-        }
-        
-        private void handlePropertyChanged(String p) {
-            if ("MENU_SHOWING".equals(p)) {
-                Menu menu = (Menu) item;
-                pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, menu.isShowing());
-            } else if ("RADIO_ITEM_SELECTED".equals(p)) {
-                RadioMenuItem radioItem = (RadioMenuItem) item;
-                pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, radioItem.isSelected());
-            } else if ("CHECK_ITEM_SELECTED".equals(p)) {
-                CheckMenuItem checkItem = (CheckMenuItem) item;
-                pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, checkItem.isSelected());
-            } else if ("DISABLE".equals(p)) {
-                pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, item.isDisable());
-            } else if ("GRAPHIC".equals(p)) {
-                createChildren();
-                computeVisualMetrics();
-            } else if ("ACCELERATOR".equals(p)) {
-                updateAccelerator();
-            } else if ("FOCUSED".equals(p)) {
-                if (isFocused()) {
-                    currentFocusedIndex = itemsContainer.getChildren().indexOf(MenuItemContainer.this);
-                }
-            }
-        }
-        
-        private void createChildren() {
-            getChildren().clear();
-            
-            // draw background region for hover effects. All content (other
-            // than Nodes from NodeMenuItems) are set to be mouseTransparent, so
-            // this background also acts as the receiver of user input
-            if (item instanceof CustomMenuItem) {
-                createNodeMenuItemChildren((CustomMenuItem)item);
-
-                if (mouseEnteredEventHandler == null) {
-                    mouseEnteredEventHandler = event -> {
-                        requestFocus(); // request Focus on hover
-                    };
-                } else {
-                    removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
-                }
-                addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
-            } else {
-                // --- add check / radio to left column
-                Node leftNode = getLeftGraphic(item);
-                if (leftNode != null) {
-                    StackPane leftPane = new StackPane();
-                    leftPane.getStyleClass().add("left-container");
-                    leftPane.getChildren().add(leftNode);
-                    left = leftPane;
-                    getChildren().add(left);
-                    left.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
-                }
-                // -- add graphic to graphic pane
-                if (item.getGraphic() != null) {
-                    Node graphicNode = item.getGraphic();
-                    StackPane graphicPane = new StackPane();
-                    graphicPane.getStyleClass().add("graphic-container");
-                    graphicPane.getChildren().add(graphicNode);
-                    graphic = graphicPane;
-                    getChildren().add(graphic);
-                }
-                
-                // --- add text to center column
-                label = new MenuLabel(item, this);  // make this a menulabel to handle mnemonics fire()
-                label.setStyle(item.getStyle());
-
-                // bind to text property in menu item
-                ((Label)label).textProperty().bind(item.textProperty());
-
-                label.setMouseTransparent(true);
-                getChildren().add(label);
-
-                listener.unregisterChangeListener(focusedProperty());
-                // RT-19546 update currentFocusedIndex when MenuItemContainer gets focused.
-                // e.g this happens when you press the Right key to open a submenu; the first
-                // menuitem is focused.
-                listener.registerChangeListener(focusedProperty(), "FOCUSED");
-
-                // --- draw in right column - this depends on whether we are
-                // a Menu or not. A Menu gets an arrow, whereas other MenuItems
-                // get the ability to draw an accelerator
-                if (item instanceof Menu) {
-                    // --- add arrow / accelerator / mnemonic to right column
-                    Region rightNode = new Region();
-                    rightNode.setMouseTransparent(true);
-                    rightNode.getStyleClass().add("arrow");
-                    
-                    StackPane rightPane = new StackPane();
-                    rightPane.setMaxWidth(Math.max(rightNode.prefWidth(-1), 10));
-                    rightPane.setMouseTransparent(true);
-                    rightPane.getStyleClass().add("right-container");
-                    rightPane.getChildren().add(rightNode);
-                    right = rightPane;
-                    getChildren().add(rightPane);
-
-                    if (mouseEnteredEventHandler == null) {
-                        mouseEnteredEventHandler = event -> {
-                            if (openSubmenu != null && item != openSubmenu) {
-                                // if a submenu of a different menu is already
-                                // open then close it (RT-15049)
-                                hideSubmenu();
-                            }
-
-                            final Menu menu = (Menu) item;
-                            if (menu.isDisable()) return;
-                            selectedBackground = MenuItemContainer.this;
-                            menu.show();
-                            requestFocus();  // request Focus on hover
-                        };
-                    } else {
-                        removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
-                    }
-
-                    if (mouseReleasedEventHandler == null) {
-                        mouseReleasedEventHandler = event -> {
-                            item.fire();
-                        };
-                    } else {
-                        removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
-                    }
-                    
-                    // show submenu when the menu is hovered over
-                    addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
-                    addEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
-                } else { // normal MenuItem
-                    // remove old listeners
-                    listener.unregisterChangeListener(item.acceleratorProperty());
-
-                    // accelerator support
-                    updateAccelerator();
-
-                    if (mouseEnteredEventHandler == null) {
-                        mouseEnteredEventHandler = event -> {
-                            if (openSubmenu != null) {
-                                openSubmenu.hide();
-                            }
-                            requestFocus();  // request Focus on hover
-                        };
-                    } else {
-                        removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
-                    }
-
-                    if (mouseReleasedEventHandler == null) {
-                        mouseReleasedEventHandler = event -> {
-                            doSelect();
-                        };
-                    } else {
-                        removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
-                    }
-
-                    addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
-                    addEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
-
-                    listener.registerChangeListener(item.acceleratorProperty(), "ACCELERATOR");
-                }
-            }
-        }
-        
-        private void updateAccelerator() {
-            if (item.getAccelerator() != null) {
-                if (right != null) {
-                    getChildren().remove(right);
-                }
-
-                String text = item.getAccelerator().getDisplayText();
-                right = new Label(text);
-                right.setStyle(item.getStyle());
-                right.getStyleClass().add("accelerator-text");
-                getChildren().add(right);
-            } else {
-                getChildren().remove(right);
-            }
-        }
-
-        void doSelect() {
-            // don't do anything on disabled menu items
-            if (item.isDisable()) return;
-            // toggle state of check or radio items
-            if (item instanceof CheckMenuItem) {
-                CheckMenuItem checkItem = (CheckMenuItem)item;
-                checkItem.setSelected(!checkItem.isSelected());
-            } else if (item instanceof RadioMenuItem) {
-                // this is a radio button. If there is a toggleGroup specified, we
-                // simply set selected to true. If no toggleGroup is specified, we
-                // toggle the selected state, as there is no assumption of mutual
-                // exclusivity when no toggleGroup is set.
-                final RadioMenuItem radioItem = (RadioMenuItem) item;
-                radioItem.setSelected(radioItem.getToggleGroup() != null ? true : !radioItem.isSelected());
-            }
-
-            // fire the action before hiding the menu
-            item.fire();
-
-            if (item instanceof CustomMenuItem) {
-                CustomMenuItem customMenuItem = (CustomMenuItem) item;
-                if (customMenuItem.isHideOnClick()) {
-                    hideAllMenus(item);
-                }
-            } else {
-                hideAllMenus(item);
-            }
-        }
-
-        private EventHandler<MouseEvent> customMenuItemMouseClickedHandler;
-        
-        private void createNodeMenuItemChildren(final CustomMenuItem item) {
-            Node node = item.getContent();
-            getChildren().add(node);
-
-            // handle hideOnClick
-            customMenuItemMouseClickedHandler = event -> {
-                if (item == null || item.isDisable()) return;
-
-                item.fire();
-                if (item.isHideOnClick()) {
-                    hideAllMenus(item);
-                }
-            };
-            node.addEventHandler(MouseEvent.MOUSE_CLICKED, customMenuItemMouseClickedHandler);
-        }
-        
-        @Override protected void layoutChildren() {
-            double xOffset;
-        
-            final double prefHeight = prefHeight(-1);
-            if (left != null) {
-                xOffset = snappedLeftInset();
-                left.resize(left.prefWidth(-1), left.prefHeight(-1));
-                positionInArea(left, xOffset, 0,
-                        maxLeftWidth, prefHeight, 0, HPos.LEFT, VPos.CENTER);
-            }
-            if (graphic != null) {
-                xOffset = snappedLeftInset() + maxLeftWidth;
-                graphic.resize(graphic.prefWidth(-1), graphic.prefHeight(-1));
-                positionInArea(graphic, xOffset, 0,
-                        maxGraphicWidth, prefHeight, 0, HPos.LEFT, VPos.CENTER);
-            }
-            
-            if (label != null) {
-                xOffset = snappedLeftInset() + maxLeftWidth + maxGraphicWidth;
-                label.resize(label.prefWidth(-1), label.prefHeight(-1));
-                positionInArea(label, xOffset, 0,
-                        maxLabelWidth, prefHeight, 0, HPos.LEFT, VPos.CENTER);
-            }
-            
-            if (right != null) {
-                xOffset = snappedLeftInset() + maxLeftWidth + maxGraphicWidth + maxLabelWidth;
-                right.resize(right.prefWidth(-1), right.prefHeight(-1));
-                positionInArea(right, xOffset, 0,
-                    maxRightWidth, prefHeight, 0, HPos.RIGHT, VPos.CENTER);
-            }
-            
-            if ( item instanceof CustomMenuItem) {
-                Node n = ((CustomMenuItem) item).getContent();
-                if (item instanceof SeparatorMenuItem) {
-                    double width = prefWidth(-1) - (snappedLeftInset() + maxGraphicWidth + snappedRightInset());
-                    n.resize(width, n.prefHeight(-1));
-                    positionInArea(n, snappedLeftInset() + maxGraphicWidth, 0, prefWidth(-1), prefHeight, 0, HPos.LEFT, VPos.CENTER);
-                } else {
-                    n.resize(n.prefWidth(-1), n.prefHeight(-1));
-                    //the node should be left aligned 
-                    positionInArea(n, snappedLeftInset(), 0, getWidth(), prefHeight, 0, HPos.LEFT, VPos.CENTER);
-                }
-            }
-        }
-        
-        @Override protected double computePrefHeight(double width) {
-            double prefHeight = 0;
-            if (item instanceof CustomMenuItem || item instanceof SeparatorMenuItem) {
-                prefHeight = (getChildren().isEmpty()) ? 0 : getChildren().get(0).prefHeight(-1);
-            } else {
-                prefHeight = Math.max(prefHeight, (left != null) ? left.prefHeight(-1) : 0);
-                prefHeight = Math.max(prefHeight, (graphic != null) ? graphic.prefHeight(-1) : 0);
-                prefHeight = Math.max(prefHeight, (label != null) ? label.prefHeight(-1) : 0);
-                prefHeight = Math.max(prefHeight, (right != null) ? right.prefHeight(-1) : 0);
-            }
-             return snappedTopInset() + prefHeight + snappedBottomInset();
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            double nodeMenuItemWidth = 0;
-            if (item instanceof CustomMenuItem && !(item instanceof SeparatorMenuItem)) {
-                nodeMenuItemWidth = snappedLeftInset() + ((CustomMenuItem) item).getContent().prefWidth(-1) +
-                        snappedRightInset();
-            }
-            return Math.max(nodeMenuItemWidth,
-                    snappedLeftInset() + maxLeftWidth + maxGraphicWidth +
-                    maxLabelWidth + maxRightWidth + snappedRightInset());
-        }
-
-        // Responsible for returning a graphic (if necessary) to position in the
-        // left column of the menu. This may be a Node from the MenuItem.graphic
-        // property, or it may be a check/radio item if necessary.
-        private Node getLeftGraphic(MenuItem item) {
-            if (item instanceof RadioMenuItem) {
-                 final Region _graphic = new Region();
-                _graphic.getStyleClass().add("radio");
-                return _graphic;
-            } else if (item instanceof CheckMenuItem) {
-                final StackPane _graphic = new StackPane();
-                _graphic.getStyleClass().add("check");
-                return _graphic;
-            } 
-            
-            return null;
-        }
-
-        @Override
-        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-            switch (attribute) {
-                case SELECTED:
-                    if (item instanceof CheckMenuItem) {
-                        return ((CheckMenuItem)item).isSelected();
-                    }
-                    if (item instanceof RadioMenuItem) {
-                        return ((RadioMenuItem) item).isSelected();
-                    }
-                    return false;
-                case ACCELERATOR: return item.getAccelerator();
-                case TEXT: {
-                    String title = "";
-                    if (graphic != null) {
-                        String t = (String)graphic.queryAccessibleAttribute(AccessibleAttribute.TEXT);
-                        if (t != null) title += t;
-                    }                  
-                    final Label label = getLabel();
-                    if (label != null) {
-                        String t = (String)label.queryAccessibleAttribute(AccessibleAttribute.TEXT);
-                        if (t != null) title += t;
-                    }
-                    if (item instanceof CustomMenuItem) {
-                        Node content = ((CustomMenuItem) item).getContent();
-                        if (content != null) {
-                            String t = (String)content.queryAccessibleAttribute(AccessibleAttribute.TEXT);
-                            if (t != null) title += t;
-                        }
-                    }
-                    return title;
-                }
-                case MNEMONIC: {
-                    final Label label = getLabel();
-                    if (label != null) {
-                        String mnemonic = (String)label.queryAccessibleAttribute(AccessibleAttribute.MNEMONIC);
-                        if (mnemonic != null) return mnemonic;
-                    }
-                    return null;
-                }
-                case DISABLED: return item.isDisable();
-                case SUBMENU:
-                    createSubmenu();
-                    // Accessibility might need to see the menu node before the window
-                    // is visible (i.e. before the skin is applied).
-                    if (submenu.getSkin() == null) {
-                        submenu.impl_styleableGetNode().impl_processCSS(true);
-                    }
-                    ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
-                    return cmContent.itemsContainer;
-                default: return super.queryAccessibleAttribute(attribute, parameters); 
-            }
-        }
-
-        @Override
-        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-            switch (action) {
-                case SHOW_MENU:{
-                    if (item instanceof Menu) {
-                        final Menu menuItem = (Menu) item;
-                        if (menuItem.isShowing()) {
-                            menuItem.hide();
-                        } else {
-                            menuItem.show();
-                        }
-                    }
-                    break;
-                }
-                case FIRE: 
-                    doSelect();
-                    break;
-                default: super.executeAccessibleAction(action);
-            }
-        }
-    }
-
-
-    private static final PseudoClass SELECTED_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("selected");
-    private static final PseudoClass DISABLED_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("disabled");
-    private static final PseudoClass CHECKED_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("checked");
-
-    private class MenuLabel extends Label {
-
-        public MenuLabel(MenuItem item, MenuItemContainer mic) {
-            super(item.getText());
-            setMnemonicParsing(item.isMnemonicParsing());
-            setLabelFor(mic);
-        }
-    }
-        
-}
--- /dev/null	2015-09-03 15:15:14.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java	2015-09-03 15:15:12.289174500 -0700
@@ -0,0 +1,1601 @@
+/*
+ * Copyright (c) 2011, 2015, 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;
+
+import com.sun.javafx.scene.control.behavior.TwoLevelFocusPopupBehavior;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.animation.Animation.Status;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.css.CssMetaData;
+import javafx.css.PseudoClass;
+import javafx.css.Styleable;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.*;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.control.*;
+import javafx.scene.control.skin.MenuBarSkin;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Window;
+import javafx.util.Duration;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This is a the SkinBase for ContextMenu based controls so that the CSS parts
+ * work right, because otherwise we would have to copy the Keys from there to here.
+ */
+public class ContextMenuContent extends Region {
+
+    private ContextMenu contextMenu;
+
+    /***************************************************************************
+     * UI subcomponents
+     **************************************************************************/
+
+    private double maxGraphicWidth = 0; // we keep this margin to left for graphic
+    private double maxRightWidth = 0;
+    private double maxLabelWidth = 0;
+    private double maxRowHeight = 0;
+    private double maxLeftWidth = 0;
+    private double oldWidth = 0;
+
+    private Rectangle clipRect;
+    MenuBox itemsContainer;
+    private ArrowMenuItem upArrow;
+    private ArrowMenuItem downArrow;
+
+    /*
+     * We maintain a current focused index which is used
+     * in keyboard navigation of menu items.
+     */
+    private int currentFocusedIndex = -1;
+    
+    private boolean itemsDirty = true;
+    private InvalidationListener popupShowingListener = arg0 -> {
+        updateItems();
+    };
+    private WeakInvalidationListener weakPopupShowingListener = 
+            new WeakInvalidationListener(popupShowingListener);
+
+    /***************************************************************************
+     * Constructors
+     **************************************************************************/
+    public ContextMenuContent(final ContextMenu popupMenu) {
+        this.contextMenu = popupMenu;
+        clipRect = new Rectangle();
+         clipRect.setSmooth(false);
+        itemsContainer = new MenuBox();
+//        itemsContainer = new VBox();
+        itemsContainer.setClip(clipRect);
+        
+        upArrow = new ArrowMenuItem(this);
+        upArrow.setUp(true);
+        upArrow.setFocusTraversable(false);
+
+        downArrow = new ArrowMenuItem(this);
+        downArrow.setUp(false);
+        downArrow.setFocusTraversable(false);
+        getChildren().add(itemsContainer);
+        getChildren().add(upArrow);
+        getChildren().add(downArrow);
+        initialize();
+        setUpBinds();
+        updateItems();
+        // RT-20197 add menuitems only on first show.
+        popupMenu.showingProperty().addListener(weakPopupShowingListener);
+
+        /*
+        ** only add this if we're on an embedded
+        ** platform that supports 5-button navigation 
+        */
+        if (Utils.isTwoLevelFocus()) {
+            new TwoLevelFocusPopupBehavior(this);
+        }
+    }
+    
+    //For access from controls
+    public VBox getItemsContainer() {
+        return itemsContainer;
+    }
+    //For testing purpose only
+    int getCurrentFocusIndex() {
+        return currentFocusedIndex;
+    }
+    //For testing purpose only
+    void setCurrentFocusedIndex(int index) {
+        if (index < itemsContainer.getChildren().size()) {
+            currentFocusedIndex = index;
+        }
+    }
+    
+    private void updateItems() {
+        if (itemsDirty) {
+            updateVisualItems();
+            itemsDirty = false;
+        }
+    }
+
+    private void computeVisualMetrics() {
+        maxRightWidth = 0;
+        maxLabelWidth = 0;
+        maxRowHeight = 0;
+        maxGraphicWidth = 0;
+        maxLeftWidth = 0;
+
+        for (int i = 0; i < itemsContainer.getChildren().size(); i++) {
+            Node child = itemsContainer.getChildren().get(i);
+            if (child instanceof MenuItemContainer) {
+                final MenuItemContainer menuItemContainer = (MenuItemContainer)itemsContainer.getChildren().get(i);
+                
+                if (! menuItemContainer.isVisible()) continue;
+                
+                double alt = -1;
+                Node n = menuItemContainer.left;
+                if (n != null) {
+                    if (n.getContentBias() == Orientation.VERTICAL) { // width depends on height
+                        alt = snapSize(n.prefHeight(-1));
+                    } else alt = -1;
+                    maxLeftWidth = Math.max(maxLeftWidth, snapSize(n.prefWidth(alt)));
+                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
+                }
+
+                n = menuItemContainer.graphic;
+                if (n != null) {
+                    if (n.getContentBias() == Orientation.VERTICAL) { // width depends on height
+                        alt = snapSize(n.prefHeight(-1));
+                    } else alt = -1;
+                    maxGraphicWidth = Math.max(maxGraphicWidth, snapSize(n.prefWidth(alt)));
+                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
+                }
+
+                n = menuItemContainer.label;
+                if (n != null) {
+                    if (n.getContentBias() == Orientation.VERTICAL) {
+                        alt = snapSize(n.prefHeight(-1));
+                    } else alt = -1;
+                    maxLabelWidth = Math.max(maxLabelWidth, snapSize(n.prefWidth(alt)));
+                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
+                }
+
+                n = menuItemContainer.right;
+                if (n != null) {
+                    if (n.getContentBias() == Orientation.VERTICAL) { // width depends on height
+                        alt = snapSize(n.prefHeight(-1));
+                    } else alt = -1;
+                    maxRightWidth = Math.max(maxRightWidth, snapSize(n.prefWidth(alt)));
+                    maxRowHeight = Math.max(maxRowHeight, n.prefHeight(-1));
+                }
+            }
+        }
+
+        // Fix for RT-38838.
+        // This fixes the issue where CSS is applied to a menu after it has been
+        // showing, resulting in its bounds changing. In this case, we need to
+        // shift the submenu such that it is properly aligned with its parent menu.
+        //
+        // To do this, we must firstly determine if the open submenu is shifted
+        // horizontally to appear on the other side of this menu, as this is the
+        // only situation where shifting has to happen. If so, we need to check
+        // if we should shift the submenu due to changes in width.
+        //
+        // We need to get the parent menu of this contextMenu, so that we only
+        // modify the X value in the following conditions:
+        // 1) There exists a parent menu
+        // 2) The parent menu is in the correct position (i.e. to the left of this
+        //    menu in normal LTR systems).
+        final double newWidth = maxRightWidth + maxLabelWidth + maxGraphicWidth + maxLeftWidth;
+        Window ownerWindow = contextMenu.getOwnerWindow();
+        if (ownerWindow instanceof ContextMenu) {
+            if (contextMenu.getX() < ownerWindow.getX()) {
+                if (oldWidth != newWidth) {
+                    contextMenu.setX(contextMenu.getX() + oldWidth - newWidth);
+                }
+            }
+        }
+
+        oldWidth = newWidth;
+    }
+    
+    private void updateVisualItems() {
+        ObservableList<Node> itemsContainerChilder = itemsContainer.getChildren();
+
+        disposeVisualItems();
+        
+        for (int row = 0; row < getItems().size(); row++) {
+            final MenuItem item = getItems().get(row);
+            if (item instanceof CustomMenuItem && ((CustomMenuItem) item).getContent() == null) {
+                continue;
+            }
+            
+            if (item instanceof SeparatorMenuItem) {
+                // we don't want the hover highlight for separators, so for
+                // now this is the simplest approach - just remove the
+                // background entirely. This may cause issues if people
+                // intend to style the background differently.
+                Node node = ((CustomMenuItem) item).getContent();
+                node.visibleProperty().bind(item.visibleProperty());
+                itemsContainerChilder.add(node);
+                // Add the (separator) menu item to properties map of this node.
+                // Special casing this for separator :
+                // This allows associating this container with SeparatorMenuItem.
+                node.getProperties().put(MenuItem.class, item);
+            } else {
+                MenuItemContainer menuItemContainer = new MenuItemContainer(item);
+                menuItemContainer.visibleProperty().bind(item.visibleProperty());
+                itemsContainerChilder.add(menuItemContainer);
+            }
+        }
+        
+        // Add the Menu to properties map of this skin. Used by QA for testing
+        // This enables associating a parent menu for this skin showing menu items.
+        if (getItems().size() > 0) {
+            final MenuItem item = getItems().get(0);
+            getProperties().put(Menu.class, item.getParentMenu());
+        }
+
+        // RT-36513 made this applyCss(). Modified by RT-36995 to impl_reapplyCSS()
+        impl_reapplyCSS();
+    }
+
+    private void disposeVisualItems() {
+        // clean up itemsContainer
+        ObservableList<Node> itemsContainerChilder = itemsContainer.getChildren();
+        for (int i = 0, max = itemsContainerChilder.size(); i < max; i++) {
+            Node n = itemsContainerChilder.get(i);
+
+            if (n instanceof MenuItemContainer) {
+                MenuItemContainer container = (MenuItemContainer) n;
+                container.visibleProperty().unbind();
+                container.dispose();
+            }
+        }
+        itemsContainerChilder.clear();
+    }
+
+    /**
+     * Can be called by Skins when they need to clean up the content of any 
+     * ContextMenu instances they might have created. This ensures that contents 
+     * of submenus if any, also get cleaned up.
+     */
+    public void dispose() {
+        disposeBinds();
+        disposeVisualItems();
+
+        disposeContextMenu(submenu);
+        submenu = null;
+        openSubmenu = null;
+        selectedBackground = null;
+        if (contextMenu != null) {
+            contextMenu.getItems().clear();
+            contextMenu = null;
+        }
+    }
+
+    public void disposeContextMenu(ContextMenu menu) {
+        if (menu == null) return;
+
+        Skin<?> skin = menu.getSkin();
+        if (skin == null) return;
+
+        ContextMenuContent cmContent = (ContextMenuContent)skin.getNode();
+        if (cmContent == null) return;
+
+        cmContent.dispose(); // recursive call to dispose submenus.
+    }
+
+    @Override protected void layoutChildren() {
+        if (itemsContainer.getChildren().size() == 0) return;
+        final double x = snappedLeftInset();
+        final double y = snappedTopInset();
+        final double w = getWidth() - x - snappedRightInset();
+        final double h = getHeight() - y - snappedBottomInset();
+        final double contentHeight =  snapSize(getContentHeight()); // itemsContainer.prefHeight(-1);
+
+        itemsContainer.resize(w,contentHeight);
+        itemsContainer.relocate(x, y);
+
+        if (isFirstShow && ty == 0) {
+            upArrow.setVisible(false);
+            isFirstShow = false;
+        } else {
+            upArrow.setVisible(ty < y && ty < 0);
+        }
+        downArrow.setVisible(ty + contentHeight > (y + h));
+
+        clipRect.setX(0);
+        clipRect.setY(0);
+        clipRect.setWidth(w);
+        clipRect.setHeight(h);
+
+        if (upArrow.isVisible()) {
+            final double prefHeight = snapSize(upArrow.prefHeight(-1));
+            clipRect.setHeight(snapSize(clipRect.getHeight() - prefHeight));
+            clipRect.setY(snapSize(clipRect.getY()) + prefHeight);
+            upArrow.resize(snapSize(upArrow.prefWidth(-1)), prefHeight);
+            positionInArea(upArrow, x, y, w, prefHeight, /*baseline ignored*/0,
+                    HPos.CENTER, VPos.CENTER);
+        }
+
+        if (downArrow.isVisible()) {
+            final double prefHeight = snapSize(downArrow.prefHeight(-1));
+            clipRect.setHeight(snapSize(clipRect.getHeight()) - prefHeight);
+            downArrow.resize(snapSize(downArrow.prefWidth(-1)), prefHeight);
+            positionInArea(downArrow, x, (y + h - prefHeight), w, prefHeight, /*baseline ignored*/0,
+                    HPos.CENTER, VPos.CENTER);
+        }
+    }
+
+     @Override protected double computePrefWidth(double height) {
+         computeVisualMetrics();
+         double prefWidth = 0;
+         if (itemsContainer.getChildren().size() == 0) return 0;
+         for (Node n : itemsContainer.getChildren()) {
+             if (! n.isVisible()) continue;
+             prefWidth = Math.max(prefWidth, snapSize(n.prefWidth(-1)));
+         }
+         return snappedLeftInset() + snapSize(prefWidth) + snappedRightInset();
+    }
+
+    @Override protected double computePrefHeight(double width) {
+        if (itemsContainer.getChildren().size() == 0) return 0;
+        final double screenHeight = getScreenHeight();
+        final double contentHeight = getContentHeight(); // itemsContainer.prefHeight(width);
+        double totalHeight = snappedTopInset() + snapSize(contentHeight) + snappedBottomInset();
+        // the pref height of this menu is the smaller value of the
+        // actual pref height and the height of the screens _visual_ bounds.
+        double prefHeight = (screenHeight <= 0) ? (totalHeight) : (Math.min(totalHeight, screenHeight));
+        return prefHeight;
+    }
+
+    @Override protected double computeMinHeight(double width) {
+        return 0.0;
+    }
+
+    @Override protected double computeMaxHeight(double height) {
+        return getScreenHeight();
+    }
+
+    private double getScreenHeight() {
+        if (contextMenu == null || contextMenu.getOwnerWindow() == null ||
+                contextMenu.getOwnerWindow().getScene() == null) {
+            return -1;
+        }
+        return snapSize(com.sun.javafx.util.Utils.getScreen(
+            contextMenu.getOwnerWindow().getScene().getRoot()).getVisualBounds().getHeight());
+        
+    }
+
+    private double getContentHeight() {
+        double h = 0.0d;
+        for (Node i : itemsContainer.getChildren()) {
+            if (i.isVisible()) {
+               h += snapSize(i.prefHeight(-1));
+            }
+        }
+        return h;
+    }
+  
+    // This handles shifting ty when doing keyboard navigation.
+    private void ensureFocusedMenuItemIsVisible(Node node) {
+        if (node == null) return;
+
+        final Bounds nodeBounds = node.getBoundsInParent();
+        final Bounds clipBounds = clipRect.getBoundsInParent();
+
+        if (nodeBounds.getMaxY() >= clipBounds.getMaxY()) {
+            // this is for moving down the menu
+            scroll(-nodeBounds.getMaxY() + clipBounds.getMaxY());
+        } else if (nodeBounds.getMinY() <= clipBounds.getMinY()) {
+            // this is for moving up the menu
+            scroll(-nodeBounds.getMinY() + clipBounds.getMinY());
+        }
+    }
+    
+    protected ObservableList<MenuItem> getItems() {
+        return contextMenu.getItems();
+    }
+
+    /**
+     * Finds the index of currently focused item.
+     */
+    private int findFocusedIndex() {
+         for (int i = 0; i < itemsContainer.getChildren().size(); i++) {
+            Node n = itemsContainer.getChildren().get(i);
+            if (n.isFocused()) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private boolean isFirstShow = true;
+    private double ty;
+
+    private void initialize() {
+        // keyboard navigation support. Initially focus goes to this ContextMenu,
+        // but when the user first hits the up or down arrow keys, the focus
+        // is transferred to the first or last item respectively. Once this
+        // happens, it is up to the menu items to navigate between themselves.
+        contextMenu.focusedProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                // initialize the focused index for keyboard navigation.
+                currentFocusedIndex = -1;
+                requestFocus();
+            }
+        });
+        
+        // RT-19624 calling requestFocus inside layout was casuing repeated layouts.
+        contextMenu.addEventHandler(Menu.ON_SHOWN, event -> {
+            for (Node child : itemsContainer.getChildren()) {
+                if (child instanceof MenuItemContainer) {
+                    final MenuItem item = ((MenuItemContainer)child).item;
+                    // When the choiceBox popup is shown, if this menu item is selected
+                    // do a requestFocus so CSS kicks in and the item is highlighted.
+                    if ("choice-box-menu-item".equals(item.getId())) {
+                        if (((RadioMenuItem)item).isSelected()) {
+                            child.requestFocus();
+                            break;
+                        }
+                    }
+                }
+
+            }
+        });
+
+//        // FIXME For some reason getSkinnable()Behavior traversal functions don't
+//        // get called as expected, so I've just put the important code below.
+        // We use setOnKeyPressed here as we are not adding a listener to a public
+        // event type (ContextMenuContent is not public API), and without this
+        // we get the issue shown in RT-34429
+        setOnKeyPressed(new EventHandler<KeyEvent>() {
+            @Override public void handle(KeyEvent ke) {
+                switch (ke.getCode()) {
+                    case LEFT:
+                        if (getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
+                            processRightKey(ke);
+                        } else {
+                            processLeftKey(ke);
+                        }
+                        break;
+                    case RIGHT:
+                        if (getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
+                            processLeftKey(ke);
+                        } else {
+                            processRightKey(ke);
+                        }
+                        break;
+                    case CANCEL:
+                        ke.consume();
+                        break;
+                    case ESCAPE:
+                        // if the owner is not a menubar button, just close the
+                        // menu - this will move focus up to the parent menu
+                        // as required. In the case of the parent being a
+                        // menubar button we special case in the conditional code
+                        // beneath this switch statement. See RT-34429 for more context.
+                        final Node ownerNode = contextMenu.getOwnerNode();
+                        if (! (ownerNode instanceof MenuBarButton)) {
+                            contextMenu.hide();
+                            ke.consume();
+                        }
+                        break;
+                    case DOWN:
+                        // move to the next sibling
+                        moveToNextSibling();
+                        ke.consume();
+                        break;
+                    case UP:
+                        // move to previous sibling
+                        moveToPreviousSibling();
+                        ke.consume();
+                        break;
+                    case SPACE:
+                    case ENTER:
+                        // select the menuitem
+                        selectMenuItem();
+                        ke.consume();
+                        break;
+                    default:
+                        break;
+                }
+
+                if (!ke.isConsumed()) {
+                    final Node ownerNode = contextMenu.getOwnerNode();
+                    if (ownerNode instanceof MenuItemContainer) {
+                        // Forward to parent menu
+                        Parent parent = ownerNode.getParent();
+                        while (parent != null && !(parent instanceof ContextMenuContent)) {
+                            parent = parent.getParent();
+                        }
+                        if (parent instanceof ContextMenuContent) {
+                            parent.getOnKeyPressed().handle(ke);
+                        }
+                    } else if (ownerNode instanceof MenuBarButton) {
+                        // the following code no longer appears necessary, but
+                        // leaving in intact for now...
+//                        // This is a top-level MenuBar Menu, so forward event to MenuBar
+//                        MenuBarSkin mbs = ((MenuBarButton)ownerNode).getMenuBarSkin();
+//                        if (mbs != null && mbs.getKeyEventHandler() != null) {
+//                            mbs.getKeyEventHandler().handle(ke);
+//                        }
+                    }
+                }
+            }
+        });
+
+        addEventHandler(ScrollEvent.SCROLL, event -> {
+            /*
+             * we'll only scroll if the arrows are visible in the direction
+             * that we're going, otherwise we go into empty space.
+             */
+            final double textDeltaY = event.getTextDeltaY();
+            final double deltaY = event.getDeltaY();
+            if ((downArrow.isVisible() && (textDeltaY < 0.0 || deltaY < 0.0)) ||
+                (upArrow.isVisible() && (textDeltaY > 0.0 || deltaY > 0.0))) {
+
+                switch(event.getTextDeltaYUnits()) {
+                  case LINES:
+                      /*
+                      ** scroll lines, use the row height of selected row,
+                      ** or row 0 if none selected
+                      */
+                      int focusedIndex = findFocusedIndex();
+                      if (focusedIndex == -1) {
+                          focusedIndex = 0;
+                      }
+                      double rowHeight = itemsContainer.getChildren().get(focusedIndex).prefHeight(-1);
+                      scroll(textDeltaY * rowHeight);
+                      break;
+                  case PAGES:
+                      /*
+                      ** page scroll, scroll the menu height
+                      */
+                      scroll(textDeltaY * itemsContainer.getHeight());
+                      break;
+                  case NONE:
+                      /*
+                      ** pixel scroll
+                      */
+                      scroll(deltaY);
+                      break;
+                }
+                event.consume();
+            }
+        });
+    }
+
+    private void processLeftKey(KeyEvent ke) {
+        if (currentFocusedIndex != -1) {
+            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
+            if (n instanceof MenuItemContainer) {
+                MenuItem item = ((MenuItemContainer)n).item;
+                if (item instanceof Menu) {
+                    final Menu menu = (Menu) item;
+
+                    // if the submenu for this menu is showing, hide it
+                    if (menu == openSubmenu && submenu != null && submenu.isShowing()) {
+                        hideSubmenu();
+                        ke.consume();
+                    }
+                }
+            }
+        }
+    }
+
+    private void processRightKey(KeyEvent ke) {
+        if (currentFocusedIndex != -1) {
+            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
+            if (n instanceof MenuItemContainer) {
+                MenuItem item = ((MenuItemContainer)n).item;
+                if (item instanceof Menu) {
+                    final Menu menu = (Menu) item;
+                    if (menu.isDisable()) return;
+                    selectedBackground = ((MenuItemContainer)n);
+
+                    // RT-15103
+                    // if submenu for this menu is already showing then do nothing
+                    // Menubar will process the right key and move to the next menu
+                    if (openSubmenu == menu && submenu != null && submenu.isShowing()) {
+                        return;
+                    }
+
+                    showMenu(menu);
+                    ke.consume();
+                }
+            }
+        }
+    }
+
+    private void showMenu(Menu menu) {
+        menu.show();
+        // request focus on the first item of the submenu after it is shown
+        ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
+        if (cmContent != null) {
+           if (cmContent.itemsContainer.getChildren().size() > 0) {
+               cmContent.itemsContainer.getChildren().get(0).requestFocus();
+               cmContent.currentFocusedIndex = 0;
+           } else {
+               cmContent.requestFocus();
+           }
+        }
+    }
+
+    private void selectMenuItem() {
+        if (currentFocusedIndex != -1) {
+            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
+            if (n instanceof MenuItemContainer) {
+                MenuItem item = ((MenuItemContainer)n).item;
+                if (item instanceof Menu) {
+                    final Menu menu = (Menu) item;
+                    if (openSubmenu != null) {
+                        hideSubmenu();
+                    }
+                    if (menu.isDisable()) return;
+                    selectedBackground = ((MenuItemContainer)n);
+                    menu.show();
+                } else {
+                    ((MenuItemContainer)n).doSelect();
+                }
+            }
+        }
+    }
+    /*
+     * Find the index of the next MenuItemContainer in the itemsContainer children.
+     */
+    private int findNext(int from) {
+        for (int i = from; i < itemsContainer.getChildren().size(); i++) {
+            Node n = itemsContainer.getChildren().get(i);
+            if (n instanceof MenuItemContainer) {
+                return i;
+            }
+        }
+        // find from top
+        for (int i = 0; i < from; i++) {
+            Node n = itemsContainer.getChildren().get(i);
+            if (n instanceof MenuItemContainer) {
+                return i;
+            }
+        }
+        return -1; // should not happen
+    }
+    
+    private void moveToNextSibling() {
+        // If focusedIndex is -1 then start from 0th menu item.
+        // Note that this will cycle through such that when you move to last item,
+        // it will move to 1st item on the next Down key press.
+        if (currentFocusedIndex != -1) {
+            currentFocusedIndex = findNext(currentFocusedIndex + 1);
+        } else if (currentFocusedIndex == -1 || currentFocusedIndex == (itemsContainer.getChildren().size() - 1)) {
+            currentFocusedIndex = findNext(0);
+        }
+
+        // request focus on the next sibling which currentFocusIndex points to
+        if (currentFocusedIndex != -1) {
+            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
+            selectedBackground = ((MenuItemContainer)n);
+            n.requestFocus();
+            ensureFocusedMenuItemIsVisible(n);
+        }
+    }
+    
+    /*
+     * Find the index the previous MenuItemContaner in the itemsContainer children.
+     */
+    private int findPrevious(int from) {
+        for (int i = from; i >= 0; i--) {
+            Node n = itemsContainer.getChildren().get(i);
+            if (n instanceof MenuItemContainer) {
+                return(i);
+            }
+        }
+        for (int i = itemsContainer.getChildren().size() - 1 ; i > from; i--) {
+            Node n = itemsContainer.getChildren().get(i);
+            if (n instanceof MenuItemContainer) {
+                return(i);
+            }
+        }
+        return -1;
+    }
+
+     private void moveToPreviousSibling() {
+        // If focusedIndex is -1 then start from the last menu item to go up.
+        // Note that this will cycle through such that when you move to first item,
+        // it will move to last item on the next Up key press.
+        if (currentFocusedIndex != -1) {
+            currentFocusedIndex = findPrevious(currentFocusedIndex - 1);
+        } else if(currentFocusedIndex == -1 || currentFocusedIndex == 0) {
+            currentFocusedIndex = findPrevious(itemsContainer.getChildren().size() - 1);
+        }
+
+        // request focus on the previous sibling which currentFocusIndex points to
+        if (currentFocusedIndex != -1) {
+            Node n = itemsContainer.getChildren().get(currentFocusedIndex);
+            selectedBackground = ((MenuItemContainer)n);
+            n.requestFocus();
+            ensureFocusedMenuItemIsVisible(n);
+        }
+    }
+
+    /*
+     * Get the Y offset from the top of the popup to the menu item whose index
+     * is given.
+     */
+    public double getMenuYOffset(int menuIndex) {
+        double offset = 0;
+        if (itemsContainer.getChildren().size() > menuIndex) {
+            offset = snappedTopInset();
+            Node menuitem = itemsContainer.getChildren().get(menuIndex);
+            offset += menuitem.getLayoutY() + menuitem.prefHeight(-1);
+        }
+        return offset;
+    }
+
+    private void setUpBinds() {
+        updateMenuShowingListeners(contextMenu.getItems(), true);
+        contextMenu.getItems().addListener(contextMenuItemsListener);
+    }
+
+    private void disposeBinds() {
+        updateMenuShowingListeners(contextMenu.getItems(), false);
+        contextMenu.getItems().removeListener(contextMenuItemsListener);
+    }
+
+    private ChangeListener<Boolean> menuShowingListener = (observable, wasShowing, isShowing) -> {
+        ReadOnlyBooleanProperty isShowingProperty = (ReadOnlyBooleanProperty) observable;
+        Menu menu = (Menu) isShowingProperty.getBean();
+
+        if (wasShowing && ! isShowing) {
+            // hide the submenu popup
+            hideSubmenu();
+        } else if (! wasShowing && isShowing) {
+            // show the submenu popup
+            showSubmenu(menu);
+        }
+    };
+
+    private ListChangeListener<MenuItem> contextMenuItemsListener = (ListChangeListener<MenuItem>) c -> {
+        // Add listeners to the showing property of all menus that have
+        // been added, and remove listeners from menus that have been removed
+        // FIXME this is temporary - we should be adding and removing
+        // listeners such that they use the one listener defined above
+        // - but that can't be done until we have the bean in the
+        // ObservableValue
+        while (c.next()) {
+            updateMenuShowingListeners(c.getRemoved(), false);
+            updateMenuShowingListeners(c.getAddedSubList(), true);
+        }
+
+        // Listener to items in PopupMenu to update items in PopupMenuContent
+        itemsDirty = true;
+        updateItems(); // RT-29761
+    };
+
+    private ChangeListener<Boolean> menuItemVisibleListener = (observable, oldValue, newValue) -> {
+        // re layout as item's visibility changed
+        requestLayout();
+    };
+
+    private void updateMenuShowingListeners(List<? extends MenuItem> items, boolean addListeners) {
+        for (MenuItem item : items) {
+            if (item instanceof Menu) {
+                final Menu menu = (Menu) item;
+
+                if (addListeners) {
+                    menu.showingProperty().addListener(menuShowingListener);
+                } else {
+                    menu.showingProperty().removeListener(menuShowingListener);
+                }
+            }
+
+             // listen to menu items's visible property.
+            if (addListeners) {
+                item.visibleProperty().addListener(menuItemVisibleListener);
+            } else {
+                item.visibleProperty().removeListener(menuItemVisibleListener);
+            }
+        }
+    }
+
+    // For test purpose only
+    ContextMenu getSubMenu() {
+        return submenu;
+    }
+
+    Menu getOpenSubMenu() {
+        return openSubmenu;
+    }
+
+    private void createSubmenu() {
+        if (submenu == null) {
+            submenu = new ContextMenu();
+            submenu.showingProperty().addListener(new ChangeListener<Boolean>() {
+                @Override public void changed(ObservableValue<? extends Boolean> observable,
+                                              Boolean oldValue, Boolean newValue) {
+                    if (!submenu.isShowing()) {
+                        // Maybe user clicked outside or typed ESCAPE.
+                        // Make sure menus are in sync.
+                        for (Node node : itemsContainer.getChildren()) {
+                            if (node instanceof MenuItemContainer
+                                  && ((MenuItemContainer)node).item instanceof Menu) {
+                                Menu menu = (Menu)((MenuItemContainer)node).item;
+                                if (menu.isShowing()) {
+                                    menu.hide();
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
+    }
+   
+    private void showSubmenu(Menu menu) {
+        openSubmenu = menu;
+        createSubmenu();
+        submenu.getItems().setAll(menu.getItems());
+        submenu.show(selectedBackground, Side.RIGHT, 0, 0);
+    }
+    
+    private void hideSubmenu() {
+        if (submenu == null) return;
+
+        submenu.hide();
+        openSubmenu = null;
+
+        // Fix for RT-37022 - we dispose content so that we do not process CSS
+        // on hidden submenus
+        disposeContextMenu(submenu);
+        submenu = null;
+    }
+    
+    private void hideAllMenus(MenuItem item) {
+        if (contextMenu != null) contextMenu.hide();
+        
+        Menu parentMenu;
+        while ((parentMenu = item.getParentMenu()) != null) {
+            parentMenu.hide();
+            item = parentMenu;
+        }
+        if (item.getParentPopup() != null) {
+            item.getParentPopup().hide();
+        }
+    }
+    
+    private Menu openSubmenu;
+    private ContextMenu submenu;
+    
+    // FIXME: HACKY. We use this so that a submenu knows where to open from
+    // but this will only work for mouse hovers currently - and won't work
+    // programmatically.
+    // package protected for testing only!
+    Region selectedBackground;
+    
+    void scroll(double delta) {
+        double newTy = ty + delta;
+        if (ty == newTy) return;
+
+        // translation should never be positive (this would mean the top of the
+        // menu content is detaching from the top of the menu!)
+        if (newTy > 0.0) {
+            newTy = 0.0;
+        }
+
+        // translation should never be greater than the preferred height of the
+        // menu content (otherwise the menu content will be detaching from the
+        // bottom of the menu).
+        // RT-37185: We check the direction of the scroll, to prevent it locking
+        // up when scrolling upwards from the very bottom (using the on-screen
+        // up arrow).
+        if (delta < 0 && (getHeight() - newTy) > itemsContainer.getHeight() - downArrow.getHeight()) {
+            newTy = getHeight() - itemsContainer.getHeight() - downArrow.getHeight();
+        }
+
+        ty = newTy;
+        itemsContainer.requestLayout();
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     *                         Stylesheet Handling                             *
+     *                                                                         *
+     **************************************************************************/
+    @Override public Styleable getStyleableParent() {
+        return contextMenu;
+    }
+
+     /** @treatAsPrivate */
+    private static class StyleableProperties {
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(Region.getClassCssMetaData());
+
+            //
+            // SkinBase only has Region's unique StlyleableProperty's, none of Nodes
+            // So, we need to add effect back in. The effect property is in a
+            // private inner class, so get the property from Node the hard way.
+            final List<CssMetaData<? extends Styleable, ?>> nodeStyleables = Node.getClassCssMetaData();
+            for(int n=0, max=nodeStyleables.size(); n<max; n++) {
+                CssMetaData<? extends Styleable, ?> styleable = nodeStyleables.get(n);
+                if ("effect".equals(styleable.getProperty())) {
+                    styleables.add(styleable);
+                    break;
+                }
+            }
+            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();
+    }
+    
+    public Label getLabelAt(int index) {
+        return ((MenuItemContainer)itemsContainer.getChildren().get(index)).getLabel();
+    }
+
+    /**
+     * Custom VBox to enable scrolling of items. Scrolling effect is achieved by
+     * controlling the translate Y coordinate of the menu item "ty" which is set by a
+     * timeline when mouse is over up/down arrow.
+     */
+    class MenuBox extends VBox {
+        MenuBox() {
+            setAccessibleRole(AccessibleRole.CONTEXT_MENU);
+        }
+
+        @Override protected void layoutChildren() {
+            double yOffset = ty;
+            for (Node n : getChildren()) {
+                if (n.isVisible()) {
+                    final double prefHeight = snapSize(n.prefHeight(-1));
+                    n.resize(snapSize(getWidth()), prefHeight);
+                    n.relocate(snappedLeftInset(), yOffset);
+                    yOffset += prefHeight;
+                }
+            }
+        }
+
+        @Override
+        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+            switch (attribute) {
+                case VISIBLE: return contextMenu.isShowing();
+                case PARENT_MENU: return contextMenu.getOwnerNode();
+                default: return super.queryAccessibleAttribute(attribute, parameters); 
+            }
+        }
+    }
+
+    class ArrowMenuItem extends StackPane {
+         private StackPane upDownArrow;
+         private ContextMenuContent popupMenuContent;
+         private boolean up = false;
+         public final boolean isUp() { return up; }
+         public void setUp(boolean value) {
+            up = value;
+            upDownArrow.getStyleClass().setAll(isUp() ? "menu-up-arrow" : "menu-down-arrow");
+        }
+
+        // used to automatically scroll through menu items when the user performs
+        // certain interactions, e.g. pressing and holding the arrow buttons
+        private Timeline scrollTimeline;
+
+        public ArrowMenuItem(ContextMenuContent pmc) {
+            getStyleClass().setAll("scroll-arrow");
+            upDownArrow = new StackPane();
+            this.popupMenuContent = pmc;
+            upDownArrow.setMouseTransparent(true);
+            upDownArrow.getStyleClass().setAll(isUp() ? "menu-up-arrow" : "menu-down-arrow");
+    //        setMaxWidth(Math.max(upDownArrow.prefWidth(-1), getWidth()));
+            addEventHandler(MouseEvent.MOUSE_ENTERED, me -> {
+                if (scrollTimeline != null && (scrollTimeline.getStatus() != Status.STOPPED)) {
+                    return;
+                }
+                startTimeline();
+            });
+            addEventHandler(MouseEvent.MOUSE_EXITED, me -> {
+                stopTimeline();
+            });
+            setVisible(false);
+            setManaged(false);
+            getChildren().add(upDownArrow);
+        }
+
+        @Override protected double computePrefWidth(double height) {
+//            return snapSize(getInsets().getLeft()) + snapSize(getInsets().getRight());
+            return itemsContainer.getWidth();
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            return snappedTopInset() + upDownArrow.prefHeight(-1) + snappedBottomInset();
+        }
+
+        @Override protected void layoutChildren() {
+            double w = snapSize(upDownArrow.prefWidth(-1));
+            double h = snapSize(upDownArrow.prefHeight(-1));
+
+            upDownArrow.resize(w, h);
+            positionInArea(upDownArrow, 0, 0, getWidth(), getHeight(),
+                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+        }
+
+        private void adjust() {
+            if(up) popupMenuContent.scroll(12); else popupMenuContent.scroll(-12);
+        }
+
+        private void startTimeline() {
+            scrollTimeline = new Timeline();
+            scrollTimeline.setCycleCount(Timeline.INDEFINITE);
+            KeyFrame kf = new KeyFrame(
+                Duration.millis(60),
+                    event -> {
+                        adjust();
+                    }
+            );
+            scrollTimeline.getKeyFrames().clear();
+            scrollTimeline.getKeyFrames().add(kf);
+            scrollTimeline.play();
+        }
+
+        private void stopTimeline() {
+            scrollTimeline.stop();
+            scrollTimeline = null;
+        }
+    }
+    
+    /*
+     * Container responsible for laying out a single row in the menu - in other
+     * words, this contains and lays out a single MenuItem, regardless of it's 
+     * specific subtype.
+     */
+    public class MenuItemContainer extends Region {
+
+        private final MenuItem item;
+
+        private Node left;
+        private Node graphic;
+        private Node label;
+        private Node right;
+
+        private final LambdaMultiplePropertyChangeListenerHandler listener =
+            new LambdaMultiplePropertyChangeListenerHandler();
+
+        private EventHandler<MouseEvent> mouseEnteredEventHandler;
+        private EventHandler<MouseEvent> mouseReleasedEventHandler;
+
+        private EventHandler<ActionEvent> actionEventHandler;
+
+        protected Label getLabel(){
+            return (Label) label;
+        }
+        
+        public MenuItem getItem() {
+            return item;
+        }
+
+        public MenuItemContainer(MenuItem item){
+            if (item == null) {
+                throw new NullPointerException("MenuItem can not be null");
+            }
+            
+            getStyleClass().addAll(item.getStyleClass());
+            setId(item.getId());
+            setFocusTraversable(!(item instanceof CustomMenuItem));
+            this.item = item;
+
+            createChildren();
+            
+            // listen to changes in the state of certain MenuItem types
+            ReadOnlyBooleanProperty pseudoProperty;
+            if (item instanceof Menu) {
+                pseudoProperty = ((Menu)item).showingProperty();
+                listener.registerChangeListener(pseudoProperty,
+                        e -> pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, ((Menu) item).isShowing()));
+                pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, pseudoProperty.get());
+                setAccessibleRole(AccessibleRole.MENU);
+            } else if (item instanceof RadioMenuItem) {
+                pseudoProperty = ((RadioMenuItem)item).selectedProperty();
+                listener.registerChangeListener(pseudoProperty,
+                        e -> pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, ((RadioMenuItem) item).isSelected()));
+                pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, pseudoProperty.get());
+                setAccessibleRole(AccessibleRole.RADIO_MENU_ITEM);
+            } else if (item instanceof CheckMenuItem) {
+                pseudoProperty = ((CheckMenuItem)item).selectedProperty();
+                listener.registerChangeListener(pseudoProperty,
+                        e -> pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, ((CheckMenuItem) item).isSelected()));
+                pseudoClassStateChanged(CHECKED_PSEUDOCLASS_STATE, pseudoProperty.get());
+                setAccessibleRole(AccessibleRole.CHECK_MENU_ITEM);
+            } else {
+                setAccessibleRole(AccessibleRole.MENU_ITEM);
+            }
+            
+            pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, item.disableProperty().get());
+            listener.registerChangeListener(item.disableProperty(),
+                    e -> pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, item.isDisable()));
+            
+            // Add the menu item to properties map of this node. Used by QA for testing
+            // This allows associating this container with corresponding MenuItem.
+            getProperties().put(MenuItem.class, item);
+            
+            listener.registerChangeListener(item.graphicProperty(), e -> {
+                createChildren();
+                computeVisualMetrics();
+            });
+
+            actionEventHandler = e -> {
+                if (item instanceof Menu) {
+                    final Menu menu = (Menu) item;
+                    if (openSubmenu == menu && submenu.isShowing()) return;
+                    if (openSubmenu != null) {
+                        hideSubmenu();
+                    }
+
+                    selectedBackground = MenuItemContainer.this;
+                    showMenu(menu);
+                } else {
+                    doSelect();
+                }
+            };
+            addEventHandler(ActionEvent.ACTION, actionEventHandler);
+        }
+        
+        public void dispose() {
+            if (item instanceof CustomMenuItem) {
+                Node node = ((CustomMenuItem)item).getContent();
+                if (node != null) {
+                    node.removeEventHandler(MouseEvent.MOUSE_CLICKED, customMenuItemMouseClickedHandler);
+                }
+            }
+
+            listener.dispose();
+            removeEventHandler(ActionEvent.ACTION, actionEventHandler);
+            
+            if (label != null) {
+                ((Label)label).textProperty().unbind();
+            }
+            
+            left = null;
+            graphic = null;
+            label = null;
+            right = null;
+        }
+        
+        private void createChildren() {
+            getChildren().clear();
+            
+            // draw background region for hover effects. All content (other
+            // than Nodes from NodeMenuItems) are set to be mouseTransparent, so
+            // this background also acts as the receiver of user input
+            if (item instanceof CustomMenuItem) {
+                createNodeMenuItemChildren((CustomMenuItem)item);
+
+                if (mouseEnteredEventHandler == null) {
+                    mouseEnteredEventHandler = event -> {
+                        requestFocus(); // request Focus on hover
+                    };
+                } else {
+                    removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
+                }
+                addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
+            } else {
+                // --- add check / radio to left column
+                Node leftNode = getLeftGraphic(item);
+                if (leftNode != null) {
+                    StackPane leftPane = new StackPane();
+                    leftPane.getStyleClass().add("left-container");
+                    leftPane.getChildren().add(leftNode);
+                    left = leftPane;
+                    getChildren().add(left);
+                    left.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
+                }
+                // -- add graphic to graphic pane
+                if (item.getGraphic() != null) {
+                    Node graphicNode = item.getGraphic();
+                    StackPane graphicPane = new StackPane();
+                    graphicPane.getStyleClass().add("graphic-container");
+                    graphicPane.getChildren().add(graphicNode);
+                    graphic = graphicPane;
+                    getChildren().add(graphic);
+                }
+                
+                // --- add text to center column
+                label = new MenuLabel(item, this);  // make this a menulabel to handle mnemonics fire()
+                label.setStyle(item.getStyle());
+
+                // bind to text property in menu item
+                ((Label)label).textProperty().bind(item.textProperty());
+
+                label.setMouseTransparent(true);
+                getChildren().add(label);
+
+                listener.unregisterChangeListener(focusedProperty());
+                // RT-19546 update currentFocusedIndex when MenuItemContainer gets focused.
+                // e.g this happens when you press the Right key to open a submenu; the first
+                // menuitem is focused.
+                listener.registerChangeListener(focusedProperty(), e -> {
+                    if (isFocused()) {
+                        currentFocusedIndex = itemsContainer.getChildren().indexOf(MenuItemContainer.this);
+                    }
+                });
+
+                // --- draw in right column - this depends on whether we are
+                // a Menu or not. A Menu gets an arrow, whereas other MenuItems
+                // get the ability to draw an accelerator
+                if (item instanceof Menu) {
+                    // --- add arrow / accelerator / mnemonic to right column
+                    Region rightNode = new Region();
+                    rightNode.setMouseTransparent(true);
+                    rightNode.getStyleClass().add("arrow");
+                    
+                    StackPane rightPane = new StackPane();
+                    rightPane.setMaxWidth(Math.max(rightNode.prefWidth(-1), 10));
+                    rightPane.setMouseTransparent(true);
+                    rightPane.getStyleClass().add("right-container");
+                    rightPane.getChildren().add(rightNode);
+                    right = rightPane;
+                    getChildren().add(rightPane);
+
+                    if (mouseEnteredEventHandler == null) {
+                        mouseEnteredEventHandler = event -> {
+                            if (openSubmenu != null && item != openSubmenu) {
+                                // if a submenu of a different menu is already
+                                // open then close it (RT-15049)
+                                hideSubmenu();
+                            }
+
+                            final Menu menu = (Menu) item;
+                            if (menu.isDisable()) return;
+                            selectedBackground = MenuItemContainer.this;
+                            menu.show();
+                            requestFocus();  // request Focus on hover
+                        };
+                    } else {
+                        removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
+                    }
+
+                    if (mouseReleasedEventHandler == null) {
+                        mouseReleasedEventHandler = event -> {
+                            item.fire();
+                        };
+                    } else {
+                        removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
+                    }
+                    
+                    // show submenu when the menu is hovered over
+                    addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
+                    addEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
+                } else { // normal MenuItem
+                    // remove old listeners
+                    listener.unregisterChangeListener(item.acceleratorProperty());
+
+                    // accelerator support
+                    updateAccelerator();
+
+                    if (mouseEnteredEventHandler == null) {
+                        mouseEnteredEventHandler = event -> {
+                            if (openSubmenu != null) {
+                                openSubmenu.hide();
+                            }
+                            requestFocus();  // request Focus on hover
+                        };
+                    } else {
+                        removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
+                    }
+
+                    if (mouseReleasedEventHandler == null) {
+                        mouseReleasedEventHandler = event -> {
+                            doSelect();
+                        };
+                    } else {
+                        removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
+                    }
+
+                    addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEnteredEventHandler);
+                    addEventHandler(MouseEvent.MOUSE_RELEASED, mouseReleasedEventHandler);
+
+                    listener.registerChangeListener(item.acceleratorProperty(), e -> updateAccelerator());
+                }
+            }
+        }
+        
+        private void updateAccelerator() {
+            if (item.getAccelerator() != null) {
+                if (right != null) {
+                    getChildren().remove(right);
+                }
+
+                String text = item.getAccelerator().getDisplayText();
+                right = new Label(text);
+                right.setStyle(item.getStyle());
+                right.getStyleClass().add("accelerator-text");
+                getChildren().add(right);
+            } else {
+                getChildren().remove(right);
+            }
+        }
+
+        void doSelect() {
+            // don't do anything on disabled menu items
+            if (item.isDisable()) return;
+            // toggle state of check or radio items
+            if (item instanceof CheckMenuItem) {
+                CheckMenuItem checkItem = (CheckMenuItem)item;
+                checkItem.setSelected(!checkItem.isSelected());
+            } else if (item instanceof RadioMenuItem) {
+                // this is a radio button. If there is a toggleGroup specified, we
+                // simply set selected to true. If no toggleGroup is specified, we
+                // toggle the selected state, as there is no assumption of mutual
+                // exclusivity when no toggleGroup is set.
+                final RadioMenuItem radioItem = (RadioMenuItem) item;
+                radioItem.setSelected(radioItem.getToggleGroup() != null ? true : !radioItem.isSelected());
+            }
+
+            // fire the action before hiding the menu
+            item.fire();
+
+            if (item instanceof CustomMenuItem) {
+                CustomMenuItem customMenuItem = (CustomMenuItem) item;
+                if (customMenuItem.isHideOnClick()) {
+                    hideAllMenus(item);
+                }
+            } else {
+                hideAllMenus(item);
+            }
+        }
+
+        private EventHandler<MouseEvent> customMenuItemMouseClickedHandler;
+        
+        private void createNodeMenuItemChildren(final CustomMenuItem item) {
+            Node node = item.getContent();
+            getChildren().add(node);
+
+            // handle hideOnClick
+            customMenuItemMouseClickedHandler = event -> {
+                if (item == null || item.isDisable()) return;
+
+                item.fire();
+                if (item.isHideOnClick()) {
+                    hideAllMenus(item);
+                }
+            };
+            node.addEventHandler(MouseEvent.MOUSE_CLICKED, customMenuItemMouseClickedHandler);
+        }
+        
+        @Override protected void layoutChildren() {
+            double xOffset;
+        
+            final double prefHeight = prefHeight(-1);
+            if (left != null) {
+                xOffset = snappedLeftInset();
+                left.resize(left.prefWidth(-1), left.prefHeight(-1));
+                positionInArea(left, xOffset, 0,
+                        maxLeftWidth, prefHeight, 0, HPos.LEFT, VPos.CENTER);
+            }
+            if (graphic != null) {
+                xOffset = snappedLeftInset() + maxLeftWidth;
+                graphic.resize(graphic.prefWidth(-1), graphic.prefHeight(-1));
+                positionInArea(graphic, xOffset, 0,
+                        maxGraphicWidth, prefHeight, 0, HPos.LEFT, VPos.CENTER);
+            }
+            
+            if (label != null) {
+                xOffset = snappedLeftInset() + maxLeftWidth + maxGraphicWidth;
+                label.resize(label.prefWidth(-1), label.prefHeight(-1));
+                positionInArea(label, xOffset, 0,
+                        maxLabelWidth, prefHeight, 0, HPos.LEFT, VPos.CENTER);
+            }
+            
+            if (right != null) {
+                xOffset = snappedLeftInset() + maxLeftWidth + maxGraphicWidth + maxLabelWidth;
+                right.resize(right.prefWidth(-1), right.prefHeight(-1));
+                positionInArea(right, xOffset, 0,
+                    maxRightWidth, prefHeight, 0, HPos.RIGHT, VPos.CENTER);
+            }
+            
+            if ( item instanceof CustomMenuItem) {
+                Node n = ((CustomMenuItem) item).getContent();
+                if (item instanceof SeparatorMenuItem) {
+                    double width = prefWidth(-1) - (snappedLeftInset() + maxGraphicWidth + snappedRightInset());
+                    n.resize(width, n.prefHeight(-1));
+                    positionInArea(n, snappedLeftInset() + maxGraphicWidth, 0, prefWidth(-1), prefHeight, 0, HPos.LEFT, VPos.CENTER);
+                } else {
+                    n.resize(n.prefWidth(-1), n.prefHeight(-1));
+                    //the node should be left aligned 
+                    positionInArea(n, snappedLeftInset(), 0, getWidth(), prefHeight, 0, HPos.LEFT, VPos.CENTER);
+                }
+            }
+        }
+        
+        @Override protected double computePrefHeight(double width) {
+            double prefHeight = 0;
+            if (item instanceof CustomMenuItem || item instanceof SeparatorMenuItem) {
+                prefHeight = (getChildren().isEmpty()) ? 0 : getChildren().get(0).prefHeight(-1);
+            } else {
+                prefHeight = Math.max(prefHeight, (left != null) ? left.prefHeight(-1) : 0);
+                prefHeight = Math.max(prefHeight, (graphic != null) ? graphic.prefHeight(-1) : 0);
+                prefHeight = Math.max(prefHeight, (label != null) ? label.prefHeight(-1) : 0);
+                prefHeight = Math.max(prefHeight, (right != null) ? right.prefHeight(-1) : 0);
+            }
+             return snappedTopInset() + prefHeight + snappedBottomInset();
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            double nodeMenuItemWidth = 0;
+            if (item instanceof CustomMenuItem && !(item instanceof SeparatorMenuItem)) {
+                nodeMenuItemWidth = snappedLeftInset() + ((CustomMenuItem) item).getContent().prefWidth(-1) +
+                        snappedRightInset();
+            }
+            return Math.max(nodeMenuItemWidth,
+                    snappedLeftInset() + maxLeftWidth + maxGraphicWidth +
+                    maxLabelWidth + maxRightWidth + snappedRightInset());
+        }
+
+        // Responsible for returning a graphic (if necessary) to position in the
+        // left column of the menu. This may be a Node from the MenuItem.graphic
+        // property, or it may be a check/radio item if necessary.
+        private Node getLeftGraphic(MenuItem item) {
+            if (item instanceof RadioMenuItem) {
+                 final Region _graphic = new Region();
+                _graphic.getStyleClass().add("radio");
+                return _graphic;
+            } else if (item instanceof CheckMenuItem) {
+                final StackPane _graphic = new StackPane();
+                _graphic.getStyleClass().add("check");
+                return _graphic;
+            } 
+            
+            return null;
+        }
+
+        @Override
+        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+            switch (attribute) {
+                case SELECTED:
+                    if (item instanceof CheckMenuItem) {
+                        return ((CheckMenuItem)item).isSelected();
+                    }
+                    if (item instanceof RadioMenuItem) {
+                        return ((RadioMenuItem) item).isSelected();
+                    }
+                    return false;
+                case ACCELERATOR: return item.getAccelerator();
+                case TEXT: {
+                    String title = "";
+                    if (graphic != null) {
+                        String t = (String)graphic.queryAccessibleAttribute(AccessibleAttribute.TEXT);
+                        if (t != null) title += t;
+                    }                  
+                    final Label label = getLabel();
+                    if (label != null) {
+                        String t = (String)label.queryAccessibleAttribute(AccessibleAttribute.TEXT);
+                        if (t != null) title += t;
+                    }
+                    if (item instanceof CustomMenuItem) {
+                        Node content = ((CustomMenuItem) item).getContent();
+                        if (content != null) {
+                            String t = (String)content.queryAccessibleAttribute(AccessibleAttribute.TEXT);
+                            if (t != null) title += t;
+                        }
+                    }
+                    return title;
+                }
+                case MNEMONIC: {
+                    final Label label = getLabel();
+                    if (label != null) {
+                        String mnemonic = (String)label.queryAccessibleAttribute(AccessibleAttribute.MNEMONIC);
+                        if (mnemonic != null) return mnemonic;
+                    }
+                    return null;
+                }
+                case DISABLED: return item.isDisable();
+                case SUBMENU:
+                    createSubmenu();
+                    // Accessibility might need to see the menu node before the window
+                    // is visible (i.e. before the skin is applied).
+                    if (submenu.getSkin() == null) {
+                        submenu.impl_styleableGetNode().impl_processCSS(true);
+                    }
+                    ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
+                    return cmContent.itemsContainer;
+                default: return super.queryAccessibleAttribute(attribute, parameters); 
+            }
+        }
+
+        @Override
+        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+            switch (action) {
+                case SHOW_MENU:{
+                    if (item instanceof Menu) {
+                        final Menu menuItem = (Menu) item;
+                        if (menuItem.isShowing()) {
+                            menuItem.hide();
+                        } else {
+                            menuItem.show();
+                        }
+                    }
+                    break;
+                }
+                case FIRE: 
+                    doSelect();
+                    break;
+                default: super.executeAccessibleAction(action);
+            }
+        }
+    }
+
+
+    private static final PseudoClass SELECTED_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("selected");
+    private static final PseudoClass DISABLED_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("disabled");
+    private static final PseudoClass CHECKED_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("checked");
+
+    private class MenuLabel extends Label {
+
+        public MenuLabel(MenuItem item, MenuItemContainer mic) {
+            super(item.getText());
+            setMnemonicParsing(item.isMnemonicParsing());
+            setLabelFor(mic);
+        }
+    }
+        
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/CustomColorDialog.java	2015-09-03 15:15:21.563705000 -0700
+++ /dev/null	2015-09-03 15:15:22.000000000 -0700
@@ -1,740 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.property.*;
-import javafx.event.EventHandler;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.*;
-import javafx.scene.paint.*;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-import javafx.stage.Window;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.geometry.Pos;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.input.KeyEvent;
-import javafx.stage.Screen;
-import javafx.stage.WindowEvent;
-
-import static com.sun.javafx.scene.control.skin.ColorPickerSkin.getString;
-
-/**
- *
- * @author paru
- */
-public class CustomColorDialog extends HBox {
-    
-    private final Stage dialog = new Stage();
-    private ColorRectPane colorRectPane;
-    private ControlsPane controlsPane;
-
-    private ObjectProperty<Color> currentColorProperty = new SimpleObjectProperty<>(Color.WHITE);
-    private ObjectProperty<Color> customColorProperty = new SimpleObjectProperty<>(Color.TRANSPARENT);
-    private Runnable onSave;
-    private Runnable onUse;
-    private Runnable onCancel;
-    
-    private WebColorField webField = null;
-    private Scene customScene;
-    
-    public CustomColorDialog(Window owner) {
-        getStyleClass().add("custom-color-dialog");
-        if (owner != null) dialog.initOwner(owner);
-        dialog.setTitle(getString("customColorDialogTitle"));
-        dialog.initModality(Modality.APPLICATION_MODAL);
-        dialog.initStyle(StageStyle.UTILITY);
-        dialog.setResizable(false);
-        colorRectPane = new ColorRectPane();
-        controlsPane = new ControlsPane();
-        setHgrow(controlsPane, Priority.ALWAYS);
-        
-        customScene = new Scene(this);
-        final Scene ownerScene = owner.getScene();
-        if (ownerScene != null) {
-            if (ownerScene.getUserAgentStylesheet() != null) {
-                customScene.setUserAgentStylesheet(ownerScene.getUserAgentStylesheet());
-            }
-            customScene.getStylesheets().addAll(ownerScene.getStylesheets());
-        }
-        getChildren().addAll(colorRectPane, controlsPane);
-        
-        dialog.setScene(customScene);
-        dialog.addEventHandler(KeyEvent.ANY, keyEventListener);
-    }
-
-    private final EventHandler<KeyEvent> keyEventListener = e -> {
-        switch (e.getCode()) {
-            case ESCAPE :
-                dialog.setScene(null);
-                dialog.close();
-        default:
-            break;
-        }
-    };
-    
-    public void setCurrentColor(Color currentColor) {
-        this.currentColorProperty.set(currentColor);
-    }
-
-    Color getCurrentColor() {
-        return currentColorProperty.get();
-    }
-    
-    ObjectProperty<Color> customColorProperty() {
-        return customColorProperty;
-    }
-
-    void setCustomColor(Color color) {
-        customColorProperty.set(color);
-    }
-
-    Color getCustomColor() {
-        return customColorProperty.get();
-    }
-    
-    public Runnable getOnSave() {
-        return onSave;
-    }
-
-    public void setOnSave(Runnable onSave) {
-        this.onSave = onSave;
-    }
-
-    public Runnable getOnUse() {
-        return onUse;
-    }
-
-    public void setOnUse(Runnable onUse) {
-        this.onUse = onUse;
-    }
-
-    public Runnable getOnCancel() {
-        return onCancel;
-    }
-
-    public void setOnCancel(Runnable onCancel) {
-        this.onCancel = onCancel;
-    }
-    
-     public void setOnHidden(EventHandler<WindowEvent> onHidden) {
-         dialog.setOnHidden(onHidden);
-     }
-
-    Stage getDialog() {
-        return dialog;
-    }
-    
-    public void show() {
-        if (dialog.getOwner() != null) {
-            // Workaround of RT-29871: Instead of just invoking fixPosition() 
-            // here need to use listener that fixes dialog position once both
-            // width and height are determined
-            dialog.widthProperty().addListener(positionAdjuster);
-            dialog.heightProperty().addListener(positionAdjuster);
-            positionAdjuster.invalidated(null);
-        }
-        if (dialog.getScene() == null) dialog.setScene(customScene);
-        colorRectPane.updateValues();
-        dialog.show();
-    }
-    
-    private InvalidationListener positionAdjuster = new InvalidationListener() {
-
-        @Override
-        public void invalidated(Observable ignored) {
-            if (Double.isNaN(dialog.getWidth()) || Double.isNaN(dialog.getHeight())) {
-                return;
-            }
-            dialog.widthProperty().removeListener(positionAdjuster);
-            dialog.heightProperty().removeListener(positionAdjuster);
-            fixPosition();
-        }
-
-    };
-    
-    private void fixPosition() {
-        Window w = dialog.getOwner();
-        Screen s = com.sun.javafx.util.Utils.getScreen(w);
-        Rectangle2D sb = s.getBounds();
-        double xR = w.getX() + w.getWidth();
-        double xL = w.getX() - dialog.getWidth();
-        double x, y;
-        if (sb.getMaxX() >= xR + dialog.getWidth()) {
-            x = xR;
-        } else if (sb.getMinX() <= xL) {
-            x = xL;
-        } else {
-            x = Math.max(sb.getMinX(), sb.getMaxX() - dialog.getWidth());
-        }
-        y = Math.max(sb.getMinY(), Math.min(sb.getMaxY() - dialog.getHeight(), w.getY()));
-        dialog.setX(x);
-        dialog.setY(y);
-    }
-    
-    @Override public void layoutChildren() {
-        super.layoutChildren();
-        if (dialog.getMinWidth() > 0 && dialog.getMinHeight() > 0) {
-            // don't recalculate min size once it's set
-            return;
-        }
-
-        // Math.max(0, ...) added for RT-34704 to ensure the dialog is at least 0 x 0
-        double minWidth = Math.max(0, computeMinWidth(getHeight()) + (dialog.getWidth() - customScene.getWidth()));
-        double minHeight = Math.max(0, computeMinHeight(getWidth()) + (dialog.getHeight() - customScene.getHeight()));
-        dialog.setMinWidth(minWidth);
-        dialog.setMinHeight(minHeight);
-    }
-       
-    /* ------------------------------------------------------------------------*/
-    
-    private class ColorRectPane extends HBox {
-
-        private Pane colorRect;
-        private Pane colorBar;
-        private Pane colorRectOverlayOne;
-        private Pane colorRectOverlayTwo;
-        private Region colorRectIndicator;
-        private Region colorBarIndicator;
-        
-        private boolean changeIsLocal = false;
-        private DoubleProperty hue = new SimpleDoubleProperty(-1) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    updateHSBColor();
-                    changeIsLocal = false;
-                }
-            }
-        };
-        private DoubleProperty sat = new SimpleDoubleProperty(-1) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    updateHSBColor();
-                    changeIsLocal = false;
-                }
-            }
-        };
-        private DoubleProperty bright = new SimpleDoubleProperty(-1) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    updateHSBColor();
-                    changeIsLocal = false;
-                }
-            }
-        };
-        private IntegerProperty red = new SimpleIntegerProperty(-1) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    updateRGBColor();
-                    changeIsLocal = false;
-                }
-            }
-        };
-        
-        private IntegerProperty green = new SimpleIntegerProperty(-1) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    updateRGBColor();
-                    changeIsLocal = false;
-                }
-            }
-        };
-        
-        private IntegerProperty blue = new SimpleIntegerProperty(-1) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    updateRGBColor();
-                    changeIsLocal = false;
-                }
-            }
-        };
-        
-        private DoubleProperty alpha = new SimpleDoubleProperty(100) {
-            @Override protected void invalidated() {
-                if (!changeIsLocal) {
-                    changeIsLocal = true;
-                    setCustomColor(new Color(
-                            getCustomColor().getRed(), 
-                            getCustomColor().getGreen(), 
-                            getCustomColor().getBlue(), 
-                            clamp(alpha.get() / 100)));
-                    changeIsLocal = false;
-                }
-            }
-        };
-         
-        private void updateRGBColor() {
-            Color newColor = Color.rgb(red.get(), green.get(), blue.get(), clamp(alpha.get() / 100));
-            hue.set(newColor.getHue());
-            sat.set(newColor.getSaturation() * 100);
-            bright.set(newColor.getBrightness() * 100);
-            setCustomColor(newColor);
-        }
-        
-        private void updateHSBColor() {
-            Color newColor = Color.hsb(hue.get(), clamp(sat.get() / 100), 
-                            clamp(bright.get() / 100), clamp(alpha.get() / 100));
-            red.set(doubleToInt(newColor.getRed()));
-            green.set(doubleToInt(newColor.getGreen()));
-            blue.set(doubleToInt(newColor.getBlue()));
-            setCustomColor(newColor);
-        }
-       
-        private void colorChanged() {
-            if (!changeIsLocal) {
-                changeIsLocal = true;
-                hue.set(getCustomColor().getHue());
-                sat.set(getCustomColor().getSaturation() * 100);
-                bright.set(getCustomColor().getBrightness() * 100);
-                red.set(doubleToInt(getCustomColor().getRed()));
-                green.set(doubleToInt(getCustomColor().getGreen()));
-                blue.set(doubleToInt(getCustomColor().getBlue()));
-                changeIsLocal = false;
-            }
-        }
-        
-        public ColorRectPane() {
-            
-            getStyleClass().add("color-rect-pane");
-            
-            customColorProperty().addListener((ov, t, t1) -> {
-                colorChanged();
-            });
-            
-            colorRectIndicator = new Region();
-            colorRectIndicator.setId("color-rect-indicator");
-            colorRectIndicator.setManaged(false);
-            colorRectIndicator.setMouseTransparent(true);
-            colorRectIndicator.setCache(true);
-        
-            final Pane colorRectOpacityContainer = new StackPane();
-            
-            colorRect = new StackPane() {
-                // This is an implementation of square control that chooses its
-                // size to fill the available height
-                @Override
-                public Orientation getContentBias() {
-                    return Orientation.VERTICAL;
-                }
-                @Override
-                protected double computePrefWidth(double height) {
-                    return height;
-                }
-                @Override
-                protected double computeMaxWidth(double height) {
-                    return height;
-                }
-            };
-            colorRect.getStyleClass().addAll("color-rect", "transparent-pattern");
-            
-            Pane colorRectHue = new Pane();
-            colorRectHue.backgroundProperty().bind(new ObjectBinding<Background>() {
-                
-                {
-                    bind(hue);
-                }
-
-                @Override protected Background computeValue() {
-                    return new Background(new BackgroundFill(
-                            Color.hsb(hue.getValue(), 1.0, 1.0), 
-                            CornerRadii.EMPTY, Insets.EMPTY));
-                }
-            });            
-            
-            colorRectOverlayOne = new Pane();
-            colorRectOverlayOne.getStyleClass().add("color-rect");
-            colorRectOverlayOne.setBackground(new Background(new BackgroundFill(
-                    new LinearGradient(0, 0, 1, 0, true, CycleMethod.NO_CYCLE, 
-                    new Stop(0, Color.rgb(255, 255, 255, 1)), 
-                    new Stop(1, Color.rgb(255, 255, 255, 0))), 
-                    CornerRadii.EMPTY, Insets.EMPTY)));
-        
-            EventHandler<MouseEvent> rectMouseHandler = event -> {
-                final double x = event.getX();
-                final double y = event.getY();
-                sat.set(clamp(x / colorRect.getWidth()) * 100);
-                bright.set(100 - (clamp(y / colorRect.getHeight()) * 100));
-            };
-        
-            colorRectOverlayTwo = new Pane();
-            colorRectOverlayTwo.getStyleClass().addAll("color-rect");
-            colorRectOverlayTwo.setBackground(new Background(new BackgroundFill(
-                    new LinearGradient(0, 0, 0, 1, true, CycleMethod.NO_CYCLE, 
-                    new Stop(0, Color.rgb(0, 0, 0, 0)), new Stop(1, Color.rgb(0, 0, 0, 1))), 
-                    CornerRadii.EMPTY, Insets.EMPTY)));
-            colorRectOverlayTwo.setOnMouseDragged(rectMouseHandler);
-            colorRectOverlayTwo.setOnMousePressed(rectMouseHandler);
-            
-            Pane colorRectBlackBorder = new Pane();
-            colorRectBlackBorder.setMouseTransparent(true);
-            colorRectBlackBorder.getStyleClass().addAll("color-rect", "color-rect-border");
-            
-            colorBar = new Pane();
-            colorBar.getStyleClass().add("color-bar");
-            colorBar.setBackground(new Background(new BackgroundFill(createHueGradient(), 
-                    CornerRadii.EMPTY, Insets.EMPTY)));
-
-            colorBarIndicator = new Region();
-            colorBarIndicator.setId("color-bar-indicator");
-            colorBarIndicator.setMouseTransparent(true);
-            colorBarIndicator.setCache(true);
-            
-            colorRectIndicator.layoutXProperty().bind(sat.divide(100).multiply(colorRect.widthProperty()));
-            colorRectIndicator.layoutYProperty().bind(Bindings.subtract(1, bright.divide(100)).multiply(colorRect.heightProperty()));
-            colorBarIndicator.layoutYProperty().bind(hue.divide(360).multiply(colorBar.heightProperty()));
-            colorRectOpacityContainer.opacityProperty().bind(alpha.divide(100));
-                    
-            EventHandler<MouseEvent> barMouseHandler = event -> {
-                final double y = event.getY();
-                hue.set(clamp(y / colorRect.getHeight()) * 360);
-            };
-            
-            colorBar.setOnMouseDragged(barMouseHandler);
-            colorBar.setOnMousePressed(barMouseHandler);
-        
-            colorBar.getChildren().setAll(colorBarIndicator);
-            colorRectOpacityContainer.getChildren().setAll(colorRectHue, colorRectOverlayOne, colorRectOverlayTwo);
-            colorRect.getChildren().setAll(colorRectOpacityContainer, colorRectBlackBorder, colorRectIndicator);
-            HBox.setHgrow(colorRect, Priority.SOMETIMES);
-            getChildren().addAll(colorRect, colorBar);
-        }
-        
-        private void updateValues() {
-            if (getCurrentColor() == null) {
-                setCurrentColor(Color.TRANSPARENT);
-            }
-            changeIsLocal = true;
-            //Initialize hue, sat, bright, color, red, green and blue
-            hue.set(getCurrentColor().getHue());
-            sat.set(getCurrentColor().getSaturation()*100);
-            bright.set(getCurrentColor().getBrightness()*100);
-            alpha.set(getCurrentColor().getOpacity()*100);
-            setCustomColor(Color.hsb(hue.get(), clamp(sat.get() / 100), clamp(bright.get() / 100), 
-                    clamp(alpha.get()/100)));
-            red.set(doubleToInt(getCustomColor().getRed()));
-            green.set(doubleToInt(getCustomColor().getGreen()));
-            blue.set(doubleToInt(getCustomColor().getBlue()));
-            changeIsLocal = false;
-        }
-        
-        @Override protected void layoutChildren() {
-            super.layoutChildren();
-            
-            // to maintain default size
-            colorRectIndicator.autosize();
-            // to maintain square size
-            double size = Math.min(colorRect.getWidth(), colorRect.getHeight());
-            colorRect.resize(size, size);
-            colorBar.resize(colorBar.getWidth(), size);
-        }
-    }
-    
-    /* ------------------------------------------------------------------------*/
-    
-    private class ControlsPane extends VBox {
-        
-        private Label currentColorLabel;
-        private Label newColorLabel;
-        private Region currentColorRect;
-        private Region newColorRect;
-        private Region currentTransparent; // for opacity
-        private GridPane currentAndNewColor;
-        private Region currentNewColorBorder;
-        private ToggleButton hsbButton;
-        private ToggleButton rgbButton;
-        private ToggleButton webButton;
-        private HBox hBox;
-        
-        private Label labels[] = new Label[4];
-        private Slider sliders[] = new Slider[4];
-        private IntegerField fields[] = new IntegerField[4];
-        private Label units[] = new Label[4];
-        private HBox buttonBox;
-        private Region whiteBox;
-        
-        private GridPane settingsPane = new GridPane();
-        
-        public ControlsPane() {
-            getStyleClass().add("controls-pane");
-            
-            currentNewColorBorder = new Region();
-            currentNewColorBorder.setId("current-new-color-border");
-            
-            currentTransparent = new Region();
-            currentTransparent.getStyleClass().addAll("transparent-pattern");
-            
-            currentColorRect = new Region();
-            currentColorRect.getStyleClass().add("color-rect");
-            currentColorRect.setId("current-color");
-            currentColorRect.backgroundProperty().bind(new ObjectBinding<Background>() {
-                {
-                    bind(currentColorProperty);
-                }
-                @Override protected Background computeValue() {
-                    return new Background(new BackgroundFill(currentColorProperty.get(), CornerRadii.EMPTY, Insets.EMPTY));
-                }
-            });
-
-            newColorRect = new Region();
-            newColorRect.getStyleClass().add("color-rect");
-            newColorRect.setId("new-color");
-            newColorRect.backgroundProperty().bind(new ObjectBinding<Background>() {
-                {
-                    bind(customColorProperty);
-                }
-                @Override protected Background computeValue() {
-                    return new Background(new BackgroundFill(customColorProperty.get(), CornerRadii.EMPTY, Insets.EMPTY));
-                }
-            });
-
-            currentColorLabel = new Label(getString("currentColor"));
-            newColorLabel = new Label(getString("newColor"));
-            
-            whiteBox = new Region();
-            whiteBox.getStyleClass().add("customcolor-controls-background");
-            
-            hsbButton = new ToggleButton(getString("colorType.hsb"));
-            hsbButton.getStyleClass().add("left-pill");
-            rgbButton = new ToggleButton(getString("colorType.rgb"));
-            rgbButton.getStyleClass().add("center-pill");
-            webButton = new ToggleButton(getString("colorType.web"));
-            webButton.getStyleClass().add("right-pill");
-            final ToggleGroup group = new ToggleGroup();
-            
-            hBox = new HBox();
-            hBox.setAlignment(Pos.CENTER);
-            hBox.getChildren().addAll(hsbButton, rgbButton, webButton);
-            
-            Region spacer1 = new Region();
-            spacer1.setId("spacer1");
-            Region spacer2 = new Region();
-            spacer2.setId("spacer2");            
-            Region leftSpacer = new Region();
-            leftSpacer.setId("spacer-side");
-            Region rightSpacer = new Region();
-            rightSpacer.setId("spacer-side");
-            Region bottomSpacer = new Region();
-            bottomSpacer.setId("spacer-bottom");
-            
-            currentAndNewColor = new GridPane();
-            currentAndNewColor.getColumnConstraints().addAll(new ColumnConstraints(), new ColumnConstraints());
-            currentAndNewColor.getColumnConstraints().get(0).setHgrow(Priority.ALWAYS);
-            currentAndNewColor.getColumnConstraints().get(1).setHgrow(Priority.ALWAYS);
-            currentAndNewColor.getRowConstraints().addAll(new RowConstraints(), new RowConstraints(), new RowConstraints());
-            currentAndNewColor.getRowConstraints().get(2).setVgrow(Priority.ALWAYS);
-            VBox.setVgrow(currentAndNewColor, Priority.ALWAYS);
-            
-            currentAndNewColor.getStyleClass().add("current-new-color-grid");
-            currentAndNewColor.add(currentColorLabel, 0, 0);
-            currentAndNewColor.add(newColorLabel, 1, 0);
-            currentAndNewColor.add(spacer1, 0, 1, 2, 1);
-            currentAndNewColor.add(currentTransparent, 0, 2, 2, 1);
-            currentAndNewColor.add(currentColorRect, 0, 2);
-            currentAndNewColor.add(newColorRect, 1, 2);
-            currentAndNewColor.add(currentNewColorBorder, 0, 2, 2, 1);
-            currentAndNewColor.add(spacer2, 0, 3, 2, 1);
-            
-            settingsPane = new GridPane();
-            settingsPane.setId("settings-pane");
-            settingsPane.getColumnConstraints().addAll(new ColumnConstraints(), 
-                    new ColumnConstraints(), new ColumnConstraints(), 
-                    new ColumnConstraints(), new ColumnConstraints(), 
-                    new ColumnConstraints());
-            settingsPane.getColumnConstraints().get(0).setHgrow(Priority.NEVER);
-            settingsPane.getColumnConstraints().get(2).setHgrow(Priority.ALWAYS);
-            settingsPane.getColumnConstraints().get(3).setHgrow(Priority.NEVER);
-            settingsPane.getColumnConstraints().get(4).setHgrow(Priority.NEVER);
-            settingsPane.getColumnConstraints().get(5).setHgrow(Priority.NEVER);
-            settingsPane.add(whiteBox, 0, 0, 6, 5);
-            settingsPane.add(hBox, 0, 0, 6, 1);
-            settingsPane.add(leftSpacer, 0, 0);
-            settingsPane.add(rightSpacer, 5, 0);
-            settingsPane.add(bottomSpacer, 0, 4);   
-            
-            webField = new WebColorField();
-            webField.getStyleClass().add("web-field");
-            webField.setSkin(new WebColorFieldSkin(webField));
-            webField.valueProperty().bindBidirectional(customColorProperty);
-            webField.visibleProperty().bind(group.selectedToggleProperty().isEqualTo(webButton));
-            settingsPane.add(webField, 2, 1);
-            
-            // Color settings Grid Pane
-            for (int i = 0; i < 4; i++) {
-                labels[i] = new Label();
-                labels[i].getStyleClass().add("settings-label");
-
-                sliders[i] = new Slider();
-
-                fields[i] = new IntegerField();
-                fields[i].getStyleClass().add("color-input-field");
-                fields[i].setSkin(new IntegerFieldSkin(fields[i]));
-                
-                units[i] = new Label(i == 0 ? "\u00B0" : "%");                
-                units[i].getStyleClass().add("settings-unit");
-
-                if (i > 0 && i < 3) {
-                    // first row and opacity labels are always visible
-                    // second and third row labels are not visible in Web page
-                    labels[i].visibleProperty().bind(group.selectedToggleProperty().isNotEqualTo(webButton));
-                }
-                if (i < 3) {
-                    // sliders and fields shouldn't be visible in Web page
-                    sliders[i].visibleProperty().bind(group.selectedToggleProperty().isNotEqualTo(webButton));
-                    fields[i].visibleProperty().bind(group.selectedToggleProperty().isNotEqualTo(webButton));
-                    units[i].visibleProperty().bind(group.selectedToggleProperty().isEqualTo(hsbButton));
-                }
-                int row = 1 + i;
-                if (i == 3) {
-                    // opacity row is shifted one gridPane row down
-                    row++;
-                }
-                
-                settingsPane.add(labels[i], 1, row);
-                settingsPane.add(sliders[i], 2, row);
-                settingsPane.add(fields[i], 3, row);
-                settingsPane.add(units[i], 4, row);
-            }
-            
-            set(3, getString("opacity_colon"), 100, colorRectPane.alpha);
-            
-            hsbButton.setToggleGroup(group);
-            rgbButton.setToggleGroup(group);
-            webButton.setToggleGroup(group);
-            group.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
-                if (newValue == null) {
-                    group.selectToggle(oldValue);
-                } else {
-                    if (newValue == hsbButton) {
-                        showHSBSettings();
-                    } else if (newValue == rgbButton) {
-                        showRGBSettings();
-                    } else {
-                        showWebSettings();
-                    }
-                }
-            });
-            group.selectToggle(hsbButton);            
-            
-            buttonBox = new HBox();
-            buttonBox.setId("buttons-hbox");
-            
-            Button saveButton = new Button(getString("Save"));
-            saveButton.setDefaultButton(true);
-            saveButton.setOnAction(t -> {
-                if (onSave != null) {
-                    onSave.run();
-                }
-                dialog.hide();
-            });
-            
-            Button useButton = new Button(getString("Use"));
-            useButton.setOnAction(t -> {
-                if (onUse != null) {
-                    onUse.run();
-                }
-                dialog.hide();
-            });
-            
-            Button cancelButton = new Button(getString("Cancel"));
-            cancelButton.setCancelButton(true);
-            cancelButton.setOnAction(e -> {
-                customColorProperty.set(getCurrentColor());
-                if (onCancel != null) {
-                    onCancel.run();
-                }
-                dialog.hide();
-            });
-            buttonBox.getChildren().addAll(saveButton, useButton, cancelButton);
-            
-            getChildren().addAll(currentAndNewColor, settingsPane, buttonBox);
-        }
-        
-        private void showHSBSettings() {
-            set(0, getString("hue_colon"), 360, colorRectPane.hue);
-            set(1, getString("saturation_colon"), 100, colorRectPane.sat);
-            set(2, getString("brightness_colon"), 100, colorRectPane.bright);
-        }
-        
-        private void showRGBSettings() {
-            set(0, getString("red_colon"), 255, colorRectPane.red);
-            set(1, getString("green_colon"), 255, colorRectPane.green);
-            set(2, getString("blue_colon"), 255, colorRectPane.blue);
-        }
-        
-        private void showWebSettings() {
-            labels[0].setText(getString("web_colon"));
-        }
-                
-        private Property<Number>[] bindedProperties = new Property[4];
-            
-        private void set(int row, String caption, int maxValue, Property<Number> prop) {
-            labels[row].setText(caption);
-            if (bindedProperties[row] != null) {
-                sliders[row].valueProperty().unbindBidirectional(bindedProperties[row]);
-                fields[row].valueProperty().unbindBidirectional(bindedProperties[row]);
-            } 
-            sliders[row].setMax(maxValue);
-            sliders[row].valueProperty().bindBidirectional(prop);
-            labels[row].setLabelFor(sliders[row]);
-            fields[row].setMaxValue(maxValue);
-            fields[row].valueProperty().bindBidirectional(prop);
-            bindedProperties[row] = prop;
-        }
-    }
-    
-    static double clamp(double value) {
-        return value < 0 ? 0 : value > 1 ? 1 : value;
-    }
-    
-    private static LinearGradient createHueGradient() {
-        double offset;
-        Stop[] stops = new Stop[255];
-        for (int y = 0; y < 255; y++) {
-            offset = (double)(1 - (1.0 / 255) * y);
-            int h = (int)((y / 255.0) * 360);
-            stops[y] = new Stop(offset, Color.hsb(h, 1.0, 1.0));
-        }
-        return new LinearGradient(0f, 1f, 0f, 0f, true, CycleMethod.NO_CYCLE, stops);
-    }
-    
-    private static int doubleToInt(double value) {
-        return (int) (value * 255 + 0.5); // Adding 0.5 for rounding only
-    }
-}
--- /dev/null	2015-09-03 15:15:22.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/CustomColorDialog.java	2015-09-03 15:15:20.642652300 -0700
@@ -0,0 +1,741 @@
+/*
+ * Copyright (c) 2012, 2015, 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;
+
+import com.sun.javafx.scene.control.IntegerField;
+import com.sun.javafx.scene.control.WebColorField;
+import com.sun.javafx.scene.control.skin.IntegerFieldSkin;
+import com.sun.javafx.scene.control.skin.WebColorFieldSkin;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.property.*;
+import javafx.event.EventHandler;
+import javafx.scene.Scene;
+import javafx.scene.control.*;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.*;
+import javafx.scene.paint.*;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+import javafx.stage.Window;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.input.KeyEvent;
+import javafx.stage.Screen;
+import javafx.stage.WindowEvent;
+
+/**
+ *
+ */
+public class CustomColorDialog extends HBox {
+    
+    private final Stage dialog = new Stage();
+    private ColorRectPane colorRectPane;
+    private ControlsPane controlsPane;
+
+    private ObjectProperty<Color> currentColorProperty = new SimpleObjectProperty<>(Color.WHITE);
+    private ObjectProperty<Color> customColorProperty = new SimpleObjectProperty<>(Color.TRANSPARENT);
+    private Runnable onSave;
+    private Runnable onUse;
+    private Runnable onCancel;
+    
+    private WebColorField webField = null;
+    private Scene customScene;
+    
+    public CustomColorDialog(Window owner) {
+        getStyleClass().add("custom-color-dialog");
+        if (owner != null) dialog.initOwner(owner);
+        dialog.setTitle(Properties.getColorPickerString("customColorDialogTitle"));
+        dialog.initModality(Modality.APPLICATION_MODAL);
+        dialog.initStyle(StageStyle.UTILITY);
+        dialog.setResizable(false);
+        colorRectPane = new ColorRectPane();
+        controlsPane = new ControlsPane();
+        setHgrow(controlsPane, Priority.ALWAYS);
+        
+        customScene = new Scene(this);
+        final Scene ownerScene = owner.getScene();
+        if (ownerScene != null) {
+            if (ownerScene.getUserAgentStylesheet() != null) {
+                customScene.setUserAgentStylesheet(ownerScene.getUserAgentStylesheet());
+            }
+            customScene.getStylesheets().addAll(ownerScene.getStylesheets());
+        }
+        getChildren().addAll(colorRectPane, controlsPane);
+        
+        dialog.setScene(customScene);
+        dialog.addEventHandler(KeyEvent.ANY, keyEventListener);
+    }
+
+    private final EventHandler<KeyEvent> keyEventListener = e -> {
+        switch (e.getCode()) {
+            case ESCAPE :
+                dialog.setScene(null);
+                dialog.close();
+        default:
+            break;
+        }
+    };
+    
+    public void setCurrentColor(Color currentColor) {
+        this.currentColorProperty.set(currentColor);
+    }
+
+    public final Color getCurrentColor() {
+        return currentColorProperty.get();
+    }
+    
+    public final ObjectProperty<Color> customColorProperty() {
+        return customColorProperty;
+    }
+
+    public final void setCustomColor(Color color) {
+        customColorProperty.set(color);
+    }
+
+    public final Color getCustomColor() {
+        return customColorProperty.get();
+    }
+    
+    public Runnable getOnSave() {
+        return onSave;
+    }
+
+    public void setOnSave(Runnable onSave) {
+        this.onSave = onSave;
+    }
+
+    public Runnable getOnUse() {
+        return onUse;
+    }
+
+    public void setOnUse(Runnable onUse) {
+        this.onUse = onUse;
+    }
+
+    public Runnable getOnCancel() {
+        return onCancel;
+    }
+
+    public void setOnCancel(Runnable onCancel) {
+        this.onCancel = onCancel;
+    }
+
+    public void setOnHidden(EventHandler<WindowEvent> onHidden) {
+        dialog.setOnHidden(onHidden);
+    }
+
+    public Stage getDialog() {
+        return dialog;
+    }
+    
+    public void show() {
+        if (dialog.getOwner() != null) {
+            // Workaround of RT-29871: Instead of just invoking fixPosition() 
+            // here need to use listener that fixes dialog position once both
+            // width and height are determined
+            dialog.widthProperty().addListener(positionAdjuster);
+            dialog.heightProperty().addListener(positionAdjuster);
+            positionAdjuster.invalidated(null);
+        }
+        if (dialog.getScene() == null) dialog.setScene(customScene);
+        colorRectPane.updateValues();
+        dialog.show();
+    }
+    
+    private InvalidationListener positionAdjuster = new InvalidationListener() {
+
+        @Override
+        public void invalidated(Observable ignored) {
+            if (Double.isNaN(dialog.getWidth()) || Double.isNaN(dialog.getHeight())) {
+                return;
+            }
+            dialog.widthProperty().removeListener(positionAdjuster);
+            dialog.heightProperty().removeListener(positionAdjuster);
+            fixPosition();
+        }
+
+    };
+    
+    private void fixPosition() {
+        Window w = dialog.getOwner();
+        Screen s = com.sun.javafx.util.Utils.getScreen(w);
+        Rectangle2D sb = s.getBounds();
+        double xR = w.getX() + w.getWidth();
+        double xL = w.getX() - dialog.getWidth();
+        double x, y;
+        if (sb.getMaxX() >= xR + dialog.getWidth()) {
+            x = xR;
+        } else if (sb.getMinX() <= xL) {
+            x = xL;
+        } else {
+            x = Math.max(sb.getMinX(), sb.getMaxX() - dialog.getWidth());
+        }
+        y = Math.max(sb.getMinY(), Math.min(sb.getMaxY() - dialog.getHeight(), w.getY()));
+        dialog.setX(x);
+        dialog.setY(y);
+    }
+    
+    @Override public void layoutChildren() {
+        super.layoutChildren();
+        if (dialog.getMinWidth() > 0 && dialog.getMinHeight() > 0) {
+            // don't recalculate min size once it's set
+            return;
+        }
+
+        // Math.max(0, ...) added for RT-34704 to ensure the dialog is at least 0 x 0
+        double minWidth = Math.max(0, computeMinWidth(getHeight()) + (dialog.getWidth() - customScene.getWidth()));
+        double minHeight = Math.max(0, computeMinHeight(getWidth()) + (dialog.getHeight() - customScene.getHeight()));
+        dialog.setMinWidth(minWidth);
+        dialog.setMinHeight(minHeight);
+    }
+       
+    /* ------------------------------------------------------------------------*/
+    
+    private class ColorRectPane extends HBox {
+
+        private Pane colorRect;
+        private Pane colorBar;
+        private Pane colorRectOverlayOne;
+        private Pane colorRectOverlayTwo;
+        private Region colorRectIndicator;
+        private Region colorBarIndicator;
+        
+        private boolean changeIsLocal = false;
+        private DoubleProperty hue = new SimpleDoubleProperty(-1) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    updateHSBColor();
+                    changeIsLocal = false;
+                }
+            }
+        };
+        private DoubleProperty sat = new SimpleDoubleProperty(-1) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    updateHSBColor();
+                    changeIsLocal = false;
+                }
+            }
+        };
+        private DoubleProperty bright = new SimpleDoubleProperty(-1) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    updateHSBColor();
+                    changeIsLocal = false;
+                }
+            }
+        };
+        private IntegerProperty red = new SimpleIntegerProperty(-1) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    updateRGBColor();
+                    changeIsLocal = false;
+                }
+            }
+        };
+        
+        private IntegerProperty green = new SimpleIntegerProperty(-1) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    updateRGBColor();
+                    changeIsLocal = false;
+                }
+            }
+        };
+        
+        private IntegerProperty blue = new SimpleIntegerProperty(-1) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    updateRGBColor();
+                    changeIsLocal = false;
+                }
+            }
+        };
+        
+        private DoubleProperty alpha = new SimpleDoubleProperty(100) {
+            @Override protected void invalidated() {
+                if (!changeIsLocal) {
+                    changeIsLocal = true;
+                    setCustomColor(new Color(
+                            getCustomColor().getRed(), 
+                            getCustomColor().getGreen(), 
+                            getCustomColor().getBlue(), 
+                            clamp(alpha.get() / 100)));
+                    changeIsLocal = false;
+                }
+            }
+        };
+         
+        private void updateRGBColor() {
+            Color newColor = Color.rgb(red.get(), green.get(), blue.get(), clamp(alpha.get() / 100));
+            hue.set(newColor.getHue());
+            sat.set(newColor.getSaturation() * 100);
+            bright.set(newColor.getBrightness() * 100);
+            setCustomColor(newColor);
+        }
+        
+        private void updateHSBColor() {
+            Color newColor = Color.hsb(hue.get(), clamp(sat.get() / 100), 
+                            clamp(bright.get() / 100), clamp(alpha.get() / 100));
+            red.set(doubleToInt(newColor.getRed()));
+            green.set(doubleToInt(newColor.getGreen()));
+            blue.set(doubleToInt(newColor.getBlue()));
+            setCustomColor(newColor);
+        }
+       
+        private void colorChanged() {
+            if (!changeIsLocal) {
+                changeIsLocal = true;
+                hue.set(getCustomColor().getHue());
+                sat.set(getCustomColor().getSaturation() * 100);
+                bright.set(getCustomColor().getBrightness() * 100);
+                red.set(doubleToInt(getCustomColor().getRed()));
+                green.set(doubleToInt(getCustomColor().getGreen()));
+                blue.set(doubleToInt(getCustomColor().getBlue()));
+                changeIsLocal = false;
+            }
+        }
+        
+        public ColorRectPane() {
+            
+            getStyleClass().add("color-rect-pane");
+            
+            customColorProperty().addListener((ov, t, t1) -> {
+                colorChanged();
+            });
+            
+            colorRectIndicator = new Region();
+            colorRectIndicator.setId("color-rect-indicator");
+            colorRectIndicator.setManaged(false);
+            colorRectIndicator.setMouseTransparent(true);
+            colorRectIndicator.setCache(true);
+        
+            final Pane colorRectOpacityContainer = new StackPane();
+            
+            colorRect = new StackPane() {
+                // This is an implementation of square control that chooses its
+                // size to fill the available height
+                @Override
+                public Orientation getContentBias() {
+                    return Orientation.VERTICAL;
+                }
+                @Override
+                protected double computePrefWidth(double height) {
+                    return height;
+                }
+                @Override
+                protected double computeMaxWidth(double height) {
+                    return height;
+                }
+            };
+            colorRect.getStyleClass().addAll("color-rect", "transparent-pattern");
+            
+            Pane colorRectHue = new Pane();
+            colorRectHue.backgroundProperty().bind(new ObjectBinding<Background>() {
+                
+                {
+                    bind(hue);
+                }
+
+                @Override protected Background computeValue() {
+                    return new Background(new BackgroundFill(
+                            Color.hsb(hue.getValue(), 1.0, 1.0), 
+                            CornerRadii.EMPTY, Insets.EMPTY));
+                }
+            });            
+            
+            colorRectOverlayOne = new Pane();
+            colorRectOverlayOne.getStyleClass().add("color-rect");
+            colorRectOverlayOne.setBackground(new Background(new BackgroundFill(
+                    new LinearGradient(0, 0, 1, 0, true, CycleMethod.NO_CYCLE, 
+                    new Stop(0, Color.rgb(255, 255, 255, 1)), 
+                    new Stop(1, Color.rgb(255, 255, 255, 0))), 
+                    CornerRadii.EMPTY, Insets.EMPTY)));
+        
+            EventHandler<MouseEvent> rectMouseHandler = event -> {
+                final double x = event.getX();
+                final double y = event.getY();
+                sat.set(clamp(x / colorRect.getWidth()) * 100);
+                bright.set(100 - (clamp(y / colorRect.getHeight()) * 100));
+            };
+        
+            colorRectOverlayTwo = new Pane();
+            colorRectOverlayTwo.getStyleClass().addAll("color-rect");
+            colorRectOverlayTwo.setBackground(new Background(new BackgroundFill(
+                    new LinearGradient(0, 0, 0, 1, true, CycleMethod.NO_CYCLE, 
+                    new Stop(0, Color.rgb(0, 0, 0, 0)), new Stop(1, Color.rgb(0, 0, 0, 1))), 
+                    CornerRadii.EMPTY, Insets.EMPTY)));
+            colorRectOverlayTwo.setOnMouseDragged(rectMouseHandler);
+            colorRectOverlayTwo.setOnMousePressed(rectMouseHandler);
+            
+            Pane colorRectBlackBorder = new Pane();
+            colorRectBlackBorder.setMouseTransparent(true);
+            colorRectBlackBorder.getStyleClass().addAll("color-rect", "color-rect-border");
+            
+            colorBar = new Pane();
+            colorBar.getStyleClass().add("color-bar");
+            colorBar.setBackground(new Background(new BackgroundFill(createHueGradient(), 
+                    CornerRadii.EMPTY, Insets.EMPTY)));
+
+            colorBarIndicator = new Region();
+            colorBarIndicator.setId("color-bar-indicator");
+            colorBarIndicator.setMouseTransparent(true);
+            colorBarIndicator.setCache(true);
+            
+            colorRectIndicator.layoutXProperty().bind(sat.divide(100).multiply(colorRect.widthProperty()));
+            colorRectIndicator.layoutYProperty().bind(Bindings.subtract(1, bright.divide(100)).multiply(colorRect.heightProperty()));
+            colorBarIndicator.layoutYProperty().bind(hue.divide(360).multiply(colorBar.heightProperty()));
+            colorRectOpacityContainer.opacityProperty().bind(alpha.divide(100));
+                    
+            EventHandler<MouseEvent> barMouseHandler = event -> {
+                final double y = event.getY();
+                hue.set(clamp(y / colorRect.getHeight()) * 360);
+            };
+            
+            colorBar.setOnMouseDragged(barMouseHandler);
+            colorBar.setOnMousePressed(barMouseHandler);
+        
+            colorBar.getChildren().setAll(colorBarIndicator);
+            colorRectOpacityContainer.getChildren().setAll(colorRectHue, colorRectOverlayOne, colorRectOverlayTwo);
+            colorRect.getChildren().setAll(colorRectOpacityContainer, colorRectBlackBorder, colorRectIndicator);
+            HBox.setHgrow(colorRect, Priority.SOMETIMES);
+            getChildren().addAll(colorRect, colorBar);
+        }
+        
+        private void updateValues() {
+            if (getCurrentColor() == null) {
+                setCurrentColor(Color.TRANSPARENT);
+            }
+            changeIsLocal = true;
+            //Initialize hue, sat, bright, color, red, green and blue
+            hue.set(getCurrentColor().getHue());
+            sat.set(getCurrentColor().getSaturation()*100);
+            bright.set(getCurrentColor().getBrightness()*100);
+            alpha.set(getCurrentColor().getOpacity()*100);
+            setCustomColor(Color.hsb(hue.get(), clamp(sat.get() / 100), clamp(bright.get() / 100), 
+                    clamp(alpha.get()/100)));
+            red.set(doubleToInt(getCustomColor().getRed()));
+            green.set(doubleToInt(getCustomColor().getGreen()));
+            blue.set(doubleToInt(getCustomColor().getBlue()));
+            changeIsLocal = false;
+        }
+        
+        @Override protected void layoutChildren() {
+            super.layoutChildren();
+            
+            // to maintain default size
+            colorRectIndicator.autosize();
+            // to maintain square size
+            double size = Math.min(colorRect.getWidth(), colorRect.getHeight());
+            colorRect.resize(size, size);
+            colorBar.resize(colorBar.getWidth(), size);
+        }
+    }
+    
+    /* ------------------------------------------------------------------------*/
+    
+    private class ControlsPane extends VBox {
+        
+        private Label currentColorLabel;
+        private Label newColorLabel;
+        private Region currentColorRect;
+        private Region newColorRect;
+        private Region currentTransparent; // for opacity
+        private GridPane currentAndNewColor;
+        private Region currentNewColorBorder;
+        private ToggleButton hsbButton;
+        private ToggleButton rgbButton;
+        private ToggleButton webButton;
+        private HBox hBox;
+        
+        private Label labels[] = new Label[4];
+        private Slider sliders[] = new Slider[4];
+        private IntegerField fields[] = new IntegerField[4];
+        private Label units[] = new Label[4];
+        private HBox buttonBox;
+        private Region whiteBox;
+        
+        private GridPane settingsPane = new GridPane();
+        
+        public ControlsPane() {
+            getStyleClass().add("controls-pane");
+            
+            currentNewColorBorder = new Region();
+            currentNewColorBorder.setId("current-new-color-border");
+            
+            currentTransparent = new Region();
+            currentTransparent.getStyleClass().addAll("transparent-pattern");
+            
+            currentColorRect = new Region();
+            currentColorRect.getStyleClass().add("color-rect");
+            currentColorRect.setId("current-color");
+            currentColorRect.backgroundProperty().bind(new ObjectBinding<Background>() {
+                {
+                    bind(currentColorProperty);
+                }
+                @Override protected Background computeValue() {
+                    return new Background(new BackgroundFill(currentColorProperty.get(), CornerRadii.EMPTY, Insets.EMPTY));
+                }
+            });
+
+            newColorRect = new Region();
+            newColorRect.getStyleClass().add("color-rect");
+            newColorRect.setId("new-color");
+            newColorRect.backgroundProperty().bind(new ObjectBinding<Background>() {
+                {
+                    bind(customColorProperty);
+                }
+                @Override protected Background computeValue() {
+                    return new Background(new BackgroundFill(customColorProperty.get(), CornerRadii.EMPTY, Insets.EMPTY));
+                }
+            });
+
+            currentColorLabel = new Label(Properties.getColorPickerString("currentColor"));
+            newColorLabel = new Label(Properties.getColorPickerString("newColor"));
+            
+            whiteBox = new Region();
+            whiteBox.getStyleClass().add("customcolor-controls-background");
+            
+            hsbButton = new ToggleButton(Properties.getColorPickerString("colorType.hsb"));
+            hsbButton.getStyleClass().add("left-pill");
+            rgbButton = new ToggleButton(Properties.getColorPickerString("colorType.rgb"));
+            rgbButton.getStyleClass().add("center-pill");
+            webButton = new ToggleButton(Properties.getColorPickerString("colorType.web"));
+            webButton.getStyleClass().add("right-pill");
+            final ToggleGroup group = new ToggleGroup();
+            
+            hBox = new HBox();
+            hBox.setAlignment(Pos.CENTER);
+            hBox.getChildren().addAll(hsbButton, rgbButton, webButton);
+            
+            Region spacer1 = new Region();
+            spacer1.setId("spacer1");
+            Region spacer2 = new Region();
+            spacer2.setId("spacer2");            
+            Region leftSpacer = new Region();
+            leftSpacer.setId("spacer-side");
+            Region rightSpacer = new Region();
+            rightSpacer.setId("spacer-side");
+            Region bottomSpacer = new Region();
+            bottomSpacer.setId("spacer-bottom");
+            
+            currentAndNewColor = new GridPane();
+            currentAndNewColor.getColumnConstraints().addAll(new ColumnConstraints(), new ColumnConstraints());
+            currentAndNewColor.getColumnConstraints().get(0).setHgrow(Priority.ALWAYS);
+            currentAndNewColor.getColumnConstraints().get(1).setHgrow(Priority.ALWAYS);
+            currentAndNewColor.getRowConstraints().addAll(new RowConstraints(), new RowConstraints(), new RowConstraints());
+            currentAndNewColor.getRowConstraints().get(2).setVgrow(Priority.ALWAYS);
+            VBox.setVgrow(currentAndNewColor, Priority.ALWAYS);
+            
+            currentAndNewColor.getStyleClass().add("current-new-color-grid");
+            currentAndNewColor.add(currentColorLabel, 0, 0);
+            currentAndNewColor.add(newColorLabel, 1, 0);
+            currentAndNewColor.add(spacer1, 0, 1, 2, 1);
+            currentAndNewColor.add(currentTransparent, 0, 2, 2, 1);
+            currentAndNewColor.add(currentColorRect, 0, 2);
+            currentAndNewColor.add(newColorRect, 1, 2);
+            currentAndNewColor.add(currentNewColorBorder, 0, 2, 2, 1);
+            currentAndNewColor.add(spacer2, 0, 3, 2, 1);
+            
+            settingsPane = new GridPane();
+            settingsPane.setId("settings-pane");
+            settingsPane.getColumnConstraints().addAll(new ColumnConstraints(), 
+                    new ColumnConstraints(), new ColumnConstraints(), 
+                    new ColumnConstraints(), new ColumnConstraints(), 
+                    new ColumnConstraints());
+            settingsPane.getColumnConstraints().get(0).setHgrow(Priority.NEVER);
+            settingsPane.getColumnConstraints().get(2).setHgrow(Priority.ALWAYS);
+            settingsPane.getColumnConstraints().get(3).setHgrow(Priority.NEVER);
+            settingsPane.getColumnConstraints().get(4).setHgrow(Priority.NEVER);
+            settingsPane.getColumnConstraints().get(5).setHgrow(Priority.NEVER);
+            settingsPane.add(whiteBox, 0, 0, 6, 5);
+            settingsPane.add(hBox, 0, 0, 6, 1);
+            settingsPane.add(leftSpacer, 0, 0);
+            settingsPane.add(rightSpacer, 5, 0);
+            settingsPane.add(bottomSpacer, 0, 4);   
+            
+            webField = new WebColorField();
+            webField.getStyleClass().add("web-field");
+            webField.setSkin(new WebColorFieldSkin(webField));
+            webField.valueProperty().bindBidirectional(customColorProperty);
+            webField.visibleProperty().bind(group.selectedToggleProperty().isEqualTo(webButton));
+            settingsPane.add(webField, 2, 1);
+            
+            // Color settings Grid Pane
+            for (int i = 0; i < 4; i++) {
+                labels[i] = new Label();
+                labels[i].getStyleClass().add("settings-label");
+
+                sliders[i] = new Slider();
+
+                fields[i] = new IntegerField();
+                fields[i].getStyleClass().add("color-input-field");
+                fields[i].setSkin(new IntegerFieldSkin(fields[i]));
+                
+                units[i] = new Label(i == 0 ? "\u00B0" : "%");                
+                units[i].getStyleClass().add("settings-unit");
+
+                if (i > 0 && i < 3) {
+                    // first row and opacity labels are always visible
+                    // second and third row labels are not visible in Web page
+                    labels[i].visibleProperty().bind(group.selectedToggleProperty().isNotEqualTo(webButton));
+                }
+                if (i < 3) {
+                    // sliders and fields shouldn't be visible in Web page
+                    sliders[i].visibleProperty().bind(group.selectedToggleProperty().isNotEqualTo(webButton));
+                    fields[i].visibleProperty().bind(group.selectedToggleProperty().isNotEqualTo(webButton));
+                    units[i].visibleProperty().bind(group.selectedToggleProperty().isEqualTo(hsbButton));
+                }
+                int row = 1 + i;
+                if (i == 3) {
+                    // opacity row is shifted one gridPane row down
+                    row++;
+                }
+                
+                settingsPane.add(labels[i], 1, row);
+                settingsPane.add(sliders[i], 2, row);
+                settingsPane.add(fields[i], 3, row);
+                settingsPane.add(units[i], 4, row);
+            }
+            
+            set(3, Properties.getColorPickerString("opacity_colon"), 100, colorRectPane.alpha);
+            
+            hsbButton.setToggleGroup(group);
+            rgbButton.setToggleGroup(group);
+            webButton.setToggleGroup(group);
+            group.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
+                if (newValue == null) {
+                    group.selectToggle(oldValue);
+                } else {
+                    if (newValue == hsbButton) {
+                        showHSBSettings();
+                    } else if (newValue == rgbButton) {
+                        showRGBSettings();
+                    } else {
+                        showWebSettings();
+                    }
+                }
+            });
+            group.selectToggle(hsbButton);            
+            
+            buttonBox = new HBox();
+            buttonBox.setId("buttons-hbox");
+            
+            Button saveButton = new Button(Properties.getColorPickerString("Save"));
+            saveButton.setDefaultButton(true);
+            saveButton.setOnAction(t -> {
+                if (onSave != null) {
+                    onSave.run();
+                }
+                dialog.hide();
+            });
+            
+            Button useButton = new Button(Properties.getColorPickerString("Use"));
+            useButton.setOnAction(t -> {
+                if (onUse != null) {
+                    onUse.run();
+                }
+                dialog.hide();
+            });
+            
+            Button cancelButton = new Button(Properties.getColorPickerString("Cancel"));
+            cancelButton.setCancelButton(true);
+            cancelButton.setOnAction(e -> {
+                customColorProperty.set(getCurrentColor());
+                if (onCancel != null) {
+                    onCancel.run();
+                }
+                dialog.hide();
+            });
+            buttonBox.getChildren().addAll(saveButton, useButton, cancelButton);
+            
+            getChildren().addAll(currentAndNewColor, settingsPane, buttonBox);
+        }
+        
+        private void showHSBSettings() {
+            set(0, Properties.getColorPickerString("hue_colon"), 360, colorRectPane.hue);
+            set(1, Properties.getColorPickerString("saturation_colon"), 100, colorRectPane.sat);
+            set(2, Properties.getColorPickerString("brightness_colon"), 100, colorRectPane.bright);
+        }
+        
+        private void showRGBSettings() {
+            set(0, Properties.getColorPickerString("red_colon"), 255, colorRectPane.red);
+            set(1, Properties.getColorPickerString("green_colon"), 255, colorRectPane.green);
+            set(2, Properties.getColorPickerString("blue_colon"), 255, colorRectPane.blue);
+        }
+        
+        private void showWebSettings() {
+            labels[0].setText(Properties.getColorPickerString("web_colon"));
+        }
+                
+        private Property<Number>[] bindedProperties = new Property[4];
+            
+        private void set(int row, String caption, int maxValue, Property<Number> prop) {
+            labels[row].setText(caption);
+            if (bindedProperties[row] != null) {
+                sliders[row].valueProperty().unbindBidirectional(bindedProperties[row]);
+                fields[row].valueProperty().unbindBidirectional(bindedProperties[row]);
+            } 
+            sliders[row].setMax(maxValue);
+            sliders[row].valueProperty().bindBidirectional(prop);
+            labels[row].setLabelFor(sliders[row]);
+            fields[row].setMaxValue(maxValue);
+            fields[row].valueProperty().bindBidirectional(prop);
+            bindedProperties[row] = prop;
+        }
+    }
+    
+    static double clamp(double value) {
+        return value < 0 ? 0 : value > 1 ? 1 : value;
+    }
+    
+    private static LinearGradient createHueGradient() {
+        double offset;
+        Stop[] stops = new Stop[255];
+        for (int y = 0; y < 255; y++) {
+            offset = (double)(1 - (1.0 / 255) * y);
+            int h = (int)((y / 255.0) * 360);
+            stops[y] = new Stop(offset, Color.hsb(h, 1.0, 1.0));
+        }
+        return new LinearGradient(0f, 1f, 0f, 0f, true, CycleMethod.NO_CYCLE, stops);
+    }
+    
+    private static int doubleToInt(double value) {
+        return (int) (value * 255 + 0.5); // Adding 0.5 for rounding only
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DatePickerContent.java	2015-09-03 15:15:29.116137000 -0700
+++ /dev/null	2015-09-03 15:15:30.000000000 -0700
@@ -1,792 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 java.time.DateTimeException;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DecimalStyle;
-import java.time.chrono.Chronology;
-import java.time.chrono.ChronoLocalDate;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.ValueRange;
-import java.time.temporal.WeekFields;
-import java.time.YearMonth;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import static java.time.temporal.ChronoField.*;
-import static java.time.temporal.ChronoUnit.*;
-
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.WeakChangeListener;
-import javafx.event.EventHandler;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.DateCell;
-import javafx.scene.control.Label;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.ColumnConstraints;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-import javafx.scene.layout.StackPane;
-
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
-import com.sun.javafx.scene.traversal.Direction;
-
-import static com.sun.javafx.PlatformUtil.*;
-
-/**
- * The full content for the DatePicker popup. This class could
- * probably be used more or less as-is with an embeddable type of date
- * picker that doesn't use a popup.
- */
-public class DatePickerContent extends VBox {
-    protected DatePicker datePicker;
-    private Button backMonthButton;
-    private Button forwardMonthButton;
-    private Button backYearButton;
-    private Button forwardYearButton;
-    private Label monthLabel;
-    private Label yearLabel;
-    protected GridPane gridPane;
-
-    private int daysPerWeek;
-    private List<DateCell> dayNameCells = new ArrayList<DateCell>();
-    private List<DateCell> weekNumberCells = new ArrayList<DateCell>();
-    protected List<DateCell> dayCells = new ArrayList<DateCell>();
-    private LocalDate[] dayCellDates;
-    private DateCell lastFocusedDayCell = null;
-
-    final DateTimeFormatter monthFormatter =
-        DateTimeFormatter.ofPattern("MMMM");
-
-    final DateTimeFormatter monthFormatterSO =
-            DateTimeFormatter.ofPattern("LLLL"); // Standalone month name
-
-    final DateTimeFormatter yearFormatter =
-        DateTimeFormatter.ofPattern("y");
-
-    final DateTimeFormatter yearWithEraFormatter =
-        DateTimeFormatter.ofPattern("GGGGy"); // For Japanese. What to use for others??
-
-    final DateTimeFormatter weekNumberFormatter =
-        DateTimeFormatter.ofPattern("w");
-
-    final DateTimeFormatter weekDayNameFormatter =
-            DateTimeFormatter.ofPattern("ccc"); // Standalone day name
-
-    final DateTimeFormatter dayCellFormatter =
-        DateTimeFormatter.ofPattern("d");
-
-    static String getString(String key) {
-        return ControlResources.getString("DatePicker."+key);
-    }
-
-    DatePickerContent(final DatePicker datePicker) {
-        this.datePicker = datePicker;
-
-        getStyleClass().add("date-picker-popup");
-
-        daysPerWeek = getDaysPerWeek();
-
-        {
-            LocalDate date = datePicker.getValue();
-            displayedYearMonth.set((date != null) ? YearMonth.from(date) : YearMonth.now());
-        }
-
-        displayedYearMonth.addListener((observable, oldValue, newValue) -> {
-            updateValues();
-        });
-
-
-        getChildren().add(createMonthYearPane());
-
-        gridPane = new GridPane() {
-            @Override protected double computePrefWidth(double height) {
-                final double width = super.computePrefWidth(height);
-
-                // RT-30903: Make sure width snaps to pixel when divided by
-                // number of columns. GridPane doesn't do this with percentage
-                // width constraints. See GridPane.adjustColumnWidths().
-                final int nCols = daysPerWeek + (datePicker.isShowWeekNumbers() ? 1 : 0);
-                final double snaphgap = snapSpace(getHgap());
-                final double left = snapSpace(getInsets().getLeft());
-                final double right = snapSpace(getInsets().getRight());
-                final double hgaps = snaphgap * (nCols - 1);
-                final double contentWidth = width - left - right - hgaps;
-                return ((snapSize(contentWidth / nCols)) * nCols) + left + right + hgaps;
-            }
-
-            @Override protected void layoutChildren() {
-                // Prevent AssertionError in GridPane
-                if (getWidth() > 0 && getHeight() > 0) {
-                    super.layoutChildren();
-                }
-            }
-        };
-        gridPane.setFocusTraversable(true);
-        gridPane.getStyleClass().add("calendar-grid");
-        gridPane.setVgap(-1);
-        gridPane.setHgap(-1);
-
-        // Add a focus owner listener to Scene when it becomes available.
-        final WeakChangeListener<Node> weakFocusOwnerListener =
-            new WeakChangeListener<Node>((ov2, oldFocusOwner, newFocusOwner) -> {
-                if (newFocusOwner == gridPane) {
-                    if (oldFocusOwner instanceof DateCell) {
-                        // Backwards traversal, skip gridPane.
-                        gridPane.impl_traverse(Direction.PREVIOUS);
-                    } else {
-                        // Forwards traversal, pass focus to day cell.
-                        if (lastFocusedDayCell != null) {
-                            Platform.runLater(() -> {
-                                lastFocusedDayCell.requestFocus();
-                            });
-                        } else {
-                            clearFocus();
-                        }
-                    }
-                }
-            });
-        gridPane.sceneProperty().addListener(new WeakChangeListener<Scene>((ov, oldScene, newScene) -> {
-            if (oldScene != null) {
-                oldScene.focusOwnerProperty().removeListener(weakFocusOwnerListener);
-            }
-            if (newScene != null) {
-                newScene.focusOwnerProperty().addListener(weakFocusOwnerListener);
-            }
-        }));
-        if (gridPane.getScene() != null) {
-            gridPane.getScene().focusOwnerProperty().addListener(weakFocusOwnerListener);
-        }
-
-        // get the weekday labels starting with the weekday that is the
-        // first-day-of-the-week according to the locale in the
-        // displayed LocalDate
-        for (int i = 0; i < daysPerWeek; i++) {
-            DateCell cell = new DateCell();
-            cell.getStyleClass().add("day-name-cell");
-            dayNameCells.add(cell);
-        }
-
-        // Week number column
-        for (int i = 0; i < 6; i++) {
-            DateCell cell = new DateCell();
-            cell.getStyleClass().add("week-number-cell");
-            weekNumberCells.add(cell);
-        }
-
-        createDayCells();
-        updateGrid();
-        getChildren().add(gridPane);
-
-        refresh();
-
-        // RT-30511: This prevents key events from reaching the popup's owner.
-        addEventHandler(KeyEvent.ANY, e -> {
-            Node node = getScene().getFocusOwner();
-            if (node instanceof DateCell) {
-                lastFocusedDayCell = (DateCell)node;
-            }
-
-            if (e.getEventType() == KeyEvent.KEY_PRESSED) {
-                switch (e.getCode()) {
-                  case HOME:
-                      goToDate(LocalDate.now(), true);
-                      e.consume();
-                      break;
-
-
-                  case PAGE_UP:
-                      if ((isMac() && e.isMetaDown()) || (!isMac() && e.isControlDown())) {
-                          if (!backYearButton.isDisabled()) {
-                              forward(-1, YEARS, true);
-                          }
-                      } else {
-                          if (!backMonthButton.isDisabled()) {
-                              forward(-1, MONTHS, true);
-                          }
-                      }
-                      e.consume();
-                      break;
-
-                  case PAGE_DOWN:
-                      if ((isMac() && e.isMetaDown()) || (!isMac() && e.isControlDown())) {
-                          if (!forwardYearButton.isDisabled()) {
-                              forward(1, YEARS, true);
-                          }
-                      } else {
-                          if (!forwardMonthButton.isDisabled()) {
-                              forward(1, MONTHS, true);
-                          }
-                      }
-                      e.consume();
-                      break;
-                }
-
-                node = getScene().getFocusOwner();
-                if (node instanceof DateCell) {
-                    lastFocusedDayCell = (DateCell)node;
-                }
-            }
-
-            // Consume all key events except those that control
-            // showing the popup and traversal.
-            switch (e.getCode()) {
-              case F4:
-              case F10:
-              case UP:
-              case DOWN:
-              case LEFT:
-              case RIGHT:
-              case TAB:
-                    break;
-
-              case ESCAPE:
-                datePicker.hide();
-                e.consume();
-                break;
-
-              default:
-                e.consume();
-            }
-        });
-    }
-
-    private ObjectProperty<YearMonth> displayedYearMonth =
-        new SimpleObjectProperty<YearMonth>(this, "displayedYearMonth");
-
-    ObjectProperty<YearMonth> displayedYearMonthProperty() {
-        return displayedYearMonth;
-    }
-
-
-    protected BorderPane createMonthYearPane() {
-        BorderPane monthYearPane = new BorderPane();
-        monthYearPane.getStyleClass().add("month-year-pane");
-
-        // Month spinner
-
-        HBox monthSpinner = new HBox();
-        monthSpinner.getStyleClass().add("spinner");
-
-        backMonthButton = new Button();
-        backMonthButton.getStyleClass().add("left-button");
-
-        forwardMonthButton = new Button();
-        forwardMonthButton.getStyleClass().add("right-button");
-
-        StackPane leftMonthArrow = new StackPane();
-        leftMonthArrow.getStyleClass().add("left-arrow");
-        leftMonthArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
-        backMonthButton.setGraphic(leftMonthArrow);
-
-        StackPane rightMonthArrow = new StackPane();
-        rightMonthArrow.getStyleClass().add("right-arrow");
-        rightMonthArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
-        forwardMonthButton.setGraphic(rightMonthArrow);
-
-
-        backMonthButton.setOnAction(t -> {
-            forward(-1, MONTHS, false);
-        });
-
-        monthLabel = new Label();
-        monthLabel.getStyleClass().add("spinner-label");
-
-        forwardMonthButton.setOnAction(t -> {
-            forward(1, MONTHS, false);
-        });
-
-        monthSpinner.getChildren().addAll(backMonthButton, monthLabel, forwardMonthButton);
-        monthYearPane.setLeft(monthSpinner);
-
-        // Year spinner
-
-        HBox yearSpinner = new HBox();
-        yearSpinner.getStyleClass().add("spinner");
-
-        backYearButton = new Button();
-        backYearButton.getStyleClass().add("left-button");
-
-        forwardYearButton = new Button();
-        forwardYearButton.getStyleClass().add("right-button");
-
-        StackPane leftYearArrow = new StackPane();
-        leftYearArrow.getStyleClass().add("left-arrow");
-        leftYearArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
-        backYearButton.setGraphic(leftYearArrow);
-
-        StackPane rightYearArrow = new StackPane();
-        rightYearArrow.getStyleClass().add("right-arrow");
-        rightYearArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
-        forwardYearButton.setGraphic(rightYearArrow);
-
-
-        backYearButton.setOnAction(t -> {
-            forward(-1, YEARS, false);
-        });
-
-        yearLabel = new Label();
-        yearLabel.getStyleClass().add("spinner-label");
-
-        forwardYearButton.setOnAction(t -> {
-            forward(1, YEARS, false);
-        });
-
-        yearSpinner.getChildren().addAll(backYearButton, yearLabel, forwardYearButton);
-yearSpinner.setFillHeight(false);
-        monthYearPane.setRight(yearSpinner);
-
-        return monthYearPane;
-    }
-
-    private void refresh() {
-        updateMonthLabelWidth();
-        updateDayNameCells();
-        updateValues();
-    }
-
-    void updateValues() {
-        // Note: Preserve this order, as DatePickerHijrahContent needs
-        // updateDayCells before updateMonthYearPane().
-        updateWeeknumberDateCells();
-        updateDayCells();
-        updateMonthYearPane();
-    }
-
-    void updateGrid() {
-        gridPane.getColumnConstraints().clear();
-        gridPane.getChildren().clear();
-
-        int nCols = daysPerWeek + (datePicker.isShowWeekNumbers() ? 1 : 0);
-
-        ColumnConstraints columnConstraints = new ColumnConstraints();
-        columnConstraints.setPercentWidth(100); // Treated as weight
-        for (int i = 0; i < nCols; i++) {
-            gridPane.getColumnConstraints().add(columnConstraints);
-        }
-
-        for (int i = 0; i < daysPerWeek; i++) {
-            gridPane.add(dayNameCells.get(i), i + nCols - daysPerWeek, 1);  // col, row
-        }
-
-        // Week number column
-        if (datePicker.isShowWeekNumbers()) {
-            for (int i = 0; i < 6; i++) {
-                gridPane.add(weekNumberCells.get(i), 0, i + 2);  // col, row
-            }
-        }
-
-        // setup: 6 rows of daysPerWeek (which is the maximum number of cells required in the worst case layout)
-        for (int row = 0; row < 6; row++) {
-            for (int col = 0; col < daysPerWeek; col++) {
-                gridPane.add(dayCells.get(row*daysPerWeek+col), col + nCols - daysPerWeek, row + 2);
-            }
-        }
-    }
-
-    void updateDayNameCells() {
-        // first day of week, 1 = monday, 7 = sunday
-        int firstDayOfWeek = WeekFields.of(getLocale()).getFirstDayOfWeek().getValue();
-
-        // july 13th 2009 is a Monday, so a firstDayOfWeek=1 must come out of the 13th
-        LocalDate date = LocalDate.of(2009, 7, 12 + firstDayOfWeek);
-        for (int i = 0; i < daysPerWeek; i++) {
-            String name = weekDayNameFormatter.withLocale(getLocale()).format(date.plus(i, DAYS));
-            dayNameCells.get(i).setText(titleCaseWord(name));
-        }
-    }
-
-    void updateWeeknumberDateCells() {
-        if (datePicker.isShowWeekNumbers()) {
-            final Locale locale = getLocale();
-            final int maxWeeksPerMonth = 6; // TODO: Get this from chronology?
-
-            LocalDate firstOfMonth = displayedYearMonth.get().atDay(1);
-            for (int i = 0; i < maxWeeksPerMonth; i++) {
-                LocalDate date = firstOfMonth.plus(i, WEEKS);
-                // Use a formatter to ensure correct localization,
-                // such as when Thai numerals are required.
-                String cellText =
-                    weekNumberFormatter.withLocale(locale)
-                                       .withDecimalStyle(DecimalStyle.of(locale))
-                                       .format(date);
-                weekNumberCells.get(i).setText(cellText);
-            }
-        }
-    }
-
-    void updateDayCells() {
-        Locale locale = getLocale();
-        Chronology chrono = getPrimaryChronology();
-        int firstOfMonthIdx = determineFirstOfMonthDayOfWeek();
-        YearMonth curMonth = displayedYearMonth.get();
-
-        // RT-31075: The following are now set in the try-catch block.
-        YearMonth prevMonth = null;
-        YearMonth nextMonth = null;
-        int daysInCurMonth = -1;
-        int daysInPrevMonth = -1;
-        int daysInNextMonth = -1;
-
-        for (int i = 0; i < 6 * daysPerWeek; i++) {
-            DateCell dayCell = dayCells.get(i);
-            dayCell.getStyleClass().setAll("cell", "date-cell", "day-cell");
-            dayCell.setDisable(false);
-            dayCell.setStyle(null);
-            dayCell.setGraphic(null);
-            dayCell.setTooltip(null);
-
-            try {
-                if (daysInCurMonth == -1) {
-                    daysInCurMonth = curMonth.lengthOfMonth();
-                }
-                YearMonth month = curMonth;
-                int day = i - firstOfMonthIdx + 1;
-                //int index = firstOfMonthIdx + i - 1;
-                if (i < firstOfMonthIdx) {
-                    if (prevMonth == null) {
-                        prevMonth = curMonth.minusMonths(1);
-                        daysInPrevMonth = prevMonth.lengthOfMonth();
-                    }
-                    month = prevMonth;
-                    day = i + daysInPrevMonth - firstOfMonthIdx + 1;
-                    dayCell.getStyleClass().add("previous-month");
-                } else if (i >= firstOfMonthIdx + daysInCurMonth) {
-                    if (nextMonth == null) {
-                        nextMonth = curMonth.plusMonths(1);
-                        daysInNextMonth = nextMonth.lengthOfMonth();
-                    }
-                    month = nextMonth;
-                    day = i - daysInCurMonth - firstOfMonthIdx + 1;
-                    dayCell.getStyleClass().add("next-month");
-                }
-                LocalDate date = month.atDay(day);
-                dayCellDates[i] = date;
-                ChronoLocalDate cDate = chrono.date(date);
-
-                dayCell.setDisable(false);
-
-                if (isToday(date)) {
-                    dayCell.getStyleClass().add("today");
-                }
-
-                if (date.equals(datePicker.getValue())) {
-                    dayCell.getStyleClass().add("selected");
-                }
-
-                String cellText =
-                    dayCellFormatter.withLocale(locale)
-                                    .withChronology(chrono)
-                                    .withDecimalStyle(DecimalStyle.of(locale))
-                                    .format(cDate);
-                dayCell.setText(cellText);
-
-                dayCell.updateItem(date, false);
-            } catch (DateTimeException ex) {
-                // Date is out of range.
-                // System.err.println(dayCellDate(dayCell) + " " + ex);
-                dayCell.setText(" ");
-                dayCell.setDisable(true);
-            }
-        }
-    }
-
-    private int getDaysPerWeek() {
-        ValueRange range = getPrimaryChronology().range(DAY_OF_WEEK);
-        return (int)(range.getMaximum() - range.getMinimum() + 1);
-    }
-
-    private int getMonthsPerYear() {
-        ValueRange range = getPrimaryChronology().range(MONTH_OF_YEAR);
-        return (int)(range.getMaximum() - range.getMinimum() + 1);
-    }
-
-    private void updateMonthLabelWidth() {
-        if (monthLabel != null) {
-            int monthsPerYear = getMonthsPerYear();
-            double width = 0;
-            for (int i = 0; i < monthsPerYear; i++) {
-                YearMonth yearMonth = displayedYearMonth.get().withMonth(i + 1);
-                String name = monthFormatterSO.withLocale(getLocale()).format(yearMonth);
-                if (Character.isDigit(name.charAt(0))) {
-                    // Fallback. The standalone format returned a number, so use standard format instead.
-                    name = monthFormatter.withLocale(getLocale()).format(yearMonth);
-                }
-                width = Math.max(width, Utils.computeTextWidth(monthLabel.getFont(), name, 0));
-            }
-            monthLabel.setMinWidth(width);
-        }
-    }
-
-    protected void updateMonthYearPane() {
-        YearMonth yearMonth = displayedYearMonth.get();
-        String str = formatMonth(yearMonth);
-        monthLabel.setText(str);
-
-        str = formatYear(yearMonth);
-        yearLabel.setText(str);
-        double width = Utils.computeTextWidth(yearLabel.getFont(), str, 0);
-        if (width > yearLabel.getMinWidth()) {
-            yearLabel.setMinWidth(width);
-        }
-
-        Chronology chrono = datePicker.getChronology();
-        LocalDate firstDayOfMonth = yearMonth.atDay(1);
-        backMonthButton.setDisable(!isValidDate(chrono, firstDayOfMonth, -1, DAYS));
-        forwardMonthButton.setDisable(!isValidDate(chrono, firstDayOfMonth, +1, MONTHS));
-        backYearButton.setDisable(!isValidDate(chrono, firstDayOfMonth, -1, YEARS));
-        forwardYearButton.setDisable(!isValidDate(chrono, firstDayOfMonth, +1, YEARS));
-    }
-
-    private String formatMonth(YearMonth yearMonth) {
-        Locale locale = getLocale();
-        Chronology chrono = getPrimaryChronology();
-        try {
-            ChronoLocalDate cDate = chrono.date(yearMonth.atDay(1));
-
-            String str = monthFormatterSO.withLocale(getLocale())
-                                         .withChronology(chrono)
-                                         .format(cDate);
-            if (Character.isDigit(str.charAt(0))) {
-                // Fallback. The standalone format returned a number, so use standard format instead.
-                str = monthFormatter.withLocale(getLocale())
-                                    .withChronology(chrono)
-                                    .format(cDate);
-            }
-            return titleCaseWord(str);
-        } catch (DateTimeException ex) {
-            // Date is out of range.
-            return "";
-        }
-    }
-
-    private String formatYear(YearMonth yearMonth) {
-        Locale locale = getLocale();
-        Chronology chrono = getPrimaryChronology();
-        try {
-            DateTimeFormatter formatter = yearFormatter;
-            ChronoLocalDate cDate = chrono.date(yearMonth.atDay(1));
-            int era = cDate.getEra().getValue();
-            int nEras = chrono.eras().size();
-
-            /*if (cDate.get(YEAR) < 0) {
-                formatter = yearForNegYearFormatter;
-            } else */
-            if ((nEras == 2 && era == 0) || nEras > 2) {
-                formatter = yearWithEraFormatter;
-            }
-
-            // Fixme: Format Japanese era names with Japanese text.
-            String str = formatter.withLocale(getLocale())
-                                  .withChronology(chrono)
-                                  .withDecimalStyle(DecimalStyle.of(getLocale()))
-                                  .format(cDate);
-
-            return str;
-        } catch (DateTimeException ex) {
-            // Date is out of range.
-            return "";
-        }
-    }
-
-    // Ensures that month and day names are titlecased (capitalized).
-    private String titleCaseWord(String str) {
-        if (str.length() > 0) {
-            int firstChar = str.codePointAt(0);
-            if (!Character.isTitleCase(firstChar)) {
-                str = new String(new int[] { Character.toTitleCase(firstChar) }, 0, 1) +
-                      str.substring(Character.offsetByCodePoints(str, 0, 1));
-            }
-        }
-        return str;
-    }
-
-
-
-    /**
-     * determine on which day of week idx the first of the months is
-     */
-    private int determineFirstOfMonthDayOfWeek() {
-        // determine with which cell to start
-        int firstDayOfWeek = WeekFields.of(getLocale()).getFirstDayOfWeek().getValue();
-        int firstOfMonthIdx = displayedYearMonth.get().atDay(1).getDayOfWeek().getValue() - firstDayOfWeek;
-        if (firstOfMonthIdx < 0) {
-            firstOfMonthIdx += daysPerWeek;
-        }
-        return firstOfMonthIdx;
-    }
-
-    private boolean isToday(LocalDate localDate) {
-        return (localDate.equals(LocalDate.now()));
-    }
-
-    protected LocalDate dayCellDate(DateCell dateCell) {
-        assert (dayCellDates != null);
-        return dayCellDates[dayCells.indexOf(dateCell)];
-    }
-
-    // public for behavior class
-    public void goToDayCell(DateCell dateCell, int offset, ChronoUnit unit, boolean focusDayCell) {
-        goToDate(dayCellDate(dateCell).plus(offset, unit), focusDayCell);
-    }
-
-    protected void forward(int offset, ChronoUnit unit, boolean focusDayCell) {
-        YearMonth yearMonth = displayedYearMonth.get();
-        DateCell dateCell = lastFocusedDayCell;
-        if (dateCell == null || !dayCellDate(dateCell).getMonth().equals(yearMonth.getMonth())) {
-            dateCell = findDayCellForDate(yearMonth.atDay(1));
-        }
-        goToDayCell(dateCell, offset, unit, focusDayCell);
-    }
-
-    // public for behavior class
-    public void goToDate(LocalDate date, boolean focusDayCell) {
-        if (isValidDate(datePicker.getChronology(), date)) {
-            displayedYearMonth.set(YearMonth.from(date));
-            if (focusDayCell) {
-                findDayCellForDate(date).requestFocus();
-            }
-        }
-    }
-
-    // public for behavior class
-    public void selectDayCell(DateCell dateCell) {
-        datePicker.setValue(dayCellDate(dateCell));
-        datePicker.hide();
-    }
-
-    private DateCell findDayCellForDate(LocalDate date) {
-        for (int i = 0; i < dayCellDates.length; i++) {
-            if (date.equals(dayCellDates[i])) {
-                return dayCells.get(i);
-            }
-        }
-        return dayCells.get(dayCells.size()/2+1);
-    }
-
-    void clearFocus() {
-        LocalDate focusDate = datePicker.getValue();
-        if (focusDate == null) {
-            focusDate = LocalDate.now();
-        }
-        if (YearMonth.from(focusDate).equals(displayedYearMonth.get())) {
-            // focus date
-            goToDate(focusDate, true);
-        } else {
-            // focus month spinner (should not happen)
-            backMonthButton.requestFocus();
-        }
-
-        // RT-31857
-        if (backMonthButton.getWidth() == 0) {
-            backMonthButton.requestLayout();
-            forwardMonthButton.requestLayout();
-            backYearButton.requestLayout();
-            forwardYearButton.requestLayout();
-        }
-    }
-
-    protected void createDayCells() {
-        final EventHandler<MouseEvent> dayCellActionHandler = ev -> {
-            if (ev.getButton() != MouseButton.PRIMARY) {
-                return;
-            }
-
-            DateCell dayCell = (DateCell)ev.getSource();
-            selectDayCell(dayCell);
-            lastFocusedDayCell = dayCell;
-        };
-
-        for (int row = 0; row < 6; row++) {
-            for (int col = 0; col < daysPerWeek; col++) {
-                DateCell dayCell = createDayCell();
-                dayCell.addEventHandler(MouseEvent.MOUSE_CLICKED, dayCellActionHandler);
-                dayCells.add(dayCell);
-            }
-        }
-
-        dayCellDates = new LocalDate[6 * daysPerWeek];
-    }
-
-    private DateCell createDayCell() {
-        DateCell cell = null;
-        if (datePicker.getDayCellFactory() != null) {
-            cell = datePicker.getDayCellFactory().call(datePicker);
-        }
-        if (cell == null) {
-            cell = new DateCell();
-        }
-
-        return cell;
-    }
-
-    protected Locale getLocale() {
-        return Locale.getDefault(Locale.Category.FORMAT);
-    }
-
-    /**
-     * The primary chronology for display. This may be overridden to
-     * be different than the DatePicker chronology. For example
-     * DatePickerHijrahContent uses ISO as primary and Hijrah as a
-     * secondary chronology.
-     */
-    protected Chronology getPrimaryChronology() {
-        return datePicker.getChronology();
-    }
-
-    protected boolean isValidDate(Chronology chrono, LocalDate date, int offset, ChronoUnit unit) {
-        if (date != null) {
-            try {
-                return isValidDate(chrono, date.plus(offset, unit));
-            } catch (DateTimeException ex) {
-            }
-        }
-        return false;
-    }
-
-    protected boolean isValidDate(Chronology chrono, LocalDate date) {
-        try {
-            if (date != null) {
-                chrono.date(date);
-            }
-            return true;
-        } catch (DateTimeException ex) {
-            return false;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:15:30.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java	2015-09-03 15:15:28.282089300 -0700
@@ -0,0 +1,795 @@
+/*
+ * Copyright (c) 2013, 2015, 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;
+
+import java.time.DateTimeException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DecimalStyle;
+import java.time.chrono.Chronology;
+import java.time.chrono.ChronoLocalDate;
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.ValueRange;
+import java.time.temporal.WeekFields;
+import java.time.YearMonth;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import static java.time.temporal.ChronoField.*;
+import static java.time.temporal.ChronoUnit.*;
+
+import com.sun.javafx.scene.control.skin.*;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.WeakChangeListener;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.DateCell;
+import javafx.scene.control.Label;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import javafx.scene.layout.StackPane;
+
+import com.sun.javafx.scene.control.skin.resources.ControlResources;
+import com.sun.javafx.scene.traversal.Direction;
+
+import static com.sun.javafx.PlatformUtil.*;
+
+/**
+ * The full content for the DatePicker popup. This class could
+ * probably be used more or less as-is with an embeddable type of date
+ * picker that doesn't use a popup.
+ */
+public class DatePickerContent extends VBox {
+    protected DatePicker datePicker;
+    private Button backMonthButton;
+    private Button forwardMonthButton;
+    private Button backYearButton;
+    private Button forwardYearButton;
+    private Label monthLabel;
+    private Label yearLabel;
+    protected GridPane gridPane;
+
+    private int daysPerWeek;
+    private List<DateCell> dayNameCells = new ArrayList<DateCell>();
+    private List<DateCell> weekNumberCells = new ArrayList<DateCell>();
+    protected List<DateCell> dayCells = new ArrayList<DateCell>();
+    private LocalDate[] dayCellDates;
+    private DateCell lastFocusedDayCell = null;
+
+    final DateTimeFormatter monthFormatter =
+        DateTimeFormatter.ofPattern("MMMM");
+
+    final DateTimeFormatter monthFormatterSO =
+            DateTimeFormatter.ofPattern("LLLL"); // Standalone month name
+
+    final DateTimeFormatter yearFormatter =
+        DateTimeFormatter.ofPattern("y");
+
+    final DateTimeFormatter yearWithEraFormatter =
+        DateTimeFormatter.ofPattern("GGGGy"); // For Japanese. What to use for others??
+
+    final DateTimeFormatter weekNumberFormatter =
+        DateTimeFormatter.ofPattern("w");
+
+    final DateTimeFormatter weekDayNameFormatter =
+            DateTimeFormatter.ofPattern("ccc"); // Standalone day name
+
+    final DateTimeFormatter dayCellFormatter =
+        DateTimeFormatter.ofPattern("d");
+
+    static String getString(String key) {
+        return ControlResources.getString("DatePicker."+key);
+    }
+
+    public DatePickerContent(final DatePicker datePicker) {
+        this.datePicker = datePicker;
+
+        getStyleClass().add("date-picker-popup");
+
+        daysPerWeek = getDaysPerWeek();
+
+        {
+            LocalDate date = datePicker.getValue();
+            displayedYearMonth.set((date != null) ? YearMonth.from(date) : YearMonth.now());
+        }
+
+        displayedYearMonth.addListener((observable, oldValue, newValue) -> {
+            updateValues();
+        });
+
+
+        getChildren().add(createMonthYearPane());
+
+        gridPane = new GridPane() {
+            @Override protected double computePrefWidth(double height) {
+                final double width = super.computePrefWidth(height);
+
+                // RT-30903: Make sure width snaps to pixel when divided by
+                // number of columns. GridPane doesn't do this with percentage
+                // width constraints. See GridPane.adjustColumnWidths().
+                final int nCols = daysPerWeek + (datePicker.isShowWeekNumbers() ? 1 : 0);
+                final double snaphgap = snapSpace(getHgap());
+                final double left = snapSpace(getInsets().getLeft());
+                final double right = snapSpace(getInsets().getRight());
+                final double hgaps = snaphgap * (nCols - 1);
+                final double contentWidth = width - left - right - hgaps;
+                return ((snapSize(contentWidth / nCols)) * nCols) + left + right + hgaps;
+            }
+
+            @Override protected void layoutChildren() {
+                // Prevent AssertionError in GridPane
+                if (getWidth() > 0 && getHeight() > 0) {
+                    super.layoutChildren();
+                }
+            }
+        };
+        gridPane.setFocusTraversable(true);
+        gridPane.getStyleClass().add("calendar-grid");
+        gridPane.setVgap(-1);
+        gridPane.setHgap(-1);
+
+        // Add a focus owner listener to Scene when it becomes available.
+        final WeakChangeListener<Node> weakFocusOwnerListener =
+            new WeakChangeListener<Node>((ov2, oldFocusOwner, newFocusOwner) -> {
+                if (newFocusOwner == gridPane) {
+                    if (oldFocusOwner instanceof DateCell) {
+                        // Backwards traversal, skip gridPane.
+                        gridPane.impl_traverse(Direction.PREVIOUS);
+                    } else {
+                        // Forwards traversal, pass focus to day cell.
+                        if (lastFocusedDayCell != null) {
+                            Platform.runLater(() -> {
+                                lastFocusedDayCell.requestFocus();
+                            });
+                        } else {
+                            clearFocus();
+                        }
+                    }
+                }
+            });
+        gridPane.sceneProperty().addListener(new WeakChangeListener<Scene>((ov, oldScene, newScene) -> {
+            if (oldScene != null) {
+                oldScene.focusOwnerProperty().removeListener(weakFocusOwnerListener);
+            }
+            if (newScene != null) {
+                Platform.runLater(() -> {
+                    newScene.focusOwnerProperty().addListener(weakFocusOwnerListener);
+                });
+            }
+        }));
+        if (gridPane.getScene() != null) {
+            gridPane.getScene().focusOwnerProperty().addListener(weakFocusOwnerListener);
+        }
+
+        // get the weekday labels starting with the weekday that is the
+        // first-day-of-the-week according to the locale in the
+        // displayed LocalDate
+        for (int i = 0; i < daysPerWeek; i++) {
+            DateCell cell = new DateCell();
+            cell.getStyleClass().add("day-name-cell");
+            dayNameCells.add(cell);
+        }
+
+        // Week number column
+        for (int i = 0; i < 6; i++) {
+            DateCell cell = new DateCell();
+            cell.getStyleClass().add("week-number-cell");
+            weekNumberCells.add(cell);
+        }
+
+        createDayCells();
+        updateGrid();
+        getChildren().add(gridPane);
+
+        refresh();
+
+        // RT-30511: This prevents key events from reaching the popup's owner.
+        addEventHandler(KeyEvent.ANY, e -> {
+            Node node = getScene().getFocusOwner();
+            if (node instanceof DateCell) {
+                lastFocusedDayCell = (DateCell)node;
+            }
+
+            if (e.getEventType() == KeyEvent.KEY_PRESSED) {
+                switch (e.getCode()) {
+                  case HOME:
+                      goToDate(LocalDate.now(), true);
+                      e.consume();
+                      break;
+
+
+                  case PAGE_UP:
+                      if ((isMac() && e.isMetaDown()) || (!isMac() && e.isControlDown())) {
+                          if (!backYearButton.isDisabled()) {
+                              forward(-1, YEARS, true);
+                          }
+                      } else {
+                          if (!backMonthButton.isDisabled()) {
+                              forward(-1, MONTHS, true);
+                          }
+                      }
+                      e.consume();
+                      break;
+
+                  case PAGE_DOWN:
+                      if ((isMac() && e.isMetaDown()) || (!isMac() && e.isControlDown())) {
+                          if (!forwardYearButton.isDisabled()) {
+                              forward(1, YEARS, true);
+                          }
+                      } else {
+                          if (!forwardMonthButton.isDisabled()) {
+                              forward(1, MONTHS, true);
+                          }
+                      }
+                      e.consume();
+                      break;
+                }
+
+                node = getScene().getFocusOwner();
+                if (node instanceof DateCell) {
+                    lastFocusedDayCell = (DateCell)node;
+                }
+            }
+
+            // Consume all key events except those that control
+            // showing the popup and traversal.
+            switch (e.getCode()) {
+              case F4:
+              case F10:
+              case UP:
+              case DOWN:
+              case LEFT:
+              case RIGHT:
+              case TAB:
+                    break;
+
+              case ESCAPE:
+                datePicker.hide();
+                e.consume();
+                break;
+
+              default:
+                e.consume();
+            }
+        });
+    }
+
+    private ObjectProperty<YearMonth> displayedYearMonth =
+        new SimpleObjectProperty<YearMonth>(this, "displayedYearMonth");
+
+    public ObjectProperty<YearMonth> displayedYearMonthProperty() {
+        return displayedYearMonth;
+    }
+
+
+    protected BorderPane createMonthYearPane() {
+        BorderPane monthYearPane = new BorderPane();
+        monthYearPane.getStyleClass().add("month-year-pane");
+
+        // Month spinner
+
+        HBox monthSpinner = new HBox();
+        monthSpinner.getStyleClass().add("spinner");
+
+        backMonthButton = new Button();
+        backMonthButton.getStyleClass().add("left-button");
+
+        forwardMonthButton = new Button();
+        forwardMonthButton.getStyleClass().add("right-button");
+
+        StackPane leftMonthArrow = new StackPane();
+        leftMonthArrow.getStyleClass().add("left-arrow");
+        leftMonthArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
+        backMonthButton.setGraphic(leftMonthArrow);
+
+        StackPane rightMonthArrow = new StackPane();
+        rightMonthArrow.getStyleClass().add("right-arrow");
+        rightMonthArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
+        forwardMonthButton.setGraphic(rightMonthArrow);
+
+
+        backMonthButton.setOnAction(t -> {
+            forward(-1, MONTHS, false);
+        });
+
+        monthLabel = new Label();
+        monthLabel.getStyleClass().add("spinner-label");
+
+        forwardMonthButton.setOnAction(t -> {
+            forward(1, MONTHS, false);
+        });
+
+        monthSpinner.getChildren().addAll(backMonthButton, monthLabel, forwardMonthButton);
+        monthYearPane.setLeft(monthSpinner);
+
+        // Year spinner
+
+        HBox yearSpinner = new HBox();
+        yearSpinner.getStyleClass().add("spinner");
+
+        backYearButton = new Button();
+        backYearButton.getStyleClass().add("left-button");
+
+        forwardYearButton = new Button();
+        forwardYearButton.getStyleClass().add("right-button");
+
+        StackPane leftYearArrow = new StackPane();
+        leftYearArrow.getStyleClass().add("left-arrow");
+        leftYearArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
+        backYearButton.setGraphic(leftYearArrow);
+
+        StackPane rightYearArrow = new StackPane();
+        rightYearArrow.getStyleClass().add("right-arrow");
+        rightYearArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
+        forwardYearButton.setGraphic(rightYearArrow);
+
+
+        backYearButton.setOnAction(t -> {
+            forward(-1, YEARS, false);
+        });
+
+        yearLabel = new Label();
+        yearLabel.getStyleClass().add("spinner-label");
+
+        forwardYearButton.setOnAction(t -> {
+            forward(1, YEARS, false);
+        });
+
+        yearSpinner.getChildren().addAll(backYearButton, yearLabel, forwardYearButton);
+        yearSpinner.setFillHeight(false);
+        monthYearPane.setRight(yearSpinner);
+
+        return monthYearPane;
+    }
+
+    private void refresh() {
+        updateMonthLabelWidth();
+        updateDayNameCells();
+        updateValues();
+    }
+
+    public void updateValues() {
+        // Note: Preserve this order, as DatePickerHijrahContent needs
+        // updateDayCells before updateMonthYearPane().
+        updateWeeknumberDateCells();
+        updateDayCells();
+        updateMonthYearPane();
+    }
+
+    public void updateGrid() {
+        gridPane.getColumnConstraints().clear();
+        gridPane.getChildren().clear();
+
+        int nCols = daysPerWeek + (datePicker.isShowWeekNumbers() ? 1 : 0);
+
+        ColumnConstraints columnConstraints = new ColumnConstraints();
+        columnConstraints.setPercentWidth(100); // Treated as weight
+        for (int i = 0; i < nCols; i++) {
+            gridPane.getColumnConstraints().add(columnConstraints);
+        }
+
+        for (int i = 0; i < daysPerWeek; i++) {
+            gridPane.add(dayNameCells.get(i), i + nCols - daysPerWeek, 1);  // col, row
+        }
+
+        // Week number column
+        if (datePicker.isShowWeekNumbers()) {
+            for (int i = 0; i < 6; i++) {
+                gridPane.add(weekNumberCells.get(i), 0, i + 2);  // col, row
+            }
+        }
+
+        // setup: 6 rows of daysPerWeek (which is the maximum number of cells required in the worst case layout)
+        for (int row = 0; row < 6; row++) {
+            for (int col = 0; col < daysPerWeek; col++) {
+                gridPane.add(dayCells.get(row*daysPerWeek+col), col + nCols - daysPerWeek, row + 2);
+            }
+        }
+    }
+
+    public void updateDayNameCells() {
+        // first day of week, 1 = monday, 7 = sunday
+        int firstDayOfWeek = WeekFields.of(getLocale()).getFirstDayOfWeek().getValue();
+
+        // july 13th 2009 is a Monday, so a firstDayOfWeek=1 must come out of the 13th
+        LocalDate date = LocalDate.of(2009, 7, 12 + firstDayOfWeek);
+        for (int i = 0; i < daysPerWeek; i++) {
+            String name = weekDayNameFormatter.withLocale(getLocale()).format(date.plus(i, DAYS));
+            dayNameCells.get(i).setText(titleCaseWord(name));
+        }
+    }
+
+    public void updateWeeknumberDateCells() {
+        if (datePicker.isShowWeekNumbers()) {
+            final Locale locale = getLocale();
+            final int maxWeeksPerMonth = 6; // TODO: Get this from chronology?
+
+            LocalDate firstOfMonth = displayedYearMonth.get().atDay(1);
+            for (int i = 0; i < maxWeeksPerMonth; i++) {
+                LocalDate date = firstOfMonth.plus(i, WEEKS);
+                // Use a formatter to ensure correct localization,
+                // such as when Thai numerals are required.
+                String cellText =
+                    weekNumberFormatter.withLocale(locale)
+                                       .withDecimalStyle(DecimalStyle.of(locale))
+                                       .format(date);
+                weekNumberCells.get(i).setText(cellText);
+            }
+        }
+    }
+
+    public void updateDayCells() {
+        Locale locale = getLocale();
+        Chronology chrono = getPrimaryChronology();
+        int firstOfMonthIdx = determineFirstOfMonthDayOfWeek();
+        YearMonth curMonth = displayedYearMonth.get();
+
+        // RT-31075: The following are now set in the try-catch block.
+        YearMonth prevMonth = null;
+        YearMonth nextMonth = null;
+        int daysInCurMonth = -1;
+        int daysInPrevMonth = -1;
+        int daysInNextMonth = -1;
+
+        for (int i = 0; i < 6 * daysPerWeek; i++) {
+            DateCell dayCell = dayCells.get(i);
+            dayCell.getStyleClass().setAll("cell", "date-cell", "day-cell");
+            dayCell.setDisable(false);
+            dayCell.setStyle(null);
+            dayCell.setGraphic(null);
+            dayCell.setTooltip(null);
+
+            try {
+                if (daysInCurMonth == -1) {
+                    daysInCurMonth = curMonth.lengthOfMonth();
+                }
+                YearMonth month = curMonth;
+                int day = i - firstOfMonthIdx + 1;
+                //int index = firstOfMonthIdx + i - 1;
+                if (i < firstOfMonthIdx) {
+                    if (prevMonth == null) {
+                        prevMonth = curMonth.minusMonths(1);
+                        daysInPrevMonth = prevMonth.lengthOfMonth();
+                    }
+                    month = prevMonth;
+                    day = i + daysInPrevMonth - firstOfMonthIdx + 1;
+                    dayCell.getStyleClass().add("previous-month");
+                } else if (i >= firstOfMonthIdx + daysInCurMonth) {
+                    if (nextMonth == null) {
+                        nextMonth = curMonth.plusMonths(1);
+                        daysInNextMonth = nextMonth.lengthOfMonth();
+                    }
+                    month = nextMonth;
+                    day = i - daysInCurMonth - firstOfMonthIdx + 1;
+                    dayCell.getStyleClass().add("next-month");
+                }
+                LocalDate date = month.atDay(day);
+                dayCellDates[i] = date;
+                ChronoLocalDate cDate = chrono.date(date);
+
+                dayCell.setDisable(false);
+
+                if (isToday(date)) {
+                    dayCell.getStyleClass().add("today");
+                }
+
+                if (date.equals(datePicker.getValue())) {
+                    dayCell.getStyleClass().add("selected");
+                }
+
+                String cellText =
+                    dayCellFormatter.withLocale(locale)
+                                    .withChronology(chrono)
+                                    .withDecimalStyle(DecimalStyle.of(locale))
+                                    .format(cDate);
+                dayCell.setText(cellText);
+
+                dayCell.updateItem(date, false);
+            } catch (DateTimeException ex) {
+                // Date is out of range.
+                // System.err.println(dayCellDate(dayCell) + " " + ex);
+                dayCell.setText(" ");
+                dayCell.setDisable(true);
+            }
+        }
+    }
+
+    private int getDaysPerWeek() {
+        ValueRange range = getPrimaryChronology().range(DAY_OF_WEEK);
+        return (int)(range.getMaximum() - range.getMinimum() + 1);
+    }
+
+    private int getMonthsPerYear() {
+        ValueRange range = getPrimaryChronology().range(MONTH_OF_YEAR);
+        return (int)(range.getMaximum() - range.getMinimum() + 1);
+    }
+
+    private void updateMonthLabelWidth() {
+        if (monthLabel != null) {
+            int monthsPerYear = getMonthsPerYear();
+            double width = 0;
+            for (int i = 0; i < monthsPerYear; i++) {
+                YearMonth yearMonth = displayedYearMonth.get().withMonth(i + 1);
+                String name = monthFormatterSO.withLocale(getLocale()).format(yearMonth);
+                if (Character.isDigit(name.charAt(0))) {
+                    // Fallback. The standalone format returned a number, so use standard format instead.
+                    name = monthFormatter.withLocale(getLocale()).format(yearMonth);
+                }
+                width = Math.max(width, Utils.computeTextWidth(monthLabel.getFont(), name, 0));
+            }
+            monthLabel.setMinWidth(width);
+        }
+    }
+
+    protected void updateMonthYearPane() {
+        YearMonth yearMonth = displayedYearMonth.get();
+        String str = formatMonth(yearMonth);
+        monthLabel.setText(str);
+
+        str = formatYear(yearMonth);
+        yearLabel.setText(str);
+        double width = Utils.computeTextWidth(yearLabel.getFont(), str, 0);
+        if (width > yearLabel.getMinWidth()) {
+            yearLabel.setMinWidth(width);
+        }
+
+        Chronology chrono = datePicker.getChronology();
+        LocalDate firstDayOfMonth = yearMonth.atDay(1);
+        backMonthButton.setDisable(!isValidDate(chrono, firstDayOfMonth, -1, DAYS));
+        forwardMonthButton.setDisable(!isValidDate(chrono, firstDayOfMonth, +1, MONTHS));
+        backYearButton.setDisable(!isValidDate(chrono, firstDayOfMonth, -1, YEARS));
+        forwardYearButton.setDisable(!isValidDate(chrono, firstDayOfMonth, +1, YEARS));
+    }
+
+    private String formatMonth(YearMonth yearMonth) {
+        Locale locale = getLocale();
+        Chronology chrono = getPrimaryChronology();
+        try {
+            ChronoLocalDate cDate = chrono.date(yearMonth.atDay(1));
+
+            String str = monthFormatterSO.withLocale(getLocale())
+                                         .withChronology(chrono)
+                                         .format(cDate);
+            if (Character.isDigit(str.charAt(0))) {
+                // Fallback. The standalone format returned a number, so use standard format instead.
+                str = monthFormatter.withLocale(getLocale())
+                                    .withChronology(chrono)
+                                    .format(cDate);
+            }
+            return titleCaseWord(str);
+        } catch (DateTimeException ex) {
+            // Date is out of range.
+            return "";
+        }
+    }
+
+    private String formatYear(YearMonth yearMonth) {
+        Locale locale = getLocale();
+        Chronology chrono = getPrimaryChronology();
+        try {
+            DateTimeFormatter formatter = yearFormatter;
+            ChronoLocalDate cDate = chrono.date(yearMonth.atDay(1));
+            int era = cDate.getEra().getValue();
+            int nEras = chrono.eras().size();
+
+            /*if (cDate.get(YEAR) < 0) {
+                formatter = yearForNegYearFormatter;
+            } else */
+            if ((nEras == 2 && era == 0) || nEras > 2) {
+                formatter = yearWithEraFormatter;
+            }
+
+            // Fixme: Format Japanese era names with Japanese text.
+            String str = formatter.withLocale(getLocale())
+                                  .withChronology(chrono)
+                                  .withDecimalStyle(DecimalStyle.of(getLocale()))
+                                  .format(cDate);
+
+            return str;
+        } catch (DateTimeException ex) {
+            // Date is out of range.
+            return "";
+        }
+    }
+
+    // Ensures that month and day names are titlecased (capitalized).
+    private String titleCaseWord(String str) {
+        if (str.length() > 0) {
+            int firstChar = str.codePointAt(0);
+            if (!Character.isTitleCase(firstChar)) {
+                str = new String(new int[] { Character.toTitleCase(firstChar) }, 0, 1) +
+                      str.substring(Character.offsetByCodePoints(str, 0, 1));
+            }
+        }
+        return str;
+    }
+
+
+
+    /**
+     * determine on which day of week idx the first of the months is
+     */
+    private int determineFirstOfMonthDayOfWeek() {
+        // determine with which cell to start
+        int firstDayOfWeek = WeekFields.of(getLocale()).getFirstDayOfWeek().getValue();
+        int firstOfMonthIdx = displayedYearMonth.get().atDay(1).getDayOfWeek().getValue() - firstDayOfWeek;
+        if (firstOfMonthIdx < 0) {
+            firstOfMonthIdx += daysPerWeek;
+        }
+        return firstOfMonthIdx;
+    }
+
+    private boolean isToday(LocalDate localDate) {
+        return (localDate.equals(LocalDate.now()));
+    }
+
+    protected LocalDate dayCellDate(DateCell dateCell) {
+        assert (dayCellDates != null);
+        return dayCellDates[dayCells.indexOf(dateCell)];
+    }
+
+    // public for behavior class
+    public void goToDayCell(DateCell dateCell, int offset, ChronoUnit unit, boolean focusDayCell) {
+        goToDate(dayCellDate(dateCell).plus(offset, unit), focusDayCell);
+    }
+
+    protected void forward(int offset, ChronoUnit unit, boolean focusDayCell) {
+        YearMonth yearMonth = displayedYearMonth.get();
+        DateCell dateCell = lastFocusedDayCell;
+        if (dateCell == null || !dayCellDate(dateCell).getMonth().equals(yearMonth.getMonth())) {
+            dateCell = findDayCellForDate(yearMonth.atDay(1));
+        }
+        goToDayCell(dateCell, offset, unit, focusDayCell);
+    }
+
+    // public for behavior class
+    public void goToDate(LocalDate date, boolean focusDayCell) {
+        if (isValidDate(datePicker.getChronology(), date)) {
+            displayedYearMonth.set(YearMonth.from(date));
+            if (focusDayCell) {
+                findDayCellForDate(date).requestFocus();
+            }
+        }
+    }
+
+    // public for behavior class
+    public void selectDayCell(DateCell dateCell) {
+        datePicker.setValue(dayCellDate(dateCell));
+        datePicker.hide();
+    }
+
+    private DateCell findDayCellForDate(LocalDate date) {
+        for (int i = 0; i < dayCellDates.length; i++) {
+            if (date.equals(dayCellDates[i])) {
+                return dayCells.get(i);
+            }
+        }
+        return dayCells.get(dayCells.size()/2+1);
+    }
+
+    public void clearFocus() {
+        LocalDate focusDate = datePicker.getValue();
+        if (focusDate == null) {
+            focusDate = LocalDate.now();
+        }
+        if (YearMonth.from(focusDate).equals(displayedYearMonth.get())) {
+            // focus date
+            goToDate(focusDate, true);
+        } else {
+            // focus month spinner (should not happen)
+            backMonthButton.requestFocus();
+        }
+
+        // RT-31857
+        if (backMonthButton.getWidth() == 0) {
+            backMonthButton.requestLayout();
+            forwardMonthButton.requestLayout();
+            backYearButton.requestLayout();
+            forwardYearButton.requestLayout();
+        }
+    }
+
+    protected void createDayCells() {
+        final EventHandler<MouseEvent> dayCellActionHandler = ev -> {
+            if (ev.getButton() != MouseButton.PRIMARY) {
+                return;
+            }
+
+            DateCell dayCell = (DateCell)ev.getSource();
+            selectDayCell(dayCell);
+            lastFocusedDayCell = dayCell;
+        };
+
+        for (int row = 0; row < 6; row++) {
+            for (int col = 0; col < daysPerWeek; col++) {
+                DateCell dayCell = createDayCell();
+                dayCell.addEventHandler(MouseEvent.MOUSE_CLICKED, dayCellActionHandler);
+                dayCells.add(dayCell);
+            }
+        }
+
+        dayCellDates = new LocalDate[6 * daysPerWeek];
+    }
+
+    private DateCell createDayCell() {
+        DateCell cell = null;
+        if (datePicker.getDayCellFactory() != null) {
+            cell = datePicker.getDayCellFactory().call(datePicker);
+        }
+        if (cell == null) {
+            cell = new DateCell();
+        }
+
+        return cell;
+    }
+
+    protected Locale getLocale() {
+        return Locale.getDefault(Locale.Category.FORMAT);
+    }
+
+    /**
+     * The primary chronology for display. This may be overridden to
+     * be different than the DatePicker chronology. For example
+     * DatePickerHijrahContent uses ISO as primary and Hijrah as a
+     * secondary chronology.
+     */
+    protected Chronology getPrimaryChronology() {
+        return datePicker.getChronology();
+    }
+
+    protected boolean isValidDate(Chronology chrono, LocalDate date, int offset, ChronoUnit unit) {
+        if (date != null) {
+            try {
+                return isValidDate(chrono, date.plus(offset, unit));
+            } catch (DateTimeException ex) {
+            }
+        }
+        return false;
+    }
+
+    protected boolean isValidDate(Chronology chrono, LocalDate date) {
+        try {
+            if (date != null) {
+                chrono.date(date);
+            }
+            return true;
+        } catch (DateTimeException ex) {
+            return false;
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DatePickerHijrahContent.java	2015-09-03 15:15:37.274603600 -0700
+++ /dev/null	2015-09-03 15:15:38.000000000 -0700
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 java.time.LocalDate;
-import java.time.DateTimeException;
-import java.time.YearMonth;
-import java.time.format.DecimalStyle;
-import java.time.chrono.Chronology;
-import java.time.chrono.HijrahChronology;
-import java.time.chrono.HijrahDate;
-import java.time.chrono.IsoChronology;
-import java.util.Locale;
-
-import static java.time.temporal.ChronoField.*;
-
-import javafx.geometry.Pos;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.DateCell;
-import javafx.scene.control.Label;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.text.Text;
-
-/**
- * Extends DatePickerContent to add a secondary calendar, allowing the
- * ISO and Islamic calendars to be displayed simultaneously.  The
- * secondary month, day, and year values are displayed as a colored
- * overlay, offset from the primary values.
- *
- * If the current DatePicker Chronology is HijrahChronology, then sets
- * the content's primary Chronology to be IsoChronology, and sets
- * HijrahChronology as the secondary.
- */
-class DatePickerHijrahContent extends DatePickerContent {
-    private Label hijrahMonthYearLabel;
-
-    DatePickerHijrahContent(final DatePicker datePicker) {
-        super(datePicker);
-    }
-
-    /**
-     * The primary chronology for display. This is overridden because
-     * DatePickerHijrahContent uses ISO as primary and Hijrah as a
-     * secondary chronology.
-     */
-    @Override protected Chronology getPrimaryChronology() {
-        return IsoChronology.INSTANCE;
-    }
-
-    @Override protected BorderPane createMonthYearPane() {
-        BorderPane monthYearPane = super.createMonthYearPane();
-
-        hijrahMonthYearLabel = new Label();
-        hijrahMonthYearLabel.getStyleClass().add("secondary-label");
-        monthYearPane.setBottom(hijrahMonthYearLabel);
-        BorderPane.setAlignment(hijrahMonthYearLabel, Pos.CENTER);
-
-        return monthYearPane;
-    }
-
-
-    @Override protected void updateMonthYearPane() {
-        super.updateMonthYearPane();
-
-        Locale locale = getLocale();
-        HijrahChronology chrono = HijrahChronology.INSTANCE;
-        long firstMonth = -1;
-        long firstYear = -1;
-        String firstMonthStr = null;
-        String firstYearStr = null;
-        String hijrahStr = null;
-        YearMonth displayedYearMonth = displayedYearMonthProperty().get();
-
-        for (DateCell dayCell : dayCells) {
-            LocalDate date = dayCellDate(dayCell);
-
-            // Display Hijra month names only for current ISO month.
-            if (!displayedYearMonth.equals(YearMonth.from(date))) {
-                continue;
-            }
-
-            try {
-                HijrahDate cDate = chrono.date(date);
-                long month = cDate.getLong(MONTH_OF_YEAR);
-                long year = cDate.getLong(YEAR);
-
-                if (hijrahStr == null || month != firstMonth) {
-                    String monthStr = monthFormatter.withLocale(locale)
-                                                    .withChronology(chrono)
-                                                    .withDecimalStyle(DecimalStyle.of(locale))
-                                                    .format(cDate);
-                    String yearStr = yearFormatter.withLocale(locale)
-                                                    .withChronology(chrono)
-                                                    .withDecimalStyle(DecimalStyle.of(locale))
-                                                    .format(cDate);
-                    if (hijrahStr == null) {
-                        firstMonth = month;
-                        firstYear = year;
-                        firstMonthStr = monthStr;
-                        firstYearStr = yearStr;
-                        hijrahStr = firstMonthStr + " " + firstYearStr;
-                    } else {
-                        if (year > firstYear) {
-                            hijrahStr = firstMonthStr + " " + firstYearStr + " - " + monthStr + " " + yearStr;
-                        } else {
-                            hijrahStr = firstMonthStr + " - " + monthStr + " " + firstYearStr;
-                        }
-                        break;
-                    }
-                }
-            } catch (DateTimeException ex) {
-                // Date is out of range, ignore.
-
-                //System.err.println(dayCellDate(dayCell) + " " + ex);
-            }
-        }
-
-        hijrahMonthYearLabel.setText(hijrahStr);
-    }
-
-    @Override protected void createDayCells() {
-        super.createDayCells();
-
-        for (DateCell dayCell : dayCells) {
-            Text secondaryText = new Text();
-            dayCell.getProperties().put("DateCell.secondaryText", secondaryText);
-        }
-    }
-
-    @Override void updateDayCells() {
-        super.updateDayCells();
-
-        Locale locale = getLocale();
-        HijrahChronology chrono = HijrahChronology.INSTANCE;
-
-        int majorityMonth = -1;
-        int visibleDaysInMajorityMonth = -1;
-        int curMonth = -1;
-        int visibleDaysInCurMonth = 0;
-
-        for (DateCell dayCell : dayCells) {
-            Text secondaryText = (Text)dayCell.getProperties().get("DateCell.secondaryText");
-            dayCell.getStyleClass().add("hijrah-day-cell");
-            secondaryText.getStyleClass().setAll("text", "secondary-text");
-
-            try {
-                HijrahDate cDate = chrono.date(dayCellDate(dayCell));
-//             long month = cDate.getLong(MONTH_OF_YEAR);
-
-                String hijrahStr =
-                    dayCellFormatter.withLocale(locale)
-                                    .withChronology(chrono)
-                                    .withDecimalStyle(DecimalStyle.of(locale))
-                                    .format(cDate);
-
-                secondaryText.setText(hijrahStr);
-                dayCell.requestLayout();
-            } catch (DateTimeException ex) {
-                // Date is out of range.
-                // System.err.println(dayCellDate(dayCell) + " " + ex);
-                secondaryText.setText(" ");
-                dayCell.setDisable(true);
-            }
-
-//             if (month == curMonth) {
-//                 visibleDaysInCurMonth++;
-//             } else {
-//                 curMonth = month;
-//                 visibleDaysInCurMonth = 1;
-//             }
-//             if (visibleDaysInCurMonth > visibleDaysInMajorityMonth) {
-//                 majorityMonth = month;
-//                 visibleDaysInMajorityMonth = visibleDaysInCurMonth;
-//             }
-        }
-
-//         boolean seenMajorityMonth = false;
-//         for (DateCell dayCell : dayCells) {
-//             HijrahDate cDate = chrono.date(dayCellDate(dayCell));
-//             int month = cDate.get(MONTH_OF_YEAR);
-//             Text secondaryText = (Text)dayCell.getProperties().get("DateCell.secondaryText");
-
-//             if (month == majorityMonth) {
-//                 seenMajorityMonth = true;
-//                 secondaryText.getStyleClass().add("current-month");
-//             } else {
-//                 secondaryText.getStyleClass().add(seenMajorityMonth ? "next-month" : "previous-month");
-//             }
-//         }
-    }
-}
--- /dev/null	2015-09-03 15:15:38.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DatePickerHijrahContent.java	2015-09-03 15:15:36.458557000 -0700
@@ -0,0 +1,214 @@
+/*
+ * Copyright (c) 2013, 2015, 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;
+
+import java.time.LocalDate;
+import java.time.DateTimeException;
+import java.time.YearMonth;
+import java.time.format.DecimalStyle;
+import java.time.chrono.Chronology;
+import java.time.chrono.HijrahChronology;
+import java.time.chrono.HijrahDate;
+import java.time.chrono.IsoChronology;
+import java.util.Locale;
+
+import static java.time.temporal.ChronoField.*;
+
+import javafx.geometry.Pos;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.DateCell;
+import javafx.scene.control.Label;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.text.Text;
+
+/**
+ * Extends DatePickerContent to add a secondary calendar, allowing the
+ * ISO and Islamic calendars to be displayed simultaneously.  The
+ * secondary month, day, and year values are displayed as a colored
+ * overlay, offset from the primary values.
+ *
+ * If the current DatePicker Chronology is HijrahChronology, then sets
+ * the content's primary Chronology to be IsoChronology, and sets
+ * HijrahChronology as the secondary.
+ */
+public class DatePickerHijrahContent extends DatePickerContent {
+    private Label hijrahMonthYearLabel;
+
+    public DatePickerHijrahContent(final DatePicker datePicker) {
+        super(datePicker);
+    }
+
+    /**
+     * The primary chronology for display. This is overridden because
+     * DatePickerHijrahContent uses ISO as primary and Hijrah as a
+     * secondary chronology.
+     */
+    @Override protected Chronology getPrimaryChronology() {
+        return IsoChronology.INSTANCE;
+    }
+
+    @Override protected BorderPane createMonthYearPane() {
+        BorderPane monthYearPane = super.createMonthYearPane();
+
+        hijrahMonthYearLabel = new Label();
+        hijrahMonthYearLabel.getStyleClass().add("secondary-label");
+        monthYearPane.setBottom(hijrahMonthYearLabel);
+        BorderPane.setAlignment(hijrahMonthYearLabel, Pos.CENTER);
+
+        return monthYearPane;
+    }
+
+
+    @Override protected void updateMonthYearPane() {
+        super.updateMonthYearPane();
+
+        Locale locale = getLocale();
+        HijrahChronology chrono = HijrahChronology.INSTANCE;
+        long firstMonth = -1;
+        long firstYear = -1;
+        String firstMonthStr = null;
+        String firstYearStr = null;
+        String hijrahStr = null;
+        YearMonth displayedYearMonth = displayedYearMonthProperty().get();
+
+        for (DateCell dayCell : dayCells) {
+            LocalDate date = dayCellDate(dayCell);
+
+            // Display Hijra month names only for current ISO month.
+            if (!displayedYearMonth.equals(YearMonth.from(date))) {
+                continue;
+            }
+
+            try {
+                HijrahDate cDate = chrono.date(date);
+                long month = cDate.getLong(MONTH_OF_YEAR);
+                long year = cDate.getLong(YEAR);
+
+                if (hijrahStr == null || month != firstMonth) {
+                    String monthStr = monthFormatter.withLocale(locale)
+                                                    .withChronology(chrono)
+                                                    .withDecimalStyle(DecimalStyle.of(locale))
+                                                    .format(cDate);
+                    String yearStr = yearFormatter.withLocale(locale)
+                                                    .withChronology(chrono)
+                                                    .withDecimalStyle(DecimalStyle.of(locale))
+                                                    .format(cDate);
+                    if (hijrahStr == null) {
+                        firstMonth = month;
+                        firstYear = year;
+                        firstMonthStr = monthStr;
+                        firstYearStr = yearStr;
+                        hijrahStr = firstMonthStr + " " + firstYearStr;
+                    } else {
+                        if (year > firstYear) {
+                            hijrahStr = firstMonthStr + " " + firstYearStr + " - " + monthStr + " " + yearStr;
+                        } else {
+                            hijrahStr = firstMonthStr + " - " + monthStr + " " + firstYearStr;
+                        }
+                        break;
+                    }
+                }
+            } catch (DateTimeException ex) {
+                // Date is out of range, ignore.
+
+                //System.err.println(dayCellDate(dayCell) + " " + ex);
+            }
+        }
+
+        hijrahMonthYearLabel.setText(hijrahStr);
+    }
+
+    @Override protected void createDayCells() {
+        super.createDayCells();
+
+        for (DateCell dayCell : dayCells) {
+            Text secondaryText = new Text();
+            dayCell.getProperties().put("DateCell.secondaryText", secondaryText);
+        }
+    }
+
+    @Override public void updateDayCells() {
+        super.updateDayCells();
+
+        Locale locale = getLocale();
+        HijrahChronology chrono = HijrahChronology.INSTANCE;
+
+        int majorityMonth = -1;
+        int visibleDaysInMajorityMonth = -1;
+        int curMonth = -1;
+        int visibleDaysInCurMonth = 0;
+
+        for (DateCell dayCell : dayCells) {
+            Text secondaryText = (Text)dayCell.getProperties().get("DateCell.secondaryText");
+            dayCell.getStyleClass().add("hijrah-day-cell");
+            secondaryText.getStyleClass().setAll("text", "secondary-text");
+
+            try {
+                HijrahDate cDate = chrono.date(dayCellDate(dayCell));
+//             long month = cDate.getLong(MONTH_OF_YEAR);
+
+                String hijrahStr =
+                    dayCellFormatter.withLocale(locale)
+                                    .withChronology(chrono)
+                                    .withDecimalStyle(DecimalStyle.of(locale))
+                                    .format(cDate);
+
+                secondaryText.setText(hijrahStr);
+                dayCell.requestLayout();
+            } catch (DateTimeException ex) {
+                // Date is out of range.
+                // System.err.println(dayCellDate(dayCell) + " " + ex);
+                secondaryText.setText(" ");
+                dayCell.setDisable(true);
+            }
+
+//             if (month == curMonth) {
+//                 visibleDaysInCurMonth++;
+//             } else {
+//                 curMonth = month;
+//                 visibleDaysInCurMonth = 1;
+//             }
+//             if (visibleDaysInCurMonth > visibleDaysInMajorityMonth) {
+//                 majorityMonth = month;
+//                 visibleDaysInMajorityMonth = visibleDaysInCurMonth;
+//             }
+        }
+
+//         boolean seenMajorityMonth = false;
+//         for (DateCell dayCell : dayCells) {
+//             HijrahDate cDate = chrono.date(dayCellDate(dayCell));
+//             int month = cDate.get(MONTH_OF_YEAR);
+//             Text secondaryText = (Text)dayCell.getProperties().get("DateCell.secondaryText");
+
+//             if (month == majorityMonth) {
+//                 seenMajorityMonth = true;
+//                 secondaryText.getStyleClass().add("current-month");
+//             } else {
+//                 secondaryText.getStyleClass().add(seenMajorityMonth ? "next-month" : "previous-month");
+//             }
+//         }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DoubleField.java	2015-09-03 15:15:45.371066700 -0700
+++ /dev/null	2015-09-03 15:15:46.000000000 -0700
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-import com.sun.javafx.scene.control.skin.InputField;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.scene.control.Skin;
-
-/**
- *
- */
-class DoubleField extends InputField {
-    /**
-     * The value of the DoubleField. If null, the value will be treated as "0", but
-     * will still actually be null.
-     */
-    private DoubleProperty value = new SimpleDoubleProperty(this, "value");
-    public final double getValue() { return value.get(); }
-    public final void setValue(double value) { this.value.set(value); }
-    public final DoubleProperty valueProperty() { return value; }
-
-    /**
-     * Creates a new DoubleField. The style class is set to "money-field".
-     */
-    public DoubleField() {
-        getStyleClass().setAll("double-field");
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Methods                                                                 *
-     *                                                                         *
-     **************************************************************************/
-
-    /** {@inheritDoc} */
-    @Override protected Skin<?> createDefaultSkin() {
-        return new DoubleFieldSkin(this);
-    }
-}
--- /dev/null	2015-09-03 15:15:46.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/DoubleField.java	2015-09-03 15:15:44.491016400 -0700
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2012, 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.scene.control;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.scene.control.Skin;
+import com.sun.javafx.scene.control.skin.DoubleFieldSkin;
+
+/**
+ *
+ */
+public class DoubleField extends InputField {
+    /**
+     * The value of the DoubleField. If null, the value will be treated as "0", but
+     * will still actually be null.
+     */
+    private DoubleProperty value = new SimpleDoubleProperty(this, "value");
+    public final double getValue() { return value.get(); }
+    public final void setValue(double value) { this.value.set(value); }
+    public final DoubleProperty valueProperty() { return value; }
+
+    /**
+     * Creates a new DoubleField. The style class is set to "money-field".
+     */
+    public DoubleField() {
+        getStyleClass().setAll("double-field");
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Methods                                                                 *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected Skin<?> createDefaultSkin() {
+        return new DoubleFieldSkin(this);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/EmbeddedTextContextMenuContent.java	2015-09-03 15:15:53.749545900 -0700
+++ /dev/null	2015-09-03 15:15:54.000000000 -0700
@@ -1,190 +0,0 @@
-/*
- * Copyright (c) 2012, 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 java.util.Map;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.collections.ListChangeListener;
-import javafx.event.ActionEvent;
-import javafx.event.Event;
-import javafx.geometry.HPos;
-import javafx.geometry.VPos;
-import javafx.scene.control.*;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-
-/**
- * The embedded context menu for a text input control.  
- * The menu will be displayed horizontally underneath the cursor 
- * with the available text editing options i.e. cut, copy, paste, select all.
- *
- */
-public class EmbeddedTextContextMenuContent extends StackPane {
-
-    private ContextMenu contextMenu;
-    private StackPane pointer;
-    private HBox menuBox;
-
-    public EmbeddedTextContextMenuContent(final ContextMenu popupMenu) {
-        this.contextMenu = popupMenu;
-        this.menuBox = new HBox();
-        this.pointer = new StackPane();
-        pointer.getStyleClass().add("pointer");
-
-        updateMenuItemContainer();
-        getChildren().addAll(pointer, menuBox);
-
-        contextMenu.ownerNodeProperty().addListener(arg0 -> {
-            if (contextMenu.getOwnerNode() instanceof TextArea) {
-                TextAreaSkin tas = (TextAreaSkin)((TextArea)contextMenu.getOwnerNode()).getSkin();
-                tas.getSkinnable().getProperties().addListener(new InvalidationListener() {
-                    @Override public void invalidated(Observable arg0) {
-                        requestLayout();
-                    }
-                });
-            } else if (contextMenu.getOwnerNode() instanceof TextField) {
-                TextFieldSkin tfs = (TextFieldSkin)((TextField)contextMenu.getOwnerNode()).getSkin();
-                tfs.getSkinnable().getProperties().addListener(new InvalidationListener() {
-                    @Override public void invalidated(Observable arg0) {
-                        requestLayout();
-                    }
-                });
-            }
-        });
-
-        contextMenu.getItems().addListener((ListChangeListener<MenuItem>) c -> {
-            // Listener to items in PopupMenu to update items in PopupMenuContent
-            updateMenuItemContainer();
-        });
-    }
-
-    private void updateMenuItemContainer() {
-        menuBox.getChildren().clear();
-        for (MenuItem item: contextMenu.getItems()) {
-            MenuItemContainer menuItemContainer = new MenuItemContainer(item);
-            menuItemContainer.visibleProperty().bind(item.visibleProperty());
-            menuBox.getChildren().add(menuItemContainer);
-        }
-    }
-
-    private void hideAllMenus(MenuItem item) {
-        contextMenu.hide();
-
-        Menu parentMenu;
-        while ((parentMenu = item.getParentMenu()) != null) {
-            parentMenu.hide();
-            item = parentMenu;
-        }
-        if (parentMenu == null && item.getParentPopup() != null) {
-            item.getParentPopup().hide();
-        }
-    }
-
-    @Override protected double computePrefHeight(double width) {
-        final double pointerHeight = snapSize(pointer.prefHeight(width));
-        final double menuBoxHeight = snapSize(menuBox.prefHeight(width));
-        return snappedTopInset() + pointerHeight + menuBoxHeight + snappedBottomInset();
-    }
-
-    @Override protected double computePrefWidth(double height) {
-        final double menuBoxWidth = snapSize(menuBox.prefWidth(height));
-        return snappedLeftInset() + menuBoxWidth + snappedRightInset();
-    }
-    
-    @Override protected void layoutChildren() {
-        final double left = snappedLeftInset();
-        final double right = snappedRightInset();
-        final double top = snappedTopInset();
-        final double width = getWidth() - (left + right);
-        final double pointerWidth = snapSize(Utils.boundedSize(pointer.prefWidth(-1), pointer.minWidth(-1), pointer.maxWidth(-1)));
-        final double pointerHeight = snapSize(Utils.boundedSize(pointer.prefWidth(-1), pointer.minWidth(-1), pointer.maxWidth(-1)));
-        final double menuBoxWidth = snapSize(Utils.boundedSize(menuBox.prefWidth(-1), menuBox.minWidth(-1), menuBox.maxWidth(-1)));
-        final double menuBoxHeight = snapSize(Utils.boundedSize(menuBox.prefWidth(-1), menuBox.minWidth(-1), menuBox.maxWidth(-1)));
-        double sceneX = 0;
-        double screenX = 0;
-        double pointerX = 0;
-
-        // Get the positions of the cursor from the TextArea/TextField and draw the arrow underneath it.
-        Map<Object,Object> properties = null;
-        if (contextMenu.getOwnerNode() instanceof TextArea) {
-            properties = ((TextArea)contextMenu.getOwnerNode()).getProperties();
-        } else if (contextMenu.getOwnerNode() instanceof TextField) {
-            properties = ((TextField)contextMenu.getOwnerNode()).getProperties();
-        }
-
-        if (properties != null) {
-            if (properties.containsKey("CONTEXT_MENU_SCENE_X")) {
-                sceneX = Double.valueOf(properties.get("CONTEXT_MENU_SCENE_X").toString());
-                properties.remove("CONTEXT_MENU_SCENE_X");
-            }
-
-            if (properties.containsKey("CONTEXT_MENU_SCREEN_X")) {
-                screenX = Double.valueOf(properties.get("CONTEXT_MENU_SCREEN_X").toString());
-                properties.remove("CONTEXT_MENU_SCREEN_X");
-            }
-        }
-
-        if (sceneX == 0) {
-            pointerX = width/2;
-        } else {
-            pointerX = (screenX - sceneX - contextMenu.getX()) + sceneX;
-        }
-
-        pointer.resize(pointerWidth, pointerHeight);
-        positionInArea(pointer, pointerX, top, pointerWidth, pointerHeight, 0, HPos.CENTER, VPos.CENTER);
-        menuBox.resize(menuBoxWidth, menuBoxHeight);
-        positionInArea(menuBox, left, top + pointerHeight, menuBoxWidth, menuBoxHeight, 0, HPos.CENTER, VPos.CENTER);
-    }
-
-    class MenuItemContainer extends Button {
-        private MenuItem item;
-
-        public MenuItemContainer(MenuItem item){
-            getStyleClass().addAll(item.getStyleClass());
-            setId(item.getId());
-            this.item = item;
-            setText(item.getText());
-            setStyle(item.getStyle());
-
-            // bind to text property in menu item
-            textProperty().bind(item.textProperty());
-        }
-
-        public MenuItem getItem() {
-            return item;
-        }
-
-        @Override public void fire() {
-            Event.fireEvent(item, new ActionEvent());
-            if (Boolean.TRUE.equals((Boolean)item.getProperties().get("refreshMenu"))) {
-                //refreshMenu();
-            } else {
-                hideAllMenus(item);
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:15:55.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/EmbeddedTextContextMenuContent.java	2015-09-03 15:15:53.000503100 -0700
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2012, 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;
+
+import java.util.Map;
+
+import com.sun.javafx.scene.control.skin.*;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
+import javafx.event.Event;
+import javafx.geometry.HPos;
+import javafx.geometry.VPos;
+import javafx.scene.control.*;
+import javafx.scene.control.skin.TextAreaSkin;
+import javafx.scene.control.skin.TextFieldSkin;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+
+/**
+ * The embedded context menu for a text input control.  
+ * The menu will be displayed horizontally underneath the cursor 
+ * with the available text editing options i.e. cut, copy, paste, select all.
+ *
+ */
+public class EmbeddedTextContextMenuContent extends StackPane {
+
+    private ContextMenu contextMenu;
+    private StackPane pointer;
+    private HBox menuBox;
+
+    public EmbeddedTextContextMenuContent(final ContextMenu popupMenu) {
+        this.contextMenu = popupMenu;
+        this.menuBox = new HBox();
+        this.pointer = new StackPane();
+        pointer.getStyleClass().add("pointer");
+
+        updateMenuItemContainer();
+        getChildren().addAll(pointer, menuBox);
+
+        contextMenu.ownerNodeProperty().addListener(arg0 -> {
+            if (contextMenu.getOwnerNode() instanceof TextArea) {
+                TextAreaSkin tas = (TextAreaSkin)((TextArea)contextMenu.getOwnerNode()).getSkin();
+                tas.getSkinnable().getProperties().addListener(new InvalidationListener() {
+                    @Override public void invalidated(Observable arg0) {
+                        requestLayout();
+                    }
+                });
+            } else if (contextMenu.getOwnerNode() instanceof TextField) {
+                TextFieldSkin tfs = (TextFieldSkin)((TextField)contextMenu.getOwnerNode()).getSkin();
+                tfs.getSkinnable().getProperties().addListener(new InvalidationListener() {
+                    @Override public void invalidated(Observable arg0) {
+                        requestLayout();
+                    }
+                });
+            }
+        });
+
+        contextMenu.getItems().addListener((ListChangeListener<MenuItem>) c -> {
+            // Listener to items in PopupMenu to update items in PopupMenuContent
+            updateMenuItemContainer();
+        });
+    }
+
+    private void updateMenuItemContainer() {
+        menuBox.getChildren().clear();
+        for (MenuItem item: contextMenu.getItems()) {
+            MenuItemContainer menuItemContainer = new MenuItemContainer(item);
+            menuItemContainer.visibleProperty().bind(item.visibleProperty());
+            menuBox.getChildren().add(menuItemContainer);
+        }
+    }
+
+    private void hideAllMenus(MenuItem item) {
+        contextMenu.hide();
+
+        Menu parentMenu;
+        while ((parentMenu = item.getParentMenu()) != null) {
+            parentMenu.hide();
+            item = parentMenu;
+        }
+        if (parentMenu == null && item.getParentPopup() != null) {
+            item.getParentPopup().hide();
+        }
+    }
+
+    @Override protected double computePrefHeight(double width) {
+        final double pointerHeight = snapSize(pointer.prefHeight(width));
+        final double menuBoxHeight = snapSize(menuBox.prefHeight(width));
+        return snappedTopInset() + pointerHeight + menuBoxHeight + snappedBottomInset();
+    }
+
+    @Override protected double computePrefWidth(double height) {
+        final double menuBoxWidth = snapSize(menuBox.prefWidth(height));
+        return snappedLeftInset() + menuBoxWidth + snappedRightInset();
+    }
+    
+    @Override protected void layoutChildren() {
+        final double left = snappedLeftInset();
+        final double right = snappedRightInset();
+        final double top = snappedTopInset();
+        final double width = getWidth() - (left + right);
+        final double pointerWidth = snapSize(Utils.boundedSize(pointer.prefWidth(-1), pointer.minWidth(-1), pointer.maxWidth(-1)));
+        final double pointerHeight = snapSize(Utils.boundedSize(pointer.prefWidth(-1), pointer.minWidth(-1), pointer.maxWidth(-1)));
+        final double menuBoxWidth = snapSize(Utils.boundedSize(menuBox.prefWidth(-1), menuBox.minWidth(-1), menuBox.maxWidth(-1)));
+        final double menuBoxHeight = snapSize(Utils.boundedSize(menuBox.prefWidth(-1), menuBox.minWidth(-1), menuBox.maxWidth(-1)));
+        double sceneX = 0;
+        double screenX = 0;
+        double pointerX = 0;
+
+        // Get the positions of the cursor from the TextArea/TextField and draw the arrow underneath it.
+        Map<Object,Object> properties = null;
+        if (contextMenu.getOwnerNode() instanceof TextArea) {
+            properties = ((TextArea)contextMenu.getOwnerNode()).getProperties();
+        } else if (contextMenu.getOwnerNode() instanceof TextField) {
+            properties = ((TextField)contextMenu.getOwnerNode()).getProperties();
+        }
+
+        if (properties != null) {
+            if (properties.containsKey("CONTEXT_MENU_SCENE_X")) {
+                sceneX = Double.valueOf(properties.get("CONTEXT_MENU_SCENE_X").toString());
+                properties.remove("CONTEXT_MENU_SCENE_X");
+            }
+
+            if (properties.containsKey("CONTEXT_MENU_SCREEN_X")) {
+                screenX = Double.valueOf(properties.get("CONTEXT_MENU_SCREEN_X").toString());
+                properties.remove("CONTEXT_MENU_SCREEN_X");
+            }
+        }
+
+        if (sceneX == 0) {
+            pointerX = width/2;
+        } else {
+            pointerX = (screenX - sceneX - contextMenu.getX()) + sceneX;
+        }
+
+        pointer.resize(pointerWidth, pointerHeight);
+        positionInArea(pointer, pointerX, top, pointerWidth, pointerHeight, 0, HPos.CENTER, VPos.CENTER);
+        menuBox.resize(menuBoxWidth, menuBoxHeight);
+        positionInArea(menuBox, left, top + pointerHeight, menuBoxWidth, menuBoxHeight, 0, HPos.CENTER, VPos.CENTER);
+    }
+
+    class MenuItemContainer extends Button {
+        private MenuItem item;
+
+        public MenuItemContainer(MenuItem item){
+            getStyleClass().addAll(item.getStyleClass());
+            setId(item.getId());
+            this.item = item;
+            setText(item.getText());
+            setStyle(item.getStyle());
+
+            // bind to text property in menu item
+            textProperty().bind(item.textProperty());
+        }
+
+        public MenuItem getItem() {
+            return item;
+        }
+
+        @Override public void fire() {
+            Event.fireEvent(item, new ActionEvent());
+            if (Boolean.TRUE.equals((Boolean)item.getProperties().get("refreshMenu"))) {
+                //refreshMenu();
+            } else {
+                hideAllMenus(item);
+            }
+        }
+    }
+}
--- /dev/null	2015-09-03 15:16:02.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/FakeFocusTextField.java	2015-09-03 15:16:00.978959400 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, 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;
+
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.TextField;
+
+public final class FakeFocusTextField extends TextField {
+
+    @Override public void requestFocus() {
+        if (getParent() != null) {
+            getParent().requestFocus();
+        }
+    }
+
+    public void setFakeFocus(boolean b) {
+        setFocused(b);
+    }
+
+    @Override
+    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM:
+                /* Internally comboBox reassign its focus the text field.
+                 * For the accessibility perspective it is more meaningful
+                 * if the focus stays with the comboBox control.
+                 */
+                return getParent();
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/InputField.java	2015-09-03 15:16:07.358324300 -0700
+++ /dev/null	2015-09-03 15:16:08.000000000 -0700
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-import javafx.beans.property.*;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.scene.control.Control;
-
-/**
- *
- */
-abstract class InputField extends Control {
-    /**
-     * The default value for {@link #prefColumnCount}.
-     */
-    public static final int DEFAULT_PREF_COLUMN_COUNT = 12;
-
-    /**
-     * Indicates whether this InputField can be edited by the user. If true, the
-     * "readonly" pseudo class will be false, but if false, the "readonly"
-     * pseudo class will be true.
-     */
-    private BooleanProperty editable = new SimpleBooleanProperty(this, "editable", true);
-    public final boolean isEditable() { return editable.getValue(); }
-    public final void setEditable(boolean value) { editable.setValue(value); }
-    public final BooleanProperty editableProperty() { return editable; }
-
-    /**
-     * The {@code InputField}'s prompt text to display, or
-     * <tt>null</tt> if no prompt text is displayed.
-     */
-    private StringProperty promptText = new StringPropertyBase("") {
-        @Override protected void invalidated() {
-            // Strip out newlines
-            String txt = get();
-            if (txt != null && txt.contains("\n")) {
-                txt = txt.replace("\n", "");
-                set(txt);
-            }
-        }
-
-        @Override public Object getBean() { return InputField.this; }
-        @Override public String getName() { return "promptText"; }
-    };
-    public final StringProperty promptTextProperty() { return promptText; }
-    public final String getPromptText() { return promptText.get(); }
-    public final void setPromptText(String value) { promptText.set(value); }
-
-
-    /**
-     * The preferred number of text columns. This is used for
-     * calculating the {@code InputField}'s preferred width.
-     */
-    private IntegerProperty prefColumnCount = new IntegerPropertyBase(DEFAULT_PREF_COLUMN_COUNT) {
-        private int oldValue = get();
-        
-        @Override
-        protected void invalidated() {
-            int value = get();
-            
-            if (value < 0) {
-                if (isBound()) {
-                    unbind();
-                }
-                set(oldValue);
-                throw new IllegalArgumentException("value cannot be negative.");
-            }
-            
-            oldValue = value;
-        }
-
-        @Override public Object getBean() { return InputField.this; }
-        @Override public String getName() { return "prefColumnCount"; }
-    };
-    public final IntegerProperty prefColumnCountProperty() { return prefColumnCount; }
-    public final int getPrefColumnCount() { return prefColumnCount.getValue(); }
-    public final void setPrefColumnCount(int value) { prefColumnCount.setValue(value); }
-
-    /**
-     * The action handler associated with this InputField, or
-     * <tt>null</tt> if no action handler is assigned.
-     *
-     * The action handler is normally called when the user types the ENTER key.
-     */
-    private ObjectProperty<EventHandler<ActionEvent>> onAction = new ObjectPropertyBase<EventHandler<ActionEvent>>() {
-        @Override protected void invalidated() {
-            setEventHandler(ActionEvent.ACTION, get());
-        }
-
-        @Override public Object getBean() { return InputField.this; }
-        @Override public String getName() { return "onAction"; }
-    };
-    public final ObjectProperty<EventHandler<ActionEvent>> onActionProperty() { return onAction; }
-    public final EventHandler<ActionEvent> getOnAction() { return onActionProperty().get(); }
-    public final void setOnAction(EventHandler<ActionEvent> value) { onActionProperty().set(value); }
-
-    /**
-     * Creates a new InputField. The style class is set to "money-field".
-     */
-    public InputField() {
-        getStyleClass().setAll("input-field");
-    }
-
-    //    @Override protected String getUserAgentStylesheet() {
-//        return getClass().getResource("InputField.css").toExternalForm();
-//    }
-}
--- /dev/null	2015-09-03 15:16:08.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/InputField.java	2015-09-03 15:16:06.610281500 -0700
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2012, 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.scene.control;
+
+import javafx.beans.property.*;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.control.Control;
+
+/**
+ *
+ */
+public abstract class InputField extends Control {
+    /**
+     * The default value for {@link #prefColumnCount}.
+     */
+    public static final int DEFAULT_PREF_COLUMN_COUNT = 12;
+
+    /**
+     * Indicates whether this InputField can be edited by the user. If true, the
+     * "readonly" pseudo class will be false, but if false, the "readonly"
+     * pseudo class will be true.
+     */
+    private BooleanProperty editable = new SimpleBooleanProperty(this, "editable", true);
+    public final boolean isEditable() { return editable.getValue(); }
+    public final void setEditable(boolean value) { editable.setValue(value); }
+    public final BooleanProperty editableProperty() { return editable; }
+
+    /**
+     * The {@code InputField}'s prompt text to display, or
+     * <tt>null</tt> if no prompt text is displayed.
+     */
+    private StringProperty promptText = new StringPropertyBase("") {
+        @Override protected void invalidated() {
+            // Strip out newlines
+            String txt = get();
+            if (txt != null && txt.contains("\n")) {
+                txt = txt.replace("\n", "");
+                set(txt);
+            }
+        }
+
+        @Override public Object getBean() { return InputField.this; }
+        @Override public String getName() { return "promptText"; }
+    };
+    public final StringProperty promptTextProperty() { return promptText; }
+    public final String getPromptText() { return promptText.get(); }
+    public final void setPromptText(String value) { promptText.set(value); }
+
+
+    /**
+     * The preferred number of text columns. This is used for
+     * calculating the {@code InputField}'s preferred width.
+     */
+    private IntegerProperty prefColumnCount = new IntegerPropertyBase(DEFAULT_PREF_COLUMN_COUNT) {
+        private int oldValue = get();
+        
+        @Override
+        protected void invalidated() {
+            int value = get();
+            
+            if (value < 0) {
+                if (isBound()) {
+                    unbind();
+                }
+                set(oldValue);
+                throw new IllegalArgumentException("value cannot be negative.");
+            }
+            
+            oldValue = value;
+        }
+
+        @Override public Object getBean() { return InputField.this; }
+        @Override public String getName() { return "prefColumnCount"; }
+    };
+    public final IntegerProperty prefColumnCountProperty() { return prefColumnCount; }
+    public final int getPrefColumnCount() { return prefColumnCount.getValue(); }
+    public final void setPrefColumnCount(int value) { prefColumnCount.setValue(value); }
+
+    /**
+     * The action handler associated with this InputField, or
+     * <tt>null</tt> if no action handler is assigned.
+     *
+     * The action handler is normally called when the user types the ENTER key.
+     */
+    private ObjectProperty<EventHandler<ActionEvent>> onAction = new ObjectPropertyBase<EventHandler<ActionEvent>>() {
+        @Override protected void invalidated() {
+            setEventHandler(ActionEvent.ACTION, get());
+        }
+
+        @Override public Object getBean() { return InputField.this; }
+        @Override public String getName() { return "onAction"; }
+    };
+    public final ObjectProperty<EventHandler<ActionEvent>> onActionProperty() { return onAction; }
+    public final EventHandler<ActionEvent> getOnAction() { return onActionProperty().get(); }
+    public final void setOnAction(EventHandler<ActionEvent> value) { onActionProperty().set(value); }
+
+    /**
+     * Creates a new InputField. The style class is set to "money-field".
+     */
+    public InputField() {
+        getStyleClass().setAll("input-field");
+    }
+
+    //    @Override protected String getUserAgentStylesheet() {
+//        return getClass().getResource("InputField.css").toExternalForm();
+//    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/IntegerField.java	2015-09-03 15:16:15.343781100 -0700
+++ /dev/null	2015-09-03 15:16:16.000000000 -0700
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.scene.control.Skin;
-
-/**
- *
- */
-class IntegerField extends InputField {
-    /**
-     * The value of the IntegerField. If null, the value will be treated as "0", but
-     * will still actually be null.
-     */
-    private IntegerProperty value = new SimpleIntegerProperty(this, "value");
-    public final int getValue() { return value.get(); }
-    public final void setValue(int value) { this.value.set(value); }
-    public final IntegerProperty valueProperty() { return value; }
-    
-    private IntegerProperty maxValue = new SimpleIntegerProperty(this, "maxValue", -1);
-    public final int getMaxValue() { return maxValue.get(); }
-    public final void setMaxValue(int maxVal) {this.maxValue.set(maxVal); }
-    public final IntegerProperty maxValueProperty() { return maxValue; }
-    /**
-     * Creates a new IntegerField. The style class is set to "money-field".
-     */
-    public IntegerField() {
-       this(-1); // setting to default
-    }
-    public IntegerField(int maxVal) {
-        getStyleClass().setAll("integer-field");
-        setMaxValue(maxVal);
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Methods                                                                 *
-     *                                                                         *
-     **************************************************************************/
-
-    /** {@inheritDoc} */
-    @Override protected Skin<?> createDefaultSkin() {
-        return new IntegerFieldSkin(this);
-    }
-}
--- /dev/null	2015-09-03 15:16:16.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/IntegerField.java	2015-09-03 15:16:14.558736200 -0700
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2012, 2015, 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;
+
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.scene.control.Skin;
+import com.sun.javafx.scene.control.skin.IntegerFieldSkin;
+
+/**
+ *
+ */
+public class IntegerField extends InputField {
+    /**
+     * The value of the IntegerField. If null, the value will be treated as "0", but
+     * will still actually be null.
+     */
+    private IntegerProperty value = new SimpleIntegerProperty(this, "value");
+    public final int getValue() { return value.get(); }
+    public final void setValue(int value) { this.value.set(value); }
+    public final IntegerProperty valueProperty() { return value; }
+    
+    private IntegerProperty maxValue = new SimpleIntegerProperty(this, "maxValue", -1);
+    public final int getMaxValue() { return maxValue.get(); }
+    public final void setMaxValue(int maxVal) {this.maxValue.set(maxVal); }
+    public final IntegerProperty maxValueProperty() { return maxValue; }
+    /**
+     * Creates a new IntegerField. The style class is set to "money-field".
+     */
+    public IntegerField() {
+       this(-1); // setting to default
+    }
+    public IntegerField(int maxVal) {
+        getStyleClass().setAll("integer-field");
+        setMaxValue(maxVal);
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Methods                                                                 *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected Skin<?> createDefaultSkin() {
+        return new IntegerFieldSkin(this);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/LabeledImpl.java	2015-09-03 15:16:23.447244600 -0700
+++ /dev/null	2015-09-03 15:16:24.000000000 -0700
@@ -1,153 +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.
- */
-
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.sun.javafx.scene.control.skin;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.scene.control.Label;
-import javafx.scene.control.Labeled;
-
-import javafx.css.CssMetaData;
-import javafx.css.StyleOrigin;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.scene.layout.Region;
-
-
-public class LabeledImpl extends Label {
-
-    public LabeledImpl(final Labeled labeled) {
-        shuttler = new Shuttler(this, labeled);
-    }
-    private final Shuttler shuttler;
-    
-    private static void initialize(Shuttler shuttler, LabeledImpl labeledImpl, Labeled labeled) {
-    
-        labeledImpl.setText(labeled.getText());
-        labeled.textProperty().addListener(shuttler);
-        
-        labeledImpl.setGraphic(labeled.getGraphic());
-        labeled.graphicProperty().addListener(shuttler);
-        
-        final List<CssMetaData<? extends Styleable, ?>> styleables = StyleableProperties.STYLEABLES_TO_MIRROR;
-        
-        for(int n=0, nMax=styleables.size(); n<nMax; n++) {
-            @SuppressWarnings("unchecked")
-            final CssMetaData<Styleable,Object> styleable = (CssMetaData<Styleable,Object>)styleables.get(n);
-            
-            // the Labeled isn't necessarily a Label, so skip the skin or
-            // we'll get an argument type mismatch on the invocation of the
-            // skin constructor. 
-            if ("-fx-skin".equals(styleable.getProperty())) continue;
-            
-            final StyleableProperty<?> fromVal = styleable.getStyleableProperty(labeled);
-            if (fromVal instanceof Observable) {
-                // listen for changes to this property
-                ((Observable)fromVal).addListener(shuttler);
-                // set this LabeledImpl's property to the same value as the Labeled. 
-                final StyleOrigin origin = fromVal.getStyleOrigin();
-                if (origin == null) continue;
-                final StyleableProperty<Object> styleableProperty = styleable.getStyleableProperty(labeledImpl);
-                styleableProperty.applyStyle(origin, fromVal.getValue());
-            }
-        }
-    }
-    
-    private static class Shuttler implements InvalidationListener {
-        
-        private final LabeledImpl labeledImpl;
-        private final Labeled labeled; 
-        
-        Shuttler(LabeledImpl labeledImpl, Labeled labeled) {
-            this.labeledImpl = labeledImpl;
-            this.labeled = labeled;
-            initialize(this, labeledImpl, labeled);
-
-        }
-        
-        @Override public void invalidated(Observable valueModel) {
-          
-            if (valueModel == labeled.textProperty()) {
-                labeledImpl.setText(labeled.getText());
-            } else if (valueModel == labeled.graphicProperty()) {
-                // If the user set the graphic, then mirror that.
-                // Otherwise, the graphic was set via the imageUrlProperty which
-                // will be mirrored onto the labeledImpl by the next block.
-                StyleOrigin origin = ((StyleableProperty<?>)labeled.graphicProperty()).getStyleOrigin();
-                if (origin == null || origin == StyleOrigin.USER) {
-                    labeledImpl.setGraphic(labeled.getGraphic());
-                }
-                
-            } else if (valueModel instanceof StyleableProperty) { 
-                StyleableProperty<?> styleableProperty = (StyleableProperty<?>)valueModel;
-                @SuppressWarnings("unchecked")
-                CssMetaData<Styleable,Object> cssMetaData = (CssMetaData<Styleable,Object>)styleableProperty.getCssMetaData();
-                if (cssMetaData != null) {
-                    StyleOrigin origin = styleableProperty.getStyleOrigin();
-                    StyleableProperty<Object> targetProperty = cssMetaData.getStyleableProperty(labeledImpl);
-                    targetProperty.applyStyle(origin, styleableProperty.getValue());
-                }
-            }
-        }
-    }
-
-    /** Protected for unit test purposes */
-    static final class StyleableProperties {
-
-        static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES_TO_MIRROR;
-        static {
-            //
-            // We do this as we only want to mirror the Labeled's keys,
-            // none of Parent's, otherwise all of the properties on Parent,
-            // like opacity, would be applied twice (once to the Labeled and 
-            // again to the LabeledImpl). 
-            //
-            // Note, however, that this subset is not the list of properties
-            // for this LabeledImpl that can be styled. For that, we want all
-            // the properites that are inherited by virtue of LabeledImpl 
-            // being a Label. This allows for the LabledImpl to be styled
-            // with styles like .menu-button .label { -fx-opacity: 80%; }
-            // If just this subset were returned (by impl_CSS_STYLEABLE) then
-            // -fx-opacity (for example) would be meaningless to the Labeled. 
-            // 
-            final List<CssMetaData<? extends Styleable, ?>> labeledStyleables = Labeled.getClassCssMetaData();
-            final List<CssMetaData<? extends Styleable, ?>> parentStyleables = Region.getClassCssMetaData();
-            final List<CssMetaData<? extends Styleable, ?>> styleables = 
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(labeledStyleables);
-            styleables.removeAll(parentStyleables);
-            STYLEABLES_TO_MIRROR = Collections.unmodifiableList(styleables);
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:16:24.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/LabeledImpl.java	2015-09-03 15:16:22.659199500 -0700
@@ -0,0 +1,153 @@
+/*
+ * 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.
+ */
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package com.sun.javafx.scene.control;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.scene.control.Label;
+import javafx.scene.control.Labeled;
+
+import javafx.css.CssMetaData;
+import javafx.css.StyleOrigin;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javafx.css.Styleable;
+import javafx.css.StyleableProperty;
+import javafx.scene.layout.Region;
+
+
+public class LabeledImpl extends Label {
+
+    public LabeledImpl(final Labeled labeled) {
+        shuttler = new Shuttler(this, labeled);
+    }
+    private final Shuttler shuttler;
+    
+    private static void initialize(Shuttler shuttler, LabeledImpl labeledImpl, Labeled labeled) {
+    
+        labeledImpl.setText(labeled.getText());
+        labeled.textProperty().addListener(shuttler);
+        
+        labeledImpl.setGraphic(labeled.getGraphic());
+        labeled.graphicProperty().addListener(shuttler);
+        
+        final List<CssMetaData<? extends Styleable, ?>> styleables = StyleableProperties.STYLEABLES_TO_MIRROR;
+        
+        for(int n=0, nMax=styleables.size(); n<nMax; n++) {
+            @SuppressWarnings("unchecked")
+            final CssMetaData<Styleable,Object> styleable = (CssMetaData<Styleable,Object>)styleables.get(n);
+            
+            // the Labeled isn't necessarily a Label, so skip the skin or
+            // we'll get an argument type mismatch on the invocation of the
+            // skin constructor. 
+            if ("-fx-skin".equals(styleable.getProperty())) continue;
+            
+            final StyleableProperty<?> fromVal = styleable.getStyleableProperty(labeled);
+            if (fromVal instanceof Observable) {
+                // listen for changes to this property
+                ((Observable)fromVal).addListener(shuttler);
+                // set this LabeledImpl's property to the same value as the Labeled. 
+                final StyleOrigin origin = fromVal.getStyleOrigin();
+                if (origin == null) continue;
+                final StyleableProperty<Object> styleableProperty = styleable.getStyleableProperty(labeledImpl);
+                styleableProperty.applyStyle(origin, fromVal.getValue());
+            }
+        }
+    }
+    
+    private static class Shuttler implements InvalidationListener {
+        
+        private final LabeledImpl labeledImpl;
+        private final Labeled labeled; 
+        
+        Shuttler(LabeledImpl labeledImpl, Labeled labeled) {
+            this.labeledImpl = labeledImpl;
+            this.labeled = labeled;
+            initialize(this, labeledImpl, labeled);
+
+        }
+        
+        @Override public void invalidated(Observable valueModel) {
+          
+            if (valueModel == labeled.textProperty()) {
+                labeledImpl.setText(labeled.getText());
+            } else if (valueModel == labeled.graphicProperty()) {
+                // If the user set the graphic, then mirror that.
+                // Otherwise, the graphic was set via the imageUrlProperty which
+                // will be mirrored onto the labeledImpl by the next block.
+                StyleOrigin origin = ((StyleableProperty<?>)labeled.graphicProperty()).getStyleOrigin();
+                if (origin == null || origin == StyleOrigin.USER) {
+                    labeledImpl.setGraphic(labeled.getGraphic());
+                }
+                
+            } else if (valueModel instanceof StyleableProperty) { 
+                StyleableProperty<?> styleableProperty = (StyleableProperty<?>)valueModel;
+                @SuppressWarnings("unchecked")
+                CssMetaData<Styleable,Object> cssMetaData = (CssMetaData<Styleable,Object>)styleableProperty.getCssMetaData();
+                if (cssMetaData != null) {
+                    StyleOrigin origin = styleableProperty.getStyleOrigin();
+                    StyleableProperty<Object> targetProperty = cssMetaData.getStyleableProperty(labeledImpl);
+                    targetProperty.applyStyle(origin, styleableProperty.getValue());
+                }
+            }
+        }
+    }
+
+    /** Protected for unit test purposes */
+    static final class StyleableProperties {
+
+        static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES_TO_MIRROR;
+        static {
+            //
+            // We do this as we only want to mirror the Labeled's keys,
+            // none of Parent's, otherwise all of the properties on Parent,
+            // like opacity, would be applied twice (once to the Labeled and 
+            // again to the LabeledImpl). 
+            //
+            // Note, however, that this subset is not the list of properties
+            // for this LabeledImpl that can be styled. For that, we want all
+            // the properites that are inherited by virtue of LabeledImpl 
+            // being a Label. This allows for the LabledImpl to be styled
+            // with styles like .menu-button .label { -fx-opacity: 80%; }
+            // If just this subset were returned (by impl_CSS_STYLEABLE) then
+            // -fx-opacity (for example) would be meaningless to the Labeled. 
+            // 
+            final List<CssMetaData<? extends Styleable, ?>> labeledStyleables = Labeled.getClassCssMetaData();
+            final List<CssMetaData<? extends Styleable, ?>> parentStyleables = Region.getClassCssMetaData();
+            final List<CssMetaData<? extends Styleable, ?>> styleables = 
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(labeledStyleables);
+            styleables.removeAll(parentStyleables);
+            STYLEABLES_TO_MIRROR = Collections.unmodifiableList(styleables);
+        }
+    }
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/LabeledText.java	2015-09-03 15:16:31.167686100 -0700
+++ /dev/null	2015-09-03 15:16:32.000000000 -0700
@@ -1,315 +0,0 @@
-/*
- * Copyright (c) 2012, 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 com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WritableValue;
-import javafx.css.*;
-import javafx.scene.control.Labeled;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextAlignment;
-
-/**
- * LabeledText allows the Text to be styled by the CSS properties of Labeled
- * that are meant to style the textual component of the Labeled.
- *
- * LabeledText has the style class "text"
- */
-public class LabeledText extends Text {
-
-   private final Labeled labeled;
-
-   public LabeledText(Labeled labeled) {
-       super();
-
-       if (labeled == null) {
-           throw new IllegalArgumentException("labeled cannot be null");
-       }
-
-       this.labeled = labeled;
-
-       //
-       // init the state of this Text object to that of the Labeled
-       //
-       this.setFill(this.labeled.getTextFill());
-       this.setFont(this.labeled.getFont());
-       this.setTextAlignment(this.labeled.getTextAlignment());
-       this.setUnderline(this.labeled.isUnderline());
-       this.setLineSpacing(this.labeled.getLineSpacing());
-
-       //
-       // Bind the state of this Text object to that of the Labeled.
-       // Binding these properties prevents CSS from setting them
-       //
-       this.fillProperty().bind(this.labeled.textFillProperty());
-       this.fontProperty().bind(this.labeled.fontProperty());
-       // do not bind text - Text doesn't have -fx-text
-       this.textAlignmentProperty().bind(this.labeled.textAlignmentProperty());
-       this.underlineProperty().bind(this.labeled.underlineProperty());
-       this.lineSpacingProperty().bind(this.labeled.lineSpacingProperty());
-
-       getStyleClass().addAll("text");
-   }
-
-    /**
-     * @return The CssMetaData associated with this class, which may include the
-     * CssMetaData of its super classes.
-     */
-    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
-        return STYLEABLES;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-   //
-   // Replace all of Text's CssMetaData instances that overlap with Labeled
-   // with instances of CssMetaData that redirect to Labeled. Thus, when
-   // the Labeled is styled,
-   //
-
-    private StyleablePropertyMirror<Font> fontMirror = null;
-    private StyleableProperty<Font> fontMirror() {
-        if (fontMirror == null) {
-            fontMirror = new StyleablePropertyMirror<Font>(FONT, "fontMirror", Font.getDefault(), (StyleableProperty<Font>)(WritableValue<Font>)labeled.fontProperty());
-            fontProperty().addListener(fontMirror);
-        }
-        return fontMirror;
-    }
-
-    private static final CssMetaData<LabeledText,Font> FONT =
-        new FontCssMetaData<LabeledText>("-fx-font", Font.getDefault()) {
-
-        @Override
-        public boolean isSettable(LabeledText node) {
-            return node.labeled != null ? node.labeled.fontProperty().isBound() == false : true;
-        }
-
-        @Override
-        public StyleableProperty<Font> getStyleableProperty(LabeledText node) {
-            return node.fontMirror();
-        }
-    };
-
-    private StyleablePropertyMirror<Paint> fillMirror;
-    private StyleableProperty<Paint> fillMirror() {
-        if (fillMirror == null) {
-            fillMirror = new StyleablePropertyMirror<Paint>(FILL, "fillMirror", Color.BLACK, (StyleableProperty<Paint>)(WritableValue<Paint>)labeled.textFillProperty());
-            fillProperty().addListener(fillMirror);
-        }
-        return fillMirror;        
-    }
-
-    private static final CssMetaData<LabeledText,Paint> FILL =
-        new CssMetaData<LabeledText,Paint>("-fx-fill",
-            PaintConverter.getInstance(), Color.BLACK) {
-
-            @Override
-            public boolean isSettable(LabeledText node) {
-                return node.labeled.textFillProperty().isBound() == false;
-            }
-
-            @Override
-            public StyleableProperty<Paint> getStyleableProperty(LabeledText node) {
-                return node.fillMirror();
-            }
-        };
-
-    private StyleablePropertyMirror<TextAlignment> textAlignmentMirror;
-    private StyleableProperty<TextAlignment> textAlignmentMirror() {
-        if (textAlignmentMirror == null) {
-            textAlignmentMirror = new StyleablePropertyMirror<TextAlignment>(TEXT_ALIGNMENT, "textAlignmentMirror", TextAlignment.LEFT, (StyleableProperty<TextAlignment>)(WritableValue<TextAlignment>)labeled.textAlignmentProperty());
-            textAlignmentProperty().addListener(textAlignmentMirror);
-        }
-        return textAlignmentMirror;        
-    }
-    
-    private static final CssMetaData<LabeledText,TextAlignment> TEXT_ALIGNMENT =
-        new CssMetaData<LabeledText,TextAlignment>("-fx-text-alignment",
-        new EnumConverter<TextAlignment>(TextAlignment.class),
-        TextAlignment.LEFT) {
-
-            @Override
-            public boolean isSettable(LabeledText node) {
-                return node.labeled.textAlignmentProperty().isBound() == false;
-            }
-
-            @Override
-            public StyleableProperty<TextAlignment> getStyleableProperty(LabeledText node) {
-                return node.textAlignmentMirror();
-            }
-        };
-
-    private StyleablePropertyMirror<Boolean> underlineMirror;
-    private StyleableProperty<Boolean> underlineMirror() {
-        if (underlineMirror == null) {
-            underlineMirror = new StyleablePropertyMirror<Boolean>(UNDERLINE, "underLineMirror", Boolean.FALSE, (StyleableProperty<Boolean>)(WritableValue<Boolean>)labeled.underlineProperty());
-            underlineProperty().addListener(underlineMirror);
-        }
-        return underlineMirror;        
-    }
-    
-    private static final CssMetaData<LabeledText,Boolean> UNDERLINE =
-            new CssMetaData<LabeledText,Boolean>("-fx-underline",
-            BooleanConverter.getInstance(),
-            Boolean.FALSE) {
- 
-            @Override
-            public boolean isSettable(LabeledText node) {
-                return node.labeled.underlineProperty().isBound() == false;
-            }
-
-            @Override
-            public StyleableProperty<Boolean> getStyleableProperty(LabeledText node) {
-                return node.underlineMirror();
-            }
-        };
-
-    private StyleablePropertyMirror<Number> lineSpacingMirror;
-    private StyleableProperty<Number> lineSpacingMirror() {
-        if (lineSpacingMirror == null) {
-            lineSpacingMirror = new StyleablePropertyMirror<Number>(LINE_SPACING, "lineSpacingMirror", 0d, (StyleableProperty<Number>)(WritableValue<Number>)labeled.lineSpacingProperty());
-            lineSpacingProperty().addListener(lineSpacingMirror);
-        }
-        return lineSpacingMirror;        
-    }
-    
-    private static final CssMetaData<LabeledText,Number> LINE_SPACING =
-        new CssMetaData<LabeledText,Number>("-fx-line-spacing",
-            SizeConverter.getInstance(),
-                0) {
-
-            @Override
-            public boolean isSettable(LabeledText node) {
-                return node.labeled.lineSpacingProperty().isBound() == false;
-            }
-
-            @Override
-            public StyleableProperty<Number> getStyleableProperty(LabeledText node) {
-                return node.lineSpacingMirror();
-            }
-        };
-
-    private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-    static {
-
-       final List<CssMetaData<? extends Styleable, ?>> styleables =
-           new ArrayList<CssMetaData<? extends Styleable, ?>>(Text.getClassCssMetaData());
-
-       for (int n=0,nMax=styleables.size(); n<nMax; n++) {
-           final String prop = styleables.get(n).getProperty();
-
-           if ("-fx-fill".equals(prop)) {
-               styleables.set(n, FILL);
-           } else if ("-fx-font".equals(prop)) {
-               styleables.set(n, FONT);
-           } else if ("-fx-text-alignment".equals(prop)) {
-               styleables.set(n, TEXT_ALIGNMENT);
-           } else if ("-fx-underline".equals(prop)) {
-               styleables.set(n, UNDERLINE);
-           } else if ("-fx-line-spacing".equals(prop)) {
-               styleables.set(n, LINE_SPACING);
-           }
-       }
-
-       STYLEABLES = Collections.unmodifiableList(styleables);
-    }       
-
-    private class StyleablePropertyMirror<T> extends SimpleStyleableObjectProperty<T> implements InvalidationListener {
-        
-        private StyleablePropertyMirror(CssMetaData<LabeledText, T> cssMetaData, String name, T initialValue, StyleableProperty<T> property) {
-            super(cssMetaData, LabeledText.this, name, initialValue);
-            this.property = property;
-            this.applying = false;
-        }
-
-        @Override
-        public void invalidated(Observable observable) {
-            // if Text's property is changing but not because a style is being applied,
-            // then it's either because the set method was called on the Labeled's property or
-            // because CSS is resetting Labeled's property to its initial value
-            // (see CssStyleHelper#resetToInitialValues(Styleable))
-            if (applying == false) {
-                super.applyStyle(null, ((ObservableValue<T>)observable).getValue());
-            }
-        }
-
-        @Override
-        public void applyStyle(StyleOrigin newOrigin, T value) {
-
-            applying = true;
-            //
-            // In the case where the Labeled's property was set by an
-            // inline style, this inline style should override values
-            // from lesser origins.
-            //
-            StyleOrigin propOrigin = property.getStyleOrigin();
-
-            //
-            // if propOrigin is null, then the property is in init state
-            // if newOrigin is null, then CSS is resetting this property -
-            //    but don't let CSS overwrite a user set value
-            // if propOrigin is greater than origin, then the style should
-            //    not override
-            //
-            if (propOrigin == null ||
-                    (newOrigin != null
-                            ? propOrigin.compareTo(newOrigin) <= 0
-                            : propOrigin != StyleOrigin.USER)) {
-                super.applyStyle(newOrigin, value);
-                property.applyStyle(newOrigin, value);
-            }
-            applying = false;
-        }
-
-        @Override public StyleOrigin getStyleOrigin() {
-            return property.getStyleOrigin();
-        }
-
-        boolean applying;
-        private final StyleableProperty<T> property;
-    } 
-       
-}
--- /dev/null	2015-09-03 15:16:32.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/LabeledText.java	2015-09-03 15:16:30.533649900 -0700
@@ -0,0 +1,315 @@
+/*
+ * Copyright (c) 2012, 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;
+
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WritableValue;
+import javafx.css.*;
+import javafx.scene.control.Labeled;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
+
+/**
+ * LabeledText allows the Text to be styled by the CSS properties of Labeled
+ * that are meant to style the textual component of the Labeled.
+ *
+ * LabeledText has the style class "text"
+ */
+public class LabeledText extends Text {
+
+   private final Labeled labeled;
+
+   public LabeledText(Labeled labeled) {
+       super();
+
+       if (labeled == null) {
+           throw new IllegalArgumentException("labeled cannot be null");
+       }
+
+       this.labeled = labeled;
+
+       //
+       // init the state of this Text object to that of the Labeled
+       //
+       this.setFill(this.labeled.getTextFill());
+       this.setFont(this.labeled.getFont());
+       this.setTextAlignment(this.labeled.getTextAlignment());
+       this.setUnderline(this.labeled.isUnderline());
+       this.setLineSpacing(this.labeled.getLineSpacing());
+
+       //
+       // Bind the state of this Text object to that of the Labeled.
+       // Binding these properties prevents CSS from setting them
+       //
+       this.fillProperty().bind(this.labeled.textFillProperty());
+       this.fontProperty().bind(this.labeled.fontProperty());
+       // do not bind text - Text doesn't have -fx-text
+       this.textAlignmentProperty().bind(this.labeled.textAlignmentProperty());
+       this.underlineProperty().bind(this.labeled.underlineProperty());
+       this.lineSpacingProperty().bind(this.labeled.lineSpacingProperty());
+
+       getStyleClass().addAll("text");
+   }
+
+    /**
+     * @return The CssMetaData associated with this class, which may include the
+     * CssMetaData of its super classes.
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return STYLEABLES;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+   //
+   // Replace all of Text's CssMetaData instances that overlap with Labeled
+   // with instances of CssMetaData that redirect to Labeled. Thus, when
+   // the Labeled is styled,
+   //
+
+    private StyleablePropertyMirror<Font> fontMirror = null;
+    private StyleableProperty<Font> fontMirror() {
+        if (fontMirror == null) {
+            fontMirror = new StyleablePropertyMirror<Font>(FONT, "fontMirror", Font.getDefault(), (StyleableProperty<Font>)(WritableValue<Font>)labeled.fontProperty());
+            fontProperty().addListener(fontMirror);
+        }
+        return fontMirror;
+    }
+
+    private static final CssMetaData<LabeledText,Font> FONT =
+        new FontCssMetaData<LabeledText>("-fx-font", Font.getDefault()) {
+
+        @Override
+        public boolean isSettable(LabeledText node) {
+            return node.labeled != null ? node.labeled.fontProperty().isBound() == false : true;
+        }
+
+        @Override
+        public StyleableProperty<Font> getStyleableProperty(LabeledText node) {
+            return node.fontMirror();
+        }
+    };
+
+    private StyleablePropertyMirror<Paint> fillMirror;
+    private StyleableProperty<Paint> fillMirror() {
+        if (fillMirror == null) {
+            fillMirror = new StyleablePropertyMirror<Paint>(FILL, "fillMirror", Color.BLACK, (StyleableProperty<Paint>)(WritableValue<Paint>)labeled.textFillProperty());
+            fillProperty().addListener(fillMirror);
+        }
+        return fillMirror;        
+    }
+
+    private static final CssMetaData<LabeledText,Paint> FILL =
+        new CssMetaData<LabeledText,Paint>("-fx-fill",
+            PaintConverter.getInstance(), Color.BLACK) {
+
+            @Override
+            public boolean isSettable(LabeledText node) {
+                return node.labeled.textFillProperty().isBound() == false;
+            }
+
+            @Override
+            public StyleableProperty<Paint> getStyleableProperty(LabeledText node) {
+                return node.fillMirror();
+            }
+        };
+
+    private StyleablePropertyMirror<TextAlignment> textAlignmentMirror;
+    private StyleableProperty<TextAlignment> textAlignmentMirror() {
+        if (textAlignmentMirror == null) {
+            textAlignmentMirror = new StyleablePropertyMirror<TextAlignment>(TEXT_ALIGNMENT, "textAlignmentMirror", TextAlignment.LEFT, (StyleableProperty<TextAlignment>)(WritableValue<TextAlignment>)labeled.textAlignmentProperty());
+            textAlignmentProperty().addListener(textAlignmentMirror);
+        }
+        return textAlignmentMirror;        
+    }
+    
+    private static final CssMetaData<LabeledText,TextAlignment> TEXT_ALIGNMENT =
+        new CssMetaData<LabeledText,TextAlignment>("-fx-text-alignment",
+        new EnumConverter<TextAlignment>(TextAlignment.class),
+        TextAlignment.LEFT) {
+
+            @Override
+            public boolean isSettable(LabeledText node) {
+                return node.labeled.textAlignmentProperty().isBound() == false;
+            }
+
+            @Override
+            public StyleableProperty<TextAlignment> getStyleableProperty(LabeledText node) {
+                return node.textAlignmentMirror();
+            }
+        };
+
+    private StyleablePropertyMirror<Boolean> underlineMirror;
+    private StyleableProperty<Boolean> underlineMirror() {
+        if (underlineMirror == null) {
+            underlineMirror = new StyleablePropertyMirror<Boolean>(UNDERLINE, "underLineMirror", Boolean.FALSE, (StyleableProperty<Boolean>)(WritableValue<Boolean>)labeled.underlineProperty());
+            underlineProperty().addListener(underlineMirror);
+        }
+        return underlineMirror;        
+    }
+    
+    private static final CssMetaData<LabeledText,Boolean> UNDERLINE =
+            new CssMetaData<LabeledText,Boolean>("-fx-underline",
+            BooleanConverter.getInstance(),
+            Boolean.FALSE) {
+ 
+            @Override
+            public boolean isSettable(LabeledText node) {
+                return node.labeled.underlineProperty().isBound() == false;
+            }
+
+            @Override
+            public StyleableProperty<Boolean> getStyleableProperty(LabeledText node) {
+                return node.underlineMirror();
+            }
+        };
+
+    private StyleablePropertyMirror<Number> lineSpacingMirror;
+    private StyleableProperty<Number> lineSpacingMirror() {
+        if (lineSpacingMirror == null) {
+            lineSpacingMirror = new StyleablePropertyMirror<Number>(LINE_SPACING, "lineSpacingMirror", 0d, (StyleableProperty<Number>)(WritableValue<Number>)labeled.lineSpacingProperty());
+            lineSpacingProperty().addListener(lineSpacingMirror);
+        }
+        return lineSpacingMirror;        
+    }
+    
+    private static final CssMetaData<LabeledText,Number> LINE_SPACING =
+        new CssMetaData<LabeledText,Number>("-fx-line-spacing",
+            SizeConverter.getInstance(),
+                0) {
+
+            @Override
+            public boolean isSettable(LabeledText node) {
+                return node.labeled.lineSpacingProperty().isBound() == false;
+            }
+
+            @Override
+            public StyleableProperty<Number> getStyleableProperty(LabeledText node) {
+                return node.lineSpacingMirror();
+            }
+        };
+
+    private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+    static {
+
+       final List<CssMetaData<? extends Styleable, ?>> styleables =
+           new ArrayList<CssMetaData<? extends Styleable, ?>>(Text.getClassCssMetaData());
+
+       for (int n=0,nMax=styleables.size(); n<nMax; n++) {
+           final String prop = styleables.get(n).getProperty();
+
+           if ("-fx-fill".equals(prop)) {
+               styleables.set(n, FILL);
+           } else if ("-fx-font".equals(prop)) {
+               styleables.set(n, FONT);
+           } else if ("-fx-text-alignment".equals(prop)) {
+               styleables.set(n, TEXT_ALIGNMENT);
+           } else if ("-fx-underline".equals(prop)) {
+               styleables.set(n, UNDERLINE);
+           } else if ("-fx-line-spacing".equals(prop)) {
+               styleables.set(n, LINE_SPACING);
+           }
+       }
+
+       STYLEABLES = Collections.unmodifiableList(styleables);
+    }       
+
+    private class StyleablePropertyMirror<T> extends SimpleStyleableObjectProperty<T> implements InvalidationListener {
+        
+        private StyleablePropertyMirror(CssMetaData<LabeledText, T> cssMetaData, String name, T initialValue, StyleableProperty<T> property) {
+            super(cssMetaData, LabeledText.this, name, initialValue);
+            this.property = property;
+            this.applying = false;
+        }
+
+        @Override
+        public void invalidated(Observable observable) {
+            // if Text's property is changing but not because a style is being applied,
+            // then it's either because the set method was called on the Labeled's property or
+            // because CSS is resetting Labeled's property to its initial value
+            // (see CssStyleHelper#resetToInitialValues(Styleable))
+            if (applying == false) {
+                super.applyStyle(null, ((ObservableValue<T>)observable).getValue());
+            }
+        }
+
+        @Override
+        public void applyStyle(StyleOrigin newOrigin, T value) {
+
+            applying = true;
+            //
+            // In the case where the Labeled's property was set by an
+            // inline style, this inline style should override values
+            // from lesser origins.
+            //
+            StyleOrigin propOrigin = property.getStyleOrigin();
+
+            //
+            // if propOrigin is null, then the property is in init state
+            // if newOrigin is null, then CSS is resetting this property -
+            //    but don't let CSS overwrite a user set value
+            // if propOrigin is greater than origin, then the style should
+            //    not override
+            //
+            if (propOrigin == null ||
+                    (newOrigin != null
+                            ? propOrigin.compareTo(newOrigin) <= 0
+                            : propOrigin != StyleOrigin.USER)) {
+                super.applyStyle(newOrigin, value);
+                property.applyStyle(newOrigin, value);
+            }
+            applying = false;
+        }
+
+        @Override public StyleOrigin getStyleOrigin() {
+            return property.getStyleOrigin();
+        }
+
+        boolean applying;
+        private final StyleableProperty<T> property;
+    } 
+       
+}
--- /dev/null	2015-09-03 15:16:40.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/LambdaMultiplePropertyChangeListenerHandler.java	2015-09-03 15:16:38.559108900 -0700
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2015, 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;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WeakChangeListener;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public final class LambdaMultiplePropertyChangeListenerHandler {
+
+    private final Map<ObservableValue<?>, List<Consumer<ObservableValue<?>>>> propertyReferenceMap;
+    private final ChangeListener<Object> propertyChangedListener;
+    private final WeakChangeListener<Object> weakPropertyChangedListener;
+
+    public LambdaMultiplePropertyChangeListenerHandler() {
+        this.propertyReferenceMap = new HashMap<>();
+        this.propertyChangedListener = (observable, oldValue, newValue) -> {
+            List<Consumer<ObservableValue<?>>> callbacks = propertyReferenceMap.getOrDefault(observable, Collections.emptyList());
+            for (Consumer<ObservableValue<?>> callback : callbacks) {
+                callback.accept(observable);
+            }
+        };
+        this.weakPropertyChangedListener = new WeakChangeListener<>(propertyChangedListener);
+    }
+    
+    /**
+     * Subclasses can invoke this method to register that we want to listen to
+     * property change events for the given property.
+     *
+     * @param property
+     */
+    public final void registerChangeListener(ObservableValue<?> property, Consumer<ObservableValue<?>> consumer) {
+        if (consumer == null) return;
+        List<Consumer<ObservableValue<?>>> callbacks = propertyReferenceMap.computeIfAbsent(property, p -> new ArrayList<>());
+        callbacks.add(consumer);
+
+        // we only add a listener if the callbacks list contains only one element
+        // (that is, we've added a consumer to this specific property for the first
+        // time).
+        if (callbacks.size() == 1) {
+            property.addListener(weakPropertyChangedListener);
+        }
+    }
+
+    // need to be careful here - removing all listeners on the specific property!
+    public final void unregisterChangeListener(ObservableValue<?> property) {
+        if (propertyReferenceMap.containsKey(property)) {
+            propertyReferenceMap.remove(property);
+            property.removeListener(weakPropertyChangedListener);
+        }
+    }
+
+    public void dispose() {
+        // unhook listeners
+        for (ObservableValue<?> value : propertyReferenceMap.keySet()) {
+            value.removeListener(weakPropertyChangedListener);
+        }
+        propertyReferenceMap.clear();
+    }
+}
--- /dev/null	2015-09-03 15:16:45.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/MenuBarButton.java	2015-09-03 15:16:43.736405000 -0700
@@ -0,0 +1,73 @@
+package com.sun.javafx.scene.control;
+
+import javafx.beans.value.ChangeListener;
+import javafx.collections.ListChangeListener;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.skin.MenuBarSkin;
+
+public class MenuBarButton extends MenuButton {
+    public ChangeListener<Boolean> menuListener;
+    public MenuBarSkin menuBarSkin;
+    public Menu menu;
+
+    private final ListChangeListener<MenuItem> itemsListener;
+    private final ListChangeListener<String> styleClassListener;
+
+    public MenuBarButton(MenuBarSkin menuBarSkin, Menu menu) {
+        super(menu.getText(), menu.getGraphic());
+        this.menuBarSkin = menuBarSkin;
+        setAccessibleRole(AccessibleRole.MENU);
+
+        // listen to changes in menu items & update menuButton items
+        menu.getItems().addListener(itemsListener = c -> {
+            while (c.next()) {
+                getItems().removeAll(c.getRemoved());
+                getItems().addAll(c.getFrom(), c.getAddedSubList());
+            }
+        });
+        menu.getStyleClass().addListener(styleClassListener = c -> {
+            while(c.next()) {
+                for(int i=c.getFrom(); i<c.getTo(); i++) {
+                    getStyleClass().add(menu.getStyleClass().get(i));
+                }
+                for (String str : c.getRemoved()) {
+                    getStyleClass().remove(str);
+                }
+            }
+        });
+        idProperty().bind(menu.idProperty());
+    }
+
+    public MenuBarSkin getMenuBarSkin() {
+        return menuBarSkin;
+    }
+
+    public void clearHover() {
+        setHover(false);
+    }
+
+    public void setHover() {
+        setHover(true);
+
+            /* Transfer the a11y focus to an item in the menu bar. */
+        menuBarSkin.getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_NODE);
+    }
+
+    public void dispose() {
+        menu.getItems().removeListener(itemsListener);
+        menu.getStyleClass().removeListener(styleClassListener);
+        idProperty().unbind();
+    }
+
+    @Override
+    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: return MenuBarButton.this;
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}
\ No newline at end of file
--- /dev/null	2015-09-03 15:16:50.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/Properties.java	2015-09-03 15:16:48.934702400 -0700
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2015, 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;
+
+import com.sun.javafx.scene.control.skin.resources.ControlResources;
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
+
+public class Properties {
+
+    /***************************************************************************
+     *
+     * SkinBase
+     *
+     **************************************************************************/
+
+    /**
+     * A static final reference to whether the platform we are on supports touch.
+     */
+    public final static boolean IS_TOUCH_SUPPORTED = Platform.isSupported(ConditionalFeature.INPUT_TOUCH);
+
+
+
+
+    /***************************************************************************
+     *
+     * ButtonBar
+     *
+     **************************************************************************/
+
+    // represented as a ButtonData
+    public static final String BUTTON_DATA_PROPERTY  = "javafx.scene.control.ButtonBar.ButtonData"; //$NON-NLS-1$
+
+    // allows to exclude button from uniform resizing
+    public static final String BUTTON_SIZE_INDEPENDENCE = "javafx.scene.control.ButtonBar.independentSize"; //$NON-NLS-1$
+
+
+
+    /***************************************************************************
+     *
+     * ComboBox
+     *
+     **************************************************************************/
+
+    public static final String COMBO_BOX_STYLE_CLASS = "combo-box-popup";
+
+
+
+    /***************************************************************************
+     *
+     * ColorPicker
+     *
+     **************************************************************************/
+
+    public static String getColorPickerString(String key) {
+        return ControlResources.getString("ColorPicker." + key);
+    }
+
+
+
+    /***************************************************************************
+     *
+     * ListView, TableView
+     *
+     **************************************************************************/
+
+    public static final String REFRESH = "refreshKey";
+    public static final String RECREATE = "recreateKey";
+
+
+
+    /***************************************************************************
+     *
+     * ScrollBar
+     *
+     **************************************************************************/
+
+    public final static int DEFAULT_LENGTH = 100;
+    public final static int DEFAULT_WIDTH = 20;
+    public static final double DEFAULT_EMBEDDED_SB_BREADTH = 8.0;
+
+
+
+    /***************************************************************************
+     *
+     * TableCell
+     *
+     **************************************************************************/
+    // This property is set on the cell when we want to know its actual
+    // preferred width, not the width of the associated TableColumn.
+    // This is primarily used in NestedTableColumnHeader such that user double
+    // clicks result in the column being resized to fit the widest content in
+    // the column
+    // FIXME make package-protected before merging into main repo
+    public static final String DEFER_TO_PARENT_PREF_WIDTH = "deferToParentPrefWidth";
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualScrollBar.java	2015-09-03 15:16:55.580082400 -0700
+++ /dev/null	2015-09-03 15:16:56.000000000 -0700
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.IndexedCell;
-import javafx.scene.control.ScrollBar;
-
-import com.sun.javafx.util.Utils;
-
-/**
- * This custom ScrollBar is used to map the increment & decrement features
- * to pixel based scrolling rather than thumb/track based scrolling, if the
- * "virtual" attribute is true.
- */
-public class VirtualScrollBar extends ScrollBar {
-    private final VirtualFlow flow;
-
-    private boolean virtual;
-    
-    private boolean adjusting;
-
-    public VirtualScrollBar(final VirtualFlow flow) {
-        this.flow = flow;
-        
-        super.valueProperty().addListener(valueModel -> {
-            if (isVirtual()/* && oldValue != newValue*/) {
-                if (adjusting) {
-                    // no-op
-                } else {
-                    flow.setPosition(getValue());
-                }
-            }
-        });
-    }
-
-    public void setVirtual(boolean virtual) {
-        this.virtual = virtual;
-    }
-
-    public boolean isVirtual() {
-        return this.virtual;
-    }
-
-    @Override public void decrement() {
-        if (isVirtual()) {
-            flow.adjustPixels(-10);
-        } else {
-            super.decrement();
-        }
-    }
-
-    @Override public void increment() {
-        if (isVirtual()) {
-            flow.adjustPixels(10);
-        } else {
-            super.increment();
-        }
-    }
-    
-//    private double lastAdjustValue = 0.0;
-
-    // this method is called when the user clicks in the scrollbar track, so
-    // we special-case it to allow for page-up and page-down clicking to work
-    // as expected.
-    @Override public void adjustValue(double pos) {
-        if (isVirtual()) {
-//            if (pos == lastAdjustValue) {
-//                return;
-//            }
-
-            adjusting = true;
-            double oldValue = flow.getPosition();
-            
-            double newValue = ((getMax() - getMin()) * Utils.clamp(0, pos, 1))+getMin();
-            if (newValue < oldValue) {
-                IndexedCell cell = flow.getFirstVisibleCell();
-                if (cell == null) return;
-                flow.showAsLast(cell);
-            } else if (newValue > oldValue) {
-                IndexedCell cell = flow.getLastVisibleCell();
-                if (cell == null) return;
-                flow.showAsFirst(cell);
-            }
-//            lastAdjustValue = pos;
-            
-            adjusting = false;
-        } else {
-            super.adjustValue(pos);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:16:56.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/VirtualScrollBar.java	2015-09-03 15:16:54.772036200 -0700
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2010, 2015, 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;
+
+import com.sun.javafx.util.Utils;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.control.skin.VirtualFlow;
+
+/**
+ * This custom ScrollBar is used to map the increment & decrement features
+ * to pixel based scrolling rather than thumb/track based scrolling, if the
+ * "virtual" attribute is true.
+ */
+public class VirtualScrollBar extends ScrollBar {
+
+    /**************************************************************************
+     *
+     * Private fields
+     *
+     **************************************************************************/
+
+    private final VirtualFlow flow;
+
+    private boolean adjusting;
+
+
+
+    /**************************************************************************
+     *
+     * Constructors
+     *
+     **************************************************************************/
+
+    /**
+     * Creates a new VirtualScrollBar, for use by the VirtualFlow control.
+     */
+    public VirtualScrollBar(final VirtualFlow flow) {
+        this.flow = flow;
+        
+        super.valueProperty().addListener(valueModel -> {
+            if (isVirtual()/* && oldValue != newValue*/) {
+                if (adjusting) {
+                    // no-op
+                } else {
+                    flow.setPosition(getValue());
+                }
+            }
+        });
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Properties
+     *
+     **************************************************************************/
+
+    // --- virtual
+    private BooleanProperty virtual = new SimpleBooleanProperty(this, "virtual");
+    public final void setVirtual(boolean value) {
+        virtual.set(value);
+    }
+
+    public final boolean isVirtual() {
+        return virtual.get();
+    }
+
+    public final BooleanProperty virtualProperty() {
+        return virtual;
+    }
+
+
+    /**************************************************************************
+     *
+     * Public API
+     *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void decrement() {
+        if (isVirtual()) {
+            flow.scrollPixels(-10);
+        } else {
+            super.decrement();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void increment() {
+        if (isVirtual()) {
+            flow.scrollPixels(10);
+        } else {
+            super.increment();
+        }
+    }
+    
+    // this method is called when the user clicks in the scrollbar track, so
+    // we special-case it to allow for page-up and page-down clicking to work
+    // as expected.
+    /** {@inheritDoc} */
+    @Override public void adjustValue(double pos) {
+        if (isVirtual()) {
+            adjusting = true;
+            double oldValue = flow.getPosition();
+            
+            double newValue = ((getMax() - getMin()) * Utils.clamp(0, pos, 1))+getMin();
+            if (newValue < oldValue) {
+                IndexedCell cell = flow.getFirstVisibleCell();
+                if (cell == null) return;
+                flow.scrollToBottom(cell);
+            } else if (newValue > oldValue) {
+                IndexedCell cell = flow.getLastVisibleCell();
+                if (cell == null) return;
+                flow.scrollToTop(cell);
+            }
+
+            adjusting = false;
+        } else {
+            super.adjustValue(pos);
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/WebColorField.java	2015-09-03 15:17:03.771551000 -0700
+++ /dev/null	2015-09-03 15:17:04.000000000 -0700
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-import com.sun.javafx.scene.control.skin.InputField;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.control.Skin;
-import javafx.scene.paint.Color;
-
-/**
- *
- */
-class WebColorField extends InputField {
-    /**
-     * The value of the WebColorField. If null, the value will be treated as "#000000" black, but
-     * will still actually be null.
-     */
-    private ObjectProperty<Color> value = new SimpleObjectProperty<Color>(this, "value");
-    public final Color getValue() { return value.get(); }
-    public final void setValue(Color value) { this.value.set(value); }
-    public final ObjectProperty<Color> valueProperty() { return value; }
-
-    /**
-     * Creates a new WebColorField. The style class is set to "webcolor-field".
-     */
-    public WebColorField() {
-        getStyleClass().setAll("webcolor-field");
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Methods                                                                 *
-     *                                                                         *
-     **************************************************************************/
-
-    /** {@inheritDoc} */
-    @Override protected Skin<?> createDefaultSkin() {
-        return new WebColorFieldSkin(this);
-    }
-}
--- /dev/null	2015-09-03 15:17:05.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/WebColorField.java	2015-09-03 15:17:02.932503000 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2012, 2015, 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;
+
+import com.sun.javafx.scene.control.skin.WebColorFieldSkin;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.Skin;
+import javafx.scene.paint.Color;
+
+/**
+ *
+ */
+public class WebColorField extends InputField {
+    /**
+     * The value of the WebColorField. If null, the value will be treated as "#000000" black, but
+     * will still actually be null.
+     */
+    private ObjectProperty<Color> value = new SimpleObjectProperty<Color>(this, "value");
+    public final Color getValue() { return value.get(); }
+    public final void setValue(Color value) { this.value.set(value); }
+    public final ObjectProperty<Color> valueProperty() { return value; }
+
+    /**
+     * Creates a new WebColorField. The style class is set to "webcolor-field".
+     */
+    public WebColorField() {
+        getStyleClass().setAll("webcolor-field");
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Methods                                                                 *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected Skin<?> createDefaultSkin() {
+        return new WebColorFieldSkin(this);
+    }
+}
--- /dev/null	2015-09-03 15:17:12.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java	2015-09-03 15:17:10.743949800 -0700
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015, 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.behavior;
+
+import com.sun.javafx.scene.traversal.Direction;
+import javafx.event.EventTarget;
+import javafx.scene.Node;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import com.sun.javafx.scene.control.inputmap.KeyBinding;
+import javafx.scene.input.KeyEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.sun.javafx.scene.control.inputmap.InputMap.*;
+import static javafx.scene.input.KeyCode.DOWN;
+import static javafx.scene.input.KeyCode.LEFT;
+import static javafx.scene.input.KeyCode.RIGHT;
+import static javafx.scene.input.KeyCode.TAB;
+import static javafx.scene.input.KeyCode.UP;
+
+public class FocusTraversalInputMap<N extends Node> {
+
+    private static final List<InputMap.Mapping<?>> mappings = new ArrayList<>();
+    static {
+        mappings.add(new KeyMapping(UP, e -> traverseUp(e)));
+        mappings.add(new KeyMapping(DOWN, e -> traverseDown(e)));
+        mappings.add(new KeyMapping(LEFT, e -> traverseLeft(e)));
+        mappings.add(new KeyMapping(RIGHT, e -> traverseRight(e)));
+        mappings.add(new KeyMapping(TAB, e -> traverseNext(e)));
+        mappings.add(new KeyMapping(new KeyBinding(TAB).shift(), e -> traversePrevious(e)));
+
+        mappings.add(new KeyMapping(new KeyBinding(UP).shift().alt().ctrl(), e -> traverseUp(e)));
+        mappings.add(new KeyMapping(new KeyBinding(DOWN).shift().alt().ctrl(), e -> traverseDown(e)));
+        mappings.add(new KeyMapping(new KeyBinding(LEFT).shift().alt().ctrl(), e -> traverseLeft(e)));
+        mappings.add(new KeyMapping(new KeyBinding(RIGHT).shift().alt().ctrl(), e -> traverseRight(e)));
+        mappings.add(new KeyMapping(new KeyBinding(TAB).shift().alt().ctrl(), e -> traverseNext(e)));
+        mappings.add(new KeyMapping(new KeyBinding(TAB).alt().ctrl(), e -> traversePrevious(e)));
+    }
+
+    private FocusTraversalInputMap() {
+        // no-op, just forcing use of static method
+    }
+
+    public static InputMap.Mapping<?>[] getFocusTraversalMappings() {
+        return mappings.toArray(new InputMap.Mapping[mappings.size()]);
+    }
+
+    public static <N extends Node> InputMap<N> createInputMap(N node) {
+        InputMap<N> inputMap = new InputMap<>(node);
+        inputMap.getMappings().addAll(getFocusTraversalMappings());
+        return inputMap;
+    }
+
+
+
+    /***************************************************************************
+     * Focus Traversal methods                                                 *
+     **************************************************************************/
+
+    /**
+     * Called by any of the BehaviorBase traverse methods to actually effect a
+     * traversal of the focus. The default behavior of this method is to simply
+     * call impl_traverse on the given node, passing the given direction. A
+     * subclass may override this method.
+     *
+     * @param node The node to call impl_traverse on
+     * @param dir The direction to traverse
+     */
+    public static void traverse(final Node node, final Direction dir) {
+        if (node == null) {
+            throw new IllegalArgumentException("Attempting to traverse on a null Node. " +
+                    "Most probably a KeyEvent has been fired with a null target specified.");
+        }
+        node.impl_traverse(dir);
+    }
+
+    /**
+     * Calls the focus traversal engine and indicates that traversal should
+     * go the next focusTraversable Node above the current one.
+     */
+    public static final void traverseUp(KeyEvent e) {
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.UP);
+    }
+
+    /**
+     * Calls the focus traversal engine and indicates that traversal should
+     * go the next focusTraversable Node below the current one.
+     */
+    public static final void traverseDown(KeyEvent e) {
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.DOWN);
+    }
+
+    /**
+     * Calls the focus traversal engine and indicates that traversal should
+     * go the next focusTraversable Node left of the current one.
+     */
+    public static final void traverseLeft(KeyEvent e) {
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.LEFT);
+    }
+
+    /**
+     * Calls the focus traversal engine and indicates that traversal should
+     * go the next focusTraversable Node right of the current one.
+     */
+    public static final void traverseRight(KeyEvent e) {
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.RIGHT);
+    }
+
+    /**
+     * Calls the focus traversal engine and indicates that traversal should
+     * go the next focusTraversable Node in the focus traversal cycle.
+     */
+    public static final void traverseNext(KeyEvent e) {
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.NEXT);
+    }
+
+    /**
+     * Calls the focus traversal engine and indicates that traversal should
+     * go the previous focusTraversable Node in the focus traversal cycle.
+     */
+    public static final void traversePrevious(KeyEvent e) {
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+    }
+
+    private static Node getNode(KeyEvent e) {
+        EventTarget target = e.getTarget();
+        if (target instanceof Node) {
+            return (Node) target;
+        }
+        return null;
+    }
+}
--- /dev/null	2015-09-03 15:17:17.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/inputmap/InputMap.java	2015-09-03 15:17:16.088255400 -0700
@@ -0,0 +1,951 @@
+/*
+ * Copyright (c) 2015, 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.inputmap;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.scene.Node;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.util.Pair;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * InputMap is a class that is set on a given {@link Node}. When the Node receives
+ * an input event from the system, it passes this event in to the InputMap where
+ * the InputMap can check all installed
+ * {@link InputMap.Mapping mappings} to see if there is any
+ * suitable mapping, and if so, fire the provided {@link EventHandler}.
+ *
+ * @param <N> The type of the Node that the InputMap is installed in.
+ * @since 9
+ */
+public class InputMap<N extends Node> implements EventHandler<Event> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final N node;
+
+    private final ObservableList<InputMap<N>> childInputMaps;
+
+    private final ObservableList<Mapping<?>> mappings;
+
+//    private final ObservableList<Predicate<? extends Event>> interceptors;
+
+    private final Map<EventType<?>, List<EventHandler<? super Event>>> installedEventHandlers;
+
+    private final Map<EventType, List<Mapping>> eventTypeMappings;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates the new InputMap instance which is related specifically to the
+     * given Node.
+     * @param node The Node for which this InputMap is attached.
+     */
+    public InputMap(N node) {
+        if (node == null) {
+            throw new IllegalArgumentException("Node can not be null");
+        }
+
+        this.node = node;
+        this.eventTypeMappings = new HashMap<>();
+        this.installedEventHandlers = new HashMap<>();
+//        this.interceptors = FXCollections.observableArrayList();
+
+        // listeners
+        this.mappings = FXCollections.observableArrayList();
+        mappings.addListener((ListChangeListener<Mapping<?>>) c -> {
+            while (c.next()) {
+                // TODO handle mapping removal
+                if (c.wasRemoved()) {
+                    for (Mapping<?> mapping : c.getRemoved()) {
+                        removeMapping(mapping);
+                    }
+                }
+
+                if (c.wasAdded()) {
+                    List<Mapping<?>> toRemove = new ArrayList<>();
+                    for (Mapping<?> mapping : c.getAddedSubList()) {
+                        if (mapping == null) {
+                            toRemove.add(null);
+                        } else {
+                            addMapping(mapping);
+                        }
+                    }
+
+                    if (!toRemove.isEmpty()) {
+                        getMappings().removeAll(toRemove);
+                        throw new IllegalArgumentException("Null mappings not permitted");
+                    }
+                }
+            }
+        });
+
+        childInputMaps = FXCollections.observableArrayList();
+        childInputMaps.addListener((ListChangeListener<InputMap<N>>) c -> {
+            while (c.next()) {
+                if (c.wasRemoved()) {
+                    for (InputMap<N> map : c.getRemoved()) {
+                        map.setParentInputMap(null);
+                    }
+                }
+
+                if (c.wasAdded()) {
+                    List<InputMap<N>> toRemove = new ArrayList<>();
+                    for (InputMap<N> map : c.getAddedSubList()) {
+                        // we check that the child input map maps to the same node
+                        // as this input map
+                        if (map.getNode() != getNode()) {
+                            toRemove.add(map);
+                        } else {
+                            map.setParentInputMap(this);
+                        }
+                    }
+
+                    if (!toRemove.isEmpty()) {
+                        getChildInputMaps().removeAll(toRemove);
+                        throw new IllegalArgumentException("Child InputMap intances need to share a common Node object");
+                    }
+                }
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    // --- parent behavior - for now this is an private property
+    private ReadOnlyObjectWrapper<InputMap<N>> parentInputMap = new ReadOnlyObjectWrapper<InputMap<N>>(this, "parentInputMap") {
+        @Override protected void invalidated() {
+            // whenever the parent InputMap changes, we uninstall all mappings and
+            // then reprocess them so that they are installed in the correct root.
+            reprocessAllMappings();
+        }
+    };
+    private final void setParentInputMap(InputMap<N> value) { parentInputMap.set(value); }
+    private final InputMap<N> getParentInputMap() {return parentInputMap.get(); }
+    private final ReadOnlyObjectProperty<InputMap<N>> parentInputMapProperty() { return parentInputMap.getReadOnlyProperty(); }
+
+
+    // --- interceptor
+    /**
+     * The role of the interceptor is to block the InputMap on which it is
+     * set from executing any mappings (contained within itself, or within a
+     * {@link #getChildInputMaps() child InputMap}, whenever the interceptor
+     * returns true. The interceptor is called every time an input event is received,
+     * and is allowed to reason on the given input event
+     * before returning a boolean value, where boolean true means block
+     * execution, and boolean false means to allow execution.
+     */
+    private ObjectProperty<Predicate<? extends Event>> interceptor = new SimpleObjectProperty<>(this, "interceptor");
+    public final Predicate<? extends Event> getInterceptor() {
+        return interceptor.get();
+    }
+    public final void setInterceptor(Predicate<? extends Event> value) {
+        interceptor.set(value);
+    }
+    public final ObjectProperty<Predicate<? extends Event>> interceptorProperty() {
+        return interceptor;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The Node for which this InputMap is attached.
+     */
+    public final N getNode() {
+        return node;
+    }
+
+    /**
+     * A mutable list of input mappings. Each will be considered whenever an
+     * input event is being looked up, and one of which may be used to handle
+     * the input event, based on the specifificity returned by each mapping
+     * (that is, the mapping with the highest specificity wins).
+     */
+    public ObservableList<Mapping<?>> getMappings() {
+        return mappings;
+    }
+
+    /**
+     * A mutable list of child InputMaps. An InputMap may have child input maps,
+     * as this allows for easy addition
+     * of mappings that are state-specific. For example, if a Node can be in two
+     * different states, and the input mappings are different for each, then it
+     * makes sense to have one root (and empty) InputMap, with two children
+     * input maps, where each is populated with the specific input mappings for
+     * one of the two states. To prevent the wrong input map from being considered,
+     * it is simply a matter of setting an appropriate
+     * {@link #interceptorProperty() interceptor} on each map, so that they are only
+     * considered in one of the two states.
+     */
+    public ObservableList<InputMap<N>> getChildInputMaps() {
+        return childInputMaps;
+    }
+
+    /**
+     * Disposes all child InputMaps, removes all event handlers from the Node,
+     * and clears the mappings list.
+     */
+    public void dispose() {
+        for (InputMap<N> childInputMap : getChildInputMaps()) {
+            childInputMap.dispose();
+        }
+
+        // uninstall event handlers
+        removeAllEventHandlers();
+
+        // clear out all mappings
+        getMappings().clear();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void handle(Event e) {
+        if (e == null || e.isConsumed()) return;
+
+        List<Mapping<?>> mappings = lookup(e, true);
+        for (Mapping<?> mapping : mappings) {
+            EventHandler eventHandler = mapping.getEventHandler();
+            if (eventHandler != null) {
+                eventHandler.handle(e);
+            }
+
+            if (mapping.isAutoConsume()) {
+                e.consume();
+            }
+
+            if (e.isConsumed()) {
+                break;
+            }
+
+            // If we are here, the event has not been consumed, so we continue
+            // looping through our list of matches. Refer to the documentation in
+            // lookup(Event) for more details on the list ordering.
+        }
+    }
+
+    /**
+     * Looks up the most specific mapping given the input, ignoring all
+     * interceptors. The valid values that can be passed into this method is
+     * based on the values returned by the {@link Mapping#getMappingKey()}
+     * method. Based on the subclasses of Mapping that ship with JavaFX, the
+     * valid values are therefore:
+     *
+     * <ul>
+     *     <li><strong>KeyMapping:</strong> A valid {@link KeyBinding}.</li>
+     *     <li><strong>MouseMapping:</strong> A valid {@link MouseEvent} event
+     *     type (e.g. {@code MouseEvent.MOUSE_PRESSED}).</li>
+     * </ul>
+     *
+     * For other Mapping subclasses, refer to their javadoc, and specifically
+     * what is returned by {@link Mapping#getMappingKey()},
+     *
+     * @param mappingKey
+     * @return
+     */
+    // TODO return all mappings, or just the first one?
+    public Optional<Mapping<?>> lookupMapping(Object mappingKey) {
+        if (mappingKey == null) {
+            return Optional.empty();
+        }
+
+        List<Mapping<?>> mappings = lookupMappingKey(mappingKey);
+
+        // descend into our child input maps as well
+        for (int i = 0; i < getChildInputMaps().size(); i++) {
+            InputMap<N> childInputMap = getChildInputMaps().get(i);
+
+            List<Mapping<?>> childMappings = childInputMap.lookupMappingKey(mappingKey);
+            mappings.addAll(0, childMappings);
+        }
+
+        return mappings.size() > 0 ? Optional.of(mappings.get(0)) : Optional.empty();
+    }
+
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private List<Mapping<?>> lookupMappingKey(Object mappingKey) {
+        return getMappings().stream()
+                .filter(mapping -> !mapping.isDisabled())
+                .filter(mapping -> mappingKey.equals(mapping.getMappingKey()))
+                .collect(Collectors.toList());
+    }
+
+    /*
+     * Returns a List of Mapping instances, in priority order (from highest priority
+     * to lowest priority). All mappings in the list have the same value specificity,
+     * so are ranked based on the input map (with the leaf input maps taking
+     * precedence over parent / root input maps).
+     */
+    private List<Mapping<?>> lookup(Event event, boolean testInterceptors) {
+        // firstly we look at ourselves to see if we have a mapping, assuming our
+        // interceptors are valid
+        if (testInterceptors) {
+            boolean interceptorsApplies = testInterceptor(event, getInterceptor());
+
+            if (interceptorsApplies) {
+                return Collections.emptyList();
+            }
+        }
+
+        List<Mapping<?>> mappings = new ArrayList<>();
+
+        int minSpecificity = 0;
+        List<Pair<Integer, Mapping<?>>> results = lookupMappingAndSpecificity(event, minSpecificity);
+        if (! results.isEmpty()) {
+            minSpecificity = results.get(0).getKey();
+            mappings.addAll(results.stream().map(pair -> pair.getValue()).collect(Collectors.toList()));
+        }
+
+        // but we always descend into our child input maps as well, to see if there
+        // is a more specific mapping there. If there is a mapping of equal
+        // specificity, we take the child mapping over the parent mapping.
+        for (int i = 0; i < getChildInputMaps().size(); i++) {
+            InputMap childInputMap = getChildInputMaps().get(i);
+
+            // test if the childInputMap should be considered
+            if (testInterceptors) {
+                boolean interceptorsApplies = testInterceptor(event, childInputMap.getInterceptor());
+                if (interceptorsApplies) {
+                    continue;
+                }
+            }
+
+            List<Pair<Integer, Mapping<?>>> childResults = childInputMap.lookupMappingAndSpecificity(event, minSpecificity);
+            if (!childResults.isEmpty()) {
+                int specificity = childResults.get(0).getKey();
+                List<Mapping<?>> childMappings = childResults.stream()
+                                    .map(pair -> pair.getValue())
+                                    .collect(Collectors.toList());
+                if (specificity == minSpecificity) {
+                    mappings.addAll(0, childMappings);
+                } else if (specificity > minSpecificity) {
+                    mappings.clear();
+                    minSpecificity = specificity;
+                    mappings.addAll(childMappings);
+                }
+            }
+        }
+
+        return mappings;
+    }
+
+    private InputMap<N> getRootInputMap() {
+        InputMap<N> rootInputMap = this;
+        while (true) {
+            if (rootInputMap == null) break;
+            InputMap<N> parentInputMap = rootInputMap.getParentInputMap();
+            if (parentInputMap == null) break;
+            rootInputMap = parentInputMap;
+        }
+        return rootInputMap;
+    }
+
+    private void addMapping(Mapping<?> mapping) {
+        InputMap<N> rootInputMap = getRootInputMap();
+
+        // we want to track the event handlers we install, so that we can clean
+        // up in the dispose() method (and also so that we don't duplicate
+        // event handlers for a single event type). Because this is all handled
+        // in the root InputMap, we firstly find it, and then we defer to it.
+        rootInputMap.addEventHandler(mapping.eventType);
+
+        // we maintain a separate map of all mappings, which maps from the
+        // mapping event type into a list of mappings. This allows for easier
+        // iteration in the lookup methods.
+        EventType<?> et = mapping.getEventType();
+        List<Mapping> _eventTypeMappings = this.eventTypeMappings.computeIfAbsent(et, f -> new ArrayList<>());
+        _eventTypeMappings.add(mapping);
+    }
+
+    private void removeMapping(Mapping<?> mapping) {
+        // TODO
+    }
+
+    private void addEventHandler(EventType et) {
+        List<EventHandler<? super Event>> eventHandlers =
+                installedEventHandlers.computeIfAbsent(et, f -> new ArrayList<>());
+
+        final EventHandler<? super Event> eventHandler = this::handle;
+
+        if (eventHandlers.isEmpty()) {
+//            System.out.println("Added event handler for type " + et);
+            node.addEventHandler(et, eventHandler);
+        }
+
+        // We need to store these event handlers so we can dispose cleanly.
+        eventHandlers.add(eventHandler);
+    }
+
+    private void removeAllEventHandlers() {
+        for (EventType<?> et : installedEventHandlers.keySet()) {
+            List<EventHandler<? super Event>> handlers = installedEventHandlers.get(et);
+            for (EventHandler<? super Event> handler : handlers) {
+//                System.out.println("Removed event handler for type " + et);
+                node.removeEventHandler(et, handler);
+            }
+        }
+    }
+
+    private void reprocessAllMappings() {
+        removeAllEventHandlers();
+        this.mappings.stream().forEach(this::addMapping);
+
+        // now do the same for all children
+        for (InputMap<N> child : getChildInputMaps()) {
+            child.reprocessAllMappings();
+        }
+    }
+
+    private List<Pair<Integer, Mapping<?>>> lookupMappingAndSpecificity(final Event event, final int minSpecificity) {
+        int _minSpecificity = minSpecificity;
+
+        List<Mapping> mappings = this.eventTypeMappings.getOrDefault(event.getEventType(), Collections.emptyList());
+        List<Pair<Integer, Mapping<?>>> result = new ArrayList<>();
+        for (Mapping mapping : mappings) {
+            if (mapping.isDisabled()) continue;
+
+            // test if mapping has an interceptor that will block this event.
+            // Interceptors return true if the interception should occur.
+            boolean interceptorsApplies = testInterceptor(event, mapping.getInterceptor());
+            if (interceptorsApplies) {
+                continue;
+            }
+
+            int specificity = mapping.getSpecificity(event);
+            if (specificity > 0 && specificity == _minSpecificity) {
+                result.add(new Pair<>(specificity, mapping));
+            } else if (specificity > _minSpecificity) {
+                result.clear();
+                result.add(new Pair<>(specificity, mapping));
+                _minSpecificity = specificity;
+            }
+        }
+
+        return result;
+    }
+
+    // Interceptors return true if the interception should occur.
+    private boolean testInterceptor(Event e, Predicate interceptor) {
+        return interceptor != null && interceptor.test(e);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Abstract base class for all input mappings as used by the
+     * {@link InputMap} class.
+     *
+     * @param <T> The type of {@link Event} the mapping represents.
+     */
+    public static abstract class Mapping<T extends Event> {
+
+        /***********************************************************************
+         *                                                                     *
+         * Private fields                                                      *
+         *                                                                     *
+         **********************************************************************/
+        private final EventType<T> eventType;
+        private final EventHandler<T> eventHandler;
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Constructors                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * Creates a new Mapping instance.
+         *
+         * @param eventType The {@link EventType} that is being listened for.
+         * @param eventHandler The {@link EventHandler} to fire when the mapping
+         *                     is selected as the most-specific mapping.
+         */
+        public Mapping(final EventType<T> eventType, final EventHandler<T> eventHandler) {
+            this.eventType = eventType;
+            this.eventHandler = eventHandler;
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Abstract methods                                                    *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * This method must be implemented by all mapping implementations such
+         * that it returns an integer value representing how closely the mapping
+         * matches the given {@link Event}. The higher the number, the greater
+         * the match. This allows the InputMap to determine
+         * which mapping is most specific, and to therefore fire the appropriate
+         * mapping {@link Mapping#getEventHandler() EventHandler}.
+         *
+         * @param event The {@link Event} that needs to be assessed for its
+         *              specificity.
+         * @return An integer indicating how close of a match the mapping is to
+         *          the given Event. The higher the number, the greater the match.
+         */
+        public abstract int getSpecificity(Event event);
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Properties                                                          *
+         *                                                                     *
+         **********************************************************************/
+
+        // --- disabled
+        /**
+         * By default all mappings are enabled (so this disabled property is set
+         * to false by default). In some cases it is useful to be able to disable
+         * a mapping until it is applicable. In these cases, users may simply
+         * toggle the disabled property until desired.
+         *
+         * <p>When the disabled property is true, the mapping will not be
+         * considered when input events are received, even if it is the most
+         * specific mapping available.</p>
+         */
+        private BooleanProperty disabled = new SimpleBooleanProperty(this, "disabled", false);
+        public final void setDisabled(boolean value) { disabled.set(value); }
+        public final boolean isDisabled() {return disabled.get(); }
+        public final BooleanProperty disabledProperty() { return disabled; }
+
+
+        // --- auto consume
+        /**
+         * By default mappings are set to 'auto consume' their specified event
+         * handler. This means that the event handler will not propagate further,
+         * but in some cases this is not desirable - sometimes it is preferred
+         * that the event continue to 'bubble up' to parent nodes so that they
+         * may also benefit from receiving this event. In these cases, it is
+         * important that this autoConsume property be changed from the default
+         * boolean true to instead be boolean false.
+         */
+        private BooleanProperty autoConsume = new SimpleBooleanProperty(this, "autoConsume", true);
+        public final void setAutoConsume(boolean value) { autoConsume.set(value); }
+        public final boolean isAutoConsume() {return autoConsume.get(); }
+        public final BooleanProperty autoConsumeProperty() { return autoConsume; }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Public API                                                          *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * The {@link EventType} that is being listened for.
+         */
+        public final EventType<T> getEventType() {
+            return eventType;
+        }
+
+        /**
+         * The {@link EventHandler} that will be fired should this mapping be
+         * the most-specific mapping for a given input, and should it not be
+         * blocked by an interceptor (either at a
+         * {@link InputMap#interceptorProperty() input map} level or a
+         * {@link Mapping#interceptorProperty() mapping} level).
+         */
+        public final EventHandler<T> getEventHandler() {
+            return eventHandler;
+        }
+
+
+        // --- interceptor
+        /**
+         * The role of the interceptor is to block the mapping on which it is
+         * set from executing, whenever the interceptor returns true. The
+         * interceptor is called every time the mapping is the best match for
+         * a given input event, and is allowed to reason on the given input event
+         * before returning a boolean value, where boolean true means block
+         * execution, and boolean false means to allow execution.
+         */
+        private ObjectProperty<Predicate<? extends Event>> interceptor = new SimpleObjectProperty<>(this, "interceptor");
+        public final Predicate<? extends Event> getInterceptor() {
+            return interceptor.get();
+        }
+        public final void setInterceptor(Predicate<? extends Event> value) {
+            interceptor.set(value);
+        }
+        public final ObjectProperty<Predicate<? extends Event>> interceptorProperty() {
+            return interceptor;
+        }
+
+        /**
+         *
+         * @return
+         */
+        public Object getMappingKey() {
+            return eventType;
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Mapping)) return false;
+
+            Mapping that = (Mapping) o;
+
+            if (eventType != null ? !eventType.equals(that.getEventType()) : that.getEventType() != null)  return false;
+
+            return true;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return eventType != null ? eventType.hashCode() : 0;
+        }
+    }
+
+    /**
+     * The KeyMapping class provides API to specify
+     * {@link InputMap.Mapping mappings} related to key input.
+     */
+    public static class KeyMapping extends Mapping<KeyEvent> {
+
+        /***********************************************************************
+         *                                                                     *
+         * Private fields                                                      *
+         *                                                                     *
+         **********************************************************************/
+        private final KeyBinding keyBinding;
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Constructors                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * Creates a new KeyMapping instance that will fire when the given
+         * {@link KeyCode} is entered into the application by the user, and this
+         * will result in the given {@link EventHandler} being fired.
+         *
+         * @param keyCode The {@link KeyCode} to listen for.
+         * @param eventHandler The {@link EventHandler} to fire when the
+         *           {@link KeyCode} is observed.
+         */
+        public KeyMapping(final KeyCode keyCode, final EventHandler<KeyEvent> eventHandler) {
+            this(new KeyBinding(keyCode), eventHandler);
+        }
+
+        /**
+         * Creates a new KeyMapping instance that will fire when the given
+         * {@link KeyCode} is entered into the application by the user, and this
+         * will result in the given {@link EventHandler} being fired. The
+         * eventType argument can be one of the following:
+         *
+         * <ul>
+         *     <li>{@link KeyEvent#ANY}</li>
+         *     <li>{@link KeyEvent#KEY_PRESSED}</li>
+         *     <li>{@link KeyEvent#KEY_TYPED}</li>
+         *     <li>{@link KeyEvent#KEY_RELEASED}</li>
+         * </ul>
+         *
+         * @param keyCode The {@link KeyCode} to listen for.
+         * @param eventType The type of {@link KeyEvent} to listen for.
+         * @param eventHandler The {@link EventHandler} to fire when the
+         *           {@link KeyCode} is observed.
+         */
+        public KeyMapping(final KeyCode keyCode, final EventType<KeyEvent> eventType, final EventHandler<KeyEvent> eventHandler) {
+            this(new KeyBinding(keyCode, eventType), eventHandler);
+        }
+
+        /**
+         * Creates a new KeyMapping instance that will fire when the given
+         * {@link KeyBinding} is entered into the application by the user, and this
+         * will result in the given {@link EventHandler} being fired.
+         *
+         * @param keyBinding The {@link KeyBinding} to listen for.
+         * @param eventHandler The {@link EventHandler} to fire when the
+         *           {@link KeyBinding} is observed.
+         */
+        public KeyMapping(KeyBinding keyBinding, final EventHandler<KeyEvent> eventHandler) {
+            this(keyBinding, eventHandler, null);
+        }
+
+        /**
+         * Creates a new KeyMapping instance that will fire when the given
+         * {@link KeyBinding} is entered into the application by the user, and this
+         * will result in the given {@link EventHandler} being fired, as long as the
+         * given interceptor is not true.
+         *
+         * @param keyBinding The {@link KeyBinding} to listen for.
+         * @param eventHandler The {@link EventHandler} to fire when the
+         *           {@link KeyBinding} is observed.
+         * @param interceptor A {@link Predicate} that, if true, will prevent the
+         *            {@link EventHandler} from being fired.
+         */
+        public KeyMapping(KeyBinding keyBinding, final EventHandler<KeyEvent> eventHandler, Predicate<KeyEvent> interceptor) {
+            super(keyBinding == null ? null : keyBinding.getType(), eventHandler);
+            if (keyBinding == null) {
+                throw new IllegalArgumentException("KeyMapping keyBinding constructor argument can not be null");
+            }
+            this.keyBinding = keyBinding;
+            setInterceptor(interceptor);
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Public API                                                          *
+         *                                                                     *
+         **********************************************************************/
+
+        /** {@inheritDoc} */
+        @Override public Object getMappingKey() {
+            return keyBinding;
+        }
+
+        /** {@inheritDoc} */
+        @Override public int getSpecificity(Event e) {
+            if (isDisabled()) return 0;
+            if (!(e instanceof KeyEvent)) return 0;
+            return keyBinding.getSpecificity((KeyEvent)e);
+        }
+
+        /** {@inheritDoc} */
+        @Override public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof KeyMapping)) return false;
+            if (!super.equals(o)) return false;
+
+            KeyMapping that = (KeyMapping) o;
+
+            // we know keyBinding is non-null here
+            return keyBinding.equals(that.keyBinding);
+        }
+
+        /** {@inheritDoc} */
+        @Override public int hashCode() {
+            return Objects.hash(keyBinding);
+        }
+    }
+
+
+
+    /**
+     * The MouseMapping class provides API to specify
+     * {@link InputMap.Mapping mappings} related to mouse input.
+     */
+    public static class MouseMapping extends Mapping<MouseEvent> {
+
+        /***********************************************************************
+         *                                                                     *
+         * Constructors                                                        *
+         *                                                                     *
+         **********************************************************************/
+
+        /**
+         * Creates a new KeyMapping instance that will fire when the given
+         * {@link KeyCode} is entered into the application by the user, and this
+         * will result in the given {@link EventHandler} being fired. The
+         * eventType argument can be any of the {@link MouseEvent} event types,
+         * but typically it is one of the following:
+         *
+         * <ul>
+         *     <li>{@link MouseEvent#ANY}</li>
+         *     <li>{@link MouseEvent#MOUSE_PRESSED}</li>
+         *     <li>{@link MouseEvent#MOUSE_CLICKED}</li>
+         *     <li>{@link MouseEvent#MOUSE_RELEASED}</li>
+         * </ul>
+         *
+         * @param eventType The type of {@link MouseEvent} to listen for.
+         * @param eventHandler The {@link EventHandler} to fire when the
+         *           {@link MouseEvent} is observed.
+         */
+        public MouseMapping(final EventType<MouseEvent> eventType, final EventHandler<MouseEvent> eventHandler) {
+            super(eventType, eventHandler);
+            if (eventType == null) {
+                throw new IllegalArgumentException("MouseMapping eventType constructor argument can not be null");
+            }
+        }
+
+
+
+        /***********************************************************************
+         *                                                                     *
+         * Public API                                                          *
+         *                                                                     *
+         **********************************************************************/
+
+        /** {@inheritDoc} */
+        @Override public int getSpecificity(Event e) {
+            if (isDisabled()) return 0;
+            if (!(e instanceof MouseEvent)) return 0;
+            EventType<MouseEvent> et = getEventType();
+
+            // FIXME naive
+            int s = 0;
+            if (e.getEventType() == MouseEvent.MOUSE_CLICKED && et != MouseEvent.MOUSE_CLICKED) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_DRAGGED && et != MouseEvent.MOUSE_DRAGGED) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_ENTERED && et != MouseEvent.MOUSE_ENTERED) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_ENTERED_TARGET && et != MouseEvent.MOUSE_ENTERED_TARGET) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_EXITED && et != MouseEvent.MOUSE_EXITED) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_EXITED_TARGET && et != MouseEvent.MOUSE_EXITED_TARGET) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_MOVED && et != MouseEvent.MOUSE_MOVED) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_PRESSED && et != MouseEvent.MOUSE_PRESSED) return 0; else s++;
+            if (e.getEventType() == MouseEvent.MOUSE_RELEASED && et != MouseEvent.MOUSE_RELEASED) return 0; else s++;
+
+            // TODO handle further checks
+
+            return s;
+        }
+    }
+
+    /**
+     * Convenience class that can act as an keyboard input interceptor, either at a
+     * {@link InputMap#interceptorProperty() input map} level or a
+     * {@link Mapping#interceptorProperty() mapping} level.
+     *
+     * @see InputMap#interceptorProperty()
+     * @see Mapping#interceptorProperty()
+     */
+    public static class KeyMappingInterceptor implements Predicate<Event> {
+
+        private final KeyBinding keyBinding;
+
+        /**
+         * Creates a new KeyMappingInterceptor, which will block execution of
+         * event handlers (either at a
+         * {@link InputMap#interceptorProperty() input map} level or a
+         * {@link Mapping#interceptorProperty() mapping} level), where the input
+         * received is equal to the given {@link KeyBinding}.
+         *
+         * @param keyBinding The {@link KeyBinding} for which mapping execution
+         *                   should be blocked.
+         */
+        public KeyMappingInterceptor(KeyBinding keyBinding) {
+            this.keyBinding = keyBinding;
+        }
+
+        /**  {@inheritDoc} */
+        public boolean test(Event event) {
+            if (!(event instanceof KeyEvent)) return false;
+            return KeyBinding.toKeyBinding((KeyEvent)event).equals(keyBinding);
+        }
+    }
+
+    /**
+     * Convenience class that can act as a mouse input interceptor, either at a
+     * {@link InputMap#interceptorProperty() input map} level or a
+     * {@link Mapping#interceptorProperty() mapping} level.
+     *
+     * @see InputMap#interceptorProperty()
+     * @see Mapping#interceptorProperty()
+     */
+    public static class MouseMappingInterceptor implements Predicate<Event> {
+
+        private final EventType<MouseEvent> eventType;
+
+        /**
+         * Creates a new MouseMappingInterceptor, which will block execution of
+         * event handlers (either at a
+         * {@link InputMap#interceptorProperty() input map} level or a
+         * {@link Mapping#interceptorProperty() mapping} level), where the input
+         * received is equal to the given {@link EventType}.
+         *
+         * @param eventType The {@link EventType} for which mapping execution
+         *                  should be blocked (typically one of
+         *                  {@link MouseEvent#MOUSE_PRESSED},
+         *                  {@link MouseEvent#MOUSE_CLICKED}, or
+         *                  {@link MouseEvent#MOUSE_RELEASED}).
+         */
+        public MouseMappingInterceptor(EventType<MouseEvent> eventType) {
+            this.eventType = eventType;
+        }
+
+        /**  {@inheritDoc} */
+        public boolean test(Event event) {
+            if (!(event instanceof MouseEvent)) return false;
+            return event.getEventType() == this.eventType;
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/KeyBinding.java	2015-09-03 15:17:22.205605300 -0700
+++ /dev/null	2015-09-03 15:17:23.000000000 -0700
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.behavior;
-
-import com.sun.javafx.util.Utils;
-import static com.sun.javafx.scene.control.behavior.OptionalBoolean.ANY;
-import static com.sun.javafx.scene.control.behavior.OptionalBoolean.FALSE;
-import static com.sun.javafx.scene.control.behavior.OptionalBoolean.TRUE;
-import com.sun.javafx.tk.Toolkit;
-import javafx.event.EventType;
-import javafx.scene.control.Control;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-
-/**
- * KeyBindings are used to describe which action should occur based on some
- * KeyEvent state and Control state. These bindings are used to populate the
- * keyBindings variable on BehaviorBase. The KeyBinding can be subclassed to
- * add additional matching criteria. A match in a subclass should always have
- * a specificity that is 1 greater than its superclass in the case of a match,
- * or 0 in the case where there is no match.
- *
- * Note that this API is, at present, quite odd in that you use a constructor
- * and then use shift(), ctrl(), alt(), or meta() separately. It gave me an
- * object-literal like approach but isn't ideal. We will want some builder
- * approach here (similar as in other places).
- */
-public class KeyBinding {
-    private KeyCode code;
-    private EventType<KeyEvent> eventType = KeyEvent.KEY_PRESSED;
-    private String action;
-    private OptionalBoolean shift = FALSE;
-    private OptionalBoolean ctrl = FALSE;
-    private OptionalBoolean alt = FALSE;
-    private OptionalBoolean meta = FALSE;
-
-    public KeyBinding(KeyCode code, String action) {
-        this.code = code;
-        this.action = action;
-    }
-
-    public KeyBinding(KeyCode code, EventType<KeyEvent> type, String action) {
-        this.code = code;
-        this.eventType = type;
-        this.action = action;
-    }
-
-    public KeyBinding shift() {
-        return shift(TRUE);
-    }
-
-    public KeyBinding shift(OptionalBoolean value) {
-        shift = value;
-        return this;
-    }
-
-    public KeyBinding ctrl() {
-        return ctrl(TRUE);
-    }
-
-    public KeyBinding ctrl(OptionalBoolean value) {
-        ctrl = value;
-        return this;
-    }
-
-    public KeyBinding alt() {
-        return alt(TRUE);
-    }
-
-    public KeyBinding alt(OptionalBoolean value) {
-        alt = value;
-        return this;
-    }
-    
-    public KeyBinding meta() {
-        return meta(TRUE);
-    }
-
-    public KeyBinding meta(OptionalBoolean value) {
-        meta = value;
-        return this;
-    }
-    
-    public KeyBinding shortcut() {
-        if (Toolkit.getToolkit().getClass().getName().endsWith("StubToolkit")) {
-            // FIXME: We've hit the terrible StubToolkit (which only appears 
-            // during testing). We will dumb down what we do here
-            if (Utils.isMac()) {
-                return meta();
-            } else {
-                return ctrl();
-            }
-        } else {
-            switch (Toolkit.getToolkit().getPlatformShortcutKey()) {
-                case SHIFT:
-                    return shift();
-
-                case CONTROL:
-                    return ctrl();
-
-                case ALT:
-                    return alt();
-
-                case META:
-                    return meta();
-
-                default:
-                    return this;
-            }
-        }
-    }
-
-    public final KeyCode getCode() { return code; }
-    public final EventType<KeyEvent> getType() { return eventType; }
-    public final String getAction() { return action; }
-    public final OptionalBoolean getShift() { return shift; }
-    public final OptionalBoolean getCtrl() { return ctrl; }
-    public final OptionalBoolean getAlt() { return alt; }
-    public final OptionalBoolean getMeta() { return meta; }
-
-    public int getSpecificity(Control control, KeyEvent event) {
-        int s = 0;
-        if (code != null && code != event.getCode()) return 0; else s = 1;
-        if (!shift.equals(event.isShiftDown())) return 0; else if (shift != ANY) s++;
-        if (!ctrl.equals(event.isControlDown())) return 0; else if (ctrl != ANY) s++;
-        if (!alt.equals(event.isAltDown())) return 0; else if (alt != ANY) s++;
-        if (!meta.equals(event.isMetaDown())) return 0; else if (meta != ANY) s++;
-        if (eventType != null && eventType != event.getEventType()) return 0; else s++;
-        // We can now trivially accept it
-        return s;
-    }
-
-    @Override public String toString() {
-        return "KeyBinding [code=" + code + ", shift=" + shift +
-                ", ctrl=" + ctrl + ", alt=" + alt + 
-                ", meta=" + meta + ", type=" + eventType + 
-                ", action=" + action + "]";
-    }
-}
--- /dev/null	2015-09-03 15:17:23.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/inputmap/KeyBinding.java	2015-09-03 15:17:21.458562600 -0700
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2015, 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.inputmap;
+
+import com.sun.javafx.util.Utils;
+import com.sun.javafx.tk.Toolkit;
+import javafx.event.EventType;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+
+import java.util.Objects;
+
+import static com.sun.javafx.scene.control.inputmap.KeyBinding.OptionalBoolean.*;
+
+/**
+ * KeyBindings are used to describe which action should occur based on some
+ * KeyEvent state and Control state. These bindings are used to populate the
+ * keyBindings variable on BehaviorBase. The KeyBinding can be subclassed to
+ * add additional matching criteria. A match in a subclass should always have
+ * a specificity that is 1 greater than its superclass in the case of a match,
+ * or 0 in the case where there is no match.
+ *
+ * Note that this API is, at present, quite odd in that you use a constructor
+ * and then use shift(), ctrl(), alt(), or meta() separately. It gave me an
+ * object-literal like approach but isn't ideal. We will want some builder
+ * approach here (similar as in other places).
+ *
+ * @since 9
+ */
+public class KeyBinding {
+    private final KeyCode code;
+    private final EventType<KeyEvent> eventType;
+    private OptionalBoolean shift = FALSE;
+    private OptionalBoolean ctrl = FALSE;
+    private OptionalBoolean alt = FALSE;
+    private OptionalBoolean meta = FALSE;
+
+    public KeyBinding(KeyCode code) {
+        this(code, null);
+    }
+
+    /**
+     * Designed for 'catch-all' situations, e.g. all KeyTyped events.
+     * @param type
+     */
+    public KeyBinding(EventType<KeyEvent> type) {
+        this(null, type);
+    }
+
+    public KeyBinding(KeyCode code, EventType<KeyEvent> type) {
+        this.code = code;
+        this.eventType = type != null ? type : KeyEvent.KEY_PRESSED;
+    }
+
+    public final KeyBinding shift() {
+        return shift(TRUE);
+    }
+
+    public final KeyBinding shift(OptionalBoolean value) {
+        shift = value;
+        return this;
+    }
+
+    public final KeyBinding ctrl() {
+        return ctrl(TRUE);
+    }
+
+    public final KeyBinding ctrl(OptionalBoolean value) {
+        ctrl = value;
+        return this;
+    }
+
+    public final KeyBinding alt() {
+        return alt(TRUE);
+    }
+
+    public final KeyBinding alt(OptionalBoolean value) {
+        alt = value;
+        return this;
+    }
+    
+    public final KeyBinding meta() {
+        return meta(TRUE);
+    }
+
+    public final KeyBinding meta(OptionalBoolean value) {
+        meta = value;
+        return this;
+    }
+    
+    public final KeyBinding shortcut() {
+        if (Toolkit.getToolkit().getClass().getName().endsWith("StubToolkit")) {
+            // FIXME: We've hit the terrible StubToolkit (which only appears 
+            // during testing). We will dumb down what we do here
+            if (Utils.isMac()) {
+                return meta();
+            } else {
+                return ctrl();
+            }
+        } else {
+            switch (Toolkit.getToolkit().getPlatformShortcutKey()) {
+                case SHIFT:
+                    return shift();
+
+                case CONTROL:
+                    return ctrl();
+
+                case ALT:
+                    return alt();
+
+                case META:
+                    return meta();
+
+                default:
+                    return this;
+            }
+        }
+    }
+
+
+
+    public final KeyCode getCode() { return code; }
+    public final EventType<KeyEvent> getType() { return eventType; }
+    public final OptionalBoolean getShift() { return shift; }
+    public final OptionalBoolean getCtrl() { return ctrl; }
+    public final OptionalBoolean getAlt() { return alt; }
+    public final OptionalBoolean getMeta() { return meta; }
+
+    public int getSpecificity(KeyEvent event) {
+        int s = 0;
+        if (code != null && code != event.getCode()) return 0; else s = 1;
+        if (!shift.equals(event.isShiftDown())) return 0; else if (shift != ANY) s++;
+        if (!ctrl.equals(event.isControlDown())) return 0; else if (ctrl != ANY) s++;
+        if (!alt.equals(event.isAltDown())) return 0; else if (alt != ANY) s++;
+        if (!meta.equals(event.isMetaDown())) return 0; else if (meta != ANY) s++;
+        if (eventType != null && eventType != event.getEventType()) return 0; else s++;
+        // We can now trivially accept it
+        return s;
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return "KeyBinding [code=" + code + ", shift=" + shift +
+                ", ctrl=" + ctrl + ", alt=" + alt + 
+                ", meta=" + meta + ", type=" + eventType + "]";
+    }
+
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof KeyBinding)) return false;
+        KeyBinding that = (KeyBinding) o;
+        return Objects.equals(getCode(), that.getCode()) &&
+                Objects.equals(eventType, that.eventType) &&
+                Objects.equals(getShift(), that.getShift()) &&
+                Objects.equals(getCtrl(), that.getCtrl()) &&
+                Objects.equals(getAlt(), that.getAlt()) &&
+                Objects.equals(getMeta(), that.getMeta());
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        return Objects.hash(getCode(), eventType, getShift(), getCtrl(), getAlt(), getMeta());
+    }
+
+    public static KeyBinding toKeyBinding(KeyEvent keyEvent) {
+        KeyBinding newKeyBinding = new KeyBinding(keyEvent.getCode(), keyEvent.getEventType());
+        if (keyEvent.isShiftDown()) newKeyBinding.shift();
+        if (keyEvent.isControlDown()) newKeyBinding.ctrl();
+        if (keyEvent.isAltDown()) newKeyBinding.alt();
+        if (keyEvent.isShortcutDown()) newKeyBinding.shortcut();
+        return newKeyBinding;
+    }
+
+    /**
+     * A tri-state boolean used with KeyBinding.
+     */
+    public enum OptionalBoolean {
+        TRUE,
+        FALSE,
+        ANY;
+
+        public boolean equals(boolean b) {
+            if (this == ANY) return true;
+            if (b && this == TRUE) return true;
+            if (!b && this == FALSE) return true;
+            return false;
+        }
+    }
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/AccordionSkin.java	2015-09-03 15:17:30.772095300 -0700
+++ /dev/null	2015-09-03 15:17:31.000000000 -0700
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2010, 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.beans.value.ChangeListener;
-import javafx.collections.ListChangeListener;
-import javafx.scene.Node;
-import javafx.scene.control.Accordion;
-import javafx.scene.control.Skin;
-import javafx.scene.control.TitledPane;
-import javafx.scene.shape.Rectangle;
-
-import com.sun.javafx.scene.control.behavior.AccordionBehavior;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class AccordionSkin extends BehaviorSkinBase<Accordion, AccordionBehavior> {
-
-    private TitledPane firstTitledPane;
-    private Rectangle clipRect;
-
-    // This is used when we definitely want to force a relayout, regardless of
-    // whether the height has also changed
-    private boolean forceRelayout = false;
-
-    // this is used to request a layout, assuming the height has also changed
-    private boolean relayout = false;
-
-    // we record the previous height to know if the current height is different
-    private double previousHeight = 0;
-
-    public AccordionSkin(final Accordion accordion) {
-        super(accordion, new AccordionBehavior(accordion));
-        accordion.getPanes().addListener((ListChangeListener<TitledPane>) c -> {
-            if (firstTitledPane != null) {
-                firstTitledPane.getStyleClass().remove("first-titled-pane");
-            }
-            if (!accordion.getPanes().isEmpty()) {
-                firstTitledPane = accordion.getPanes().get(0);
-                firstTitledPane.getStyleClass().add("first-titled-pane");
-            }
-            // TODO there may be a more efficient way to keep these in sync
-            getChildren().setAll(accordion.getPanes());
-            while (c.next()) {
-                removeTitledPaneListeners(c.getRemoved());
-                initTitledPaneListeners(c.getAddedSubList());
-            }
-
-            // added to resolve RT-32787
-            forceRelayout = true;
-        });
-
-        if (!accordion.getPanes().isEmpty()) {
-            firstTitledPane = accordion.getPanes().get(0);
-            firstTitledPane.getStyleClass().add("first-titled-pane");
-        }
-
-        clipRect = new Rectangle(accordion.getWidth(), accordion.getHeight());
-        getSkinnable().setClip(clipRect);
-
-        initTitledPaneListeners(accordion.getPanes());
-        getChildren().setAll(accordion.getPanes());
-        getSkinnable().requestLayout();
-
-        registerChangeListener(getSkinnable().widthProperty(), "WIDTH");
-        registerChangeListener(getSkinnable().heightProperty(), "HEIGHT");
-    }
-
-    @Override
-    protected void handleControlPropertyChanged(String property) {
-        super.handleControlPropertyChanged(property);
-        if ("WIDTH".equals(property)) {
-            clipRect.setWidth(getSkinnable().getWidth());
-        } else if ("HEIGHT".equals(property)) {
-            clipRect.setHeight(getSkinnable().getHeight());
-            relayout = true;
-        }
-    }
-
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double h = 0;
-
-        if (expandedPane != null) {
-            h += expandedPane.minHeight(width);
-        }
-
-        if (previousPane != null && !previousPane.equals(expandedPane)) {
-            h += previousPane.minHeight(width);
-        }
-
-        for (Node child: getChildren()) {
-            TitledPane pane = (TitledPane)child;
-            if (!pane.equals(expandedPane) && !pane.equals(previousPane)) {
-                final Skin<?> skin = ((TitledPane)child).getSkin();
-                if (skin instanceof TitledPaneSkin) {
-                    TitledPaneSkin childSkin = (TitledPaneSkin) skin;
-                    h += childSkin.getTitleRegionSize(width);
-                } else {
-                    h += pane.minHeight(width);
-                }
-            }
-        }
-
-        return h + topInset + bottomInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double h = 0;
-
-        if (expandedPane != null) {
-            h += expandedPane.prefHeight(width);
-        }
-
-        if (previousPane != null && !previousPane.equals(expandedPane)) {
-            h += previousPane.prefHeight(width);
-        }
-
-        for (Node child: getChildren()) {
-            TitledPane pane = (TitledPane)child;
-            if (!pane.equals(expandedPane) && !pane.equals(previousPane)) {
-                final Skin<?> skin = ((TitledPane)child).getSkin();
-                if (skin instanceof TitledPaneSkin) {
-                    TitledPaneSkin childSkin = (TitledPaneSkin) skin;
-                    h += childSkin.getTitleRegionSize(width);
-                } else {
-                    h += pane.prefHeight(width);
-                }
-            }
-        }
-
-        return h + topInset + bottomInset;
-    }
-
-    @Override protected void layoutChildren(final double x, double y,
-            final double w, final double h) {
-        final boolean rebuild = forceRelayout || (relayout && previousHeight != h);
-        forceRelayout = false;
-        previousHeight = h;
-
-        // Compute height of all the collapsed panes
-        double collapsedPanesHeight = 0;
-        for (TitledPane tp : getSkinnable().getPanes()) {
-            if (!tp.equals(expandedPane)) {
-                TitledPaneSkin childSkin = (TitledPaneSkin) ((TitledPane)tp).getSkin();
-                collapsedPanesHeight += snapSize(childSkin.getTitleRegionSize(w));
-            }
-        }
-        final double maxTitledPaneHeight = h - collapsedPanesHeight;
-
-        for (TitledPane tp : getSkinnable().getPanes()) {
-            Skin<?> skin = tp.getSkin();
-            double ph;
-            if (skin instanceof TitledPaneSkin) {
-                ((TitledPaneSkin)skin).setMaxTitledPaneHeightForAccordion(maxTitledPaneHeight);
-                ph = snapSize(((TitledPaneSkin)skin).getTitledPaneHeightForAccordion());
-            } else {
-                ph = tp.prefHeight(w);
-            }
-            tp.resize(w, ph);
-
-            boolean needsRelocate = true;
-            if (! rebuild && previousPane != null && expandedPane != null) {
-                List<TitledPane> panes = getSkinnable().getPanes();
-                final int previousPaneIndex = panes.indexOf(previousPane);
-                final int expandedPaneIndex = panes.indexOf(expandedPane);
-                final int currentPaneIndex  = panes.indexOf(tp);
-
-                if (previousPaneIndex < expandedPaneIndex) {
-                    // Current expanded pane is after the previous expanded pane..
-                    // Only move the panes that are less than or equal to the current expanded.
-                    if (currentPaneIndex <= expandedPaneIndex) {
-                        tp.relocate(x, y);
-                        y += ph;
-                        needsRelocate = false;
-                    }
-                } else if (previousPaneIndex > expandedPaneIndex) {
-                    // Previous pane is after the current expanded pane.
-                    // Only move the panes that are less than or equal to the previous expanded pane.
-                    if (currentPaneIndex <= previousPaneIndex) {
-                        tp.relocate(x, y);
-                        y += ph;
-                        needsRelocate = false;
-                    }
-                } else {
-                    // Previous and current expanded pane are the same.
-                    // Since we are expanding and collapsing the same pane we will need to relocate
-                    // all the panes.
-                    tp.relocate(x, y);
-                    y += ph;
-                    needsRelocate = false;
-                }
-            }
-
-            if (needsRelocate) {
-                tp.relocate(x, y);
-                y += ph;
-            }
-        }
-    }
-
-    private TitledPane expandedPane = null;
-    private TitledPane previousPane = null;
-    private Map<TitledPane, ChangeListener<Boolean>>listeners = new HashMap<TitledPane, ChangeListener<Boolean>>();
-
-    private void initTitledPaneListeners(List<? extends TitledPane> list) {
-        for (final TitledPane tp: list) {
-            tp.setExpanded(tp == getSkinnable().getExpandedPane());
-            if (tp.isExpanded()) {
-                expandedPane = tp;
-            }
-            ChangeListener<Boolean> changeListener = expandedPropertyListener(tp);
-            tp.expandedProperty().addListener(changeListener);
-            listeners.put(tp, changeListener);
-        }
-    }
-
-    private void removeTitledPaneListeners(List<? extends TitledPane> list) {
-        for (final TitledPane tp: list) {
-            if (listeners.containsKey(tp)) {
-                tp.expandedProperty().removeListener(listeners.get(tp));
-                listeners.remove(tp);
-            }
-        }
-    }
-
-    private ChangeListener<Boolean> expandedPropertyListener(final TitledPane tp) {
-        return (observable, wasExpanded, expanded) -> {
-            previousPane = expandedPane;
-            final Accordion accordion = getSkinnable();
-            if (expanded) {
-                if (expandedPane != null) {
-                    expandedPane.setExpanded(false);
-                }
-                if (tp != null) {
-                    accordion.setExpandedPane(tp);
-                }
-                expandedPane = accordion.getExpandedPane();
-            } else {
-                expandedPane = null;
-                accordion.setExpandedPane(null);
-            }
-        };
-    }
-}
--- /dev/null	2015-09-03 15:17:31.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/AccordionSkin.java	2015-09-03 15:17:29.915046300 -0700
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.value.ChangeListener;
+import javafx.collections.ListChangeListener;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.Skin;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.TitledPane;
+import javafx.scene.shape.Rectangle;
+
+import com.sun.javafx.scene.control.behavior.AccordionBehavior;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Default skin implementation for the {@link Accordion} control.
+ *
+ * @see Accordion
+ * @since 9
+ */
+public class AccordionSkin extends SkinBase<Accordion> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private TitledPane firstTitledPane;
+    private Rectangle clipRect;
+
+    // This is used when we definitely want to force a relayout, regardless of
+    // whether the height has also changed
+    private boolean forceRelayout = false;
+
+    // this is used to request a layout, assuming the height has also changed
+    private boolean relayout = false;
+
+    // we record the previous height to know if the current height is different
+    private double previousHeight = 0;
+
+    private TitledPane expandedPane = null;
+    private TitledPane previousPane = null;
+    private Map<TitledPane, ChangeListener<Boolean>>listeners = new HashMap<>();
+
+    private final BehaviorBase<Accordion> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new AccordionSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public AccordionSkin(final Accordion control) {
+        super(control);
+
+        // install default input map for the accordion control
+        behavior = new AccordionBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        control.getPanes().addListener((ListChangeListener<TitledPane>) c -> {
+            if (firstTitledPane != null) {
+                firstTitledPane.getStyleClass().remove("first-titled-pane");
+            }
+            if (!control.getPanes().isEmpty()) {
+                firstTitledPane = control.getPanes().get(0);
+                firstTitledPane.getStyleClass().add("first-titled-pane");
+            }
+            // TODO there may be a more efficient way to keep these in sync
+            getChildren().setAll(control.getPanes());
+            while (c.next()) {
+                removeTitledPaneListeners(c.getRemoved());
+                initTitledPaneListeners(c.getAddedSubList());
+            }
+
+            // added to resolve RT-32787
+            forceRelayout = true;
+        });
+
+        if (!control.getPanes().isEmpty()) {
+            firstTitledPane = control.getPanes().get(0);
+            firstTitledPane.getStyleClass().add("first-titled-pane");
+        }
+
+        clipRect = new Rectangle(control.getWidth(), control.getHeight());
+        getSkinnable().setClip(clipRect);
+
+        initTitledPaneListeners(control.getPanes());
+        getChildren().setAll(control.getPanes());
+        getSkinnable().requestLayout();
+
+        registerChangeListener(getSkinnable().widthProperty(), e -> clipRect.setWidth(getSkinnable().getWidth()));
+        registerChangeListener(getSkinnable().heightProperty(), e -> {
+            clipRect.setHeight(getSkinnable().getHeight());
+            relayout = true;
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double h = 0;
+
+        if (expandedPane != null) {
+            h += expandedPane.minHeight(width);
+        }
+
+        if (previousPane != null && !previousPane.equals(expandedPane)) {
+            h += previousPane.minHeight(width);
+        }
+
+        for (Node child: getChildren()) {
+            TitledPane pane = (TitledPane)child;
+            if (!pane.equals(expandedPane) && !pane.equals(previousPane)) {
+                final Skin<?> skin = ((TitledPane)child).getSkin();
+                if (skin instanceof TitledPaneSkin) {
+                    TitledPaneSkin childSkin = (TitledPaneSkin) skin;
+                    h += childSkin.getTitleRegionSize(width);
+                } else {
+                    h += pane.minHeight(width);
+                }
+            }
+        }
+
+        return h + topInset + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double h = 0;
+
+        if (expandedPane != null) {
+            h += expandedPane.prefHeight(width);
+        }
+
+        if (previousPane != null && !previousPane.equals(expandedPane)) {
+            h += previousPane.prefHeight(width);
+        }
+
+        for (Node child: getChildren()) {
+            TitledPane pane = (TitledPane)child;
+            if (!pane.equals(expandedPane) && !pane.equals(previousPane)) {
+                final Skin<?> skin = ((TitledPane)child).getSkin();
+                if (skin instanceof TitledPaneSkin) {
+                    TitledPaneSkin childSkin = (TitledPaneSkin) skin;
+                    h += childSkin.getTitleRegionSize(width);
+                } else {
+                    h += pane.prefHeight(width);
+                }
+            }
+        }
+
+        return h + topInset + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, double y,
+            final double w, final double h) {
+        final boolean rebuild = forceRelayout || (relayout && previousHeight != h);
+        forceRelayout = false;
+        previousHeight = h;
+
+        // Compute height of all the collapsed panes
+        double collapsedPanesHeight = 0;
+        for (TitledPane tp : getSkinnable().getPanes()) {
+            if (!tp.equals(expandedPane)) {
+                TitledPaneSkin childSkin = (TitledPaneSkin) ((TitledPane)tp).getSkin();
+                collapsedPanesHeight += snapSize(childSkin.getTitleRegionSize(w));
+            }
+        }
+        final double maxTitledPaneHeight = h - collapsedPanesHeight;
+
+        for (TitledPane tp : getSkinnable().getPanes()) {
+            Skin<?> skin = tp.getSkin();
+            double ph;
+            if (skin instanceof TitledPaneSkin) {
+                ((TitledPaneSkin)skin).setMaxTitledPaneHeightForAccordion(maxTitledPaneHeight);
+                ph = snapSize(((TitledPaneSkin)skin).getTitledPaneHeightForAccordion());
+            } else {
+                ph = tp.prefHeight(w);
+            }
+            tp.resize(w, ph);
+
+            boolean needsRelocate = true;
+            if (! rebuild && previousPane != null && expandedPane != null) {
+                List<TitledPane> panes = getSkinnable().getPanes();
+                final int previousPaneIndex = panes.indexOf(previousPane);
+                final int expandedPaneIndex = panes.indexOf(expandedPane);
+                final int currentPaneIndex  = panes.indexOf(tp);
+
+                if (previousPaneIndex < expandedPaneIndex) {
+                    // Current expanded pane is after the previous expanded pane..
+                    // Only move the panes that are less than or equal to the current expanded.
+                    if (currentPaneIndex <= expandedPaneIndex) {
+                        tp.relocate(x, y);
+                        y += ph;
+                        needsRelocate = false;
+                    }
+                } else if (previousPaneIndex > expandedPaneIndex) {
+                    // Previous pane is after the current expanded pane.
+                    // Only move the panes that are less than or equal to the previous expanded pane.
+                    if (currentPaneIndex <= previousPaneIndex) {
+                        tp.relocate(x, y);
+                        y += ph;
+                        needsRelocate = false;
+                    }
+                } else {
+                    // Previous and current expanded pane are the same.
+                    // Since we are expanding and collapsing the same pane we will need to relocate
+                    // all the panes.
+                    tp.relocate(x, y);
+                    y += ph;
+                    needsRelocate = false;
+                }
+            }
+
+            if (needsRelocate) {
+                tp.relocate(x, y);
+                y += ph;
+            }
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void initTitledPaneListeners(List<? extends TitledPane> list) {
+        for (final TitledPane tp: list) {
+            tp.setExpanded(tp == getSkinnable().getExpandedPane());
+            if (tp.isExpanded()) {
+                expandedPane = tp;
+            }
+            ChangeListener<Boolean> changeListener = expandedPropertyListener(tp);
+            tp.expandedProperty().addListener(changeListener);
+            listeners.put(tp, changeListener);
+        }
+    }
+
+    private void removeTitledPaneListeners(List<? extends TitledPane> list) {
+        for (final TitledPane tp: list) {
+            if (listeners.containsKey(tp)) {
+                tp.expandedProperty().removeListener(listeners.get(tp));
+                listeners.remove(tp);
+            }
+        }
+    }
+
+    private ChangeListener<Boolean> expandedPropertyListener(final TitledPane tp) {
+        return (observable, wasExpanded, expanded) -> {
+            previousPane = expandedPane;
+            final Accordion accordion = getSkinnable();
+            if (expanded) {
+                if (expandedPane != null) {
+                    expandedPane.setExpanded(false);
+                }
+                if (tp != null) {
+                    accordion.setExpandedPane(tp);
+                }
+                expandedPane = accordion.getExpandedPane();
+            } else {
+                expandedPane = null;
+                accordion.setExpandedPane(null);
+            }
+        };
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ButtonBarSkin.java	2015-09-03 15:17:37.974507300 -0700
+++ /dev/null	2015-09-03 15:17:39.000000000 -0700
@@ -1,375 +0,0 @@
-/*
- * Copyright (c) 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.ListChangeListener;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonBar.ButtonData;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.behavior.KeyBinding;
-
-public class ButtonBarSkin extends BehaviorSkinBase<ButtonBar, BehaviorBase<ButtonBar>> {
-    
-    /**************************************************************************
-     * 
-     * Static fields
-     * 
-     **************************************************************************/
-
-    private static final double GAP_SIZE = 10; 
-    
-    private static final String CATEGORIZED_TYPES = "LRHEYNXBIACO"; //$NON-NLS-1$
-    
-    // represented as a ButtonData
-    public static final String BUTTON_DATA_PROPERTY  = "javafx.scene.control.ButtonBar.ButtonData"; //$NON-NLS-1$
-    
-    // allows to exclude button from uniform resizing
-    public static final String BUTTON_SIZE_INDEPENDENCE = "javafx.scene.control.ButtonBar.independentSize"; //$NON-NLS-1$
-    
-    // pick an arbitrary number
-    private static final double DO_NOT_CHANGE_SIZE = Double.MAX_VALUE - 100;
-    
-    
-    /**************************************************************************
-     * 
-     * fields
-     * 
-     **************************************************************************/
-    
-    private HBox layout;
-
-    private InvalidationListener buttonDataListener = o -> layoutButtons();
-    
-    
-    
-    /**************************************************************************
-     * 
-     * Constructors
-     * 
-     **************************************************************************/
-
-    public ButtonBarSkin(final ButtonBar control) {
-        super(control, new BehaviorBase<>(control, Collections.<KeyBinding> emptyList()));
-        
-        this.layout = new HBox(GAP_SIZE) {
-            @Override
-            protected void layoutChildren() {
-                // has to be called first or layout is not correct sometimes
-                resizeButtons();
-                super.layoutChildren();
-            }
-        };
-        this.layout.setAlignment(Pos.CENTER);
-        this.layout.getStyleClass().add("container");
-        getChildren().add(layout);
-        
-        layoutButtons();
-
-        updateButtonListeners(control.getButtons(), true);
-        control.getButtons().addListener((ListChangeListener<Node>) c -> {
-            while (c.next()) {
-                updateButtonListeners(c.getRemoved(), false);
-                updateButtonListeners(c.getAddedSubList(), true);
-            }
-            layoutButtons();
-        });
-        
-        registerChangeListener(control.buttonOrderProperty(), "BUTTON_ORDER"); //$NON-NLS-1$
-        registerChangeListener(control.buttonMinWidthProperty(), "BUTTON_MIN_WIDTH"); //$NON-NLS-1$
-    }
-
-    private void updateButtonListeners(List<? extends Node> list, boolean buttonsAdded) {
-        if (list != null) {
-            for (Node n : list) {
-                final Map<Object, Object> properties = n.getProperties();
-                if (properties.containsKey(ButtonBarSkin.BUTTON_DATA_PROPERTY)) {
-                    ObjectProperty<ButtonData> property = (ObjectProperty<ButtonData>) properties.get(ButtonBarSkin.BUTTON_DATA_PROPERTY);
-                    if (property != null) {
-                        if (buttonsAdded) {
-                            property.addListener(buttonDataListener);
-                        } else {
-                            property.removeListener(buttonDataListener);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**************************************************************************
-     * 
-     * Overriding public API
-     * 
-     **************************************************************************/
-    
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        
-        if ("BUTTON_ORDER".equals(p)) { //$NON-NLS-1$
-            layoutButtons();
-        } else if ("BUTTON_MIN_WIDTH".equals(p)) { //$NON-NLS-1$
-//            layoutButtons();
-            resizeButtons();
-        }
-    }
-    
-    
-    
-    /**************************************************************************
-     * 
-     * Implementation
-     * 
-     **************************************************************************/
-    
-    private void layoutButtons() {
-        final ButtonBar buttonBar = getSkinnable();
-        final List<? extends Node> buttons = buttonBar.getButtons();
-        final double buttonMinWidth = buttonBar.getButtonMinWidth();
-        
-        String buttonOrder = getSkinnable().getButtonOrder();
-
-        layout.getChildren().clear();
-
-        // empty is valid, because it is BUTTON_ORDER_NONE
-        if (buttonOrder == null) {
-            throw new IllegalStateException("ButtonBar buttonOrder string can not be null"); //$NON-NLS-1$
-        }
-
-        if (buttonOrder == ButtonBar.BUTTON_ORDER_NONE) {
-            // when using BUTTON_ORDER_NONE, we just lay out the buttons in the
-            // order they are specified, but we do right-align the buttons by
-            // inserting a dynamic spacer.
-            Spacer.DYNAMIC.add(layout, true);
-            for (Node btn: buttons) {
-                sizeButton(btn, buttonMinWidth, DO_NOT_CHANGE_SIZE, Double.MAX_VALUE);
-                layout.getChildren().add(btn);
-                HBox.setHgrow(btn, Priority.NEVER);
-            }
-        } else {
-            doButtonOrderLayout(buttonOrder);
-        }
-    }
-
-    private void doButtonOrderLayout(String buttonOrder) {
-        final ButtonBar buttonBar = getSkinnable();
-        final List<? extends Node> buttons = buttonBar.getButtons();
-        final double buttonMinWidth = buttonBar.getButtonMinWidth();
-        Map<String, List<Node>> buttonMap = buildButtonMap(buttons);
-
-        char[] buttonOrderArr = buttonOrder.toCharArray();
-
-        int buttonIndex = 0; // to determine edge cases
-        Spacer spacer = Spacer.NONE;
-
-        for (int i = 0; i < buttonOrderArr.length; i++) {
-            char type = buttonOrderArr[i];
-            boolean edgeCase = buttonIndex <= 0 && buttonIndex >= buttons.size()-1;
-            boolean hasChildren = ! layout.getChildren().isEmpty();
-            if (type == '+') {
-                spacer = spacer.replace(Spacer.DYNAMIC);
-            } else if (type == '_' && hasChildren) {
-                spacer = spacer.replace(Spacer.FIXED);
-            } else {
-                List<Node> buttonList = buttonMap.get(String.valueOf(type).toUpperCase());
-                if (buttonList != null) {
-                    spacer.add(layout,edgeCase);
-
-                    for (Node btn: buttonList) {
-                        sizeButton(btn, buttonMinWidth, DO_NOT_CHANGE_SIZE, Double.MAX_VALUE);
-
-                        layout.getChildren().add(btn);
-                        HBox.setHgrow(btn, Priority.NEVER);
-                        buttonIndex++;
-                    }
-                    spacer = spacer.replace(Spacer.NONE);
-                }
-            }
-        }
-
-        // now that all buttons have been placed, we need to ensure focus is
-        // set on the correct button. Firstly, we check to see if any button
-        // is of type Button (which is typically the case), and of these, if
-        // any is a default button. If so, we request focus onto this default
-        // button.
-        // If there is no Button that is a default button, we subsequently look
-        // at the ButtonData for each node and request focus on the first one
-        // that returns true for isDefaultButton()
-        boolean isDefaultSet = false;
-        final int childrenCount = buttons.size();
-        for (int i = 0; i < childrenCount; i++) {
-            Node btn = buttons.get(i);
-
-            if (btn instanceof Button && ((Button) btn).isDefaultButton()) {
-                btn.requestFocus();
-                isDefaultSet = true;
-                break;
-            }
-        }
-        if (!isDefaultSet) {
-            for (int i = 0; i < childrenCount; i++) {
-                Node btn = buttons.get(i);
-                ButtonData btnData = ButtonBar.getButtonData(btn);
-
-                if (btnData != null && btnData.isDefaultButton()) {
-                    btn.requestFocus();
-                    isDefaultSet = true;
-                    break;
-                }
-            }
-        }
-    }
-    
-    private void resizeButtons() {
-        final ButtonBar buttonBar = getSkinnable();
-        double buttonMinWidth = buttonBar.getButtonMinWidth();
-        final List<? extends Node> buttons = buttonBar.getButtons();
-
-        // determine the widest button
-        double widest = buttonMinWidth;
-        for (Node button : buttons) {
-            if (ButtonBar.isButtonUniformSize(button)) {
-               widest = Math.max(button.prefWidth(-1), widest);
-            }
-        }
-        
-        // set the width of all buttons
-        for (Node button : buttons) {
-            if (ButtonBar.isButtonUniformSize(button)) {
-                sizeButton(button, DO_NOT_CHANGE_SIZE, widest, DO_NOT_CHANGE_SIZE);
-            }
-        }
-    }
-    
-    private void sizeButton(Node btn, double min, double pref, double max) {
-        if (btn instanceof Region) {
-            Region regionBtn = (Region)btn;
-            
-            if (min != DO_NOT_CHANGE_SIZE) {
-                regionBtn.setMinWidth(min);
-            }
-            if (pref != DO_NOT_CHANGE_SIZE) {
-                regionBtn.setPrefWidth(pref);
-            }
-            if (max != DO_NOT_CHANGE_SIZE) {
-                regionBtn.setMaxWidth(max);
-            }
-        }
-    }
-    
-    private String getButtonType(Node btn) {
-        ButtonData buttonType = ButtonBar.getButtonData(btn);
-        
-        if (buttonType == null) {
-            // just assume it is ButtonType.OTHER
-            buttonType = ButtonData.OTHER;
-        }
-        
-        String typeCode = buttonType.getTypeCode();
-        typeCode = typeCode.length() > 0? typeCode.substring(0,1): ""; //$NON-NLS-1$
-        return CATEGORIZED_TYPES.contains(typeCode.toUpperCase())? typeCode : ButtonData.OTHER.getTypeCode(); 
-    }
-    
-    private Map<String, List<Node>> buildButtonMap( List<? extends Node> buttons ) {
-        Map<String, List<Node>> buttonMap = new HashMap<>();
-        for (Node btn : buttons) {
-            if ( btn == null ) continue;
-            String type =  getButtonType(btn); 
-            List<Node> typedButtons = buttonMap.get(type);
-            if ( typedButtons == null ) {
-                typedButtons = new ArrayList<Node>();
-                buttonMap.put(type, typedButtons);
-            }
-            typedButtons.add( btn );
-        }
-        return buttonMap;
-    }
-    
-    
-    
-    /**************************************************************************
-     * 
-     * Support classes / enums
-     * 
-     **************************************************************************/
-    
-    private enum Spacer {
-        FIXED {
-            @Override protected Node create(boolean edgeCase) {
-                if ( edgeCase ) return null;
-                Region spacer = new Region();
-                ButtonBar.setButtonData(spacer, ButtonData.SMALL_GAP);
-                spacer.setMinWidth(GAP_SIZE);
-                HBox.setHgrow(spacer, Priority.NEVER);
-                return spacer;
-            }
-        },
-        DYNAMIC {
-            @Override protected Node create(boolean edgeCase) {
-                Region spacer = new Region();
-                ButtonBar.setButtonData(spacer, ButtonData.BIG_GAP);
-                spacer.setMinWidth(edgeCase ? 0 : GAP_SIZE);
-                HBox.setHgrow(spacer, Priority.ALWAYS);
-                return spacer;
-            }
-
-            @Override public Spacer replace(Spacer spacer) {
-                return FIXED == spacer? this: spacer;
-            }
-        },
-        NONE;
-        
-        protected Node create(boolean edgeCase) {
-            return null;
-        }
-        
-        public Spacer replace(Spacer spacer) {
-            return spacer;
-        }
-        
-        public void add(Pane pane, boolean edgeCase) {
-            Node spacer = create(edgeCase);
-            if (spacer != null) {
-                pane.getChildren().add(spacer);
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:17:39.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ButtonBarSkin.java	2015-09-03 15:17:37.381473300 -0700
@@ -0,0 +1,363 @@
+/*
+ * Copyright (c) 2014, 2015, 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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.InvalidationListener;
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonBar.ButtonData;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+
+/**
+ * Default skin implementation for the {@link ButtonBar} control.
+ *
+ * @see ButtonBar
+ * @since 9
+ */
+public class ButtonBarSkin extends SkinBase<ButtonBar> {
+    
+    /**************************************************************************
+     * 
+     * Static fields
+     * 
+     **************************************************************************/
+
+    private static final double GAP_SIZE = 10; 
+    
+    private static final String CATEGORIZED_TYPES = "LRHEYNXBIACO"; //$NON-NLS-1$
+    
+    // pick an arbitrary number
+    private static final double DO_NOT_CHANGE_SIZE = Double.MAX_VALUE - 100;
+    
+    
+    /**************************************************************************
+     * 
+     * fields
+     * 
+     **************************************************************************/
+    
+    private HBox layout;
+    private InvalidationListener buttonDataListener = o -> layoutButtons();
+
+    
+    
+    /**************************************************************************
+     * 
+     * Constructors
+     * 
+     **************************************************************************/
+
+    /**
+     * Creates a new ButtonBarSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ButtonBarSkin(final ButtonBar control) {
+        super(control);
+        
+        this.layout = new HBox(GAP_SIZE) {
+            @Override protected void layoutChildren() {
+                // has to be called first or layout is not correct sometimes
+                resizeButtons();
+                super.layoutChildren();
+            }
+        };
+        this.layout.setAlignment(Pos.CENTER);
+        this.layout.getStyleClass().add("container");
+        getChildren().add(layout);
+        
+        layoutButtons();
+
+        updateButtonListeners(control.getButtons(), true);
+        control.getButtons().addListener((ListChangeListener<Node>) c -> {
+            while (c.next()) {
+                updateButtonListeners(c.getRemoved(), false);
+                updateButtonListeners(c.getAddedSubList(), true);
+            }
+            layoutButtons();
+        });
+        
+        registerChangeListener(control.buttonOrderProperty(), e -> layoutButtons());
+        registerChangeListener(control.buttonMinWidthProperty(), e -> resizeButtons());
+    }
+
+
+
+    /**************************************************************************
+     * 
+     * Implementation
+     * 
+     **************************************************************************/
+
+    private void updateButtonListeners(List<? extends Node> list, boolean buttonsAdded) {
+        if (list != null) {
+            for (Node n : list) {
+                final Map<Object, Object> properties = n.getProperties();
+                if (properties.containsKey(Properties.BUTTON_DATA_PROPERTY)) {
+                    ObjectProperty<ButtonData> property = (ObjectProperty<ButtonData>) properties.get(Properties.BUTTON_DATA_PROPERTY);
+                    if (property != null) {
+                        if (buttonsAdded) {
+                            property.addListener(buttonDataListener);
+                        } else {
+                            property.removeListener(buttonDataListener);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    private void layoutButtons() {
+        final ButtonBar buttonBar = getSkinnable();
+        final List<? extends Node> buttons = buttonBar.getButtons();
+        final double buttonMinWidth = buttonBar.getButtonMinWidth();
+        
+        String buttonOrder = getSkinnable().getButtonOrder();
+
+        layout.getChildren().clear();
+
+        // empty is valid, because it is BUTTON_ORDER_NONE
+        if (buttonOrder == null) {
+            throw new IllegalStateException("ButtonBar buttonOrder string can not be null"); //$NON-NLS-1$
+        }
+
+        if (buttonOrder == ButtonBar.BUTTON_ORDER_NONE) {
+            // when using BUTTON_ORDER_NONE, we just lay out the buttons in the
+            // order they are specified, but we do right-align the buttons by
+            // inserting a dynamic spacer.
+            Spacer.DYNAMIC.add(layout, true);
+            for (Node btn: buttons) {
+                sizeButton(btn, buttonMinWidth, DO_NOT_CHANGE_SIZE, Double.MAX_VALUE);
+                layout.getChildren().add(btn);
+                HBox.setHgrow(btn, Priority.NEVER);
+            }
+        } else {
+            doButtonOrderLayout(buttonOrder);
+        }
+    }
+
+    private void doButtonOrderLayout(String buttonOrder) {
+        final ButtonBar buttonBar = getSkinnable();
+        final List<? extends Node> buttons = buttonBar.getButtons();
+        final double buttonMinWidth = buttonBar.getButtonMinWidth();
+        Map<String, List<Node>> buttonMap = buildButtonMap(buttons);
+
+        char[] buttonOrderArr = buttonOrder.toCharArray();
+
+        int buttonIndex = 0; // to determine edge cases
+        Spacer spacer = Spacer.NONE;
+
+        for (int i = 0; i < buttonOrderArr.length; i++) {
+            char type = buttonOrderArr[i];
+            boolean edgeCase = buttonIndex <= 0 && buttonIndex >= buttons.size()-1;
+            boolean hasChildren = ! layout.getChildren().isEmpty();
+            if (type == '+') {
+                spacer = spacer.replace(Spacer.DYNAMIC);
+            } else if (type == '_' && hasChildren) {
+                spacer = spacer.replace(Spacer.FIXED);
+            } else {
+                List<Node> buttonList = buttonMap.get(String.valueOf(type).toUpperCase());
+                if (buttonList != null) {
+                    spacer.add(layout,edgeCase);
+
+                    for (Node btn: buttonList) {
+                        sizeButton(btn, buttonMinWidth, DO_NOT_CHANGE_SIZE, Double.MAX_VALUE);
+
+                        layout.getChildren().add(btn);
+                        HBox.setHgrow(btn, Priority.NEVER);
+                        buttonIndex++;
+                    }
+                    spacer = spacer.replace(Spacer.NONE);
+                }
+            }
+        }
+
+        // now that all buttons have been placed, we need to ensure focus is
+        // set on the correct button. Firstly, we check to see if any button
+        // is of type Button (which is typically the case), and of these, if
+        // any is a default button. If so, we request focus onto this default
+        // button.
+        // If there is no Button that is a default button, we subsequently look
+        // at the ButtonData for each node and request focus on the first one
+        // that returns true for isDefaultButton()
+        boolean isDefaultSet = false;
+        final int childrenCount = buttons.size();
+        for (int i = 0; i < childrenCount; i++) {
+            Node btn = buttons.get(i);
+
+            if (btn instanceof Button && ((Button) btn).isDefaultButton()) {
+                btn.requestFocus();
+                isDefaultSet = true;
+                break;
+            }
+        }
+        if (!isDefaultSet) {
+            for (int i = 0; i < childrenCount; i++) {
+                Node btn = buttons.get(i);
+                ButtonData btnData = ButtonBar.getButtonData(btn);
+
+                if (btnData != null && btnData.isDefaultButton()) {
+                    btn.requestFocus();
+                    isDefaultSet = true;
+                    break;
+                }
+            }
+        }
+    }
+    
+    private void resizeButtons() {
+        final ButtonBar buttonBar = getSkinnable();
+        double buttonMinWidth = buttonBar.getButtonMinWidth();
+        final List<? extends Node> buttons = buttonBar.getButtons();
+
+        // determine the widest button
+        double widest = buttonMinWidth;
+        for (Node button : buttons) {
+            if (ButtonBar.isButtonUniformSize(button)) {
+               widest = Math.max(button.prefWidth(-1), widest);
+            }
+        }
+        
+        // set the width of all buttons
+        for (Node button : buttons) {
+            if (ButtonBar.isButtonUniformSize(button)) {
+                sizeButton(button, DO_NOT_CHANGE_SIZE, widest, DO_NOT_CHANGE_SIZE);
+            }
+        }
+    }
+    
+    private void sizeButton(Node btn, double min, double pref, double max) {
+        if (btn instanceof Region) {
+            Region regionBtn = (Region)btn;
+            
+            if (min != DO_NOT_CHANGE_SIZE) {
+                regionBtn.setMinWidth(min);
+            }
+            if (pref != DO_NOT_CHANGE_SIZE) {
+                regionBtn.setPrefWidth(pref);
+            }
+            if (max != DO_NOT_CHANGE_SIZE) {
+                regionBtn.setMaxWidth(max);
+            }
+        }
+    }
+    
+    private String getButtonType(Node btn) {
+        ButtonData buttonType = ButtonBar.getButtonData(btn);
+        
+        if (buttonType == null) {
+            // just assume it is ButtonType.OTHER
+            buttonType = ButtonData.OTHER;
+        }
+        
+        String typeCode = buttonType.getTypeCode();
+        typeCode = typeCode.length() > 0? typeCode.substring(0,1): ""; //$NON-NLS-1$
+        return CATEGORIZED_TYPES.contains(typeCode.toUpperCase())? typeCode : ButtonData.OTHER.getTypeCode(); 
+    }
+    
+    private Map<String, List<Node>> buildButtonMap( List<? extends Node> buttons ) {
+        Map<String, List<Node>> buttonMap = new HashMap<>();
+        for (Node btn : buttons) {
+            if ( btn == null ) continue;
+            String type =  getButtonType(btn); 
+            List<Node> typedButtons = buttonMap.get(type);
+            if ( typedButtons == null ) {
+                typedButtons = new ArrayList<Node>();
+                buttonMap.put(type, typedButtons);
+            }
+            typedButtons.add( btn );
+        }
+        return buttonMap;
+    }
+    
+    
+    
+    /**************************************************************************
+     * 
+     * Support classes / enums
+     * 
+     **************************************************************************/
+    
+    private enum Spacer {
+        FIXED {
+            @Override protected Node create(boolean edgeCase) {
+                if ( edgeCase ) return null;
+                Region spacer = new Region();
+                ButtonBar.setButtonData(spacer, ButtonData.SMALL_GAP);
+                spacer.setMinWidth(GAP_SIZE);
+                HBox.setHgrow(spacer, Priority.NEVER);
+                return spacer;
+            }
+        },
+        DYNAMIC {
+            @Override protected Node create(boolean edgeCase) {
+                Region spacer = new Region();
+                ButtonBar.setButtonData(spacer, ButtonData.BIG_GAP);
+                spacer.setMinWidth(edgeCase ? 0 : GAP_SIZE);
+                HBox.setHgrow(spacer, Priority.ALWAYS);
+                return spacer;
+            }
+
+            @Override public Spacer replace(Spacer spacer) {
+                return FIXED == spacer? this: spacer;
+            }
+        },
+        NONE;
+        
+        protected Node create(boolean edgeCase) {
+            return null;
+        }
+        
+        public Spacer replace(Spacer spacer) {
+            return spacer;
+        }
+        
+        public void add(Pane pane, boolean edgeCase) {
+            Node spacer = create(edgeCase);
+            if (spacer != null) {
+                pane.getChildren().add(spacer);
+            }
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ButtonSkin.java	2015-09-03 15:17:45.855958100 -0700
+++ /dev/null	2015-09-03 15:17:46.000000000 -0700
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2010, 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.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-
-import com.sun.javafx.scene.control.behavior.ButtonBehavior;
-
-
-
-/**
- * A Skin for command Buttons.
- */
-public class ButtonSkin extends LabeledSkinBase<Button, ButtonBehavior<Button>> {
-
-    public ButtonSkin(Button button) {
-        super(button, new ButtonBehavior<Button>(button));
-
-        // Register listeners
-        registerChangeListener(button.defaultButtonProperty(), "DEFAULT_BUTTON");
-        registerChangeListener(button.cancelButtonProperty(), "CANCEL_BUTTON");
-        registerChangeListener(button.focusedProperty(), "FOCUSED");
-
-        if (getSkinnable().isDefaultButton()) {
-            /*
-            ** were we already the defaultButton, before the listener was added?
-            ** don't laugh, it can happen....
-            */
-            setDefaultButton(true);
-        }
-
-        if (getSkinnable().isCancelButton()) {
-            /*
-            ** were we already the defaultButton, before the listener was added?
-            ** don't laugh, it can happen....
-            */
-            setCancelButton(true);
-        }       
-
-    }
-
-
-    @Override protected void handleControlPropertyChanged(String p) {     
-        super.handleControlPropertyChanged(p);
-        if ("DEFAULT_BUTTON".equals(p)) {
-            setDefaultButton(getSkinnable().isDefaultButton());
-        }
-        else if ("CANCEL_BUTTON".equals(p)) {
-            setCancelButton(getSkinnable().isCancelButton());
-        }
-        else if ("FOCUSED".equals(p)) {
-           if (!getSkinnable().isFocused()) {
-                ContextMenu cm = getSkinnable().getContextMenu();
-                if (cm != null) {
-                    if (cm.isShowing()) {
-                        cm.hide();
-                        Utils.removeMnemonics(cm, getSkinnable().getScene());
-                    }
-                }
-           }
-        } else if ("PARENT".equals(p)) {
-            if (getSkinnable().getParent() == null && getSkinnable().getScene() != null) {  
-                if (getSkinnable().isDefaultButton()) {
-                    getSkinnable().getScene().getAccelerators().remove(defaultAcceleratorKeyCodeCombination);
-                }
-                if (getSkinnable().isCancelButton()) {
-                    getSkinnable().getScene().getAccelerators().remove(cancelAcceleratorKeyCodeCombination);
-                }
-            }
-        }
-    }
-
-    Runnable defaultButtonRunnable = () -> {
-        if (getSkinnable().getScene() != null && getSkinnable().impl_isTreeVisible() && !getSkinnable().isDisabled()) {
-            getSkinnable().fire();
-        }
-    };
-
-    Runnable cancelButtonRunnable = () -> {
-        if (getSkinnable().getScene() != null && getSkinnable().impl_isTreeVisible() && !getSkinnable().isDisabled()) {
-            getSkinnable().fire();
-        }
-    };
-
-    private KeyCodeCombination defaultAcceleratorKeyCodeCombination;
-    
-    private void setDefaultButton(boolean value) {
-        Scene scene = getSkinnable().getScene();
-        if (scene != null) {
-            KeyCode acceleratorCode = KeyCode.ENTER;
-            defaultAcceleratorKeyCodeCombination = new KeyCodeCombination(acceleratorCode);
-
-            Runnable oldDefault = scene.getAccelerators().get(defaultAcceleratorKeyCodeCombination);
-            if (!value) {
-                /**
-                 * first check of there's a default button already
-                 */
-                if (defaultButtonRunnable.equals(oldDefault)) {
-                    /**
-                     * is it us?
-                     */
-                    scene.getAccelerators().remove(defaultAcceleratorKeyCodeCombination);
-                }
-            }
-            else {
-                if (!defaultButtonRunnable.equals(oldDefault)) {
-                    scene.getAccelerators().remove(defaultAcceleratorKeyCodeCombination);
-                    scene.getAccelerators().put(defaultAcceleratorKeyCodeCombination, defaultButtonRunnable);
-                }
-            }
-        }
-    }
-
-    private KeyCodeCombination cancelAcceleratorKeyCodeCombination;
-
-    private void setCancelButton(boolean value) {
-        Scene scene = getSkinnable().getScene();
-        if (scene != null) {
-            KeyCode acceleratorCode = KeyCode.ESCAPE;
-            cancelAcceleratorKeyCodeCombination = new KeyCodeCombination(acceleratorCode);
-        
-            Runnable oldCancel = scene.getAccelerators().get(cancelAcceleratorKeyCodeCombination);
-            if (!value) {
-                /**
-                 * first check of there's a cancel button already
-                 */
-                if (cancelButtonRunnable.equals(oldCancel)) {
-                    /**
-                     * is it us?
-                     */
-                    scene.getAccelerators().remove(cancelAcceleratorKeyCodeCombination);
-                }
-            }
-            else {
-                if (!cancelButtonRunnable.equals(oldCancel)) {
-                    scene.getAccelerators().remove(cancelAcceleratorKeyCodeCombination);
-                    scene.getAccelerators().put(cancelAcceleratorKeyCodeCombination, cancelButtonRunnable);
-                }
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:17:46.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ButtonSkin.java	2015-09-03 15:17:45.023910500 -0700
@@ -0,0 +1,220 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContextMenu;
+import com.sun.javafx.scene.control.behavior.ButtonBehavior;
+import javafx.scene.control.Control;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+
+/**
+ * Default skin implementation for the {@link Button} control.
+ *
+ * @see Button
+ * @since 9
+ */
+public class ButtonSkin extends LabeledSkinBase<Button> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private KeyCodeCombination defaultAcceleratorKeyCodeCombination;
+    private KeyCodeCombination cancelAcceleratorKeyCodeCombination;
+    private final BehaviorBase<Button> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    Runnable defaultButtonRunnable = () -> {
+        if (getSkinnable().getScene() != null && getSkinnable().impl_isTreeVisible() && !getSkinnable().isDisabled()) {
+            getSkinnable().fire();
+        }
+    };
+
+    Runnable cancelButtonRunnable = () -> {
+        if (getSkinnable().getScene() != null && getSkinnable().impl_isTreeVisible() && !getSkinnable().isDisabled()) {
+            getSkinnable().fire();
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ButtonSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ButtonSkin(Button control) {
+        super(control);
+
+        // install default input map for the Button control
+        behavior = new ButtonBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        // Register listeners
+        registerChangeListener(control.defaultButtonProperty(), o -> setDefaultButton(getSkinnable().isDefaultButton()));
+        registerChangeListener(control.cancelButtonProperty(), o -> setCancelButton(getSkinnable().isCancelButton()));
+        registerChangeListener(control.focusedProperty(), o -> {
+            if (!getSkinnable().isFocused()) {
+                ContextMenu cm = getSkinnable().getContextMenu();
+                if (cm != null) {
+                    if (cm.isShowing()) {
+                        cm.hide();
+                        Utils.removeMnemonics(cm, getSkinnable().getScene());
+                    }
+                }
+            }
+        });
+        registerChangeListener(control.parentProperty(), o -> {
+            if (getSkinnable().getParent() == null && getSkinnable().getScene() != null) {
+                if (getSkinnable().isDefaultButton()) {
+                    getSkinnable().getScene().getAccelerators().remove(defaultAcceleratorKeyCodeCombination);
+                }
+                if (getSkinnable().isCancelButton()) {
+                    getSkinnable().getScene().getAccelerators().remove(cancelAcceleratorKeyCodeCombination);
+                }
+            }
+        });
+
+        // set visuals
+        if (getSkinnable().isDefaultButton()) {
+            /*
+            ** were we already the defaultButton, before the listener was added?
+            ** don't laugh, it can happen....
+            */
+            setDefaultButton(true);
+        }
+
+        if (getSkinnable().isCancelButton()) {
+            /*
+            ** were we already the defaultButton, before the listener was added?
+            ** don't laugh, it can happen....
+            */
+            setCancelButton(true);
+        }       
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void setDefaultButton(boolean value) {
+        Scene scene = getSkinnable().getScene();
+        if (scene != null) {
+            KeyCode acceleratorCode = KeyCode.ENTER;
+            defaultAcceleratorKeyCodeCombination = new KeyCodeCombination(acceleratorCode);
+
+            Runnable oldDefault = scene.getAccelerators().get(defaultAcceleratorKeyCodeCombination);
+            if (!value) {
+                /**
+                 * first check of there's a default button already
+                 */
+                if (defaultButtonRunnable.equals(oldDefault)) {
+                    /**
+                     * is it us?
+                     */
+                    scene.getAccelerators().remove(defaultAcceleratorKeyCodeCombination);
+                }
+            }
+            else {
+                if (!defaultButtonRunnable.equals(oldDefault)) {
+                    scene.getAccelerators().remove(defaultAcceleratorKeyCodeCombination);
+                    scene.getAccelerators().put(defaultAcceleratorKeyCodeCombination, defaultButtonRunnable);
+                }
+            }
+        }
+    }
+
+    private void setCancelButton(boolean value) {
+        Scene scene = getSkinnable().getScene();
+        if (scene != null) {
+            KeyCode acceleratorCode = KeyCode.ESCAPE;
+            cancelAcceleratorKeyCodeCombination = new KeyCodeCombination(acceleratorCode);
+        
+            Runnable oldCancel = scene.getAccelerators().get(cancelAcceleratorKeyCodeCombination);
+            if (!value) {
+                /**
+                 * first check of there's a cancel button already
+                 */
+                if (cancelButtonRunnable.equals(oldCancel)) {
+                    /**
+                     * is it us?
+                     */
+                    scene.getAccelerators().remove(cancelAcceleratorKeyCodeCombination);
+                }
+            }
+            else {
+                if (!cancelButtonRunnable.equals(oldCancel)) {
+                    scene.getAccelerators().remove(cancelAcceleratorKeyCodeCombination);
+                    scene.getAccelerators().put(cancelAcceleratorKeyCodeCombination, cancelButtonRunnable);
+                }
+            }
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/CellSkinBase.java	2015-09-03 15:17:53.815413300 -0700
+++ /dev/null	2015-09-03 15:17:55.000000000 -0700
@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 2010, 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-import javafx.scene.control.Cell;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.CssMetaData;
-import javafx.css.StyleOrigin;
-
-import com.sun.javafx.css.converters.SizeConverter;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.beans.value.WritableValue;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.scene.control.SkinBase;
-
-
-/**
- * A base skin implementation, specifically for ListCellSkin and TreeCellSkin.
- * This might not be a suitable base class for TreeCellSkin or some other
- * such skins.
- */
-public class CellSkinBase<C extends Cell, B extends BehaviorBase<C>> extends LabeledSkinBase<C, B> {
-    /**
-     * The default cell size. For vertical ListView or a TreeView or TableView
-     * this is the height, for a horizontal ListView this is the width. This
-     * is settable from CSS
-     */
-    private DoubleProperty cellSize;
-
-    public final double getCellSize() {
-        return cellSize == null ? DEFAULT_CELL_SIZE : cellSize.get();
-    }
-
-    public final ReadOnlyDoubleProperty cellSizeProperty() {
-        return cellSizePropertyImpl();
-    }
-
-    private DoubleProperty cellSizePropertyImpl() {
-        if (cellSize == null) {
-            cellSize = new StyleableDoubleProperty(DEFAULT_CELL_SIZE) {
-
-                @Override
-                public void applyStyle(StyleOrigin origin, Number value) {
-                    double size = value == null ? DEFAULT_CELL_SIZE : value.doubleValue();
-                    // guard against a 0 or negative size
-                    super.applyStyle(origin, size <= 0 ? DEFAULT_CELL_SIZE : size);
-                }
-
-
-                @Override public void set(double value) {
-//                    // Commented this out due to RT-19794, because otherwise
-//                    // cellSizeSet would be false when the default caspian.css
-//                    // cell size was set. This would lead to 
-//                    // ListCellSkin.computePrefHeight computing the pref height
-//                    // of the cell (which is about 22px), rather than use the 
-//                    // value provided by caspian.css (which is 24px).
-//                    // cellSizeSet = true;//value != DEFAULT_CELL_SIZE;
-                    super.set(value);
-                    getSkinnable().requestLayout();
-                }
-                
-                @Override public Object getBean() {
-                    return CellSkinBase.this;
-                }
-
-                @Override public String getName() {
-                    return "cellSize";
-                }
-
-                @Override public CssMetaData<Cell<?>, Number> getCssMetaData() {
-                    return StyleableProperties.CELL_SIZE;
-                }
-            }; 
-        }
-        return cellSize;
-    }
-
-    public CellSkinBase(final C control, final B behavior) {
-        super (control, behavior);
-
-        /**
-         * The Cell does not typically want to block mouse events from going down
-         * to the virtualized controls holding the cell. For example mouse clicks
-         * on cells should also pass down to the ListView holding the cells.
-         */
-        consumeMouseEvents(false);
-    }
-
-
-    
-    /***************************************************************************
-     *                                                                         *
-     *                         Stylesheet Handling                             *
-     *                                                                         *
-     **************************************************************************/
-
-    static final double DEFAULT_CELL_SIZE = 24.0;
-
-     /**
-      * Super-lazy instantiation pattern from Bill Pugh.
-      * @treatAsPrivate implementation detail
-      */
-     private static class StyleableProperties {
-         private final static CssMetaData<Cell<?>,Number> CELL_SIZE =
-                new CssMetaData<Cell<?>,Number>("-fx-cell-size",
-                 SizeConverter.getInstance(), DEFAULT_CELL_SIZE) {
-
-            @Override
-            public boolean isSettable(Cell<?> n) {
-                final CellSkinBase<?,?> skin = (CellSkinBase<?,?>) n.getSkin();
-                return skin.cellSize == null || !skin.cellSize.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Number> getStyleableProperty(Cell<?> n) {
-                final CellSkinBase<?,?> skin = (CellSkinBase<?,?>) n.getSkin();
-                return (StyleableProperty<Number>)(WritableValue<Number>)skin.cellSizePropertyImpl();
-            }
-        };
-
-         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-         static {
-
-            final List<CssMetaData<? extends Styleable, ?>> styleables = 
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-            styleables.add(CELL_SIZE);
-            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-03 15:17:55.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/CellSkinBase.java	2015-09-03 15:17:53.023368000 -0700
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2010, 2015, 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.scene.Node;
+import javafx.scene.control.Cell;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.CssMetaData;
+import javafx.css.StyleOrigin;
+
+import javafx.css.converter.SizeConverter;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.value.WritableValue;
+import javafx.css.Styleable;
+import javafx.css.StyleableProperty;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+
+/**
+ * Default skin implementation for the {@link Cell} control, and subclasses such
+ * as {@link javafx.scene.control.ListCell}, {@link javafx.scene.control.TreeCell},
+ * etc.
+ *
+ * @see Cell
+ * @since 9
+ */
+public class CellSkinBase<C extends Cell> extends LabeledSkinBase<C> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new CellSkinBase instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public CellSkinBase(final C control) {
+        super (control);
+
+        /**
+         * The Cell does not typically want to block mouse events from going down
+         * to the virtualized controls holding the cell. For example mouse clicks
+         * on cells should also pass down to the ListView holding the cells.
+         */
+        consumeMouseEvents(false);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The default cell size. For vertical ListView or a TreeView or TableView
+     * this is the height, for a horizontal ListView this is the width. This
+     * is settable from CSS
+     */
+    private DoubleProperty cellSize;
+
+    public final double getCellSize() {
+        return cellSize == null ? DEFAULT_CELL_SIZE : cellSize.get();
+    }
+
+    public final ReadOnlyDoubleProperty cellSizeProperty() {
+        return cellSizePropertyImpl();
+    }
+
+    private DoubleProperty cellSizePropertyImpl() {
+        if (cellSize == null) {
+            cellSize = new StyleableDoubleProperty(DEFAULT_CELL_SIZE) {
+
+                @Override
+                public void applyStyle(StyleOrigin origin, Number value) {
+                    double size = value == null ? DEFAULT_CELL_SIZE : value.doubleValue();
+                    // guard against a 0 or negative size
+                    super.applyStyle(origin, size <= 0 ? DEFAULT_CELL_SIZE : size);
+                }
+
+
+                @Override public void set(double value) {
+//                    // Commented this out due to RT-19794, because otherwise
+//                    // cellSizeSet would be false when the default caspian.css
+//                    // cell size was set. This would lead to
+//                    // ListCellSkin.computePrefHeight computing the pref height
+//                    // of the cell (which is about 22px), rather than use the
+//                    // value provided by caspian.css (which is 24px).
+//                    // cellSizeSet = true;//value != DEFAULT_CELL_SIZE;
+                    super.set(value);
+                    getSkinnable().requestLayout();
+                }
+
+                @Override public Object getBean() {
+                    return CellSkinBase.this;
+                }
+
+                @Override public String getName() {
+                    return "cellSize";
+                }
+
+                @Override public CssMetaData<Cell<?>, Number> getCssMetaData() {
+                    return StyleableProperties.CELL_SIZE;
+                }
+            };
+        }
+        return cellSize;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     *                         Stylesheet Handling                             *
+     *                                                                         *
+     **************************************************************************/
+
+    static final double DEFAULT_CELL_SIZE = 24.0;
+
+     /**
+      * Super-lazy instantiation pattern from Bill Pugh.
+      * @treatAsPrivate implementation detail
+      */
+     private static class StyleableProperties {
+         private final static CssMetaData<Cell<?>,Number> CELL_SIZE =
+                new CssMetaData<Cell<?>,Number>("-fx-cell-size",
+                 SizeConverter.getInstance(), DEFAULT_CELL_SIZE) {
+
+            @Override
+            public boolean isSettable(Cell<?> n) {
+                final CellSkinBase<?> skin = (CellSkinBase<?>) n.getSkin();
+                return skin.cellSize == null || !skin.cellSize.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Number> getStyleableProperty(Cell<?> n) {
+                final CellSkinBase<?> skin = (CellSkinBase<?>) n.getSkin();
+                return (StyleableProperty<Number>)(WritableValue<Number>)skin.cellSizePropertyImpl();
+            }
+        };
+
+         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+         static {
+
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+            styleables.add(CELL_SIZE);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+
+         }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/CheckBoxSkin.java	2015-09-03 15:18:02.165890900 -0700
+++ /dev/null	2015-09-03 15:18:03.000000000 -0700
@@ -1,94 +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 com.sun.javafx.scene.control.skin;
-
-import javafx.scene.control.CheckBox;
-import javafx.scene.layout.StackPane;
-
-import com.sun.javafx.scene.control.behavior.ButtonBehavior;
-import javafx.geometry.NodeOrientation;
-
-/**
- * Skin for tri state selection Control.
- */
-public class CheckBoxSkin extends LabeledSkinBase<CheckBox, ButtonBehavior<CheckBox>> {
-
-    private final StackPane box = new StackPane();
-    private StackPane innerbox;
-
-    public CheckBoxSkin(CheckBox checkbox) {
-        super(checkbox, new ButtonBehavior<CheckBox>(checkbox));
-
-        box.getStyleClass().setAll("box");
-        innerbox = new StackPane();
-        innerbox.getStyleClass().setAll("mark");
-        innerbox.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
-        box.getChildren().add(innerbox);
-        updateChildren();
-    }
-
-    @Override protected void updateChildren() {
-        super.updateChildren();
-        if (box != null) {
-            getChildren().add(box);
-        }
-    }
-    
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return super.computeMinWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.minWidth(-1));
-    }
-    
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Math.max(super.computeMinHeight(width - box.minWidth(-1), topInset, rightInset, bottomInset, leftInset),
-                topInset + box.minHeight(-1) + bottomInset);
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.prefWidth(-1));
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Math.max(super.computePrefHeight(width - box.prefWidth(-1), topInset, rightInset, bottomInset, leftInset),
-                        topInset + box.prefHeight(-1) + bottomInset);
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        final CheckBox checkBox = getSkinnable(); 
-        final double boxWidth = snapSize(box.prefWidth(-1));
-        final double boxHeight = snapSize(box.prefHeight(-1));
-        final double computeWidth = Math.max(checkBox.prefWidth(-1), checkBox.minWidth(-1));
-        final double labelWidth = Math.min( computeWidth - boxWidth, w - snapSize(boxWidth));
-        final double labelHeight = Math.min(checkBox.prefHeight(labelWidth), h);
-        final double maxHeight = Math.max(boxHeight, labelHeight);
-        final double xOffset = Utils.computeXOffset(w, labelWidth + boxWidth, checkBox.getAlignment().getHpos()) + x;
-        final double yOffset = Utils.computeYOffset(h, maxHeight, checkBox.getAlignment().getVpos()) + x;
-
-        layoutLabelInArea(xOffset + boxWidth, yOffset, labelWidth, maxHeight, checkBox.getAlignment());
-        box.resize(boxWidth, boxHeight);
-        positionInArea(box, xOffset, yOffset, boxWidth, maxHeight, 0, checkBox.getAlignment().getHpos(), checkBox.getAlignment().getVpos());
-    }
-}    
--- /dev/null	2015-09-03 15:18:03.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/CheckBoxSkin.java	2015-09-03 15:18:01.354844500 -0700
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import com.sun.javafx.scene.control.behavior.ButtonBehavior;
+import javafx.scene.control.Control;
+import javafx.scene.layout.StackPane;
+
+import javafx.geometry.NodeOrientation;
+
+/**
+ * Default skin implementation for the tri-state {@link CheckBox} control.
+ *
+ * @see CheckBox
+ * @since 9
+ */
+public class CheckBoxSkin extends LabeledSkinBase<CheckBox> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final StackPane box = new StackPane();
+    private StackPane innerbox;
+    private final BehaviorBase<CheckBox> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new CheckBoxSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public CheckBoxSkin(CheckBox control) {
+        super(control);
+
+        // install default input map for the CheckBox control
+        behavior = new ButtonBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        box.getStyleClass().setAll("box");
+        innerbox = new StackPane();
+        innerbox.getStyleClass().setAll("mark");
+        innerbox.setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
+        box.getChildren().add(innerbox);
+        updateChildren();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void updateChildren() {
+        super.updateChildren();
+        if (box != null) {
+            getChildren().add(box);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return super.computeMinWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.minWidth(-1));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Math.max(super.computeMinHeight(width - box.minWidth(-1), topInset, rightInset, bottomInset, leftInset),
+                topInset + box.minHeight(-1) + bottomInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(box.prefWidth(-1));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Math.max(super.computePrefHeight(width - box.prefWidth(-1), topInset, rightInset, bottomInset, leftInset),
+                        topInset + box.prefHeight(-1) + bottomInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+            final double w, final double h) {
+        final CheckBox checkBox = getSkinnable(); 
+        final double boxWidth = snapSize(box.prefWidth(-1));
+        final double boxHeight = snapSize(box.prefHeight(-1));
+        final double computeWidth = Math.max(checkBox.prefWidth(-1), checkBox.minWidth(-1));
+        final double labelWidth = Math.min( computeWidth - boxWidth, w - snapSize(boxWidth));
+        final double labelHeight = Math.min(checkBox.prefHeight(labelWidth), h);
+        final double maxHeight = Math.max(boxHeight, labelHeight);
+        final double xOffset = Utils.computeXOffset(w, labelWidth + boxWidth, checkBox.getAlignment().getHpos()) + x;
+        final double yOffset = Utils.computeYOffset(h, maxHeight, checkBox.getAlignment().getVpos()) + x;
+
+        layoutLabelInArea(xOffset + boxWidth, yOffset, labelWidth, maxHeight, checkBox.getAlignment());
+        box.resize(boxWidth, boxHeight);
+        positionInArea(box, xOffset, yOffset, boxWidth, maxHeight, 0, checkBox.getAlignment().getHpos(), checkBox.getAlignment().getVpos());
+    }
+}    
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ChoiceBoxSkin.java	2015-09-03 15:18:10.045341600 -0700
+++ /dev/null	2015-09-03 15:18:11.000000000 -0700
@@ -1,369 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.beans.WeakInvalidationListener;
-import javafx.util.StringConverter;
-import javafx.beans.InvalidationListener;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.geometry.HPos;
-import javafx.geometry.Side;
-import javafx.geometry.VPos;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.RadioMenuItem;
-import javafx.scene.control.SelectionModel;
-import javafx.scene.control.Separator;
-import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.StackPane;
-import javafx.scene.text.Text;
-
-import com.sun.javafx.scene.control.behavior.ChoiceBoxBehavior;
-import javafx.collections.WeakListChangeListener;
-
-
-/**
- * ChoiceBoxSkin - default implementation
- */
-public class ChoiceBoxSkin<T> extends BehaviorSkinBase<ChoiceBox<T>, ChoiceBoxBehavior<T>> {
-
-    public ChoiceBoxSkin(ChoiceBox<T> control) {
-        super(control, new ChoiceBoxBehavior<T>(control));
-        initialize();
-
-        itemsObserver = observable -> updateChoiceBoxItems();
-        control.itemsProperty().addListener(new WeakInvalidationListener(itemsObserver));
-
-        control.requestLayout();
-        registerChangeListener(control.selectionModelProperty(), "SELECTION_MODEL");
-        registerChangeListener(control.showingProperty(), "SHOWING");
-        registerChangeListener(control.itemsProperty(), "ITEMS");
-        registerChangeListener(control.getSelectionModel().selectedItemProperty(), "SELECTION_CHANGED");
-        registerChangeListener(control.converterProperty(), "CONVERTER");
-    }
-
-    private ObservableList<T> choiceBoxItems;
-
-    private ContextMenu popup;
-
-    // The region that shows the "arrow" box portion
-    private StackPane openButton;
-
-    private final ToggleGroup toggleGroup = new ToggleGroup();
-
-    /*
-     * Watch for if the user changes the selected index, and if so, we toggle
-     * the selection in the toggle group (so the check shows in the right place)
-     */
-    private SelectionModel<T> selectionModel;
-
-    private Label label;
-
-    private final ListChangeListener<T> choiceBoxItemsListener = new ListChangeListener<T>() {
-        @Override public void onChanged(Change<? extends T> c) {
-            while (c.next()) {
-                if (c.getRemovedSize() > 0 || c.wasPermutated()) {
-                    toggleGroup.getToggles().clear();
-                    popup.getItems().clear();
-                    int i = 0;
-                    for (T obj : c.getList()) {
-                        addPopupItem(obj, i);
-                        i++;
-                    }
-                } else {
-                    for (int i = c.getFrom(); i < c.getTo(); i++) {
-                        final T obj = c.getList().get(i);
-                        addPopupItem(obj, i);
-                    }
-                }
-            }
-            updateSelection();
-            getSkinnable().requestLayout(); // RT-18052 resize of choicebox should happen immediately.
-        }
-    };
-    
-    private final WeakListChangeListener<T> weakChoiceBoxItemsListener =
-            new WeakListChangeListener<T>(choiceBoxItemsListener);
-
-    private final InvalidationListener itemsObserver;
-
-    private void initialize() {
-        updateChoiceBoxItems();
-
-        label = new Label();
-        label.setMnemonicParsing(false);  // ChoiceBox doesn't do Mnemonics
-
-        openButton = new StackPane();
-        openButton.getStyleClass().setAll("open-button");
-
-        StackPane region = new StackPane();
-        region.getStyleClass().setAll("arrow");
-        openButton.getChildren().clear();
-        openButton.getChildren().addAll(region);
-
-        popup = new ContextMenu();
-        // When popup is hidden by autohide - the ChoiceBox Showing property needs
-        // to be updated. So we listen to when autohide happens. Calling hide()
-        // there after causes Showing to be set to false
-        popup.showingProperty().addListener((o, ov, nv) -> {
-            if (!nv) {
-                getSkinnable().hide();
-            }
-        });
-        // This is used as a way of accessing the context menu within the ChoiceBox.
-        popup.setId("choice-box-popup-menu");
-//        popup.getItems().clear();
-//        popup.getItems().addAll(popupItems);
-//        popup.setManaged(false);
-//        popup.visibleProperty().addListener(new InvalidationListener() {
-//            @Override public void invalidated(ObservableValue valueModel) {
-//                if (popup.isVisible() {
-////                    RadioMenuItem selected = (RadioMenuItem) toggleGroup.getSelectedToggle();
-////                    if (selected != null) selected.requestFocus();
-//                } else {
-//                    getBehavior().close();
-//                }
-//            }
-//        });
-        getChildren().setAll(label, openButton);
-
-        updatePopupItems();
-
-        updateSelectionModel();
-        updateSelection();
-        if(selectionModel != null && selectionModel.getSelectedIndex() == -1) {
-            label.setText(""); // clear label text when selectedIndex is -1
-        }
-    }
-
-    private void updateChoiceBoxItems() {
-        if (choiceBoxItems != null) {
-            choiceBoxItems.removeListener(weakChoiceBoxItemsListener);
-        }
-        choiceBoxItems = getSkinnable().getItems();
-        if (choiceBoxItems != null) {
-            choiceBoxItems.addListener(weakChoiceBoxItemsListener);
-        }
-    }
-    
-    // Test only purpose    
-    String getChoiceBoxSelectedText() {
-        return label.getText();
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("ITEMS".equals(p)) {
-            updateChoiceBoxItems();
-            updatePopupItems();
-            updateSelectionModel();
-            updateSelection();
-            if(selectionModel != null && selectionModel.getSelectedIndex() == -1) {
-                label.setText(""); // clear label text when selectedIndex is -1
-            }
-        } else if (("SELECTION_MODEL").equals(p)) {
-            updateSelectionModel();
-        } else if ("SELECTION_CHANGED".equals(p)) {
-            if (getSkinnable().getSelectionModel() != null) {
-                int index = getSkinnable().getSelectionModel().getSelectedIndex();
-                if (index != -1) {
-                    MenuItem item = popup.getItems().get(index);
-                    if (item instanceof RadioMenuItem) ((RadioMenuItem)item).setSelected(true);
-                }
-            }
-        } else if ("SHOWING".equals(p)) {
-            if (getSkinnable().isShowing()) {
-                MenuItem item = null;
-
-                SelectionModel sm = getSkinnable().getSelectionModel();
-                if (sm == null) return;
-
-                long currentSelectedIndex = sm.getSelectedIndex();
-                int itemInControlCount = choiceBoxItems.size();
-                boolean hasSelection = currentSelectedIndex >= 0 && currentSelectedIndex < itemInControlCount;
-                if (hasSelection) {
-                    item = popup.getItems().get((int) currentSelectedIndex);
-                    if (item != null && item instanceof RadioMenuItem) ((RadioMenuItem)item).setSelected(true);
-                } else {
-                    if (itemInControlCount > 0) item = popup.getItems().get(0);
-                }
-
-                // This is a fix for RT-9071. Ideally this won't be necessary in
-                // the long-run, but for now at least this resolves the
-                // positioning
-                // problem of ChoiceBox inside a Cell.
-                getSkinnable().autosize();
-                // -- End of RT-9071 fix
-
-                double y = 0;
-
-                if (popup.getSkin() != null) {
-                    ContextMenuContent cmContent = (ContextMenuContent)popup.getSkin().getNode();
-                    if (cmContent != null && currentSelectedIndex != -1) {
-                        y = -(cmContent.getMenuYOffset((int)currentSelectedIndex));
-                    }
-                }
-
-                popup.show(getSkinnable(), Side.BOTTOM, 2, y);
-            } else {
-                popup.hide();
-            }
-        } else if ("CONVERTER".equals(p)) {
-            updateChoiceBoxItems();
-            updatePopupItems();
-        }
-    }
-
-    private void addPopupItem(final T o, int i) {
-        MenuItem popupItem = null;
-        if (o instanceof Separator) {
-            // We translate the Separator into a SeparatorMenuItem...
-            popupItem = new SeparatorMenuItem();
-        } else if (o instanceof SeparatorMenuItem) {
-            popupItem = (SeparatorMenuItem) o;
-        } else {
-            StringConverter<T> c = getSkinnable().getConverter();
-            String displayString = (c == null) ? ((o == null) ? "" : o.toString()) :  c.toString(o);
-            final RadioMenuItem item = new RadioMenuItem(displayString);
-            item.setId("choice-box-menu-item");
-            item.setToggleGroup(toggleGroup);
-            item.setOnAction(e -> {
-                if (selectionModel == null) return;
-                int index = getSkinnable().getItems().indexOf(o);
-                selectionModel.select(index);
-                item.setSelected(true);
-            });
-            popupItem = item;
-        }
-        popupItem.setMnemonicParsing(false);   // ChoiceBox doesn't do Mnemonics
-        popup.getItems().add(i, popupItem);
-    }
-
-    private void updatePopupItems() {
-        toggleGroup.getToggles().clear();
-        popup.getItems().clear();
-        toggleGroup.selectToggle(null);
-
-        for (int i = 0; i < choiceBoxItems.size(); i++) {
-            T o = choiceBoxItems.get(i);
-            addPopupItem(o, i);
-        }
-    }
-
-    private void updateSelectionModel() {
-        if (selectionModel != null) {
-            selectionModel.selectedIndexProperty().removeListener(selectionChangeListener);
-        }
-        this.selectionModel = getSkinnable().getSelectionModel();
-        if (selectionModel != null) {
-            selectionModel.selectedIndexProperty().addListener(selectionChangeListener);
-        }
-    }
-
-    private InvalidationListener selectionChangeListener = observable -> {
-        updateSelection();
-    };
-
-    private void updateSelection() {
-        if (selectionModel == null || selectionModel.isEmpty()) {
-            toggleGroup.selectToggle(null);
-            label.setText("");
-        } else {
-            int selectedIndex = selectionModel.getSelectedIndex();
-            if (selectedIndex == -1 || selectedIndex > popup.getItems().size()) {
-                label.setText(""); // clear label text
-                return;
-            }
-            if (selectedIndex < popup.getItems().size()) {
-                MenuItem selectedItem = popup.getItems().get(selectedIndex);
-                if (selectedItem instanceof RadioMenuItem) {
-                    ((RadioMenuItem) selectedItem).setSelected(true);
-                    toggleGroup.selectToggle(null);
-                }
-                // update the label
-                label.setText(popup.getItems().get(selectedIndex).getText());
-            }
-        }
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        // open button width/height
-        double obw = openButton.prefWidth(-1);
-
-        ChoiceBox<T> control = getSkinnable();
-        label.resizeRelocate(x, y, w, h);
-        openButton.resize(obw, openButton.prefHeight(-1));
-        positionInArea(openButton, (x+w) - obw,
-                y, obw, h, /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final double boxWidth = label.minWidth(-1) + openButton.minWidth(-1);
-        final double popupWidth = popup.minWidth(-1);
-        return leftInset + Math.max(boxWidth, popupWidth) + rightInset;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final double displayHeight = label.minHeight(-1);
-        final double openButtonHeight = openButton.minHeight(-1);
-        return topInset + Math.max(displayHeight, openButtonHeight) + bottomInset;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final double boxWidth = label.prefWidth(-1)
-                + openButton.prefWidth(-1);
-        double popupWidth = popup.prefWidth(-1);
-        if (popupWidth <= 0) { // first time: when the popup has not shown yet
-            if (popup.getItems().size() > 0){
-                popupWidth = (new Text(((MenuItem)popup.getItems().get(0)).getText())).prefWidth(-1);
-            }
-        }
-        return (popup.getItems().size() == 0) ? 50 : leftInset + Math.max(boxWidth, popupWidth)
-                + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final double displayHeight = label.prefHeight(-1);
-        final double openButtonHeight = openButton.prefHeight(-1);
-        return topInset
-                + Math.max(displayHeight, openButtonHeight)
-                + bottomInset;
-    }
-    
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-    
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefWidth(height);
-    }
-}
--- /dev/null	2015-09-03 15:18:11.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ChoiceBoxSkin.java	2015-09-03 15:18:09.273297500 -0700
@@ -0,0 +1,439 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.ContextMenuContent;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.WeakInvalidationListener;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.util.StringConverter;
+import javafx.beans.InvalidationListener;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.HPos;
+import javafx.geometry.Side;
+import javafx.geometry.VPos;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.SelectionModel;
+import javafx.scene.control.Separator;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.layout.StackPane;
+import javafx.scene.text.Text;
+
+import com.sun.javafx.scene.control.behavior.ChoiceBoxBehavior;
+import javafx.collections.WeakListChangeListener;
+
+
+/**
+ * Default skin implementation for the {@link ChoiceBox} control.
+ *
+ * @see ChoiceBox
+ * @since 9
+ */
+public class ChoiceBoxSkin<T> extends SkinBase<ChoiceBox<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private ObservableList<T> choiceBoxItems;
+
+    private ContextMenu popup;
+
+    // The region that shows the "arrow" box portion
+    private StackPane openButton;
+
+    private final ToggleGroup toggleGroup = new ToggleGroup();
+
+    /*
+     * Watch for if the user changes the selected index, and if so, we toggle
+     * the selection in the toggle group (so the check shows in the right place)
+     */
+    private SelectionModel<T> selectionModel;
+
+    private Label label;
+
+    private final BehaviorBase<ChoiceBox<T>> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private final ListChangeListener<T> choiceBoxItemsListener = new ListChangeListener<T>() {
+        @Override public void onChanged(Change<? extends T> c) {
+            while (c.next()) {
+                if (c.getRemovedSize() > 0 || c.wasPermutated()) {
+                    toggleGroup.getToggles().clear();
+                    popup.getItems().clear();
+                    int i = 0;
+                    for (T obj : c.getList()) {
+                        addPopupItem(obj, i);
+                        i++;
+                    }
+                } else {
+                    for (int i = c.getFrom(); i < c.getTo(); i++) {
+                        final T obj = c.getList().get(i);
+                        addPopupItem(obj, i);
+                    }
+                }
+            }
+            updateSelection();
+            getSkinnable().requestLayout(); // RT-18052 resize of choicebox should happen immediately.
+        }
+    };
+
+    private final WeakListChangeListener<T> weakChoiceBoxItemsListener =
+            new WeakListChangeListener<T>(choiceBoxItemsListener);
+
+    private final InvalidationListener itemsObserver;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ChoiceBoxSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ChoiceBoxSkin(ChoiceBox<T> control) {
+        super(control);
+
+        // install default input map for the ChoiceBox control
+        behavior = new ChoiceBoxBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        initialize();
+
+        itemsObserver = observable -> updateChoiceBoxItems();
+        control.itemsProperty().addListener(new WeakInvalidationListener(itemsObserver));
+
+        control.requestLayout();
+        registerChangeListener(control.selectionModelProperty(), e -> updateSelectionModel());
+        registerChangeListener(control.showingProperty(), e -> {
+            if (getSkinnable().isShowing()) {
+                MenuItem item = null;
+
+                SelectionModel sm = getSkinnable().getSelectionModel();
+                if (sm == null) return;
+
+                long currentSelectedIndex = sm.getSelectedIndex();
+                int itemInControlCount = choiceBoxItems.size();
+                boolean hasSelection = currentSelectedIndex >= 0 && currentSelectedIndex < itemInControlCount;
+                if (hasSelection) {
+                    item = popup.getItems().get((int) currentSelectedIndex);
+                    if (item != null && item instanceof RadioMenuItem) ((RadioMenuItem)item).setSelected(true);
+                } else {
+                    if (itemInControlCount > 0) item = popup.getItems().get(0);
+                }
+
+                // This is a fix for RT-9071. Ideally this won't be necessary in
+                // the long-run, but for now at least this resolves the
+                // positioning
+                // problem of ChoiceBox inside a Cell.
+                getSkinnable().autosize();
+                // -- End of RT-9071 fix
+
+                double y = 0;
+
+                if (popup.getSkin() != null) {
+                    ContextMenuContent cmContent = (ContextMenuContent)popup.getSkin().getNode();
+                    if (cmContent != null && currentSelectedIndex != -1) {
+                        y = -(cmContent.getMenuYOffset((int)currentSelectedIndex));
+                    }
+                }
+
+                popup.show(getSkinnable(), Side.BOTTOM, 2, y);
+            } else {
+                popup.hide();
+            }
+        });
+        registerChangeListener(control.itemsProperty(), e -> {
+            updateChoiceBoxItems();
+            updatePopupItems();
+            updateSelectionModel();
+            updateSelection();
+            if(selectionModel != null && selectionModel.getSelectedIndex() == -1) {
+                label.setText(""); // clear label text when selectedIndex is -1
+            }
+        });
+        registerChangeListener(control.getSelectionModel().selectedItemProperty(), e -> {
+            if (getSkinnable().getSelectionModel() != null) {
+                int index = getSkinnable().getSelectionModel().getSelectedIndex();
+                if (index != -1) {
+                    MenuItem item = popup.getItems().get(index);
+                    if (item instanceof RadioMenuItem) ((RadioMenuItem)item).setSelected(true);
+                }
+            }
+        });
+        registerChangeListener(control.converterProperty(), e -> {
+            updateChoiceBoxItems();
+            updatePopupItems();
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        // open button width/height
+        double obw = openButton.prefWidth(-1);
+
+        ChoiceBox<T> control = getSkinnable();
+        label.resizeRelocate(x, y, w, h);
+        openButton.resize(obw, openButton.prefHeight(-1));
+        positionInArea(openButton, (x+w) - obw,
+                y, obw, h, /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final double boxWidth = label.minWidth(-1) + openButton.minWidth(-1);
+        final double popupWidth = popup.minWidth(-1);
+        return leftInset + Math.max(boxWidth, popupWidth) + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final double displayHeight = label.minHeight(-1);
+        final double openButtonHeight = openButton.minHeight(-1);
+        return topInset + Math.max(displayHeight, openButtonHeight) + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final double boxWidth = label.prefWidth(-1)
+                + openButton.prefWidth(-1);
+        double popupWidth = popup.prefWidth(-1);
+        if (popupWidth <= 0) { // first time: when the popup has not shown yet
+            if (popup.getItems().size() > 0){
+                popupWidth = (new Text(((MenuItem)popup.getItems().get(0)).getText())).prefWidth(-1);
+            }
+        }
+        return (popup.getItems().size() == 0) ? 50 : leftInset + Math.max(boxWidth, popupWidth)
+                + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final double displayHeight = label.prefHeight(-1);
+        final double openButtonHeight = openButton.prefHeight(-1);
+        return topInset
+                + Math.max(displayHeight, openButtonHeight)
+                + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void initialize() {
+        updateChoiceBoxItems();
+
+        label = new Label();
+        label.setMnemonicParsing(false);  // ChoiceBox doesn't do Mnemonics
+
+        openButton = new StackPane();
+        openButton.getStyleClass().setAll("open-button");
+
+        StackPane region = new StackPane();
+        region.getStyleClass().setAll("arrow");
+        openButton.getChildren().clear();
+        openButton.getChildren().addAll(region);
+
+        popup = new ContextMenu();
+        // When popup is hidden by autohide - the ChoiceBox Showing property needs
+        // to be updated. So we listen to when autohide happens. Calling hide()
+        // there after causes Showing to be set to false
+        popup.showingProperty().addListener((o, ov, nv) -> {
+            if (!nv) {
+                getSkinnable().hide();
+            }
+        });
+        // This is used as a way of accessing the context menu within the ChoiceBox.
+        popup.setId("choice-box-popup-menu");
+//        popup.getItems().clear();
+//        popup.getItems().addAll(popupItems);
+//        popup.setManaged(false);
+//        popup.visibleProperty().addListener(new InvalidationListener() {
+//            @Override public void invalidated(ObservableValue valueModel) {
+//                if (popup.isVisible() {
+////                    RadioMenuItem selected = (RadioMenuItem) toggleGroup.getSelectedToggle();
+////                    if (selected != null) selected.requestFocus();
+//                } else {
+//                    getBehavior().close();
+//                }
+//            }
+//        });
+        getChildren().setAll(label, openButton);
+
+        updatePopupItems();
+
+        updateSelectionModel();
+        updateSelection();
+        if(selectionModel != null && selectionModel.getSelectedIndex() == -1) {
+            label.setText(""); // clear label text when selectedIndex is -1
+        }
+    }
+
+    private void updateChoiceBoxItems() {
+        if (choiceBoxItems != null) {
+            choiceBoxItems.removeListener(weakChoiceBoxItemsListener);
+        }
+        choiceBoxItems = getSkinnable().getItems();
+        if (choiceBoxItems != null) {
+            choiceBoxItems.addListener(weakChoiceBoxItemsListener);
+        }
+    }
+    
+    // Test only purpose    
+    String getChoiceBoxSelectedText() {
+        return label.getText();
+    }
+
+    private void addPopupItem(final T o, int i) {
+        MenuItem popupItem = null;
+        if (o instanceof Separator) {
+            // We translate the Separator into a SeparatorMenuItem...
+            popupItem = new SeparatorMenuItem();
+        } else if (o instanceof SeparatorMenuItem) {
+            popupItem = (SeparatorMenuItem) o;
+        } else {
+            StringConverter<T> c = getSkinnable().getConverter();
+            String displayString = (c == null) ? ((o == null) ? "" : o.toString()) :  c.toString(o);
+            final RadioMenuItem item = new RadioMenuItem(displayString);
+            item.setId("choice-box-menu-item");
+            item.setToggleGroup(toggleGroup);
+            item.setOnAction(e -> {
+                if (selectionModel == null) return;
+                int index = getSkinnable().getItems().indexOf(o);
+                selectionModel.select(index);
+                item.setSelected(true);
+            });
+            popupItem = item;
+        }
+        popupItem.setMnemonicParsing(false);   // ChoiceBox doesn't do Mnemonics
+        popup.getItems().add(i, popupItem);
+    }
+
+    private void updatePopupItems() {
+        toggleGroup.getToggles().clear();
+        popup.getItems().clear();
+        toggleGroup.selectToggle(null);
+
+        for (int i = 0; i < choiceBoxItems.size(); i++) {
+            T o = choiceBoxItems.get(i);
+            addPopupItem(o, i);
+        }
+    }
+
+    private void updateSelectionModel() {
+        if (selectionModel != null) {
+            selectionModel.selectedIndexProperty().removeListener(selectionChangeListener);
+        }
+        this.selectionModel = getSkinnable().getSelectionModel();
+        if (selectionModel != null) {
+            selectionModel.selectedIndexProperty().addListener(selectionChangeListener);
+        }
+    }
+
+    private InvalidationListener selectionChangeListener = observable -> {
+        updateSelection();
+    };
+
+    private void updateSelection() {
+        if (selectionModel == null || selectionModel.isEmpty()) {
+            toggleGroup.selectToggle(null);
+            label.setText("");
+        } else {
+            int selectedIndex = selectionModel.getSelectedIndex();
+            if (selectedIndex == -1 || selectedIndex > popup.getItems().size()) {
+                label.setText(""); // clear label text
+                return;
+            }
+            if (selectedIndex < popup.getItems().size()) {
+                MenuItem selectedItem = popup.getItems().get(selectedIndex);
+                if (selectedItem instanceof RadioMenuItem) {
+                    ((RadioMenuItem) selectedItem).setSelected(true);
+                    toggleGroup.selectToggle(null);
+                }
+                // update the label
+                label.setText(popup.getItems().get(selectedIndex).getText());
+            }
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ColorPalette.java	2015-09-03 15:18:18.349816600 -0700
+++ /dev/null	2015-09-03 15:18:19.000000000 -0700
@@ -1,686 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 com.sun.javafx.scene.traversal.Algorithm;
-import com.sun.javafx.scene.traversal.Direction;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import com.sun.javafx.scene.traversal.TraversalContext;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.geometry.Bounds;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.Pos;
-import javafx.geometry.Side;
-import javafx.scene.Node;
-import javafx.scene.control.ColorPicker;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Hyperlink;
-import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.PopupControl;
-import javafx.scene.control.Separator;
-import javafx.scene.control.Tooltip;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.shape.StrokeType;
-
-import java.util.List;
-
-import static com.sun.javafx.scene.control.skin.ColorPickerSkin.getString;
-
-public class ColorPalette extends Region {
-
-    private static final int SQUARE_SIZE = 15;
-
-    // package protected for testing purposes
-    ColorPickerGrid colorPickerGrid;
-    final Hyperlink customColorLink = new Hyperlink(getString("customColorLink"));
-    CustomColorDialog customColorDialog = null;
-
-    private ColorPicker colorPicker;
-    private final GridPane customColorGrid = new GridPane();
-    private final Separator separator = new Separator();
-    private final Label customColorLabel = new Label(getString("customColorLabel"));
-
-    private PopupControl popupControl;
-    private ColorSquare focusedSquare;
-    private ContextMenu contextMenu = null;
-    
-    private Color mouseDragColor = null;
-    private boolean dragDetected = false;
-
-    // Metrics for custom colors
-    private int customColorNumber = 0;
-    private int customColorRows = 0;
-    private int customColorLastRowLength = 0;
-
-    private final ColorSquare hoverSquare = new ColorSquare();
-    
-    public ColorPalette(final ColorPicker colorPicker) {
-        getStyleClass().add("color-palette-region");
-        this.colorPicker = colorPicker;
-        colorPickerGrid = new ColorPickerGrid();
-        colorPickerGrid.getChildren().get(0).requestFocus();
-        customColorLabel.setAlignment(Pos.CENTER_LEFT);
-        customColorLink.setPrefWidth(colorPickerGrid.prefWidth(-1));
-        customColorLink.setAlignment(Pos.CENTER);
-        customColorLink.setFocusTraversable(true);
-        customColorLink.setVisited(true); // so that it always appears blue 
-        customColorLink.setOnAction(new EventHandler<ActionEvent>() {
-            @Override public void handle(ActionEvent t) {
-                if (customColorDialog == null) {
-                    customColorDialog = new CustomColorDialog(popupControl);
-                    customColorDialog.customColorProperty().addListener((ov, t1, t2) -> {
-                        colorPicker.setValue(customColorDialog.customColorProperty().get());
-                    });
-                    customColorDialog.setOnSave(() -> {
-                        Color customColor = customColorDialog.customColorProperty().get();
-                        buildCustomColors();
-                        colorPicker.getCustomColors().add(customColor);
-                        updateSelection(customColor);
-                        Event.fireEvent(colorPicker, new ActionEvent());
-                        colorPicker.hide();
-                    });
-                    customColorDialog.setOnUse(() -> {
-                        Event.fireEvent(colorPicker, new ActionEvent());
-                        colorPicker.hide();
-                    });
-                }
-                customColorDialog.setCurrentColor(colorPicker.valueProperty().get());
-                if (popupControl != null) popupControl.setAutoHide(false);
-                customColorDialog.show();
-                 customColorDialog.setOnHidden(event -> {
-                    if (popupControl != null) popupControl.setAutoHide(true);
-                 });
-            }
-        });
-        
-        initNavigation();
-        customColorGrid.getStyleClass().add("color-picker-grid");
-        customColorGrid.setVisible(false);
-        buildCustomColors();
-        colorPicker.getCustomColors().addListener(new ListChangeListener<Color>() {
-            @Override public void onChanged(Change<? extends Color> change) {
-                buildCustomColors();
-            }
-        });
-
-        VBox paletteBox = new VBox();
-        paletteBox.getStyleClass().add("color-palette");
-        paletteBox.getChildren().addAll(colorPickerGrid, customColorLabel, customColorGrid, separator, customColorLink);
-
-        hoverSquare.setMouseTransparent(true);
-        hoverSquare.getStyleClass().addAll("hover-square");
-        setFocusedSquare(null);
-
-        getChildren().addAll(paletteBox, hoverSquare);
-    }
-
-    private void setFocusedSquare(ColorSquare square) {
-        if (square == focusedSquare) {
-            return;
-        }
-        focusedSquare = square;
-
-        hoverSquare.setVisible(focusedSquare != null);
-        if (focusedSquare == null) {
-            return;
-        }
-
-        if (!focusedSquare.isFocused()) {
-            focusedSquare.requestFocus();
-        }
-
-        hoverSquare.rectangle.setFill(focusedSquare.rectangle.getFill());
-
-        Bounds b = square.localToScene(square.getLayoutBounds());
-
-        double x = b.getMinX();
-        double y = b.getMinY();
-
-        double xAdjust;
-        double scaleAdjust = hoverSquare.getScaleX() == 1.0 ? 0 : hoverSquare.getWidth() / 4.0;
-
-        if (colorPicker.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-            x = focusedSquare.getLayoutX();
-            xAdjust = -focusedSquare.getWidth() + scaleAdjust;
-        } else {
-            xAdjust = focusedSquare.getWidth() / 2.0 + scaleAdjust;
-        }
-
-        hoverSquare.setLayoutX(snapPosition(x) - xAdjust);
-        hoverSquare.setLayoutY(snapPosition(y) - focusedSquare.getHeight() / 2.0 + (hoverSquare.getScaleY() == 1.0 ? 0 : focusedSquare.getHeight() / 4.0));
-    }
-    
-    private void buildCustomColors() {
-        final ObservableList<Color> customColors = colorPicker.getCustomColors();
-        customColorNumber = customColors.size();
-
-        customColorGrid.getChildren().clear();
-        if (customColors.isEmpty()) {
-            customColorLabel.setVisible(false);
-            customColorLabel.setManaged(false);
-            customColorGrid.setVisible(false);
-            customColorGrid.setManaged(false);
-            return;
-        } else {
-            customColorLabel.setVisible(true);
-            customColorLabel.setManaged(true);
-            customColorGrid.setVisible(true);
-            customColorGrid.setManaged(true);
-            if (contextMenu == null) {
-                MenuItem item = new MenuItem(getString("removeColor"));
-                item.setOnAction(e -> {
-                    ColorSquare square = (ColorSquare)contextMenu.getOwnerNode();
-                    customColors.remove(square.rectangle.getFill());
-                    buildCustomColors();
-                });
-                contextMenu = new ContextMenu(item);
-            }
-        }
-
-        int customColumnIndex = 0;
-        int customRowIndex = 0;
-        int remainingSquares = customColors.size() % NUM_OF_COLUMNS;
-        int numEmpty = (remainingSquares == 0) ? 0 : NUM_OF_COLUMNS - remainingSquares;
-        customColorLastRowLength = remainingSquares == 0 ? 12 : remainingSquares;
-
-        for (int i = 0; i < customColors.size(); i++) {
-            Color c = customColors.get(i);
-            ColorSquare square = new ColorSquare(c, i, true);
-            square.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
-                if (e.getCode() == KeyCode.DELETE) {
-                    customColors.remove(square.rectangle.getFill());
-                    buildCustomColors();
-                }
-            });
-            customColorGrid.add(square, customColumnIndex, customRowIndex);
-            customColumnIndex++;
-            if (customColumnIndex == NUM_OF_COLUMNS) {
-                customColumnIndex = 0;
-                customRowIndex++;
-            }
-        }
-        for (int i = 0; i < numEmpty; i++) {
-            ColorSquare emptySquare = new ColorSquare();
-            customColorGrid.add(emptySquare, customColumnIndex, customRowIndex);
-            customColumnIndex++;
-        }
-        customColorRows = customRowIndex + 1;
-        requestLayout();
-
-    }
-    
-    private void initNavigation() {
-        setOnKeyPressed(ke -> {
-            switch (ke.getCode()) {
-                case SPACE:
-                case ENTER:
-                    processSelectKey(ke);
-                    ke.consume();
-                    break;
-                default: // no-op
-            }
-        });
-
-        setImpl_traversalEngine(new ParentTraversalEngine(this, new Algorithm() {
-            @Override
-            public Node select(Node owner, Direction dir, TraversalContext context) {
-                final Node subsequentNode = context.selectInSubtree(context.getRoot(), owner, dir);
-                switch (dir) {
-                    case NEXT:
-                    case NEXT_IN_LINE:
-                    case PREVIOUS:
-                        return subsequentNode;
-                    // Here, we need to intercept the standard algorithm in a few cases to get the desired traversal
-                    // For right or left direction we want to continue on the next or previous row respectively
-                    // For up and down, the custom color panel might be skipped by the standard algorithm (if not wide enough
-                    // to be between the current color and custom color button), so we need to include it in the path explicitly.
-                    case LEFT:
-                    case RIGHT:
-                    case UP:
-                    case DOWN:
-                        if (owner instanceof ColorSquare) {
-                            Node result =  processArrow((ColorSquare)owner, dir);
-                            return result != null ? result : subsequentNode;
-                        } else {
-                            return subsequentNode;
-                        }
-                }
-                return null;
-            }
-
-            private Node processArrow(ColorSquare owner, Direction dir) {
-                final int row = owner.index / NUM_OF_COLUMNS;
-                final int column = owner.index % NUM_OF_COLUMNS;
-
-                // Adjust the direction according to color picker orientation
-                dir = dir.getDirectionForNodeOrientation(colorPicker.getEffectiveNodeOrientation());
-                // This returns true for all the cases which we need to override
-                if (isAtBorder(dir, row, column, owner.isCustom)) {
-                    // There's no other node in the direction from the square, so we need to continue on some other row
-                    // or cycle
-                    int subsequentRow = row;
-                    int subsequentColumn = column;
-                    boolean subSequentSquareCustom = owner.isCustom;
-                    switch (dir) {
-                        case LEFT:
-                        case RIGHT:
-                            // The next row is either the first or the last, except when cycling in custom colors, the last row
-                            // might have different number of columns
-                            if (owner.isCustom) {
-                                subsequentRow = Math.floorMod(dir == Direction.LEFT ? row - 1 : row + 1, customColorRows);
-                                subsequentColumn = dir == Direction.LEFT ? subsequentRow == customColorRows - 1 ?
-                                        customColorLastRowLength - 1 : NUM_OF_COLUMNS - 1 : 0;
-                            } else {
-                                subsequentRow = Math.floorMod(dir == Direction.LEFT ? row - 1 : row + 1, NUM_OF_ROWS);
-                                subsequentColumn = dir == Direction.LEFT ? NUM_OF_COLUMNS - 1 : 0;
-                            }
-                            break;
-                        case UP: // custom color are not handled here
-                            subsequentRow = NUM_OF_ROWS - 1;
-                            break;
-                        case DOWN: // custom color are not handled here
-                            if (customColorNumber > 0) {
-                                subSequentSquareCustom = true;
-                                subsequentRow = 0;
-                                subsequentColumn = customColorRows > 1 ? column : Math.min(customColorLastRowLength - 1, column);
-                                break;
-                            } else {
-                                return null; // Let the default algorith handle this
-                            }
-
-                    }
-                    if (subSequentSquareCustom) {
-                        return customColorGrid.getChildren().get(subsequentRow * NUM_OF_COLUMNS + subsequentColumn);
-                    } else {
-                        return colorPickerGrid.getChildren().get(subsequentRow * NUM_OF_COLUMNS + subsequentColumn);
-                    }
-                }
-                return null;
-            }
-
-            private boolean isAtBorder(Direction dir, int row, int column, boolean custom) {
-                switch (dir) {
-                    case LEFT:
-                        return column == 0;
-                    case RIGHT:
-                        return custom && row == customColorRows - 1 ?
-                                column == customColorLastRowLength - 1 : column == NUM_OF_COLUMNS - 1;
-                    case UP:
-                        return !custom && row == 0;
-                    case DOWN:
-                        return !custom && row == NUM_OF_ROWS - 1;
-                }
-                return false;
-            }
-
-            @Override
-            public Node selectFirst(TraversalContext context) {
-                return colorPickerGrid.getChildren().get(0);
-            }
-
-            @Override
-            public Node selectLast(TraversalContext context) {
-                return customColorLink;
-            }
-        }));
-    }
-
-    private void processSelectKey(KeyEvent ke) {
-        if (focusedSquare != null) focusedSquare.selectColor(ke);
-    }
-    
-    public void setPopupControl(PopupControl pc) {
-        this.popupControl = pc;
-    }
-    
-    public ColorPickerGrid getColorGrid() {
-        return colorPickerGrid;
-    }
-
-    public boolean isCustomColorDialogShowing() {
-        if (customColorDialog != null) return customColorDialog.isVisible();
-        return false;
-    }
-
-    class ColorSquare extends StackPane {
-        Rectangle rectangle;
-        int index;
-        boolean isEmpty;
-        boolean isCustom;
-
-        public ColorSquare() {
-            this(null, -1, false);
-        }
-
-        public ColorSquare(Color color, int index) {
-            this(color, index, false);
-        }
-
-        public ColorSquare(Color color, int index, boolean isCustom) {
-            // Add style class to handle selected color square
-            getStyleClass().add("color-square");
-            if (color != null) {
-                setFocusTraversable(true);
-
-                focusedProperty().addListener((s, ov, nv) -> {
-                    setFocusedSquare(nv ? this : null);
-                });
-
-                addEventHandler(MouseEvent.MOUSE_ENTERED, event -> {
-                    setFocusedSquare(ColorSquare.this);
-                });
-                addEventHandler(MouseEvent.MOUSE_EXITED, event -> {
-                    setFocusedSquare(null);
-                });
-
-                addEventHandler(MouseEvent.MOUSE_RELEASED, event -> {
-                    if (!dragDetected && event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 1) {
-                        if (!isEmpty) {
-                            Color fill = (Color) rectangle.getFill();
-                            colorPicker.setValue(fill);
-                            colorPicker.fireEvent(new ActionEvent());
-                            updateSelection(fill);
-                            event.consume();
-                        }
-                        colorPicker.hide();
-                    } else if (event.getButton() == MouseButton.SECONDARY ||
-                            event.getButton() == MouseButton.MIDDLE) {
-                        if (isCustom && contextMenu != null) {
-                            if (!contextMenu.isShowing()) {
-                                contextMenu.show(ColorSquare.this, Side.RIGHT, 0, 0);
-                                Utils.addMnemonics(contextMenu, ColorSquare.this.getScene(), colorPicker.impl_isShowMnemonics());
-                            } else {
-                                contextMenu.hide();
-                                Utils.removeMnemonics(contextMenu, ColorSquare.this.getScene());
-                            }
-                        }
-                    }
-                });
-            }
-            this.index = index;
-            this.isCustom = isCustom;
-            rectangle = new Rectangle(SQUARE_SIZE, SQUARE_SIZE);
-            if (color == null) {
-                rectangle.setFill(Color.WHITE);
-                isEmpty = true;
-            } else {
-                rectangle.setFill(color);
-            }
-
-            rectangle.setStrokeType(StrokeType.INSIDE);
-
-            String tooltipStr = ColorPickerSkin.tooltipString(color);
-            Tooltip.install(this, new Tooltip((tooltipStr == null) ? "" : tooltipStr));
-          
-            rectangle.getStyleClass().add("color-rect");
-
-            getChildren().add(rectangle);
-        }
-        
-        public void selectColor(KeyEvent event) {
-            if (rectangle.getFill() != null) {
-                if (rectangle.getFill() instanceof Color) {
-                    colorPicker.setValue((Color) rectangle.getFill());
-                    colorPicker.fireEvent(new ActionEvent());
-                }
-                event.consume();
-            }
-            colorPicker.hide();
-        }
-    }
-    
-    // The skin can update selection if colorpicker value changes..
-    public void updateSelection(Color color) {
-        setFocusedSquare(null);
-
-        for (ColorSquare c : colorPickerGrid.getSquares()) {
-            if (c.rectangle.getFill().equals(color)) {
-                setFocusedSquare(c);
-                return;
-            }
-        }
-        // check custom colors
-        for (Node n : customColorGrid.getChildren()) {
-            ColorSquare c = (ColorSquare) n;
-            if (c.rectangle.getFill().equals(color)) {
-                setFocusedSquare(c);
-                return;
-            }
-        }
-    }
-    
-    class ColorPickerGrid extends GridPane {
-
-        private final List<ColorSquare> squares;
-
-        public ColorPickerGrid() {
-            getStyleClass().add("color-picker-grid");
-            setId("ColorCustomizerColorGrid");
-            int columnIndex = 0, rowIndex = 0;
-            squares = FXCollections.observableArrayList();
-            final int numColors = RAW_VALUES.length / 3;
-            Color[] colors = new Color[numColors];
-            for (int i = 0; i < numColors; i++) {
-                colors[i] = new Color(RAW_VALUES[(i * 3)] / 255,
-                        RAW_VALUES[(i * 3) + 1] / 255, RAW_VALUES[(i * 3) + 2] / 255,
-                        1.0);
-                ColorSquare cs = new ColorSquare(colors[i], i);
-                squares.add(cs);
-            }
-
-            for (ColorSquare square : squares) {
-                add(square, columnIndex, rowIndex);
-                columnIndex++;
-                if (columnIndex == NUM_OF_COLUMNS) {
-                    columnIndex = 0;
-                    rowIndex++;
-                }
-            }
-            setOnMouseDragged(t -> {
-                if (!dragDetected) {
-                    dragDetected = true;
-                    mouseDragColor = colorPicker.getValue();
-                }
-                int xIndex = com.sun.javafx.util.Utils.clamp(0,
-                        (int)t.getX()/(SQUARE_SIZE + 1), NUM_OF_COLUMNS - 1);
-                int yIndex = com.sun.javafx.util.Utils.clamp(0,
-                        (int)t.getY()/(SQUARE_SIZE + 1), NUM_OF_ROWS - 1);
-                int index = xIndex + yIndex*NUM_OF_COLUMNS;
-                colorPicker.setValue((Color) squares.get(index).rectangle.getFill());
-                updateSelection(colorPicker.getValue());
-            });
-            addEventHandler(MouseEvent.MOUSE_RELEASED, t -> {
-                if(colorPickerGrid.getBoundsInLocal().contains(t.getX(), t.getY())) {
-                    updateSelection(colorPicker.getValue());
-                    colorPicker.fireEvent(new ActionEvent());
-                    colorPicker.hide();
-                } else {
-                    // restore color as mouse release happened outside the grid.
-                    if (mouseDragColor != null) {
-                        colorPicker.setValue(mouseDragColor);
-                        updateSelection(mouseDragColor);
-                    }
-                }
-                dragDetected = false;
-            });
-        }
-        
-        public List<ColorSquare> getSquares() {
-            return squares;
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            return (SQUARE_SIZE + 1)*NUM_OF_COLUMNS;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            return (SQUARE_SIZE + 1)*NUM_OF_ROWS;
-        }
-    }
-
-    private static final int NUM_OF_COLUMNS = 12;
-    private static double[] RAW_VALUES = {
-            // WARNING: always make sure the number of colors is a divisable by NUM_OF_COLUMNS
-            255, 255, 255, // first row
-            242, 242, 242,
-            230, 230, 230,
-            204, 204, 204,
-            179, 179, 179,
-            153, 153, 153,
-            128, 128, 128,
-            102, 102, 102,
-            77, 77, 77,
-            51, 51, 51,
-            26, 26, 26,
-            0, 0, 0,
-            0, 51, 51, // second row
-            0, 26, 128,
-            26, 0, 104,
-            51, 0, 51,
-            77, 0, 26,
-            153, 0, 0,
-            153, 51, 0,
-            153, 77, 0,
-            153, 102, 0,
-            153, 153, 0,
-            102, 102, 0,
-            0, 51, 0,
-            26, 77, 77, // third row
-            26, 51, 153,
-            51, 26, 128,
-            77, 26, 77,
-            102, 26, 51,
-            179, 26, 26,
-            179, 77, 26,
-            179, 102, 26,
-            179, 128, 26,
-            179, 179, 26,
-            128, 128, 26,
-            26, 77, 26,
-            51, 102, 102, // fourth row
-            51, 77, 179,
-            77, 51, 153,
-            102, 51, 102,
-            128, 51, 77,
-            204, 51, 51,
-            204, 102, 51,
-            204, 128, 51,
-            204, 153, 51,
-            204, 204, 51,
-            153, 153, 51,
-            51, 102, 51,
-            77, 128, 128, // fifth row
-            77, 102, 204,
-            102, 77, 179,
-            128, 77, 128,
-            153, 77, 102,
-            230, 77, 77,
-            230, 128, 77,
-            230, 153, 77,
-            230, 179, 77,
-            230, 230, 77,
-            179, 179, 77,
-            77, 128, 77,
-            102, 153, 153, // sixth row
-            102, 128, 230,
-            128, 102, 204,
-            153, 102, 153,
-            179, 102, 128,
-            255, 102, 102,
-            255, 153, 102,
-            255, 179, 102,
-            255, 204, 102,
-            255, 255, 77,
-            204, 204, 102,
-            102, 153, 102,
-            128, 179, 179, // seventh row
-            128, 153, 255,
-            153, 128, 230,
-            179, 128, 179,
-            204, 128, 153,
-            255, 128, 128,
-            255, 153, 128,
-            255, 204, 128,
-            255, 230, 102,
-            255, 255, 102,
-            230, 230, 128,
-            128, 179, 128,
-            153, 204, 204, // eigth row
-            153, 179, 255,
-            179, 153, 255,
-            204, 153, 204,
-            230, 153, 179,
-            255, 153, 153,
-            255, 179, 128,
-            255, 204, 153,
-            255, 230, 128,
-            255, 255, 128,
-            230, 230, 153,
-            153, 204, 153,
-            179, 230, 230, // ninth row
-            179, 204, 255,
-            204, 179, 255,
-            230, 179, 230,
-            230, 179, 204,
-            255, 179, 179,
-            255, 179, 153,
-            255, 230, 179,
-            255, 230, 153,
-            255, 255, 153,
-            230, 230, 179,
-            179, 230, 179,
-            204, 255, 255, // tenth row
-            204, 230, 255,
-            230, 204, 255,
-            255, 204, 255,
-            255, 204, 230,
-            255, 204, 204,
-            255, 204, 179,
-            255, 230, 204,
-            255, 255, 179,
-            255, 255, 204,
-            230, 230, 204,
-            204, 255, 204
-    };
-
-    private static final int NUM_OF_COLORS = RAW_VALUES.length / 3;
-    private static final int NUM_OF_ROWS = NUM_OF_COLORS / NUM_OF_COLUMNS;
-}
--- /dev/null	2015-09-03 15:18:19.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ColorPalette.java	2015-09-03 15:18:17.538770200 -0700
@@ -0,0 +1,689 @@
+/*
+ * Copyright (c) 2012, 2015, 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 com.sun.javafx.scene.control.CustomColorDialog;
+import com.sun.javafx.scene.control.skin.Utils;
+import com.sun.javafx.scene.traversal.Algorithm;
+import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalContext;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.geometry.Bounds;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.scene.Node;
+import javafx.scene.control.ColorPicker;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.PopupControl;
+import javafx.scene.control.Separator;
+import javafx.scene.control.Tooltip;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.shape.StrokeType;
+
+import java.util.List;
+
+import static com.sun.javafx.scene.control.Properties.getColorPickerString;
+
+// Not public API - this is (presently) an implementation detail only
+class ColorPalette extends Region {
+
+    private static final int SQUARE_SIZE = 15;
+
+    // package protected for testing purposes
+    ColorPickerGrid colorPickerGrid;
+    final Hyperlink customColorLink = new Hyperlink(getColorPickerString("customColorLink"));
+    CustomColorDialog customColorDialog = null;
+
+    private ColorPicker colorPicker;
+    private final GridPane customColorGrid = new GridPane();
+    private final Separator separator = new Separator();
+    private final Label customColorLabel = new Label(getColorPickerString("customColorLabel"));
+
+    private PopupControl popupControl;
+    private ColorSquare focusedSquare;
+    private ContextMenu contextMenu = null;
+    
+    private Color mouseDragColor = null;
+    private boolean dragDetected = false;
+
+    // Metrics for custom colors
+    private int customColorNumber = 0;
+    private int customColorRows = 0;
+    private int customColorLastRowLength = 0;
+
+    private final ColorSquare hoverSquare = new ColorSquare();
+    
+    public ColorPalette(final ColorPicker colorPicker) {
+        getStyleClass().add("color-palette-region");
+        this.colorPicker = colorPicker;
+        colorPickerGrid = new ColorPickerGrid();
+        colorPickerGrid.getChildren().get(0).requestFocus();
+        customColorLabel.setAlignment(Pos.CENTER_LEFT);
+        customColorLink.setPrefWidth(colorPickerGrid.prefWidth(-1));
+        customColorLink.setAlignment(Pos.CENTER);
+        customColorLink.setFocusTraversable(true);
+        customColorLink.setVisited(true); // so that it always appears blue 
+        customColorLink.setOnAction(new EventHandler<ActionEvent>() {
+            @Override public void handle(ActionEvent t) {
+                if (customColorDialog == null) {
+                    customColorDialog = new CustomColorDialog(popupControl);
+                    customColorDialog.customColorProperty().addListener((ov, t1, t2) -> {
+                        colorPicker.setValue(customColorDialog.customColorProperty().get());
+                    });
+                    customColorDialog.setOnSave(() -> {
+                        Color customColor = customColorDialog.customColorProperty().get();
+                        buildCustomColors();
+                        colorPicker.getCustomColors().add(customColor);
+                        updateSelection(customColor);
+                        Event.fireEvent(colorPicker, new ActionEvent());
+                        colorPicker.hide();
+                    });
+                    customColorDialog.setOnUse(() -> {
+                        Event.fireEvent(colorPicker, new ActionEvent());
+                        colorPicker.hide();
+                    });
+                }
+                customColorDialog.setCurrentColor(colorPicker.valueProperty().get());
+                if (popupControl != null) popupControl.setAutoHide(false);
+                customColorDialog.show();
+                 customColorDialog.setOnHidden(event -> {
+                    if (popupControl != null) popupControl.setAutoHide(true);
+                 });
+            }
+        });
+        
+        initNavigation();
+        customColorGrid.getStyleClass().add("color-picker-grid");
+        customColorGrid.setVisible(false);
+        buildCustomColors();
+        colorPicker.getCustomColors().addListener(new ListChangeListener<Color>() {
+            @Override public void onChanged(Change<? extends Color> change) {
+                buildCustomColors();
+            }
+        });
+
+        VBox paletteBox = new VBox();
+        paletteBox.getStyleClass().add("color-palette");
+        paletteBox.getChildren().addAll(colorPickerGrid, customColorLabel, customColorGrid, separator, customColorLink);
+
+        hoverSquare.setMouseTransparent(true);
+        hoverSquare.getStyleClass().addAll("hover-square");
+        setFocusedSquare(null);
+
+        getChildren().addAll(paletteBox, hoverSquare);
+    }
+
+    private void setFocusedSquare(ColorSquare square) {
+        if (square == focusedSquare) {
+            return;
+        }
+        focusedSquare = square;
+
+        hoverSquare.setVisible(focusedSquare != null);
+        if (focusedSquare == null) {
+            return;
+        }
+
+        if (!focusedSquare.isFocused()) {
+            focusedSquare.requestFocus();
+        }
+
+        hoverSquare.rectangle.setFill(focusedSquare.rectangle.getFill());
+
+        Bounds b = square.localToScene(square.getLayoutBounds());
+
+        double x = b.getMinX();
+        double y = b.getMinY();
+
+        double xAdjust;
+        double scaleAdjust = hoverSquare.getScaleX() == 1.0 ? 0 : hoverSquare.getWidth() / 4.0;
+
+        if (colorPicker.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
+            x = focusedSquare.getLayoutX();
+            xAdjust = -focusedSquare.getWidth() + scaleAdjust;
+        } else {
+            xAdjust = focusedSquare.getWidth() / 2.0 + scaleAdjust;
+        }
+
+        hoverSquare.setLayoutX(snapPosition(x) - xAdjust);
+        hoverSquare.setLayoutY(snapPosition(y) - focusedSquare.getHeight() / 2.0 + (hoverSquare.getScaleY() == 1.0 ? 0 : focusedSquare.getHeight() / 4.0));
+    }
+    
+    private void buildCustomColors() {
+        final ObservableList<Color> customColors = colorPicker.getCustomColors();
+        customColorNumber = customColors.size();
+
+        customColorGrid.getChildren().clear();
+        if (customColors.isEmpty()) {
+            customColorLabel.setVisible(false);
+            customColorLabel.setManaged(false);
+            customColorGrid.setVisible(false);
+            customColorGrid.setManaged(false);
+            return;
+        } else {
+            customColorLabel.setVisible(true);
+            customColorLabel.setManaged(true);
+            customColorGrid.setVisible(true);
+            customColorGrid.setManaged(true);
+            if (contextMenu == null) {
+                MenuItem item = new MenuItem(getColorPickerString("removeColor"));
+                item.setOnAction(e -> {
+                    ColorSquare square = (ColorSquare)contextMenu.getOwnerNode();
+                    customColors.remove(square.rectangle.getFill());
+                    buildCustomColors();
+                });
+                contextMenu = new ContextMenu(item);
+            }
+        }
+
+        int customColumnIndex = 0;
+        int customRowIndex = 0;
+        int remainingSquares = customColors.size() % NUM_OF_COLUMNS;
+        int numEmpty = (remainingSquares == 0) ? 0 : NUM_OF_COLUMNS - remainingSquares;
+        customColorLastRowLength = remainingSquares == 0 ? 12 : remainingSquares;
+
+        for (int i = 0; i < customColors.size(); i++) {
+            Color c = customColors.get(i);
+            ColorSquare square = new ColorSquare(c, i, true);
+            square.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
+                if (e.getCode() == KeyCode.DELETE) {
+                    customColors.remove(square.rectangle.getFill());
+                    buildCustomColors();
+                }
+            });
+            customColorGrid.add(square, customColumnIndex, customRowIndex);
+            customColumnIndex++;
+            if (customColumnIndex == NUM_OF_COLUMNS) {
+                customColumnIndex = 0;
+                customRowIndex++;
+            }
+        }
+        for (int i = 0; i < numEmpty; i++) {
+            ColorSquare emptySquare = new ColorSquare();
+            customColorGrid.add(emptySquare, customColumnIndex, customRowIndex);
+            customColumnIndex++;
+        }
+        customColorRows = customRowIndex + 1;
+        requestLayout();
+
+    }
+    
+    private void initNavigation() {
+        setOnKeyPressed(ke -> {
+            switch (ke.getCode()) {
+                case SPACE:
+                case ENTER:
+                    processSelectKey(ke);
+                    ke.consume();
+                    break;
+                default: // no-op
+            }
+        });
+
+        setImpl_traversalEngine(new ParentTraversalEngine(this, new Algorithm() {
+            @Override
+            public Node select(Node owner, Direction dir, TraversalContext context) {
+                final Node subsequentNode = context.selectInSubtree(context.getRoot(), owner, dir);
+                switch (dir) {
+                    case NEXT:
+                    case NEXT_IN_LINE:
+                    case PREVIOUS:
+                        return subsequentNode;
+                    // Here, we need to intercept the standard algorithm in a few cases to get the desired traversal
+                    // For right or left direction we want to continue on the next or previous row respectively
+                    // For up and down, the custom color panel might be skipped by the standard algorithm (if not wide enough
+                    // to be between the current color and custom color button), so we need to include it in the path explicitly.
+                    case LEFT:
+                    case RIGHT:
+                    case UP:
+                    case DOWN:
+                        if (owner instanceof ColorSquare) {
+                            Node result =  processArrow((ColorSquare)owner, dir);
+                            return result != null ? result : subsequentNode;
+                        } else {
+                            return subsequentNode;
+                        }
+                }
+                return null;
+            }
+
+            private Node processArrow(ColorSquare owner, Direction dir) {
+                final int row = owner.index / NUM_OF_COLUMNS;
+                final int column = owner.index % NUM_OF_COLUMNS;
+
+                // Adjust the direction according to color picker orientation
+                dir = dir.getDirectionForNodeOrientation(colorPicker.getEffectiveNodeOrientation());
+                // This returns true for all the cases which we need to override
+                if (isAtBorder(dir, row, column, owner.isCustom)) {
+                    // There's no other node in the direction from the square, so we need to continue on some other row
+                    // or cycle
+                    int subsequentRow = row;
+                    int subsequentColumn = column;
+                    boolean subSequentSquareCustom = owner.isCustom;
+                    switch (dir) {
+                        case LEFT:
+                        case RIGHT:
+                            // The next row is either the first or the last, except when cycling in custom colors, the last row
+                            // might have different number of columns
+                            if (owner.isCustom) {
+                                subsequentRow = Math.floorMod(dir == Direction.LEFT ? row - 1 : row + 1, customColorRows);
+                                subsequentColumn = dir == Direction.LEFT ? subsequentRow == customColorRows - 1 ?
+                                        customColorLastRowLength - 1 : NUM_OF_COLUMNS - 1 : 0;
+                            } else {
+                                subsequentRow = Math.floorMod(dir == Direction.LEFT ? row - 1 : row + 1, NUM_OF_ROWS);
+                                subsequentColumn = dir == Direction.LEFT ? NUM_OF_COLUMNS - 1 : 0;
+                            }
+                            break;
+                        case UP: // custom color are not handled here
+                            subsequentRow = NUM_OF_ROWS - 1;
+                            break;
+                        case DOWN: // custom color are not handled here
+                            if (customColorNumber > 0) {
+                                subSequentSquareCustom = true;
+                                subsequentRow = 0;
+                                subsequentColumn = customColorRows > 1 ? column : Math.min(customColorLastRowLength - 1, column);
+                                break;
+                            } else {
+                                return null; // Let the default algorith handle this
+                            }
+
+                    }
+                    if (subSequentSquareCustom) {
+                        return customColorGrid.getChildren().get(subsequentRow * NUM_OF_COLUMNS + subsequentColumn);
+                    } else {
+                        return colorPickerGrid.getChildren().get(subsequentRow * NUM_OF_COLUMNS + subsequentColumn);
+                    }
+                }
+                return null;
+            }
+
+            private boolean isAtBorder(Direction dir, int row, int column, boolean custom) {
+                switch (dir) {
+                    case LEFT:
+                        return column == 0;
+                    case RIGHT:
+                        return custom && row == customColorRows - 1 ?
+                                column == customColorLastRowLength - 1 : column == NUM_OF_COLUMNS - 1;
+                    case UP:
+                        return !custom && row == 0;
+                    case DOWN:
+                        return !custom && row == NUM_OF_ROWS - 1;
+                }
+                return false;
+            }
+
+            @Override
+            public Node selectFirst(TraversalContext context) {
+                return colorPickerGrid.getChildren().get(0);
+            }
+
+            @Override
+            public Node selectLast(TraversalContext context) {
+                return customColorLink;
+            }
+        }));
+    }
+
+    private void processSelectKey(KeyEvent ke) {
+        if (focusedSquare != null) focusedSquare.selectColor(ke);
+    }
+    
+    public void setPopupControl(PopupControl pc) {
+        this.popupControl = pc;
+    }
+    
+    public ColorPickerGrid getColorGrid() {
+        return colorPickerGrid;
+    }
+
+    public boolean isCustomColorDialogShowing() {
+        if (customColorDialog != null) return customColorDialog.isVisible();
+        return false;
+    }
+
+    class ColorSquare extends StackPane {
+        Rectangle rectangle;
+        int index;
+        boolean isEmpty;
+        boolean isCustom;
+
+        public ColorSquare() {
+            this(null, -1, false);
+        }
+
+        public ColorSquare(Color color, int index) {
+            this(color, index, false);
+        }
+
+        public ColorSquare(Color color, int index, boolean isCustom) {
+            // Add style class to handle selected color square
+            getStyleClass().add("color-square");
+            if (color != null) {
+                setFocusTraversable(true);
+
+                focusedProperty().addListener((s, ov, nv) -> {
+                    setFocusedSquare(nv ? this : null);
+                });
+
+                addEventHandler(MouseEvent.MOUSE_ENTERED, event -> {
+                    setFocusedSquare(ColorSquare.this);
+                });
+                addEventHandler(MouseEvent.MOUSE_EXITED, event -> {
+                    setFocusedSquare(null);
+                });
+
+                addEventHandler(MouseEvent.MOUSE_RELEASED, event -> {
+                    if (!dragDetected && event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 1) {
+                        if (!isEmpty) {
+                            Color fill = (Color) rectangle.getFill();
+                            colorPicker.setValue(fill);
+                            colorPicker.fireEvent(new ActionEvent());
+                            updateSelection(fill);
+                            event.consume();
+                        }
+                        colorPicker.hide();
+                    } else if (event.getButton() == MouseButton.SECONDARY ||
+                            event.getButton() == MouseButton.MIDDLE) {
+                        if (isCustom && contextMenu != null) {
+                            if (!contextMenu.isShowing()) {
+                                contextMenu.show(ColorSquare.this, Side.RIGHT, 0, 0);
+                                Utils.addMnemonics(contextMenu, ColorSquare.this.getScene(), colorPicker.impl_isShowMnemonics());
+                            } else {
+                                contextMenu.hide();
+                                Utils.removeMnemonics(contextMenu, ColorSquare.this.getScene());
+                            }
+                        }
+                    }
+                });
+            }
+            this.index = index;
+            this.isCustom = isCustom;
+            rectangle = new Rectangle(SQUARE_SIZE, SQUARE_SIZE);
+            if (color == null) {
+                rectangle.setFill(Color.WHITE);
+                isEmpty = true;
+            } else {
+                rectangle.setFill(color);
+            }
+
+            rectangle.setStrokeType(StrokeType.INSIDE);
+
+            String tooltipStr = ColorPickerSkin.tooltipString(color);
+            Tooltip.install(this, new Tooltip((tooltipStr == null) ? "" : tooltipStr));
+          
+            rectangle.getStyleClass().add("color-rect");
+
+            getChildren().add(rectangle);
+        }
+        
+        public void selectColor(KeyEvent event) {
+            if (rectangle.getFill() != null) {
+                if (rectangle.getFill() instanceof Color) {
+                    colorPicker.setValue((Color) rectangle.getFill());
+                    colorPicker.fireEvent(new ActionEvent());
+                }
+                event.consume();
+            }
+            colorPicker.hide();
+        }
+    }
+    
+    // The skin can update selection if colorpicker value changes..
+    public void updateSelection(Color color) {
+        setFocusedSquare(null);
+
+        for (ColorSquare c : colorPickerGrid.getSquares()) {
+            if (c.rectangle.getFill().equals(color)) {
+                setFocusedSquare(c);
+                return;
+            }
+        }
+        // check custom colors
+        for (Node n : customColorGrid.getChildren()) {
+            ColorSquare c = (ColorSquare) n;
+            if (c.rectangle.getFill().equals(color)) {
+                setFocusedSquare(c);
+                return;
+            }
+        }
+    }
+    
+    class ColorPickerGrid extends GridPane {
+
+        private final List<ColorSquare> squares;
+
+        public ColorPickerGrid() {
+            getStyleClass().add("color-picker-grid");
+            setId("ColorCustomizerColorGrid");
+            int columnIndex = 0, rowIndex = 0;
+            squares = FXCollections.observableArrayList();
+            final int numColors = RAW_VALUES.length / 3;
+            Color[] colors = new Color[numColors];
+            for (int i = 0; i < numColors; i++) {
+                colors[i] = new Color(RAW_VALUES[(i * 3)] / 255,
+                        RAW_VALUES[(i * 3) + 1] / 255, RAW_VALUES[(i * 3) + 2] / 255,
+                        1.0);
+                ColorSquare cs = new ColorSquare(colors[i], i);
+                squares.add(cs);
+            }
+
+            for (ColorSquare square : squares) {
+                add(square, columnIndex, rowIndex);
+                columnIndex++;
+                if (columnIndex == NUM_OF_COLUMNS) {
+                    columnIndex = 0;
+                    rowIndex++;
+                }
+            }
+            setOnMouseDragged(t -> {
+                if (!dragDetected) {
+                    dragDetected = true;
+                    mouseDragColor = colorPicker.getValue();
+                }
+                int xIndex = com.sun.javafx.util.Utils.clamp(0,
+                        (int)t.getX()/(SQUARE_SIZE + 1), NUM_OF_COLUMNS - 1);
+                int yIndex = com.sun.javafx.util.Utils.clamp(0,
+                        (int)t.getY()/(SQUARE_SIZE + 1), NUM_OF_ROWS - 1);
+                int index = xIndex + yIndex*NUM_OF_COLUMNS;
+                colorPicker.setValue((Color) squares.get(index).rectangle.getFill());
+                updateSelection(colorPicker.getValue());
+            });
+            addEventHandler(MouseEvent.MOUSE_RELEASED, t -> {
+                if(colorPickerGrid.getBoundsInLocal().contains(t.getX(), t.getY())) {
+                    updateSelection(colorPicker.getValue());
+                    colorPicker.fireEvent(new ActionEvent());
+                    colorPicker.hide();
+                } else {
+                    // restore color as mouse release happened outside the grid.
+                    if (mouseDragColor != null) {
+                        colorPicker.setValue(mouseDragColor);
+                        updateSelection(mouseDragColor);
+                    }
+                }
+                dragDetected = false;
+            });
+        }
+        
+        public List<ColorSquare> getSquares() {
+            return squares;
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            return (SQUARE_SIZE + 1)*NUM_OF_COLUMNS;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            return (SQUARE_SIZE + 1)*NUM_OF_ROWS;
+        }
+    }
+
+    private static final int NUM_OF_COLUMNS = 12;
+    private static double[] RAW_VALUES = {
+            // WARNING: always make sure the number of colors is a divisable by NUM_OF_COLUMNS
+            255, 255, 255, // first row
+            242, 242, 242,
+            230, 230, 230,
+            204, 204, 204,
+            179, 179, 179,
+            153, 153, 153,
+            128, 128, 128,
+            102, 102, 102,
+            77, 77, 77,
+            51, 51, 51,
+            26, 26, 26,
+            0, 0, 0,
+            0, 51, 51, // second row
+            0, 26, 128,
+            26, 0, 104,
+            51, 0, 51,
+            77, 0, 26,
+            153, 0, 0,
+            153, 51, 0,
+            153, 77, 0,
+            153, 102, 0,
+            153, 153, 0,
+            102, 102, 0,
+            0, 51, 0,
+            26, 77, 77, // third row
+            26, 51, 153,
+            51, 26, 128,
+            77, 26, 77,
+            102, 26, 51,
+            179, 26, 26,
+            179, 77, 26,
+            179, 102, 26,
+            179, 128, 26,
+            179, 179, 26,
+            128, 128, 26,
+            26, 77, 26,
+            51, 102, 102, // fourth row
+            51, 77, 179,
+            77, 51, 153,
+            102, 51, 102,
+            128, 51, 77,
+            204, 51, 51,
+            204, 102, 51,
+            204, 128, 51,
+            204, 153, 51,
+            204, 204, 51,
+            153, 153, 51,
+            51, 102, 51,
+            77, 128, 128, // fifth row
+            77, 102, 204,
+            102, 77, 179,
+            128, 77, 128,
+            153, 77, 102,
+            230, 77, 77,
+            230, 128, 77,
+            230, 153, 77,
+            230, 179, 77,
+            230, 230, 77,
+            179, 179, 77,
+            77, 128, 77,
+            102, 153, 153, // sixth row
+            102, 128, 230,
+            128, 102, 204,
+            153, 102, 153,
+            179, 102, 128,
+            255, 102, 102,
+            255, 153, 102,
+            255, 179, 102,
+            255, 204, 102,
+            255, 255, 77,
+            204, 204, 102,
+            102, 153, 102,
+            128, 179, 179, // seventh row
+            128, 153, 255,
+            153, 128, 230,
+            179, 128, 179,
+            204, 128, 153,
+            255, 128, 128,
+            255, 153, 128,
+            255, 204, 128,
+            255, 230, 102,
+            255, 255, 102,
+            230, 230, 128,
+            128, 179, 128,
+            153, 204, 204, // eigth row
+            153, 179, 255,
+            179, 153, 255,
+            204, 153, 204,
+            230, 153, 179,
+            255, 153, 153,
+            255, 179, 128,
+            255, 204, 153,
+            255, 230, 128,
+            255, 255, 128,
+            230, 230, 153,
+            153, 204, 153,
+            179, 230, 230, // ninth row
+            179, 204, 255,
+            204, 179, 255,
+            230, 179, 230,
+            230, 179, 204,
+            255, 179, 179,
+            255, 179, 153,
+            255, 230, 179,
+            255, 230, 153,
+            255, 255, 153,
+            230, 230, 179,
+            179, 230, 179,
+            204, 255, 255, // tenth row
+            204, 230, 255,
+            230, 204, 255,
+            255, 204, 255,
+            255, 204, 230,
+            255, 204, 204,
+            255, 204, 179,
+            255, 230, 204,
+            255, 255, 179,
+            255, 255, 204,
+            230, 230, 204,
+            204, 255, 204
+    };
+
+    private static final int NUM_OF_COLORS = RAW_VALUES.length / 3;
+    private static final int NUM_OF_ROWS = NUM_OF_COLORS / NUM_OF_COLUMNS;
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ColorPickerSkin.java	2015-09-03 15:18:26.120261000 -0700
+++ /dev/null	2015-09-03 15:18:27.000000000 -0700
@@ -1,672 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 com.sun.javafx.css.StyleManager;
-
-import javafx.beans.property.StringProperty;
-import javafx.css.StyleOrigin;
-import javafx.css.StyleableBooleanProperty;
-import javafx.css.CssMetaData;
-
-import com.sun.javafx.css.converters.BooleanConverter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableStringProperty;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.scene.control.behavior.ColorPickerBehavior;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javafx.scene.control.ColorPicker;
-import javafx.scene.control.TextField;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.value.WritableValue;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Label;
-import javafx.scene.paint.Color;
-
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
-
-import static javafx.scene.paint.Color.*;
-
-/**
- *
- */
-public class ColorPickerSkin extends ComboBoxPopupControl<Color> {
-
-    private Label displayNode; 
-    private StackPane pickerColorBox;
-    private Rectangle colorRect; 
-    private ColorPalette popupContent;
-    BooleanProperty colorLabelVisible = new StyleableBooleanProperty(true) {
-        @Override public void invalidated() {
-            if (displayNode != null) {
-                if (colorLabelVisible.get()) {
-                    displayNode.setText(colorDisplayName(((ColorPicker)getSkinnable()).getValue()));
-                } else {
-                    displayNode.setText("");
-                }
-            }
-        }
-        @Override public Object getBean() {
-            return ColorPickerSkin.this;
-        }
-        @Override public String getName() {
-            return "colorLabelVisible";
-        }
-        @Override public CssMetaData<ColorPicker,Boolean> getCssMetaData() {
-            return StyleableProperties.COLOR_LABEL_VISIBLE;
-        }
-    };
-    public StringProperty imageUrlProperty() { return imageUrl; }
-    private final StyleableStringProperty imageUrl = new StyleableStringProperty() {
-        @Override public void applyStyle(StyleOrigin origin, String v) {
-            super.applyStyle(origin, v);
-            if (v == null) {
-                // remove old image view
-                if (pickerColorBox.getChildren().size() == 2) pickerColorBox.getChildren().remove(1);
-            } else {
-                if (pickerColorBox.getChildren().size() == 2) {
-                    ImageView imageView = (ImageView)pickerColorBox.getChildren().get(1);
-                    imageView.setImage(StyleManager.getInstance().getCachedImage(v));
-                } else {
-                    pickerColorBox.getChildren().add(new ImageView(StyleManager.getInstance().getCachedImage(v)));
-                }
-            }
-        }
-        @Override public Object getBean() {
-            return ColorPickerSkin.this;
-        }
-        @Override public String getName() {
-            return "imageUrl";
-        }
-        @Override public CssMetaData<ColorPicker,String> getCssMetaData() {
-            return StyleableProperties.GRAPHIC;
-        }
-    };
-    private final StyleableDoubleProperty colorRectWidth =  new StyleableDoubleProperty(12) {
-        @Override protected void invalidated() {
-            if(pickerColorBox!=null) pickerColorBox.requestLayout();
-        }
-        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
-            return StyleableProperties.COLOR_RECT_WIDTH;
-        }
-        @Override public Object getBean() {
-            return ColorPickerSkin.this;
-        }
-        @Override public String getName() {
-            return "colorRectWidth";
-        }
-    };
-    private final StyleableDoubleProperty colorRectHeight =  new StyleableDoubleProperty(12) {
-        @Override protected void invalidated() {
-            if(pickerColorBox!=null) pickerColorBox.requestLayout();
-        }
-        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
-            return StyleableProperties.COLOR_RECT_HEIGHT;
-        }
-        @Override public Object getBean() {
-            return ColorPickerSkin.this;
-        }
-        @Override public String getName() {
-            return "colorRectHeight";
-        }
-    };
-    private final StyleableDoubleProperty colorRectX =  new StyleableDoubleProperty(0) {
-        @Override protected void invalidated() {
-            if(pickerColorBox!=null) pickerColorBox.requestLayout();
-        }
-        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
-            return StyleableProperties.COLOR_RECT_X;
-        }
-        @Override public Object getBean() {
-            return ColorPickerSkin.this;
-        }
-        @Override public String getName() {
-            return "colorRectX";
-        }
-    };
-    private final StyleableDoubleProperty colorRectY =  new StyleableDoubleProperty(0) {
-        @Override protected void invalidated() {
-            if(pickerColorBox!=null) pickerColorBox.requestLayout();
-        }
-        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
-            return StyleableProperties.COLOR_RECT_Y;
-        }
-        @Override public Object getBean() {
-            return ColorPickerSkin.this;
-        }
-        @Override public String getName() {
-            return "colorRectY";
-        }
-    };
-
-    public ColorPickerSkin(final ColorPicker colorPicker) {
-        super(colorPicker, new ColorPickerBehavior(colorPicker));
-        updateComboBoxMode();
-        registerChangeListener(colorPicker.valueProperty(), "VALUE");
-
-        // create displayNode
-        displayNode = new Label();
-        displayNode.getStyleClass().add("color-picker-label");
-        displayNode.setManaged(false);
-
-        // label graphic
-        pickerColorBox = new PickerColorBox();
-        pickerColorBox.getStyleClass().add("picker-color");
-        colorRect = new Rectangle(12, 12);
-        colorRect.getStyleClass().add("picker-color-rect");
-
-        updateColor();
-
-        pickerColorBox.getChildren().add(colorRect);
-        displayNode.setGraphic(pickerColorBox);
-    }
-
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (!colorLabelVisible.get()) {
-            return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-        }
-        String displayNodeText = displayNode.getText();
-        double width = 0;
-        for (String name : colorNameMap.values()) {
-            displayNode.setText(name);
-            width = Math.max(width, super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset));
-        }
-        displayNode.setText(formatHexString(Color.BLACK)); // #000000
-        width = Math.max(width, super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset));
-        displayNode.setText(displayNodeText);
-        return width;
-    }
-
-    private void updateComboBoxMode() {
-        List<String> styleClass = getSkinnable().getStyleClass();
-        if (styleClass.contains(ColorPicker.STYLE_CLASS_BUTTON)) {
-            setMode(ComboBoxMode.BUTTON);
-        } else if (styleClass.contains(ColorPicker.STYLE_CLASS_SPLIT_BUTTON)) {
-            setMode(ComboBoxMode.SPLITBUTTON);
-        }
-    }
-
-    private static final Map<Color, String> colorNameMap = new HashMap<Color, String>(24);
-    private static final Map<Color, String> cssNameMap = new HashMap<Color, String>(139);
-    static {
-        // Translatable display names for the most common colors
-        colorNameMap.put(TRANSPARENT, getString("colorName.transparent"));
-        colorNameMap.put(BLACK,       getString("colorName.black"));
-        colorNameMap.put(BLUE,        getString("colorName.blue"));
-        colorNameMap.put(CYAN,        getString("colorName.cyan"));
-        colorNameMap.put(DARKBLUE,    getString("colorName.darkblue"));
-        colorNameMap.put(DARKCYAN,    getString("colorName.darkcyan"));
-        colorNameMap.put(DARKGRAY,    getString("colorName.darkgray"));
-        colorNameMap.put(DARKGREEN,   getString("colorName.darkgreen"));
-        colorNameMap.put(DARKMAGENTA, getString("colorName.darkmagenta"));
-        colorNameMap.put(DARKRED,     getString("colorName.darkred"));
-        colorNameMap.put(GRAY,        getString("colorName.gray"));
-        colorNameMap.put(GREEN,       getString("colorName.green"));
-        colorNameMap.put(LIGHTBLUE,   getString("colorName.lightblue"));
-        colorNameMap.put(LIGHTCYAN,   getString("colorName.lightcyan"));
-        colorNameMap.put(LIGHTGRAY,   getString("colorName.lightgray"));
-        colorNameMap.put(LIGHTGREEN,  getString("colorName.lightgreen"));
-        colorNameMap.put(LIGHTYELLOW, getString("colorName.lightyellow"));
-        colorNameMap.put(MAGENTA,     getString("colorName.magenta"));
-        colorNameMap.put(MEDIUMBLUE,  getString("colorName.mediumblue"));
-        colorNameMap.put(ORANGE,      getString("colorName.orange"));
-        colorNameMap.put(PINK,        getString("colorName.pink"));
-        colorNameMap.put(RED,         getString("colorName.red"));
-        colorNameMap.put(WHITE,       getString("colorName.white"));
-        colorNameMap.put(YELLOW,      getString("colorName.yellow"));
-
-        // CSS names.
-        // Note that synonyms (such as "grey") have been removed here,
-        // since a color can be presented with only one name in this
-        // skin. If a reverse map is created for parsing names in the
-        // future, then the synonyms should be included there. For a
-        // full list of CSS names, see Color.java.
-        cssNameMap.put(ALICEBLUE,            "aliceblue");
-        cssNameMap.put(ANTIQUEWHITE,         "antiquewhite");
-        cssNameMap.put(AQUAMARINE,           "aquamarine");
-        cssNameMap.put(AZURE,                "azure");
-        cssNameMap.put(BEIGE,                "beige");
-        cssNameMap.put(BISQUE,               "bisque");
-        cssNameMap.put(BLACK,                "black");
-        cssNameMap.put(BLANCHEDALMOND,       "blanchedalmond");
-        cssNameMap.put(BLUE,                 "blue");
-        cssNameMap.put(BLUEVIOLET,           "blueviolet");
-        cssNameMap.put(BROWN,                "brown");
-        cssNameMap.put(BURLYWOOD,            "burlywood");
-        cssNameMap.put(CADETBLUE,            "cadetblue");
-        cssNameMap.put(CHARTREUSE,           "chartreuse");
-        cssNameMap.put(CHOCOLATE,            "chocolate");
-        cssNameMap.put(CORAL,                "coral");
-        cssNameMap.put(CORNFLOWERBLUE,       "cornflowerblue");
-        cssNameMap.put(CORNSILK,             "cornsilk");
-        cssNameMap.put(CRIMSON,              "crimson");
-        cssNameMap.put(CYAN,                 "cyan");
-        cssNameMap.put(DARKBLUE,             "darkblue");
-        cssNameMap.put(DARKCYAN,             "darkcyan");
-        cssNameMap.put(DARKGOLDENROD,        "darkgoldenrod");
-        cssNameMap.put(DARKGRAY,             "darkgray");
-        cssNameMap.put(DARKGREEN,            "darkgreen");
-        cssNameMap.put(DARKKHAKI,            "darkkhaki");
-        cssNameMap.put(DARKMAGENTA,          "darkmagenta");
-        cssNameMap.put(DARKOLIVEGREEN,       "darkolivegreen");
-        cssNameMap.put(DARKORANGE,           "darkorange");
-        cssNameMap.put(DARKORCHID,           "darkorchid");
-        cssNameMap.put(DARKRED,              "darkred");
-        cssNameMap.put(DARKSALMON,           "darksalmon");
-        cssNameMap.put(DARKSEAGREEN,         "darkseagreen");
-        cssNameMap.put(DARKSLATEBLUE,        "darkslateblue");
-        cssNameMap.put(DARKSLATEGRAY,        "darkslategray");
-        cssNameMap.put(DARKTURQUOISE,        "darkturquoise");
-        cssNameMap.put(DARKVIOLET,           "darkviolet");
-        cssNameMap.put(DEEPPINK,             "deeppink");
-        cssNameMap.put(DEEPSKYBLUE,          "deepskyblue");
-        cssNameMap.put(DIMGRAY,              "dimgray");
-        cssNameMap.put(DODGERBLUE,           "dodgerblue");
-        cssNameMap.put(FIREBRICK,            "firebrick");
-        cssNameMap.put(FLORALWHITE,          "floralwhite");
-        cssNameMap.put(FORESTGREEN,          "forestgreen");
-        cssNameMap.put(GAINSBORO,            "gainsboro");
-        cssNameMap.put(GHOSTWHITE,           "ghostwhite");
-        cssNameMap.put(GOLD,                 "gold");
-        cssNameMap.put(GOLDENROD,            "goldenrod");
-        cssNameMap.put(GRAY,                 "gray");
-        cssNameMap.put(GREEN,                "green");
-        cssNameMap.put(GREENYELLOW,          "greenyellow");
-        cssNameMap.put(HONEYDEW,             "honeydew");
-        cssNameMap.put(HOTPINK,              "hotpink");
-        cssNameMap.put(INDIANRED,            "indianred");
-        cssNameMap.put(INDIGO,               "indigo");
-        cssNameMap.put(IVORY,                "ivory");
-        cssNameMap.put(KHAKI,                "khaki");
-        cssNameMap.put(LAVENDER,             "lavender");
-        cssNameMap.put(LAVENDERBLUSH,        "lavenderblush");
-        cssNameMap.put(LAWNGREEN,            "lawngreen");
-        cssNameMap.put(LEMONCHIFFON,         "lemonchiffon");
-        cssNameMap.put(LIGHTBLUE,            "lightblue");
-        cssNameMap.put(LIGHTCORAL,           "lightcoral");
-        cssNameMap.put(LIGHTCYAN,            "lightcyan");
-        cssNameMap.put(LIGHTGOLDENRODYELLOW, "lightgoldenrodyellow");
-        cssNameMap.put(LIGHTGRAY,            "lightgray");
-        cssNameMap.put(LIGHTGREEN,           "lightgreen");
-        cssNameMap.put(LIGHTPINK,            "lightpink");
-        cssNameMap.put(LIGHTSALMON,          "lightsalmon");
-        cssNameMap.put(LIGHTSEAGREEN,        "lightseagreen");
-        cssNameMap.put(LIGHTSKYBLUE,         "lightskyblue");
-        cssNameMap.put(LIGHTSLATEGRAY,       "lightslategray");
-        cssNameMap.put(LIGHTSTEELBLUE,       "lightsteelblue");
-        cssNameMap.put(LIGHTYELLOW,          "lightyellow");
-        cssNameMap.put(LIME,                 "lime");
-        cssNameMap.put(LIMEGREEN,            "limegreen");
-        cssNameMap.put(LINEN,                "linen");
-        cssNameMap.put(MAGENTA,              "magenta");
-        cssNameMap.put(MAROON,               "maroon");
-        cssNameMap.put(MEDIUMAQUAMARINE,     "mediumaquamarine");
-        cssNameMap.put(MEDIUMBLUE,           "mediumblue");
-        cssNameMap.put(MEDIUMORCHID,         "mediumorchid");
-        cssNameMap.put(MEDIUMPURPLE,         "mediumpurple");
-        cssNameMap.put(MEDIUMSEAGREEN,       "mediumseagreen");
-        cssNameMap.put(MEDIUMSLATEBLUE,      "mediumslateblue");
-        cssNameMap.put(MEDIUMSPRINGGREEN,    "mediumspringgreen");
-        cssNameMap.put(MEDIUMTURQUOISE,      "mediumturquoise");
-        cssNameMap.put(MEDIUMVIOLETRED,      "mediumvioletred");
-        cssNameMap.put(MIDNIGHTBLUE,         "midnightblue");
-        cssNameMap.put(MINTCREAM,            "mintcream");
-        cssNameMap.put(MISTYROSE,            "mistyrose");
-        cssNameMap.put(MOCCASIN,             "moccasin");
-        cssNameMap.put(NAVAJOWHITE,          "navajowhite");
-        cssNameMap.put(NAVY,                 "navy");
-        cssNameMap.put(OLDLACE,              "oldlace");
-        cssNameMap.put(OLIVE,                "olive");
-        cssNameMap.put(OLIVEDRAB,            "olivedrab");
-        cssNameMap.put(ORANGE,               "orange");
-        cssNameMap.put(ORANGERED,            "orangered");
-        cssNameMap.put(ORCHID,               "orchid");
-        cssNameMap.put(PALEGOLDENROD,        "palegoldenrod");
-        cssNameMap.put(PALEGREEN,            "palegreen");
-        cssNameMap.put(PALETURQUOISE,        "paleturquoise");
-        cssNameMap.put(PALEVIOLETRED,        "palevioletred");
-        cssNameMap.put(PAPAYAWHIP,           "papayawhip");
-        cssNameMap.put(PEACHPUFF,            "peachpuff");
-        cssNameMap.put(PERU,                 "peru");
-        cssNameMap.put(PINK,                 "pink");
-        cssNameMap.put(PLUM,                 "plum");
-        cssNameMap.put(POWDERBLUE,           "powderblue");
-        cssNameMap.put(PURPLE,               "purple");
-        cssNameMap.put(RED,                  "red");
-        cssNameMap.put(ROSYBROWN,            "rosybrown");
-        cssNameMap.put(ROYALBLUE,            "royalblue");
-        cssNameMap.put(SADDLEBROWN,          "saddlebrown");
-        cssNameMap.put(SALMON,               "salmon");
-        cssNameMap.put(SANDYBROWN,           "sandybrown");
-        cssNameMap.put(SEAGREEN,             "seagreen");
-        cssNameMap.put(SEASHELL,             "seashell");
-        cssNameMap.put(SIENNA,               "sienna");
-        cssNameMap.put(SILVER,               "silver");
-        cssNameMap.put(SKYBLUE,              "skyblue");
-        cssNameMap.put(SLATEBLUE,            "slateblue");
-        cssNameMap.put(SLATEGRAY,            "slategray");
-        cssNameMap.put(SNOW,                 "snow");
-        cssNameMap.put(SPRINGGREEN,          "springgreen");
-        cssNameMap.put(STEELBLUE,            "steelblue");
-        cssNameMap.put(TAN,                  "tan");
-        cssNameMap.put(TEAL,                 "teal");
-        cssNameMap.put(THISTLE,              "thistle");
-        cssNameMap.put(TOMATO,               "tomato");
-        cssNameMap.put(TRANSPARENT,          "transparent");
-        cssNameMap.put(TURQUOISE,            "turquoise");
-        cssNameMap.put(VIOLET,               "violet");
-        cssNameMap.put(WHEAT,                "wheat");
-        cssNameMap.put(WHITE,                "white");
-        cssNameMap.put(WHITESMOKE,           "whitesmoke");
-        cssNameMap.put(YELLOW,               "yellow");
-        cssNameMap.put(YELLOWGREEN,          "yellowgreen");
-    }
-
-    static String colorDisplayName(Color c) {
-        if (c != null) {
-            String displayName = colorNameMap.get(c);
-            if (displayName == null) {
-                displayName = formatHexString(c);
-            }
-            return displayName;
-        } else {
-            return null;
-        }
-    }
-
-    static String tooltipString(Color c) {
-        if (c != null) {
-            String tooltipStr = "";
-            String displayName = colorNameMap.get(c);
-            if (displayName != null) {
-                tooltipStr += displayName + " ";
-            }
-
-            tooltipStr += formatHexString(c);
-
-            String cssName = cssNameMap.get(c);
-            if (cssName != null) {
-                tooltipStr += " (css: " + cssName + ")";
-            }
-            return tooltipStr;
-        } else {
-            return null;
-        }
-    }
-
-    static String formatHexString(Color c) {
-        if (c != null) {
-            return String.format((Locale) null, "#%02x%02x%02x",
-                                 Math.round(c.getRed() * 255),
-                                 Math.round(c.getGreen() * 255),
-                                 Math.round(c.getBlue() * 255));
-        } else {
-            return null;
-        }
-    }
-
-    @Override protected Node getPopupContent() {
-        if (popupContent == null) {
-//            popupContent = new ColorPalette(colorPicker.getValue(), colorPicker);
-            popupContent = new ColorPalette((ColorPicker)getSkinnable());
-            popupContent.setPopupControl(getPopup());
-        }
-       return popupContent;
-    }
-    
-    @Override protected void focusLost() {
-        // do nothing
-    }
-    
-    @Override public void show() {
-        super.show();
-        final ColorPicker colorPicker = (ColorPicker)getSkinnable();
-        popupContent.updateSelection(colorPicker.getValue());
-    }
-    
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-    
-        if ("SHOWING".equals(p)) {
-            if (getSkinnable().isShowing()) {
-                show();
-            } else {
-                if (!popupContent.isCustomColorDialogShowing()) hide();
-            }
-        } else if ("VALUE".equals(p)) {
-            updateColor();
-           // Change the current selected color in the grid if ColorPicker value changes
-            if (popupContent != null) {
-//                popupContent.updateSelection(getSkinnable().getValue());
-            }
-        }
-    }
-    @Override public Node getDisplayNode() {
-        return displayNode;
-    }
-    
-    private void updateColor() {
-        final ColorPicker colorPicker = (ColorPicker)getSkinnable();
-        colorRect.setFill(colorPicker.getValue());
-        if (colorLabelVisible.get()) {
-            displayNode.setText(colorDisplayName(colorPicker.getValue()));
-        } else {
-            displayNode.setText("");
-        }
-    }
-    public void syncWithAutoUpdate() {
-        if (!getPopup().isShowing() && getSkinnable().isShowing()) {
-            // Popup was dismissed. Maybe user clicked outside or typed ESCAPE.
-            // Make sure ColorPicker button is in sync.
-            getSkinnable().hide();
-        }
-    }
-    
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        updateComboBoxMode();
-        super.layoutChildren(x,y,w,h);
-    }
-
-    static String getString(String key) {
-        return ControlResources.getString("ColorPicker."+key);
-    }
-
-    /***************************************************************************
-    *                                                                         *
-    *                         picker-color-cell                               *
-    *                                                                         *
-    **************************************************************************/
-
-    private class PickerColorBox extends StackPane {
-        @Override protected void layoutChildren() {
-            final double top = snappedTopInset();
-            final double left = snappedLeftInset();
-            final double width = getWidth();
-            final double height = getHeight();
-            final double right = snappedRightInset();
-            final double bottom = snappedBottomInset();
-            colorRect.setX(snapPosition(colorRectX.get()));
-            colorRect.setY(snapPosition(colorRectY.get()));
-            colorRect.setWidth(snapSize(colorRectWidth.get()));
-            colorRect.setHeight(snapSize(colorRectHeight.get()));
-            if (getChildren().size() == 2) {
-                final ImageView icon = (ImageView) getChildren().get(1);
-                Pos childAlignment = StackPane.getAlignment(icon);
-                layoutInArea(icon, left, top,
-                             width - left - right, height - top - bottom,
-                             0, getMargin(icon),
-                             childAlignment != null? childAlignment.getHpos() : getAlignment().getHpos(),
-                             childAlignment != null? childAlignment.getVpos() : getAlignment().getVpos());
-                colorRect.setLayoutX(icon.getLayoutX());
-                colorRect.setLayoutY(icon.getLayoutY());
-            } else {
-                Pos childAlignment = StackPane.getAlignment(colorRect);
-                layoutInArea(colorRect, left, top,
-                             width - left - right, height - top - bottom,
-                             0, getMargin(colorRect),
-                             childAlignment != null? childAlignment.getHpos() : getAlignment().getHpos(),
-                             childAlignment != null? childAlignment.getVpos() : getAlignment().getVpos());
-            }
-        }
-    }
-
-    /***************************************************************************
-    *                                                                         *
-    *                         Stylesheet Handling                             *
-    *                                                                         *
-    **************************************************************************/
-
-     private static class StyleableProperties {
-        private static final CssMetaData<ColorPicker,Boolean> COLOR_LABEL_VISIBLE = 
-                new CssMetaData<ColorPicker,Boolean>("-fx-color-label-visible",
-                BooleanConverter.getInstance(), Boolean.TRUE) {
-
-            @Override public boolean isSettable(ColorPicker n) {
-                final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                return skin.colorLabelVisible == null || !skin.colorLabelVisible.isBound();
-            }
-            
-            @Override public StyleableProperty<Boolean> getStyleableProperty(ColorPicker n) {
-                final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.colorLabelVisible;
-            }
-        };
-        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_WIDTH =
-                new CssMetaData<ColorPicker,Number>("-fx-color-rect-width", SizeConverter.getInstance(), 12d) {
-                    @Override public boolean isSettable(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return !skin.colorRectWidth.isBound();
-                    }
-                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return skin.colorRectWidth;
-                    }
-                };
-        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_HEIGHT =
-                new CssMetaData<ColorPicker,Number>("-fx-color-rect-height", SizeConverter.getInstance(), 12d) {
-                    @Override public boolean isSettable(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return !skin.colorRectHeight.isBound();
-                    }
-                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return skin.colorRectHeight;
-                    }
-                };
-        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_X =
-                new CssMetaData<ColorPicker,Number>("-fx-color-rect-x", SizeConverter.getInstance(), 0) {
-                    @Override public boolean isSettable(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return !skin.colorRectX.isBound();
-                    }
-                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return skin.colorRectX;
-                    }
-                };
-        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_Y =
-                new CssMetaData<ColorPicker,Number>("-fx-color-rect-y", SizeConverter.getInstance(), 0) {
-                    @Override public boolean isSettable(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return !skin.colorRectY.isBound();
-                    }
-                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
-                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                        return skin.colorRectY;
-                    }
-                };
-        private static final CssMetaData<ColorPicker,String> GRAPHIC =
-            new CssMetaData<ColorPicker,String>("-fx-graphic", StringConverter.getInstance()) {
-                @Override public boolean isSettable(ColorPicker n) {
-                    final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                    return !skin.imageUrl.isBound();
-                }
-                @Override public StyleableProperty<String> getStyleableProperty(ColorPicker n) {
-                    final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
-                    return skin.imageUrl;
-                }
-            };
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(ComboBoxBaseSkin.getClassCssMetaData());
-            styleables.add(COLOR_LABEL_VISIBLE);
-            styleables.add(COLOR_RECT_WIDTH);
-            styleables.add(COLOR_RECT_HEIGHT);
-            styleables.add(COLOR_RECT_X);
-            styleables.add(COLOR_RECT_Y);
-            styleables.add(GRAPHIC);
-            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();
-    }
-
-    @Override protected javafx.util.StringConverter<Color> getConverter() {
-        return null;
-    }
-
-    /**
-     * ColorPicker does not use a main text field.
-     */
-    @Override protected TextField getEditor() {
-        return null;
-    }
-}
--- /dev/null	2015-09-03 15:18:27.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ColorPickerSkin.java	2015-09-03 15:18:25.331215900 -0700
@@ -0,0 +1,723 @@
+/*
+ * Copyright (c) 2012, 2015, 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 com.sun.javafx.css.StyleManager;
+
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.ComboBoxBaseBehavior;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.beans.property.StringProperty;
+import javafx.css.StyleOrigin;
+import javafx.css.StyleableBooleanProperty;
+import javafx.css.CssMetaData;
+
+import javafx.css.converter.BooleanConverter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableStringProperty;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.StringConverter;
+import com.sun.javafx.scene.control.behavior.ColorPickerBehavior;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javafx.scene.control.ColorPicker;
+import javafx.scene.control.TextField;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.value.WritableValue;
+import javafx.css.Styleable;
+import javafx.css.StyleableProperty;
+import javafx.scene.control.Label;
+import javafx.scene.paint.Color;
+
+import static javafx.scene.paint.Color.*;
+
+/**
+ * Default skin implementation for the {@link ColorPicker} control.
+ *
+ * @see ColorPicker
+ * @since 9
+ */
+public class ColorPickerSkin extends ComboBoxPopupControl<Color> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private Label displayNode;
+    private StackPane pickerColorBox;
+    private Rectangle colorRect; 
+    private ColorPalette popupContent;
+
+    private final ColorPickerBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ColorPickerSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ColorPickerSkin(final ColorPicker control) {
+        super(control);
+
+        // install default input map for the control
+        this.behavior = new ColorPickerBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        updateComboBoxMode();
+        registerChangeListener(control.valueProperty(), e -> updateColor());
+
+        // create displayNode
+        displayNode = new Label();
+        displayNode.getStyleClass().add("color-picker-label");
+        displayNode.setManaged(false);
+
+        // label graphic
+        pickerColorBox = new PickerColorBox();
+        pickerColorBox.getStyleClass().add("picker-color");
+        colorRect = new Rectangle(12, 12);
+        colorRect.getStyleClass().add("picker-color-rect");
+
+        updateColor();
+
+        pickerColorBox.getChildren().add(colorRect);
+        displayNode.setGraphic(pickerColorBox);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    // --- color label visible
+    BooleanProperty colorLabelVisible = new StyleableBooleanProperty(true) {
+        @Override public void invalidated() {
+            if (displayNode != null) {
+                if (colorLabelVisible.get()) {
+                    displayNode.setText(colorDisplayName(((ColorPicker)getSkinnable()).getValue()));
+                } else {
+                    displayNode.setText("");
+                }
+            }
+        }
+        @Override public Object getBean() {
+            return ColorPickerSkin.this;
+        }
+        @Override public String getName() {
+            return "colorLabelVisible";
+        }
+        @Override public CssMetaData<ColorPicker,Boolean> getCssMetaData() {
+            return StyleableProperties.COLOR_LABEL_VISIBLE;
+        }
+    };
+
+    // --- image url
+    private final StringProperty imageUrlProperty() { return imageUrl; }
+    private final StyleableStringProperty imageUrl = new StyleableStringProperty() {
+        @Override public void applyStyle(StyleOrigin origin, String v) {
+            super.applyStyle(origin, v);
+            if (v == null) {
+                // remove old image view
+                if (pickerColorBox.getChildren().size() == 2) pickerColorBox.getChildren().remove(1);
+            } else {
+                if (pickerColorBox.getChildren().size() == 2) {
+                    ImageView imageView = (ImageView)pickerColorBox.getChildren().get(1);
+                    imageView.setImage(StyleManager.getInstance().getCachedImage(v));
+                } else {
+                    pickerColorBox.getChildren().add(new ImageView(StyleManager.getInstance().getCachedImage(v)));
+                }
+            }
+        }
+        @Override public Object getBean() {
+            return ColorPickerSkin.this;
+        }
+        @Override public String getName() {
+            return "imageUrl";
+        }
+        @Override public CssMetaData<ColorPicker,String> getCssMetaData() {
+            return StyleableProperties.GRAPHIC;
+        }
+    };
+
+    // --- color rect width
+    private final StyleableDoubleProperty colorRectWidth =  new StyleableDoubleProperty(12) {
+        @Override protected void invalidated() {
+            if(pickerColorBox!=null) pickerColorBox.requestLayout();
+        }
+        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
+            return StyleableProperties.COLOR_RECT_WIDTH;
+        }
+        @Override public Object getBean() {
+            return ColorPickerSkin.this;
+        }
+        @Override public String getName() {
+            return "colorRectWidth";
+        }
+    };
+
+    // --- color rect height
+    private final StyleableDoubleProperty colorRectHeight =  new StyleableDoubleProperty(12) {
+        @Override protected void invalidated() {
+            if(pickerColorBox!=null) pickerColorBox.requestLayout();
+        }
+        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
+            return StyleableProperties.COLOR_RECT_HEIGHT;
+        }
+        @Override public Object getBean() {
+            return ColorPickerSkin.this;
+        }
+        @Override public String getName() {
+            return "colorRectHeight";
+        }
+    };
+
+    // --- color rect X
+    private final StyleableDoubleProperty colorRectX =  new StyleableDoubleProperty(0) {
+        @Override protected void invalidated() {
+            if(pickerColorBox!=null) pickerColorBox.requestLayout();
+        }
+        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
+            return StyleableProperties.COLOR_RECT_X;
+        }
+        @Override public Object getBean() {
+            return ColorPickerSkin.this;
+        }
+        @Override public String getName() {
+            return "colorRectX";
+        }
+    };
+
+    // --- color rect Y
+    private final StyleableDoubleProperty colorRectY =  new StyleableDoubleProperty(0) {
+        @Override protected void invalidated() {
+            if(pickerColorBox!=null) pickerColorBox.requestLayout();
+        }
+        @Override public CssMetaData<ColorPicker,Number> getCssMetaData() {
+            return StyleableProperties.COLOR_RECT_Y;
+        }
+        @Override public Object getBean() {
+            return ColorPickerSkin.this;
+        }
+        @Override public String getName() {
+            return "colorRectY";
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (!colorLabelVisible.get()) {
+            return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+        }
+        String displayNodeText = displayNode.getText();
+        double width = 0;
+        for (String name : colorNameMap.values()) {
+            displayNode.setText(name);
+            width = Math.max(width, super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset));
+        }
+        displayNode.setText(Utils.formatHexString(Color.BLACK)); // #000000
+        width = Math.max(width, super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset));
+        displayNode.setText(displayNodeText);
+        return width;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Node getPopupContent() {
+        if (popupContent == null) {
+//            popupContent = new ColorPalette(colorPicker.getValue(), colorPicker);
+            popupContent = new ColorPalette((ColorPicker)getSkinnable());
+            popupContent.setPopupControl(getPopup());
+        }
+        return popupContent;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void show() {
+        super.show();
+        final ColorPicker colorPicker = (ColorPicker)getSkinnable();
+        popupContent.updateSelection(colorPicker.getValue());
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getDisplayNode() {
+        return displayNode;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        updateComboBoxMode();
+        super.layoutChildren(x, y, w, h);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override void focusLost() {
+        // do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override ComboBoxBaseBehavior getBehavior() {
+        return behavior;
+    }
+
+    private void updateComboBoxMode() {
+        List<String> styleClass = getSkinnable().getStyleClass();
+        if (styleClass.contains(ColorPicker.STYLE_CLASS_BUTTON)) {
+            setMode(ComboBoxMode.BUTTON);
+        } else if (styleClass.contains(ColorPicker.STYLE_CLASS_SPLIT_BUTTON)) {
+            setMode(ComboBoxMode.SPLITBUTTON);
+        }
+    }
+
+    private static final Map<Color, String> colorNameMap = new HashMap<>(24);
+    private static final Map<Color, String> cssNameMap = new HashMap<>(139);
+    static {
+        // Translatable display names for the most common colors
+        colorNameMap.put(TRANSPARENT, Properties.getColorPickerString("colorName.transparent"));
+        colorNameMap.put(BLACK,       Properties.getColorPickerString("colorName.black"));
+        colorNameMap.put(BLUE,        Properties.getColorPickerString("colorName.blue"));
+        colorNameMap.put(CYAN,        Properties.getColorPickerString("colorName.cyan"));
+        colorNameMap.put(DARKBLUE,    Properties.getColorPickerString("colorName.darkblue"));
+        colorNameMap.put(DARKCYAN,    Properties.getColorPickerString("colorName.darkcyan"));
+        colorNameMap.put(DARKGRAY,    Properties.getColorPickerString("colorName.darkgray"));
+        colorNameMap.put(DARKGREEN,   Properties.getColorPickerString("colorName.darkgreen"));
+        colorNameMap.put(DARKMAGENTA, Properties.getColorPickerString("colorName.darkmagenta"));
+        colorNameMap.put(DARKRED,     Properties.getColorPickerString("colorName.darkred"));
+        colorNameMap.put(GRAY,        Properties.getColorPickerString("colorName.gray"));
+        colorNameMap.put(GREEN,       Properties.getColorPickerString("colorName.green"));
+        colorNameMap.put(LIGHTBLUE,   Properties.getColorPickerString("colorName.lightblue"));
+        colorNameMap.put(LIGHTCYAN,   Properties.getColorPickerString("colorName.lightcyan"));
+        colorNameMap.put(LIGHTGRAY,   Properties.getColorPickerString("colorName.lightgray"));
+        colorNameMap.put(LIGHTGREEN,  Properties.getColorPickerString("colorName.lightgreen"));
+        colorNameMap.put(LIGHTYELLOW, Properties.getColorPickerString("colorName.lightyellow"));
+        colorNameMap.put(MAGENTA,     Properties.getColorPickerString("colorName.magenta"));
+        colorNameMap.put(MEDIUMBLUE,  Properties.getColorPickerString("colorName.mediumblue"));
+        colorNameMap.put(ORANGE,      Properties.getColorPickerString("colorName.orange"));
+        colorNameMap.put(PINK,        Properties.getColorPickerString("colorName.pink"));
+        colorNameMap.put(RED,         Properties.getColorPickerString("colorName.red"));
+        colorNameMap.put(WHITE,       Properties.getColorPickerString("colorName.white"));
+        colorNameMap.put(YELLOW,      Properties.getColorPickerString("colorName.yellow"));
+
+        // CSS names.
+        // Note that synonyms (such as "grey") have been removed here,
+        // since a color can be presented with only one name in this
+        // skin. If a reverse map is created for parsing names in the
+        // future, then the synonyms should be included there. For a
+        // full list of CSS names, see Color.java.
+        cssNameMap.put(ALICEBLUE,            "aliceblue");
+        cssNameMap.put(ANTIQUEWHITE,         "antiquewhite");
+        cssNameMap.put(AQUAMARINE,           "aquamarine");
+        cssNameMap.put(AZURE,                "azure");
+        cssNameMap.put(BEIGE,                "beige");
+        cssNameMap.put(BISQUE,               "bisque");
+        cssNameMap.put(BLACK,                "black");
+        cssNameMap.put(BLANCHEDALMOND,       "blanchedalmond");
+        cssNameMap.put(BLUE,                 "blue");
+        cssNameMap.put(BLUEVIOLET,           "blueviolet");
+        cssNameMap.put(BROWN,                "brown");
+        cssNameMap.put(BURLYWOOD,            "burlywood");
+        cssNameMap.put(CADETBLUE,            "cadetblue");
+        cssNameMap.put(CHARTREUSE,           "chartreuse");
+        cssNameMap.put(CHOCOLATE,            "chocolate");
+        cssNameMap.put(CORAL,                "coral");
+        cssNameMap.put(CORNFLOWERBLUE,       "cornflowerblue");
+        cssNameMap.put(CORNSILK,             "cornsilk");
+        cssNameMap.put(CRIMSON,              "crimson");
+        cssNameMap.put(CYAN,                 "cyan");
+        cssNameMap.put(DARKBLUE,             "darkblue");
+        cssNameMap.put(DARKCYAN,             "darkcyan");
+        cssNameMap.put(DARKGOLDENROD,        "darkgoldenrod");
+        cssNameMap.put(DARKGRAY,             "darkgray");
+        cssNameMap.put(DARKGREEN,            "darkgreen");
+        cssNameMap.put(DARKKHAKI,            "darkkhaki");
+        cssNameMap.put(DARKMAGENTA,          "darkmagenta");
+        cssNameMap.put(DARKOLIVEGREEN,       "darkolivegreen");
+        cssNameMap.put(DARKORANGE,           "darkorange");
+        cssNameMap.put(DARKORCHID,           "darkorchid");
+        cssNameMap.put(DARKRED,              "darkred");
+        cssNameMap.put(DARKSALMON,           "darksalmon");
+        cssNameMap.put(DARKSEAGREEN,         "darkseagreen");
+        cssNameMap.put(DARKSLATEBLUE,        "darkslateblue");
+        cssNameMap.put(DARKSLATEGRAY,        "darkslategray");
+        cssNameMap.put(DARKTURQUOISE,        "darkturquoise");
+        cssNameMap.put(DARKVIOLET,           "darkviolet");
+        cssNameMap.put(DEEPPINK,             "deeppink");
+        cssNameMap.put(DEEPSKYBLUE,          "deepskyblue");
+        cssNameMap.put(DIMGRAY,              "dimgray");
+        cssNameMap.put(DODGERBLUE,           "dodgerblue");
+        cssNameMap.put(FIREBRICK,            "firebrick");
+        cssNameMap.put(FLORALWHITE,          "floralwhite");
+        cssNameMap.put(FORESTGREEN,          "forestgreen");
+        cssNameMap.put(GAINSBORO,            "gainsboro");
+        cssNameMap.put(GHOSTWHITE,           "ghostwhite");
+        cssNameMap.put(GOLD,                 "gold");
+        cssNameMap.put(GOLDENROD,            "goldenrod");
+        cssNameMap.put(GRAY,                 "gray");
+        cssNameMap.put(GREEN,                "green");
+        cssNameMap.put(GREENYELLOW,          "greenyellow");
+        cssNameMap.put(HONEYDEW,             "honeydew");
+        cssNameMap.put(HOTPINK,              "hotpink");
+        cssNameMap.put(INDIANRED,            "indianred");
+        cssNameMap.put(INDIGO,               "indigo");
+        cssNameMap.put(IVORY,                "ivory");
+        cssNameMap.put(KHAKI,                "khaki");
+        cssNameMap.put(LAVENDER,             "lavender");
+        cssNameMap.put(LAVENDERBLUSH,        "lavenderblush");
+        cssNameMap.put(LAWNGREEN,            "lawngreen");
+        cssNameMap.put(LEMONCHIFFON,         "lemonchiffon");
+        cssNameMap.put(LIGHTBLUE,            "lightblue");
+        cssNameMap.put(LIGHTCORAL,           "lightcoral");
+        cssNameMap.put(LIGHTCYAN,            "lightcyan");
+        cssNameMap.put(LIGHTGOLDENRODYELLOW, "lightgoldenrodyellow");
+        cssNameMap.put(LIGHTGRAY,            "lightgray");
+        cssNameMap.put(LIGHTGREEN,           "lightgreen");
+        cssNameMap.put(LIGHTPINK,            "lightpink");
+        cssNameMap.put(LIGHTSALMON,          "lightsalmon");
+        cssNameMap.put(LIGHTSEAGREEN,        "lightseagreen");
+        cssNameMap.put(LIGHTSKYBLUE,         "lightskyblue");
+        cssNameMap.put(LIGHTSLATEGRAY,       "lightslategray");
+        cssNameMap.put(LIGHTSTEELBLUE,       "lightsteelblue");
+        cssNameMap.put(LIGHTYELLOW,          "lightyellow");
+        cssNameMap.put(LIME,                 "lime");
+        cssNameMap.put(LIMEGREEN,            "limegreen");
+        cssNameMap.put(LINEN,                "linen");
+        cssNameMap.put(MAGENTA,              "magenta");
+        cssNameMap.put(MAROON,               "maroon");
+        cssNameMap.put(MEDIUMAQUAMARINE,     "mediumaquamarine");
+        cssNameMap.put(MEDIUMBLUE,           "mediumblue");
+        cssNameMap.put(MEDIUMORCHID,         "mediumorchid");
+        cssNameMap.put(MEDIUMPURPLE,         "mediumpurple");
+        cssNameMap.put(MEDIUMSEAGREEN,       "mediumseagreen");
+        cssNameMap.put(MEDIUMSLATEBLUE,      "mediumslateblue");
+        cssNameMap.put(MEDIUMSPRINGGREEN,    "mediumspringgreen");
+        cssNameMap.put(MEDIUMTURQUOISE,      "mediumturquoise");
+        cssNameMap.put(MEDIUMVIOLETRED,      "mediumvioletred");
+        cssNameMap.put(MIDNIGHTBLUE,         "midnightblue");
+        cssNameMap.put(MINTCREAM,            "mintcream");
+        cssNameMap.put(MISTYROSE,            "mistyrose");
+        cssNameMap.put(MOCCASIN,             "moccasin");
+        cssNameMap.put(NAVAJOWHITE,          "navajowhite");
+        cssNameMap.put(NAVY,                 "navy");
+        cssNameMap.put(OLDLACE,              "oldlace");
+        cssNameMap.put(OLIVE,                "olive");
+        cssNameMap.put(OLIVEDRAB,            "olivedrab");
+        cssNameMap.put(ORANGE,               "orange");
+        cssNameMap.put(ORANGERED,            "orangered");
+        cssNameMap.put(ORCHID,               "orchid");
+        cssNameMap.put(PALEGOLDENROD,        "palegoldenrod");
+        cssNameMap.put(PALEGREEN,            "palegreen");
+        cssNameMap.put(PALETURQUOISE,        "paleturquoise");
+        cssNameMap.put(PALEVIOLETRED,        "palevioletred");
+        cssNameMap.put(PAPAYAWHIP,           "papayawhip");
+        cssNameMap.put(PEACHPUFF,            "peachpuff");
+        cssNameMap.put(PERU,                 "peru");
+        cssNameMap.put(PINK,                 "pink");
+        cssNameMap.put(PLUM,                 "plum");
+        cssNameMap.put(POWDERBLUE,           "powderblue");
+        cssNameMap.put(PURPLE,               "purple");
+        cssNameMap.put(RED,                  "red");
+        cssNameMap.put(ROSYBROWN,            "rosybrown");
+        cssNameMap.put(ROYALBLUE,            "royalblue");
+        cssNameMap.put(SADDLEBROWN,          "saddlebrown");
+        cssNameMap.put(SALMON,               "salmon");
+        cssNameMap.put(SANDYBROWN,           "sandybrown");
+        cssNameMap.put(SEAGREEN,             "seagreen");
+        cssNameMap.put(SEASHELL,             "seashell");
+        cssNameMap.put(SIENNA,               "sienna");
+        cssNameMap.put(SILVER,               "silver");
+        cssNameMap.put(SKYBLUE,              "skyblue");
+        cssNameMap.put(SLATEBLUE,            "slateblue");
+        cssNameMap.put(SLATEGRAY,            "slategray");
+        cssNameMap.put(SNOW,                 "snow");
+        cssNameMap.put(SPRINGGREEN,          "springgreen");
+        cssNameMap.put(STEELBLUE,            "steelblue");
+        cssNameMap.put(TAN,                  "tan");
+        cssNameMap.put(TEAL,                 "teal");
+        cssNameMap.put(THISTLE,              "thistle");
+        cssNameMap.put(TOMATO,               "tomato");
+        cssNameMap.put(TRANSPARENT,          "transparent");
+        cssNameMap.put(TURQUOISE,            "turquoise");
+        cssNameMap.put(VIOLET,               "violet");
+        cssNameMap.put(WHEAT,                "wheat");
+        cssNameMap.put(WHITE,                "white");
+        cssNameMap.put(WHITESMOKE,           "whitesmoke");
+        cssNameMap.put(YELLOW,               "yellow");
+        cssNameMap.put(YELLOWGREEN,          "yellowgreen");
+    }
+
+    static String colorDisplayName(Color c) {
+        if (c != null) {
+            String displayName = colorNameMap.get(c);
+            if (displayName == null) {
+                displayName = Utils.formatHexString(c);
+            }
+            return displayName;
+        } else {
+            return null;
+        }
+    }
+
+    static String tooltipString(Color c) {
+        if (c != null) {
+            String tooltipStr = "";
+            String displayName = colorNameMap.get(c);
+            if (displayName != null) {
+                tooltipStr += displayName + " ";
+            }
+
+            tooltipStr += Utils.formatHexString(c);
+
+            String cssName = cssNameMap.get(c);
+            if (cssName != null) {
+                tooltipStr += " (css: " + cssName + ")";
+            }
+            return tooltipStr;
+        } else {
+            return null;
+        }
+    }
+
+    private void updateColor() {
+        final ColorPicker colorPicker = (ColorPicker)getSkinnable();
+        colorRect.setFill(colorPicker.getValue());
+        if (colorLabelVisible.get()) {
+            displayNode.setText(colorDisplayName(colorPicker.getValue()));
+        } else {
+            displayNode.setText("");
+        }
+    }
+
+
+
+    /***************************************************************************
+    *                                                                         *
+    *                         picker-color-cell                               *
+    *                                                                         *
+    **************************************************************************/
+
+    private class PickerColorBox extends StackPane {
+        @Override protected void layoutChildren() {
+            final double top = snappedTopInset();
+            final double left = snappedLeftInset();
+            final double width = getWidth();
+            final double height = getHeight();
+            final double right = snappedRightInset();
+            final double bottom = snappedBottomInset();
+            colorRect.setX(snapPosition(colorRectX.get()));
+            colorRect.setY(snapPosition(colorRectY.get()));
+            colorRect.setWidth(snapSize(colorRectWidth.get()));
+            colorRect.setHeight(snapSize(colorRectHeight.get()));
+            if (getChildren().size() == 2) {
+                final ImageView icon = (ImageView) getChildren().get(1);
+                Pos childAlignment = StackPane.getAlignment(icon);
+                layoutInArea(icon, left, top,
+                             width - left - right, height - top - bottom,
+                             0, getMargin(icon),
+                             childAlignment != null? childAlignment.getHpos() : getAlignment().getHpos(),
+                             childAlignment != null? childAlignment.getVpos() : getAlignment().getVpos());
+                colorRect.setLayoutX(icon.getLayoutX());
+                colorRect.setLayoutY(icon.getLayoutY());
+            } else {
+                Pos childAlignment = StackPane.getAlignment(colorRect);
+                layoutInArea(colorRect, left, top,
+                             width - left - right, height - top - bottom,
+                             0, getMargin(colorRect),
+                             childAlignment != null? childAlignment.getHpos() : getAlignment().getHpos(),
+                             childAlignment != null? childAlignment.getVpos() : getAlignment().getVpos());
+            }
+        }
+    }
+
+    /***************************************************************************
+    *                                                                         *
+    *                         Stylesheet Handling                             *
+    *                                                                         *
+    **************************************************************************/
+
+     private static class StyleableProperties {
+        private static final CssMetaData<ColorPicker,Boolean> COLOR_LABEL_VISIBLE = 
+                new CssMetaData<ColorPicker,Boolean>("-fx-color-label-visible",
+                BooleanConverter.getInstance(), Boolean.TRUE) {
+
+            @Override public boolean isSettable(ColorPicker n) {
+                final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                return skin.colorLabelVisible == null || !skin.colorLabelVisible.isBound();
+            }
+            
+            @Override public StyleableProperty<Boolean> getStyleableProperty(ColorPicker n) {
+                final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.colorLabelVisible;
+            }
+        };
+        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_WIDTH =
+                new CssMetaData<ColorPicker,Number>("-fx-color-rect-width", SizeConverter.getInstance(), 12d) {
+                    @Override public boolean isSettable(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return !skin.colorRectWidth.isBound();
+                    }
+                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return skin.colorRectWidth;
+                    }
+                };
+        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_HEIGHT =
+                new CssMetaData<ColorPicker,Number>("-fx-color-rect-height", SizeConverter.getInstance(), 12d) {
+                    @Override public boolean isSettable(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return !skin.colorRectHeight.isBound();
+                    }
+                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return skin.colorRectHeight;
+                    }
+                };
+        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_X =
+                new CssMetaData<ColorPicker,Number>("-fx-color-rect-x", SizeConverter.getInstance(), 0) {
+                    @Override public boolean isSettable(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return !skin.colorRectX.isBound();
+                    }
+                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return skin.colorRectX;
+                    }
+                };
+        private static final CssMetaData<ColorPicker,Number> COLOR_RECT_Y =
+                new CssMetaData<ColorPicker,Number>("-fx-color-rect-y", SizeConverter.getInstance(), 0) {
+                    @Override public boolean isSettable(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return !skin.colorRectY.isBound();
+                    }
+                    @Override public StyleableProperty<Number> getStyleableProperty(ColorPicker n) {
+                        final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                        return skin.colorRectY;
+                    }
+                };
+        private static final CssMetaData<ColorPicker,String> GRAPHIC =
+            new CssMetaData<ColorPicker,String>("-fx-graphic", StringConverter.getInstance()) {
+                @Override public boolean isSettable(ColorPicker n) {
+                    final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                    return !skin.imageUrl.isBound();
+                }
+                @Override public StyleableProperty<String> getStyleableProperty(ColorPicker n) {
+                    final ColorPickerSkin skin = (ColorPickerSkin) n.getSkin();
+                    return skin.imageUrl;
+                }
+            };
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(ComboBoxBaseSkin.getClassCssMetaData());
+            styleables.add(COLOR_LABEL_VISIBLE);
+            styleables.add(COLOR_RECT_WIDTH);
+            styleables.add(COLOR_RECT_HEIGHT);
+            styleables.add(COLOR_RECT_X);
+            styleables.add(COLOR_RECT_Y);
+            styleables.add(GRAPHIC);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected javafx.util.StringConverter<Color> getConverter() {
+        return null;
+    }
+
+    /**
+     * ColorPicker does not use a main text field, so this method has been
+     * overridden to return null.
+     */
+    @Override protected TextField getEditor() {
+        return null;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxBaseSkin.java	2015-09-03 15:18:34.193722800 -0700
+++ /dev/null	2015-09-03 15:18:35.000000000 -0700
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.ComboBoxBaseBehavior;
-import javafx.geometry.HPos;
-import javafx.geometry.VPos;
-import javafx.scene.Node;
-import javafx.scene.control.ComboBoxBase;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-
-import java.util.List;
-
-public abstract class ComboBoxBaseSkin<T> extends BehaviorSkinBase<ComboBoxBase<T>, ComboBoxBaseBehavior<T>> {
-    
-    private Node displayNode; // this is normally either label or textField
-    
-    protected StackPane arrowButton;
-    protected Region arrow;
-    
-    /** The mode in which this control will be represented. */
-    private ComboBoxMode mode = ComboBoxMode.COMBOBOX;
-    protected final ComboBoxMode getMode() { return mode; }
-    protected final void setMode(ComboBoxMode value) { mode = value; }
-    
-    public ComboBoxBaseSkin(final ComboBoxBase<T> comboBox, final ComboBoxBaseBehavior<T> behavior) {
-        // Call the super method with the ComboBox we were just given in the 
-        // constructor, as well as an instance of the behavior class.
-        super(comboBox, behavior);
-        
-        // open button / arrow
-        arrow = new Region();
-        arrow.setFocusTraversable(false);
-        arrow.getStyleClass().setAll("arrow");
-        arrow.setId("arrow");
-        arrow.setMaxWidth(Region.USE_PREF_SIZE);
-        arrow.setMaxHeight(Region.USE_PREF_SIZE);
-        arrow.setMouseTransparent(true);
-
-        arrowButton = new StackPane();
-        arrowButton.setFocusTraversable(false);
-        arrowButton.setId("arrow-button");
-        arrowButton.getStyleClass().setAll("arrow-button");
-        arrowButton.getChildren().add(arrow);
-
-        if (comboBox.isEditable()) {
-            //
-            // arrowButton behaves like a button.
-            // This is strongly tied to the implementation in ComboBoxBaseBehavior.
-            //
-            arrowButton.addEventHandler(MouseEvent.MOUSE_ENTERED,  (e) -> getBehavior().mouseEntered(e));
-            arrowButton.addEventHandler(MouseEvent.MOUSE_PRESSED,  (e) -> { getBehavior().mousePressed(e);  e.consume(); });
-            arrowButton.addEventHandler(MouseEvent.MOUSE_RELEASED, (e) -> { getBehavior().mouseReleased(e); e.consume();});
-            arrowButton.addEventHandler(MouseEvent.MOUSE_EXITED, (e) -> getBehavior().mouseExited(e));
-
-        }
-        getChildren().add(arrowButton);
-
-        // When ComboBoxBase focus shifts to another node, it should hide.
-        getSkinnable().focusedProperty().addListener((observable, oldValue, newValue) -> {
-            if (!newValue) {
-                focusLost();
-            }
-        });
-        
-        // Register listeners
-        registerChangeListener(comboBox.editableProperty(), "EDITABLE");
-        registerChangeListener(comboBox.showingProperty(), "SHOWING");
-        registerChangeListener(comboBox.focusedProperty(), "FOCUSED");
-        registerChangeListener(comboBox.valueProperty(), "VALUE");
-    }
-    
-    protected void focusLost() {
-        getSkinnable().hide();
-    }
-    /**
-     * This method should return a Node that will be positioned within the
-     * ComboBox 'button' area.
-     */
-    public abstract Node getDisplayNode();
-
-    /**
-     * This method will be called when the ComboBox popup should be displayed.
-     * It is up to specific skin implementations to determine how this is handled.
-     */
-    public abstract void show();
- 
-    /**
-     * This method will be called when the ComboBox popup should be hidden.
-     * It is up to specific skin implementations to determine how this is handled.
-     */
-    public abstract void hide();
-    
-     /**
-     * Handles changes to properties of the MenuButton.
-     */
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("SHOWING".equals(p)) {
-            if (getSkinnable().isShowing()) {
-                show();
-            } else {
-                hide();
-            }
-        } else if ("EDITABLE".equals(p)) {
-            updateDisplayArea();
-        } else if ("VALUE".equals(p)) {
-            updateDisplayArea();
-        } 
-    }
-    
-    protected void updateDisplayArea() {
-        final List<Node> children = getChildren();
-        final Node oldDisplayNode = displayNode;
-        displayNode = getDisplayNode();
-
-        // don't remove displayNode if it hasn't changed.
-        if (oldDisplayNode != null && oldDisplayNode != displayNode) {
-            children.remove(oldDisplayNode);
-        }
-
-        if (displayNode != null && !children.contains(displayNode)) {
-            children.add(displayNode);
-            displayNode.applyCss();
-        }
-    }
-    
-    private boolean isButton() {
-        return getMode() == ComboBoxMode.BUTTON;
-    }
-    
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        if (displayNode == null) {
-            updateDisplayArea();
-        }
-
-        final double arrowWidth = snapSize(arrow.prefWidth(-1));
-        final double arrowButtonWidth = (isButton()) ? 0 :
-                arrowButton.snappedLeftInset() + arrowWidth +
-                arrowButton.snappedRightInset();
-        
-        if (displayNode != null) {
-            displayNode.resizeRelocate(x, y, w - arrowButtonWidth, h);
-        }
-
-        arrowButton.setVisible(! isButton());
-        if (! isButton()) {
-            arrowButton.resize(arrowButtonWidth, h);
-            positionInArea(arrowButton, (x + w) - arrowButtonWidth, y,
-                    arrowButtonWidth, h, 0, HPos.CENTER, VPos.CENTER);
-        }
-    }
-    
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (displayNode == null) {
-            updateDisplayArea();
-        }
-
-        final double arrowWidth = snapSize(arrow.prefWidth(-1));
-        final double arrowButtonWidth = isButton() ? 0 :
-                                        arrowButton.snappedLeftInset() +
-                                        arrowWidth + 
-                                        arrowButton.snappedRightInset();
-        final double displayNodeWidth = displayNode == null ? 0 : displayNode.prefWidth(height);
-        
-        final double totalWidth = displayNodeWidth + arrowButtonWidth;
-        return leftInset + totalWidth + rightInset;
-    }
-    
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (displayNode == null) {
-            updateDisplayArea();
-        }
-
-        double ph;
-        if (displayNode == null) {
-            final int DEFAULT_HEIGHT = 21;
-            double arrowHeight = (isButton()) ? 0 : 
-                    (arrowButton.snappedTopInset() + arrow.prefHeight(-1) + arrowButton.snappedBottomInset());
-            ph = Math.max(DEFAULT_HEIGHT, arrowHeight);
-        } else {
-            ph = displayNode.prefHeight(width);
-        }
-
-        return topInset+ ph + bottomInset;
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefWidth(height);
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-
-    // Overridden so that we use the displayNode as the baseline, rather than the arrow.
-    // See RT-30754 for more information.
-    @Override protected double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (displayNode == null) {
-            updateDisplayArea();
-        }
-
-        if (displayNode != null) {
-            return displayNode.getLayoutBounds().getMinY() + displayNode.getLayoutY() + displayNode.getBaselineOffset();
-        }
-
-        return super.computeBaselineOffset(topInset, rightInset, bottomInset, leftInset);
-    }
-}
--- /dev/null	2015-09-03 15:18:35.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxBaseSkin.java	2015-09-03 15:18:33.369675700 -0700
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2010, 2015, 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.SkinBase;
+import com.sun.javafx.scene.control.behavior.ComboBoxBaseBehavior;
+import javafx.geometry.HPos;
+import javafx.geometry.VPos;
+import javafx.scene.Node;
+import javafx.scene.control.ComboBoxBase;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+
+import java.util.List;
+
+/**
+ * An abstract class intended to be used as the base skin for ComboBox-like
+ * controls that are based on {@link ComboBoxBase}. Most users of this skin class
+ * would be well-advised to also look at {@link ComboBoxPopupControl} for
+ * additional useful API.
+ *
+ * @since 9
+ * @param <T> The type of the ComboBox-like control.
+ * @see ComboBoxBase
+ * @see ComboBoxPopupControl
+ */
+public abstract class ComboBoxBaseSkin<T> extends SkinBase<ComboBoxBase<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+    
+    private Node displayNode; // this is normally either label or textField
+    
+    StackPane arrowButton;
+    Region arrow;
+    
+    /** The mode in which this control will be represented. */
+    private ComboBoxMode mode = ComboBoxMode.COMBOBOX;
+    final ComboBoxMode getMode() { return mode; }
+    final void setMode(ComboBoxMode value) { mode = value; }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new instance of ComboBoxBaseSkin, although note that this
+     * instance does not handle any behavior / input mappings - this needs to be
+     * handled appropriately by subclasses.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ComboBoxBaseSkin(final ComboBoxBase<T> control) {
+        // Call the super method with the ComboBox we were just given in the constructor
+        super(control);
+
+        // open button / arrow
+        arrow = new Region();
+        arrow.setFocusTraversable(false);
+        arrow.getStyleClass().setAll("arrow");
+        arrow.setId("arrow");
+        arrow.setMaxWidth(Region.USE_PREF_SIZE);
+        arrow.setMaxHeight(Region.USE_PREF_SIZE);
+        arrow.setMouseTransparent(true);
+
+        arrowButton = new StackPane();
+        arrowButton.setFocusTraversable(false);
+        arrowButton.setId("arrow-button");
+        arrowButton.getStyleClass().setAll("arrow-button");
+        arrowButton.getChildren().add(arrow);
+
+        if (control.isEditable()) {
+            //
+            // arrowButton behaves like a button.
+            // This is strongly tied to the implementation in ComboBoxBaseBehavior.
+            //
+            arrowButton.addEventHandler(MouseEvent.MOUSE_ENTERED,  (e) ->   getBehavior().mouseEntered(e));
+            arrowButton.addEventHandler(MouseEvent.MOUSE_PRESSED,  (e) -> { getBehavior().mousePressed(e);  e.consume(); });
+            arrowButton.addEventHandler(MouseEvent.MOUSE_RELEASED, (e) -> { getBehavior().mouseReleased(e); e.consume();});
+            arrowButton.addEventHandler(MouseEvent.MOUSE_EXITED,   (e) ->   getBehavior().mouseExited(e));
+
+        }
+        getChildren().add(arrowButton);
+
+        // When ComboBoxBase focus shifts to another node, it should hide.
+        getSkinnable().focusedProperty().addListener((observable, oldValue, newValue) -> {
+            if (!newValue) {
+                focusLost();
+            }
+        });
+        
+        // Register listeners
+        registerChangeListener(control.editableProperty(), e -> updateDisplayArea());
+        registerChangeListener(control.showingProperty(), e -> {
+            if (getSkinnable().isShowing()) {
+                show();
+            } else {
+                hide();
+            }
+        });
+        registerChangeListener(control.valueProperty(), e -> updateDisplayArea());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * This method should return a Node that will be positioned within the
+     * ComboBox 'button' area.
+     */
+    public abstract Node getDisplayNode();
+
+    /**
+     * This method will be called when the ComboBox popup should be displayed.
+     * It is up to specific skin implementations to determine how this is handled.
+     */
+    public abstract void show();
+ 
+    /**
+     * This method will be called when the ComboBox popup should be hidden.
+     * It is up to specific skin implementations to determine how this is handled.
+     */
+    public abstract void hide();
+    
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+            final double w, final double h) {
+        if (displayNode == null) {
+            updateDisplayArea();
+        }
+
+        final double arrowWidth = snapSize(arrow.prefWidth(-1));
+        final double arrowButtonWidth = (isButton()) ? 0 :
+                arrowButton.snappedLeftInset() + arrowWidth +
+                arrowButton.snappedRightInset();
+        
+        if (displayNode != null) {
+            displayNode.resizeRelocate(x, y, w - arrowButtonWidth, h);
+        }
+
+        arrowButton.setVisible(! isButton());
+        if (! isButton()) {
+            arrowButton.resize(arrowButtonWidth, h);
+            positionInArea(arrowButton, (x + w) - arrowButtonWidth, y,
+                    arrowButtonWidth, h, 0, HPos.CENTER, VPos.CENTER);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (displayNode == null) {
+            updateDisplayArea();
+        }
+
+        final double arrowWidth = snapSize(arrow.prefWidth(-1));
+        final double arrowButtonWidth = isButton() ? 0 :
+                                        arrowButton.snappedLeftInset() +
+                                        arrowWidth + 
+                                        arrowButton.snappedRightInset();
+        final double displayNodeWidth = displayNode == null ? 0 : displayNode.prefWidth(height);
+        
+        final double totalWidth = displayNodeWidth + arrowButtonWidth;
+        return leftInset + totalWidth + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (displayNode == null) {
+            updateDisplayArea();
+        }
+
+        double ph;
+        if (displayNode == null) {
+            final int DEFAULT_HEIGHT = 21;
+            double arrowHeight = (isButton()) ? 0 : 
+                    (arrowButton.snappedTopInset() + arrow.prefHeight(-1) + arrowButton.snappedBottomInset());
+            ph = Math.max(DEFAULT_HEIGHT, arrowHeight);
+        } else {
+            ph = displayNode.prefHeight(width);
+        }
+
+        return topInset+ ph + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    // Overridden so that we use the displayNode as the baseline, rather than the arrow.
+    // See RT-30754 for more information.
+    /** {@inheritDoc} */
+    @Override protected double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (displayNode == null) {
+            updateDisplayArea();
+        }
+
+        if (displayNode != null) {
+            return displayNode.getLayoutBounds().getMinY() + displayNode.getLayoutY() + displayNode.getBaselineOffset();
+        }
+
+        return super.computeBaselineOffset(topInset, rightInset, bottomInset, leftInset);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    ComboBoxBaseBehavior getBehavior() {
+        return null;
+    }
+
+    void focusLost() {
+        getSkinnable().hide();
+    }
+
+    private boolean isButton() {
+        return getMode() == ComboBoxMode.BUTTON;
+    }
+
+    void updateDisplayArea() {
+        final List<Node> children = getChildren();
+        final Node oldDisplayNode = displayNode;
+        displayNode = getDisplayNode();
+
+        // don't remove displayNode if it hasn't changed.
+        if (oldDisplayNode != null && oldDisplayNode != displayNode) {
+            children.remove(oldDisplayNode);
+        }
+
+        if (displayNode != null && !children.contains(displayNode)) {
+            children.add(displayNode);
+            displayNode.applyCss();
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxListViewSkin.java	2015-09-03 15:18:42.432194000 -0700
+++ /dev/null	2015-09-03 15:18:43.000000000 -0700
@@ -1,599 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.ComboBoxListViewBehavior;
-
-import java.util.List;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.WeakInvalidationListener;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.WeakListChangeListener;
-import javafx.css.PseudoClass;
-import javafx.event.ActionEvent;
-import javafx.event.EventTarget;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.ComboBoxBase;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.control.SelectionMode;
-import javafx.scene.control.SelectionModel;
-import javafx.scene.control.TextField;
-import javafx.scene.input.*;
-import javafx.util.Callback;
-import javafx.util.StringConverter;
-
-public class ComboBoxListViewSkin<T> extends ComboBoxPopupControl<T> {
-    
-    // By default we measure the width of all cells in the ListView. If this
-    // is too burdensome, the developer may set a property in the ComboBox
-    // properties map with this key to specify the number of rows to measure.
-    // This may one day become a property on the ComboBox itself.
-    private static final String COMBO_BOX_ROWS_TO_MEASURE_WIDTH_KEY = "comboBoxRowsToMeasureWidth";
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Private fields                                                          *
-     *                                                                         *
-     **************************************************************************/    
-    
-    private final ComboBox<T> comboBox;
-    private ObservableList<T> comboBoxItems;
-    
-    private ListCell<T> buttonCell;
-    private Callback<ListView<T>, ListCell<T>> cellFactory;
-    
-    private final ListView<T> listView;
-    private ObservableList<T> listViewItems;
-    
-    private boolean listSelectionLock = false;
-    private boolean listViewSelectionDirty = false;
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-    
-    private boolean itemCountDirty;
-    private final ListChangeListener<T> listViewItemsListener = new ListChangeListener<T>() {
-        @Override public void onChanged(ListChangeListener.Change<? extends T> c) {
-            itemCountDirty = true;
-            getSkinnable().requestLayout();
-        }
-    };
-
-    private final InvalidationListener itemsObserver;
-    
-    private final WeakListChangeListener<T> weakListViewItemsListener =
-            new WeakListChangeListener<T>(listViewItemsListener);
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/   
-    
-    public ComboBoxListViewSkin(final ComboBox<T> comboBox) {
-        super(comboBox, new ComboBoxListViewBehavior<T>(comboBox));
-        this.comboBox = comboBox;
-        updateComboBoxItems();
-
-        itemsObserver = observable -> {
-            updateComboBoxItems();
-            updateListViewItems();
-        };
-        this.comboBox.itemsProperty().addListener(new WeakInvalidationListener(itemsObserver));
-        
-        // listview for popup
-        this.listView = createListView();
-        
-        // Fix for RT-21207. Additional code related to this bug is further below.
-        this.listView.setManaged(false);
-        getChildren().add(listView);
-        // -- end of fix
-                
-        updateListViewItems();
-        updateCellFactory();
-        
-        updateButtonCell();
-
-        // Fix for RT-19431 (also tested via ComboBoxListViewSkinTest)
-        updateValue();
-
-        registerChangeListener(comboBox.itemsProperty(), "ITEMS");
-        registerChangeListener(comboBox.promptTextProperty(), "PROMPT_TEXT");
-        registerChangeListener(comboBox.cellFactoryProperty(), "CELL_FACTORY");
-        registerChangeListener(comboBox.visibleRowCountProperty(), "VISIBLE_ROW_COUNT");
-        registerChangeListener(comboBox.converterProperty(), "CONVERTER");
-        registerChangeListener(comboBox.buttonCellProperty(), "BUTTON_CELL");
-        registerChangeListener(comboBox.valueProperty(), "VALUE");
-        registerChangeListener(comboBox.editableProperty(), "EDITABLE");
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/  
-    
-    /** {@inheritDoc} */
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        
-        if ("ITEMS".equals(p)) {
-            updateComboBoxItems();
-            updateListViewItems();
-        } else if ("PROMPT_TEXT".equals(p)) {
-            updateDisplayNode();
-        } else if ("CELL_FACTORY".equals(p)) {
-            updateCellFactory();
-        } else if ("VISIBLE_ROW_COUNT".equals(p)) {
-            if (listView == null) return;
-            listView.requestLayout();
-        } else if ("CONVERTER".equals(p)) {
-            updateListViewItems();
-        } else if ("EDITOR".equals(p)) {
-            getEditableInputNode();
-        } else if ("BUTTON_CELL".equals(p)) {
-            updateButtonCell();
-        } else if ("VALUE".equals(p)) {
-            updateValue();
-            comboBox.fireEvent(new ActionEvent());
-        } else if ("EDITABLE".equals(p)) {
-            updateEditable();
-        }
-    }
-
-    @Override protected TextField getEditor() {
-        // Return null if editable is false, even if the ComboBox has an editor set.
-        // Use getSkinnable() here because this method is called from the super
-        // constructor before comboBox is initialized.
-        return getSkinnable().isEditable() ? ((ComboBox)getSkinnable()).getEditor() : null;
-    }
-
-    @Override protected StringConverter<T> getConverter() {
-        return ((ComboBox)getSkinnable()).getConverter();
-    }
-
-    
-    /** {@inheritDoc} */
-    @Override public Node getDisplayNode() {
-        Node displayNode;
-        if (comboBox.isEditable()) {
-            displayNode = getEditableInputNode();
-        } else {
-            displayNode = buttonCell;
-        }
-        
-        updateDisplayNode();
-        
-        return displayNode;
-    }
-    
-    public void updateComboBoxItems() {
-        comboBoxItems = comboBox.getItems();
-        comboBoxItems = comboBoxItems == null ? FXCollections.<T>emptyObservableList() : comboBoxItems;
-    }
-    
-    public void updateListViewItems() {
-        if (listViewItems != null) {
-            listViewItems.removeListener(weakListViewItemsListener);
-        }
-
-        this.listViewItems = comboBoxItems;
-        listView.setItems(listViewItems);
-
-        if (listViewItems != null) {
-            listViewItems.addListener(weakListViewItemsListener);
-        }
-        
-        itemCountDirty = true;
-        getSkinnable().requestLayout();
-    }
-    
-    @Override public Node getPopupContent() {
-        return listView;
-    }
-    
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        reconfigurePopup();
-        return 50;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double superPrefWidth = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-        double listViewWidth = listView.prefWidth(height);
-        double pw = Math.max(superPrefWidth, listViewWidth);
-
-        reconfigurePopup();
-
-        return pw;
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        reconfigurePopup();
-        return super.computeMaxWidth(height, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        reconfigurePopup();
-        return super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        reconfigurePopup();
-        return super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        reconfigurePopup();
-        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        if (listViewSelectionDirty) {
-            try {
-                listSelectionLock = true;
-                T item = comboBox.getSelectionModel().getSelectedItem();
-                listView.getSelectionModel().clearSelection();
-                listView.getSelectionModel().select(item);
-            } finally {
-                listSelectionLock = false;
-                listViewSelectionDirty = false;
-            }
-        }
-        
-        super.layoutChildren(x,y,w,h);
-    }
-
-    // Added to allow subclasses to prevent the popup from hiding when the
-    // ListView is clicked on (e.g when the list cells have checkboxes).
-    protected boolean isHideOnClickEnabled() {
-        return true;
-    }
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Private methods                                                         *
-     *                                                                         *
-     **************************************************************************/
-
-    private void updateValue() {
-        T newValue = comboBox.getValue();
-        
-        SelectionModel<T> listViewSM = listView.getSelectionModel();
-        
-        if (newValue == null) {
-            listViewSM.clearSelection();
-        } else {
-            // RT-22386: We need to test to see if the value is in the comboBox
-            // items list. If it isn't, then we should clear the listview 
-            // selection
-            int indexOfNewValue = getIndexOfComboBoxValueInItemsList();
-            if (indexOfNewValue == -1) {
-                listSelectionLock = true;
-                listViewSM.clearSelection();
-                listSelectionLock = false;
-            } else {
-                int index = comboBox.getSelectionModel().getSelectedIndex();
-                if (index >= 0 && index < comboBoxItems.size()) {
-                    T itemsObj = comboBoxItems.get(index);
-                    if (itemsObj != null && itemsObj.equals(newValue)) {
-                        listViewSM.select(index);
-                    } else {
-                        listViewSM.select(newValue);
-                    }
-                } else {
-                    // just select the first instance of newValue in the list
-                    int listViewIndex = comboBoxItems.indexOf(newValue);
-                    if (listViewIndex == -1) {
-                        // RT-21336 Show the ComboBox value even though it doesn't
-                        // exist in the ComboBox items list (part one of fix)
-                        updateDisplayNode();
-                    } else {
-                        listViewSM.select(listViewIndex);
-                    }
-                }
-            }
-        }
-    }
-    
-    
-    @Override protected void updateDisplayNode() {
-        if (getEditor() != null) {
-            super.updateDisplayNode();
-        } else {
-            T value = comboBox.getValue();
-            int index = getIndexOfComboBoxValueInItemsList();
-            if (index > -1) {
-                buttonCell.setItem(null);
-                buttonCell.updateIndex(index);
-            } else {
-                // RT-21336 Show the ComboBox value even though it doesn't
-                // exist in the ComboBox items list (part two of fix)
-                buttonCell.updateIndex(-1);
-                boolean empty = updateDisplayText(buttonCell, value, false);
-                
-                // Note that empty boolean collected above. This is used to resolve
-                // RT-27834, where we were getting different styling based on whether
-                // the cell was updated via the updateIndex method above, or just
-                // by directly updating the text. We fake the pseudoclass state
-                // for empty, filled, and selected here.
-                buttonCell.pseudoClassStateChanged(PSEUDO_CLASS_EMPTY,    empty);
-                buttonCell.pseudoClassStateChanged(PSEUDO_CLASS_FILLED,   !empty);
-                buttonCell.pseudoClassStateChanged(PSEUDO_CLASS_SELECTED, true);
-            }
-        }
-    }
-    
-    // return a boolean to indicate that the cell is empty (and therefore not filled)
-    private boolean updateDisplayText(ListCell<T> cell, T item, boolean empty) {
-        if (empty) {
-            if (cell == null) return true;
-            cell.setGraphic(null);
-            cell.setText(null);
-            return true;
-        } else if (item instanceof Node) {
-            Node currentNode = cell.getGraphic();
-            Node newNode = (Node) item;
-            if (currentNode == null || ! currentNode.equals(newNode)) {
-                cell.setText(null);
-                cell.setGraphic(newNode);
-            }
-            return newNode == null;
-        } else {
-            // run item through StringConverter if it isn't null
-            StringConverter<T> c = comboBox.getConverter();
-            String s = item == null ? comboBox.getPromptText() : (c == null ? item.toString() : c.toString(item));
-            cell.setText(s);
-            cell.setGraphic(null);
-            return s == null || s.isEmpty();
-        }
-    }
-    
-    private int getIndexOfComboBoxValueInItemsList() {
-        T value = comboBox.getValue();
-        int index = comboBoxItems.indexOf(value);
-        return index;
-    }
-    
-    private void updateButtonCell() {
-        buttonCell = comboBox.getButtonCell() != null ? 
-                comboBox.getButtonCell() : getDefaultCellFactory().call(listView);
-        buttonCell.setMouseTransparent(true);
-        buttonCell.updateListView(listView);
-        updateDisplayArea();
-        // As long as the screen-reader is concerned this node is not a list item.
-        // This matters because the screen-reader counts the number of list item
-        // within combo and speaks it to the user.
-        buttonCell.setAccessibleRole(AccessibleRole.NODE);
-    }
-
-    private void updateCellFactory() {
-        Callback<ListView<T>, ListCell<T>> cf = comboBox.getCellFactory();
-        cellFactory = cf != null ? cf : getDefaultCellFactory();
-        listView.setCellFactory(cellFactory);
-    }
-    
-    private Callback<ListView<T>, ListCell<T>> getDefaultCellFactory() {
-        return new Callback<ListView<T>, ListCell<T>>() {
-            @Override public ListCell<T> call(ListView<T> listView) {
-                return new ListCell<T>() {
-                    @Override public void updateItem(T item, boolean empty) {
-                        super.updateItem(item, empty);
-                        updateDisplayText(this, item, empty);
-                    }
-                };
-            }
-        };
-    }
-    
-    private ListView<T> createListView() {
-        final ListView<T> _listView = new ListView<T>() {
-
-            {
-                getProperties().put("selectFirstRowByDefault", false);
-            }
-
-            @Override protected double computeMinHeight(double width) {
-                return 30;
-            }
-            
-            @Override protected double computePrefWidth(double height) {
-                double pw;
-                if (getSkin() instanceof ListViewSkin) {
-                    ListViewSkin<?> skin = (ListViewSkin<?>)getSkin();
-                    if (itemCountDirty) {
-                        skin.updateRowCount();
-                        itemCountDirty = false;
-                    }
-                    
-                    int rowsToMeasure = -1;
-                    if (comboBox.getProperties().containsKey(COMBO_BOX_ROWS_TO_MEASURE_WIDTH_KEY)) {
-                        rowsToMeasure = (Integer) comboBox.getProperties().get(COMBO_BOX_ROWS_TO_MEASURE_WIDTH_KEY);
-                    }
-                    
-                    pw = Math.max(comboBox.getWidth(), skin.getMaxCellWidth(rowsToMeasure) + 30);
-                } else {
-                    pw = Math.max(100, comboBox.getWidth());
-                }
-
-                // need to check the ListView pref height in the case that the
-                // placeholder node is showing
-                if (getItems().isEmpty() && getPlaceholder() != null) {
-                    pw = Math.max(super.computePrefWidth(height), pw);
-                }
-
-                return Math.max(50, pw);
-            }
-
-            @Override protected double computePrefHeight(double width) {
-                return getListViewPrefHeight();
-            }
-        };
-
-        _listView.setId("list-view");
-        _listView.placeholderProperty().bind(comboBox.placeholderProperty());
-        _listView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
-        _listView.setFocusTraversable(false);
-
-        _listView.getSelectionModel().selectedIndexProperty().addListener(o -> {
-            if (listSelectionLock) return;
-            int index = listView.getSelectionModel().getSelectedIndex();
-            comboBox.getSelectionModel().select(index);
-            updateDisplayNode();
-            comboBox.notifyAccessibleAttributeChanged(AccessibleAttribute.TEXT);
-        });
-         
-        comboBox.getSelectionModel().selectedItemProperty().addListener(o -> {
-            listViewSelectionDirty = true;
-        });
-        
-        _listView.addEventFilter(MouseEvent.MOUSE_RELEASED, t -> {
-            // RT-18672: Without checking if the user is clicking in the
-            // scrollbar area of the ListView, the comboBox will hide. Therefore,
-            // we add the check below to prevent this from happening.
-            EventTarget target = t.getTarget();
-            if (target instanceof Parent) {
-                List<String> s = ((Parent) target).getStyleClass();
-                if (s.contains("thumb")
-                        || s.contains("track")
-                        || s.contains("decrement-arrow")
-                        || s.contains("increment-arrow")) {
-                    return;
-                }
-            }
-
-            if (isHideOnClickEnabled()) {
-                comboBox.hide();
-            }
-        });
-
-        _listView.setOnKeyPressed(t -> {
-            // TODO move to behavior, when (or if) this class becomes a SkinBase
-            if (t.getCode() == KeyCode.ENTER ||
-                    t.getCode() == KeyCode.SPACE ||
-                    t.getCode() == KeyCode.ESCAPE) {
-                comboBox.hide();
-            }
-        });
-        
-        return _listView;
-    }
-    
-    private double getListViewPrefHeight() {
-        double ph;
-        if (listView.getSkin() instanceof VirtualContainerBase) {
-            int maxRows = comboBox.getVisibleRowCount();
-            VirtualContainerBase<?,?,?> skin = (VirtualContainerBase<?,?,?>)listView.getSkin();
-            ph = skin.getVirtualFlowPreferredHeight(maxRows);
-        } else {
-            double ch = comboBoxItems.size() * 25;
-            ph = Math.min(ch, 200);
-        }
-        
-        return ph;
-    }
-
-
-    
-    /**************************************************************************
-     * 
-     * API for testing
-     * 
-     *************************************************************************/
-    
-    public ListView<T> getListView() {
-        return listView;
-    }
-    
-    
-    
-
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-    
-    // These three pseudo class states are duplicated from Cell
-    private static final PseudoClass PSEUDO_CLASS_SELECTED =
-            PseudoClass.getPseudoClass("selected");
-    private static final PseudoClass PSEUDO_CLASS_EMPTY =
-            PseudoClass.getPseudoClass("empty");
-    private static final PseudoClass PSEUDO_CLASS_FILLED =
-            PseudoClass.getPseudoClass("filled");
-
-
-
-    @Override
-    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_ITEM: {
-                if (comboBox.isShowing()) {
-                    /* On Mac, for some reason, changing the selection on the list is not
-                     * reported by VoiceOver the first time it shows.
-                     * Note that this fix returns a child of the PopupWindow back to the main
-                     * Stage, which doesn't seem to cause problems.
-                     */
-                    return listView.queryAccessibleAttribute(attribute, parameters);
-                }
-                return null;
-            }
-            case TEXT: {
-                String accText = comboBox.getAccessibleText();
-                if (accText != null && !accText.isEmpty()) return accText;
-                String title = comboBox.isEditable() ? getEditor().getText() : buttonCell.getText();
-                if (title == null || title.isEmpty()) {
-                    title = comboBox.getPromptText();
-                }
-                return title;
-            }
-            case SELECTION_START: return getEditor().getSelection().getStart();
-            case SELECTION_END: return getEditor().getSelection().getEnd();
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
-
--- /dev/null	2015-09-03 15:18:43.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxListViewSkin.java	2015-09-03 15:18:41.737154300 -0700
@@ -0,0 +1,654 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.ComboBoxBaseBehavior;
+import com.sun.javafx.scene.control.behavior.ComboBoxListViewBehavior;
+
+import java.util.List;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.WeakListChangeListener;
+import javafx.css.PseudoClass;
+import javafx.event.ActionEvent;
+import javafx.event.EventTarget;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Control;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionMode;
+import javafx.scene.control.SelectionModel;
+import javafx.scene.control.TextField;
+import javafx.scene.input.*;
+import javafx.util.Callback;
+import javafx.util.StringConverter;
+
+/**
+ * Default skin implementation for the {@link ComboBox} control.
+ *
+ * @see ComboBox
+ * @since 9
+ */
+public class ComboBoxListViewSkin<T> extends ComboBoxPopupControl<T> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    // By default we measure the width of all cells in the ListView. If this
+    // is too burdensome, the developer may set a property in the ComboBox
+    // properties map with this key to specify the number of rows to measure.
+    // This may one day become a property on the ComboBox itself.
+    private static final String COMBO_BOX_ROWS_TO_MEASURE_WIDTH_KEY = "comboBoxRowsToMeasureWidth";
+
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/    
+    
+    private final ComboBox<T> comboBox;
+    private ObservableList<T> comboBoxItems;
+    
+    private ListCell<T> buttonCell;
+    private Callback<ListView<T>, ListCell<T>> cellFactory;
+    
+    private final ListView<T> listView;
+    private ObservableList<T> listViewItems;
+    
+    private boolean listSelectionLock = false;
+    private boolean listViewSelectionDirty = false;
+
+    private final ComboBoxListViewBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+    
+    private boolean itemCountDirty;
+    private final ListChangeListener<T> listViewItemsListener = new ListChangeListener<T>() {
+        @Override public void onChanged(ListChangeListener.Change<? extends T> c) {
+            itemCountDirty = true;
+            getSkinnable().requestLayout();
+        }
+    };
+
+    private final InvalidationListener itemsObserver;
+    
+    private final WeakListChangeListener<T> weakListViewItemsListener =
+            new WeakListChangeListener<T>(listViewItemsListener);
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ComboBoxListViewSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ComboBoxListViewSkin(final ComboBox<T> control) {
+        super(control);
+
+        // install default input map for the control
+        this.behavior = new ComboBoxListViewBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        this.comboBox = control;
+        updateComboBoxItems();
+
+        itemsObserver = observable -> {
+            updateComboBoxItems();
+            updateListViewItems();
+        };
+        control.itemsProperty().addListener(new WeakInvalidationListener(itemsObserver));
+        
+        // listview for popup
+        this.listView = createListView();
+        
+        // Fix for RT-21207. Additional code related to this bug is further below.
+        this.listView.setManaged(false);
+        getChildren().add(listView);
+        // -- end of fix
+                
+        updateListViewItems();
+        updateCellFactory();
+        
+        updateButtonCell();
+
+        // Fix for RT-19431 (also tested via ComboBoxListViewSkinTest)
+        updateValue();
+
+        registerChangeListener(control.itemsProperty(), e -> {
+            updateComboBoxItems();
+            updateListViewItems();
+        });
+        registerChangeListener(control.promptTextProperty(), e -> updateDisplayNode());
+        registerChangeListener(control.cellFactoryProperty(), e -> updateCellFactory());
+        registerChangeListener(control.visibleRowCountProperty(), e -> {
+            if (listView == null) return;
+            listView.requestLayout();
+        });
+        registerChangeListener(control.converterProperty(), e -> updateListViewItems());
+        registerChangeListener(control.buttonCellProperty(), e -> updateButtonCell());
+        registerChangeListener(control.valueProperty(), e -> {
+            updateValue();
+            control.fireEvent(new ActionEvent());
+        });
+        registerChangeListener(control.editableProperty(), e -> updateEditable());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * By default this skin hides the popup whenever the ListView is clicked in.
+     * By setting hideOnClick to false, the popup will not be hidden when the
+     * ListView is clicked in. This is beneficial in some scenarios (for example,
+     * when the ListView cells have checkboxes).
+     */
+    // --- hide on click
+    private final BooleanProperty hideOnClick = new SimpleBooleanProperty(this, "hideOnClick", true);
+    public final BooleanProperty hideOnClickProperty() {
+        return hideOnClick;
+    }
+    public final boolean isHideOnClick() {
+        return hideOnClick.get();
+    }
+    public final void setHideOnClick(boolean value) {
+        hideOnClick.set(value);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected TextField getEditor() {
+        // Return null if editable is false, even if the ComboBox has an editor set.
+        // Use getSkinnable() here because this method is called from the super
+        // constructor before comboBox is initialized.
+        return getSkinnable().isEditable() ? ((ComboBox)getSkinnable()).getEditor() : null;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected StringConverter<T> getConverter() {
+        return ((ComboBox)getSkinnable()).getConverter();
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getDisplayNode() {
+        Node displayNode;
+        if (comboBox.isEditable()) {
+            displayNode = getEditableInputNode();
+        } else {
+            displayNode = buttonCell;
+        }
+        
+        updateDisplayNode();
+        
+        return displayNode;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getPopupContent() {
+        return listView;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        reconfigurePopup();
+        return 50;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double superPrefWidth = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+        double listViewWidth = listView.prefWidth(height);
+        double pw = Math.max(superPrefWidth, listViewWidth);
+
+        reconfigurePopup();
+
+        return pw;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        reconfigurePopup();
+        return super.computeMaxWidth(height, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        reconfigurePopup();
+        return super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        reconfigurePopup();
+        return super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        reconfigurePopup();
+        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+            final double w, final double h) {
+        if (listViewSelectionDirty) {
+            try {
+                listSelectionLock = true;
+                T item = comboBox.getSelectionModel().getSelectedItem();
+                listView.getSelectionModel().clearSelection();
+                listView.getSelectionModel().select(item);
+            } finally {
+                listSelectionLock = false;
+                listViewSelectionDirty = false;
+            }
+        }
+        
+        super.layoutChildren(x, y, w, h);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override void updateDisplayNode() {
+        if (getEditor() != null) {
+            super.updateDisplayNode();
+        } else {
+            T value = comboBox.getValue();
+            int index = getIndexOfComboBoxValueInItemsList();
+            if (index > -1) {
+                buttonCell.setItem(null);
+                buttonCell.updateIndex(index);
+            } else {
+                // RT-21336 Show the ComboBox value even though it doesn't
+                // exist in the ComboBox items list (part two of fix)
+                buttonCell.updateIndex(-1);
+                boolean empty = updateDisplayText(buttonCell, value, false);
+
+                // Note that empty boolean collected above. This is used to resolve
+                // RT-27834, where we were getting different styling based on whether
+                // the cell was updated via the updateIndex method above, or just
+                // by directly updating the text. We fake the pseudoclass state
+                // for empty, filled, and selected here.
+                buttonCell.pseudoClassStateChanged(PSEUDO_CLASS_EMPTY,    empty);
+                buttonCell.pseudoClassStateChanged(PSEUDO_CLASS_FILLED,   !empty);
+                buttonCell.pseudoClassStateChanged(PSEUDO_CLASS_SELECTED, true);
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override ComboBoxBaseBehavior getBehavior() {
+        return behavior;
+    }
+
+    private void updateComboBoxItems() {
+        comboBoxItems = comboBox.getItems();
+        comboBoxItems = comboBoxItems == null ? FXCollections.<T>emptyObservableList() : comboBoxItems;
+    }
+
+    private void updateListViewItems() {
+        if (listViewItems != null) {
+            listViewItems.removeListener(weakListViewItemsListener);
+        }
+
+        this.listViewItems = comboBoxItems;
+        listView.setItems(listViewItems);
+
+        if (listViewItems != null) {
+            listViewItems.addListener(weakListViewItemsListener);
+        }
+
+        itemCountDirty = true;
+        getSkinnable().requestLayout();
+    }
+
+    private void updateValue() {
+        T newValue = comboBox.getValue();
+        
+        SelectionModel<T> listViewSM = listView.getSelectionModel();
+        
+        if (newValue == null) {
+            listViewSM.clearSelection();
+        } else {
+            // RT-22386: We need to test to see if the value is in the comboBox
+            // items list. If it isn't, then we should clear the listview 
+            // selection
+            int indexOfNewValue = getIndexOfComboBoxValueInItemsList();
+            if (indexOfNewValue == -1) {
+                listSelectionLock = true;
+                listViewSM.clearSelection();
+                listSelectionLock = false;
+            } else {
+                int index = comboBox.getSelectionModel().getSelectedIndex();
+                if (index >= 0 && index < comboBoxItems.size()) {
+                    T itemsObj = comboBoxItems.get(index);
+                    if (itemsObj != null && itemsObj.equals(newValue)) {
+                        listViewSM.select(index);
+                    } else {
+                        listViewSM.select(newValue);
+                    }
+                } else {
+                    // just select the first instance of newValue in the list
+                    int listViewIndex = comboBoxItems.indexOf(newValue);
+                    if (listViewIndex == -1) {
+                        // RT-21336 Show the ComboBox value even though it doesn't
+                        // exist in the ComboBox items list (part one of fix)
+                        updateDisplayNode();
+                    } else {
+                        listViewSM.select(listViewIndex);
+                    }
+                }
+            }
+        }
+    }
+
+    // return a boolean to indicate that the cell is empty (and therefore not filled)
+    private boolean updateDisplayText(ListCell<T> cell, T item, boolean empty) {
+        if (empty) {
+            if (cell == null) return true;
+            cell.setGraphic(null);
+            cell.setText(null);
+            return true;
+        } else if (item instanceof Node) {
+            Node currentNode = cell.getGraphic();
+            Node newNode = (Node) item;
+            if (currentNode == null || ! currentNode.equals(newNode)) {
+                cell.setText(null);
+                cell.setGraphic(newNode);
+            }
+            return newNode == null;
+        } else {
+            // run item through StringConverter if it isn't null
+            StringConverter<T> c = comboBox.getConverter();
+            String s = item == null ? comboBox.getPromptText() : (c == null ? item.toString() : c.toString(item));
+            cell.setText(s);
+            cell.setGraphic(null);
+            return s == null || s.isEmpty();
+        }
+    }
+    
+    private int getIndexOfComboBoxValueInItemsList() {
+        T value = comboBox.getValue();
+        int index = comboBoxItems.indexOf(value);
+        return index;
+    }
+    
+    private void updateButtonCell() {
+        buttonCell = comboBox.getButtonCell() != null ? 
+                comboBox.getButtonCell() : getDefaultCellFactory().call(listView);
+        buttonCell.setMouseTransparent(true);
+        buttonCell.updateListView(listView);
+        updateDisplayArea();
+        // As long as the screen-reader is concerned this node is not a list item.
+        // This matters because the screen-reader counts the number of list item
+        // within combo and speaks it to the user.
+        buttonCell.setAccessibleRole(AccessibleRole.NODE);
+    }
+
+    private void updateCellFactory() {
+        Callback<ListView<T>, ListCell<T>> cf = comboBox.getCellFactory();
+        cellFactory = cf != null ? cf : getDefaultCellFactory();
+        listView.setCellFactory(cellFactory);
+    }
+    
+    private Callback<ListView<T>, ListCell<T>> getDefaultCellFactory() {
+        return new Callback<ListView<T>, ListCell<T>>() {
+            @Override public ListCell<T> call(ListView<T> listView) {
+                return new ListCell<T>() {
+                    @Override public void updateItem(T item, boolean empty) {
+                        super.updateItem(item, empty);
+                        updateDisplayText(this, item, empty);
+                    }
+                };
+            }
+        };
+    }
+    
+    private ListView<T> createListView() {
+        final ListView<T> _listView = new ListView<T>() {
+
+            {
+                getProperties().put("selectFirstRowByDefault", false);
+            }
+
+            @Override protected double computeMinHeight(double width) {
+                return 30;
+            }
+            
+            @Override protected double computePrefWidth(double height) {
+                double pw;
+                if (getSkin() instanceof ListViewSkin) {
+                    ListViewSkin<?> skin = (ListViewSkin<?>)getSkin();
+                    if (itemCountDirty) {
+                        skin.updateRowCount();
+                        itemCountDirty = false;
+                    }
+                    
+                    int rowsToMeasure = -1;
+                    if (comboBox.getProperties().containsKey(COMBO_BOX_ROWS_TO_MEASURE_WIDTH_KEY)) {
+                        rowsToMeasure = (Integer) comboBox.getProperties().get(COMBO_BOX_ROWS_TO_MEASURE_WIDTH_KEY);
+                    }
+                    
+                    pw = Math.max(comboBox.getWidth(), skin.getMaxCellWidth(rowsToMeasure) + 30);
+                } else {
+                    pw = Math.max(100, comboBox.getWidth());
+                }
+
+                // need to check the ListView pref height in the case that the
+                // placeholder node is showing
+                if (getItems().isEmpty() && getPlaceholder() != null) {
+                    pw = Math.max(super.computePrefWidth(height), pw);
+                }
+
+                return Math.max(50, pw);
+            }
+
+            @Override protected double computePrefHeight(double width) {
+                return getListViewPrefHeight();
+            }
+        };
+
+        _listView.setId("list-view");
+        _listView.placeholderProperty().bind(comboBox.placeholderProperty());
+        _listView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+        _listView.setFocusTraversable(false);
+
+        _listView.getSelectionModel().selectedIndexProperty().addListener(o -> {
+            if (listSelectionLock) return;
+            int index = listView.getSelectionModel().getSelectedIndex();
+            comboBox.getSelectionModel().select(index);
+            updateDisplayNode();
+            comboBox.notifyAccessibleAttributeChanged(AccessibleAttribute.TEXT);
+        });
+         
+        comboBox.getSelectionModel().selectedItemProperty().addListener(o -> {
+            listViewSelectionDirty = true;
+        });
+        
+        _listView.addEventFilter(MouseEvent.MOUSE_RELEASED, t -> {
+            // RT-18672: Without checking if the user is clicking in the
+            // scrollbar area of the ListView, the comboBox will hide. Therefore,
+            // we add the check below to prevent this from happening.
+            EventTarget target = t.getTarget();
+            if (target instanceof Parent) {
+                List<String> s = ((Parent) target).getStyleClass();
+                if (s.contains("thumb")
+                        || s.contains("track")
+                        || s.contains("decrement-arrow")
+                        || s.contains("increment-arrow")) {
+                    return;
+                }
+            }
+
+            if (isHideOnClick()) {
+                comboBox.hide();
+            }
+        });
+
+        _listView.setOnKeyPressed(t -> {
+            // TODO move to behavior, when (or if) this class becomes a SkinBase
+            if (t.getCode() == KeyCode.ENTER ||
+                    t.getCode() == KeyCode.SPACE ||
+                    t.getCode() == KeyCode.ESCAPE) {
+                comboBox.hide();
+            }
+        });
+        
+        return _listView;
+    }
+    
+    private double getListViewPrefHeight() {
+        double ph;
+        if (listView.getSkin() instanceof VirtualContainerBase) {
+            int maxRows = comboBox.getVisibleRowCount();
+            VirtualContainerBase<?,?> skin = (VirtualContainerBase<?,?>)listView.getSkin();
+            ph = skin.getVirtualFlowPreferredHeight(maxRows);
+        } else {
+            double ch = comboBoxItems.size() * 25;
+            ph = Math.min(ch, 200);
+        }
+        
+        return ph;
+    }
+
+
+    
+    /**************************************************************************
+     * 
+     * API for testing
+     * 
+     *************************************************************************/
+    
+    ListView<T> getListView() {
+        return listView;
+    }
+    
+    
+    
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+    
+    // These three pseudo class states are duplicated from Cell
+    private static final PseudoClass PSEUDO_CLASS_SELECTED =
+            PseudoClass.getPseudoClass("selected");
+    private static final PseudoClass PSEUDO_CLASS_EMPTY =
+            PseudoClass.getPseudoClass("empty");
+    private static final PseudoClass PSEUDO_CLASS_FILLED =
+            PseudoClass.getPseudoClass("filled");
+
+
+    /** {@inheritDoc} */
+    @Override public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: {
+                if (comboBox.isShowing()) {
+                    /* On Mac, for some reason, changing the selection on the list is not
+                     * reported by VoiceOver the first time it shows.
+                     * Note that this fix returns a child of the PopupWindow back to the main
+                     * Stage, which doesn't seem to cause problems.
+                     */
+                    return listView.queryAccessibleAttribute(attribute, parameters);
+                }
+                return null;
+            }
+            case TEXT: {
+                String accText = comboBox.getAccessibleText();
+                if (accText != null && !accText.isEmpty()) return accText;
+                String title = comboBox.isEditable() ? getEditor().getText() : buttonCell.getText();
+                if (title == null || title.isEmpty()) {
+                    title = comboBox.getPromptText();
+                }
+                return title;
+            }
+            case SELECTION_START: return getEditor().getSelection().getStart();
+            case SELECTION_END: return getEditor().getSelection().getEnd();
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}
+
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxMode.java	2015-09-03 15:18:50.603661400 -0700
+++ /dev/null	2015-09-03 15:18:51.000000000 -0700
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-/**
- * Indicates what the look of the ColorPicker control should be. 
- */
-enum ComboBoxMode {
-    
-     /**
-     * The default look with display and arrow button.
-     */
-    COMBOBOX,
-
-    /**
-     * Split Menu Button look with display and arrow button separated by a line.
-     */
-    SPLITBUTTON,
-    
-    /**
-     * Simple Button look with display area only.
-     */       
-    BUTTON 
-}
-
--- /dev/null	2015-09-03 15:18:51.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxMode.java	2015-09-03 15:18:49.814616300 -0700
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2012, 2015, 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;
+
+/**
+ * Indicates what the look of the ColorPicker control should be. 
+ */
+enum ComboBoxMode {
+    
+     /**
+     * The default look with display and arrow button.
+     */
+    COMBOBOX,
+
+    /**
+     * Split Menu Button look with display and arrow button separated by a line.
+     */
+    SPLITBUTTON,
+    
+    /**
+     * Simple Button look with display area only.
+     */       
+    BUTTON 
+}
+
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ComboBoxPopupControl.java	2015-09-03 15:18:58.130091900 -0700
+++ /dev/null	2015-09-03 15:18:59.000000000 -0700
@@ -1,553 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.beans.value.ObservableValue;
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-import javafx.geometry.*;
-import javafx.scene.control.*;
-import com.sun.javafx.scene.control.behavior.ComboBoxBaseBehavior;
-import com.sun.javafx.scene.input.ExtendedInputMethodRequests;
-import com.sun.javafx.scene.traversal.Algorithm;
-import com.sun.javafx.scene.traversal.Direction;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import com.sun.javafx.scene.traversal.TraversalContext;
-import javafx.beans.InvalidationListener;
-import javafx.event.EventHandler;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.input.DragEvent;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Region;
-import javafx.stage.WindowEvent;
-import javafx.util.StringConverter;
-
-public abstract class ComboBoxPopupControl<T> extends ComboBoxBaseSkin<T> {
-    
-    protected PopupControl popup;
-    public static final String COMBO_BOX_STYLE_CLASS = "combo-box-popup";
-
-    private boolean popupNeedsReconfiguring = true;
-
-    private final ComboBoxBase<T> comboBoxBase;
-    private TextField textField;
-
-    public ComboBoxPopupControl(ComboBoxBase<T> comboBoxBase, final ComboBoxBaseBehavior<T> behavior) {
-        super(comboBoxBase, behavior);
-        this.comboBoxBase = comboBoxBase;
-
-        // editable input node
-        this.textField = getEditor() != null ? getEditableInputNode() : null;
-        
-        // Fix for RT-29565. Without this the textField does not have a correct
-        // pref width at startup, as it is not part of the scenegraph (and therefore
-        // has no pref width until after the first measurements have been taken).
-        if (this.textField != null) {
-            getChildren().add(textField);
-        }
-        
-        // move fake focus in to the textfield if the comboBox is editable
-        comboBoxBase.focusedProperty().addListener((ov, t, hasFocus) -> {
-            if (getEditor() != null) {
-                // Fix for the regression noted in a comment in RT-29885.
-                ((FakeFocusTextField)textField).setFakeFocus(hasFocus);
-            }
-        });
-
-        comboBoxBase.addEventFilter(KeyEvent.ANY, ke -> {
-            if (textField == null || getEditor() == null) {
-                handleKeyEvent(ke, false);
-            } else {
-                // This prevents a stack overflow from our rebroadcasting of the
-                // event to the textfield that occurs in the final else statement
-                // of the conditions below.
-                if (ke.getTarget().equals(textField)) return;
-
-                switch (ke.getCode()) {
-                  case ESCAPE:
-                  case F10:
-                      // Allow to bubble up.
-                      break;
-
-                  case ENTER:
-                    handleKeyEvent(ke, true);
-                    break;
-
-                  default:
-                    // Fix for the regression noted in a comment in RT-29885.
-                    // This forwards the event down into the TextField when
-                    // the key event is actually received by the ComboBox.
-                    textField.fireEvent(ke.copyFor(textField, textField));
-                    ke.consume();
-                }
-            }
-        });
-
-        // RT-38978: Forward input method events to TextField if editable.
-        if (comboBoxBase.getOnInputMethodTextChanged() == null) {
-            comboBoxBase.setOnInputMethodTextChanged(event -> {
-                if (textField != null && getEditor() != null && comboBoxBase.getScene().getFocusOwner() == comboBoxBase) {
-                    if (textField.getOnInputMethodTextChanged() != null) {
-                        textField.getOnInputMethodTextChanged().handle(event);
-                    }
-                }
-            });
-        }
-
-        // Fix for RT-36902, where focus traversal was getting stuck inside the ComboBox
-        comboBoxBase.setImpl_traversalEngine(new ParentTraversalEngine(comboBoxBase, new Algorithm() {
-            @Override public Node select(Node owner, Direction dir, TraversalContext context) {
-                return null;
-            }
-
-            @Override public Node selectFirst(TraversalContext context) {
-                return null;
-            }
-
-            @Override public Node selectLast(TraversalContext context) {
-                return null;
-            }
-        }));
-
-        updateEditable();
-    }
-    
-    /**
-     * This method should return the Node that will be displayed when the user
-     * clicks on the ComboBox 'button' area.
-     */
-    protected abstract Node getPopupContent();
-    
-    protected PopupControl getPopup() {
-        if (popup == null) {
-            createPopup();
-        }
-        return popup;
-    }
-
-    @Override public void show() {
-        if (getSkinnable() == null) {
-            throw new IllegalStateException("ComboBox is null");
-        }
-        
-        Node content = getPopupContent();
-        if (content == null) {
-            throw new IllegalStateException("Popup node is null");
-        }
-        
-        if (getPopup().isShowing()) return;
-        
-        positionAndShowPopup();
-    }
-
-    @Override public void hide() {
-        if (popup != null && popup.isShowing()) {
-            popup.hide();
-        }
-    }
-    
-    private Point2D getPrefPopupPosition() {
-        return com.sun.javafx.util.Utils.pointRelativeTo(getSkinnable(), getPopupContent(), HPos.CENTER, VPos.BOTTOM, 0, 0, true);
-    }
-    
-    private void positionAndShowPopup() {
-        final PopupControl _popup = getPopup();
-        _popup.getScene().setNodeOrientation(getSkinnable().getEffectiveNodeOrientation());
-
-
-        final Node popupContent = getPopupContent();
-        sizePopup();
-
-        Point2D p = getPrefPopupPosition();
-
-        popupNeedsReconfiguring = true;
-        reconfigurePopup();
-        
-        final ComboBoxBase<T> comboBoxBase = getSkinnable();
-        _popup.show(comboBoxBase.getScene().getWindow(),
-                snapPosition(p.getX()),
-                snapPosition(p.getY()));
-
-        popupContent.requestFocus();
-
-        // second call to sizePopup here to enable proper sizing _after_ the popup
-        // has been displayed. See RT-37622 for more detail.
-        sizePopup();
-    }
-
-    private void sizePopup() {
-        final Node popupContent = getPopupContent();
-
-        if (popupContent instanceof Region) {
-            // snap to pixel
-            final Region r = (Region) popupContent;
-
-            // 0 is used here for the width due to RT-46097
-            double prefHeight = snapSize(r.prefHeight(0));
-            double minHeight = snapSize(r.minHeight(0));
-            double maxHeight = snapSize(r.maxHeight(0));
-            double h = snapSize(Math.min(Math.max(prefHeight, minHeight), Math.max(minHeight, maxHeight)));
-
-            double prefWidth = snapSize(r.prefWidth(h));
-            double minWidth = snapSize(r.minWidth(h));
-            double maxWidth = snapSize(r.maxWidth(h));
-            double w = snapSize(Math.min(Math.max(prefWidth, minWidth), Math.max(minWidth, maxWidth)));
-
-            popupContent.resize(w, h);
-        } else {
-            popupContent.autosize();
-        }
-    }
-    
-    private void createPopup() {
-        popup = new PopupControl() {
-
-            @Override public Styleable getStyleableParent() {
-                return ComboBoxPopupControl.this.getSkinnable();
-            }
-            {
-                setSkin(new Skin<Skinnable>() {
-                    @Override public Skinnable getSkinnable() { return ComboBoxPopupControl.this.getSkinnable(); }
-                    @Override public Node getNode() { return getPopupContent(); }
-                    @Override public void dispose() { }
-                });
-            }
-
-        };
-        popup.getStyleClass().add(COMBO_BOX_STYLE_CLASS);
-        popup.setConsumeAutoHidingEvents(false);
-        popup.setAutoHide(true);
-        popup.setAutoFix(true);
-        popup.setHideOnEscape(true);
-        popup.setOnAutoHide(e -> {
-            getBehavior().onAutoHide();
-        });
-        popup.addEventHandler(MouseEvent.MOUSE_CLICKED, t -> {
-            // RT-18529: We listen to mouse input that is received by the popup
-            // but that is not consumed, and assume that this is due to the mouse
-            // clicking outside of the node, but in areas such as the
-            // dropshadow.
-            getBehavior().onAutoHide();
-        });
-        popup.addEventHandler(WindowEvent.WINDOW_HIDDEN, t -> {
-            // Make sure the accessibility focus returns to the combo box
-            // after the window closes.
-            getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_NODE);
-        });
-        
-        // Fix for RT-21207
-        InvalidationListener layoutPosListener = o -> {
-            popupNeedsReconfiguring = true;
-            reconfigurePopup();
-        };
-        getSkinnable().layoutXProperty().addListener(layoutPosListener);
-        getSkinnable().layoutYProperty().addListener(layoutPosListener);
-        getSkinnable().widthProperty().addListener(layoutPosListener);
-        getSkinnable().heightProperty().addListener(layoutPosListener);
-
-        // RT-36966 - if skinnable's scene becomes null, ensure popup is closed
-        getSkinnable().sceneProperty().addListener(o -> {
-            if (((ObservableValue)o).getValue() == null) {
-                hide();
-            }
-        });
-
-    }
-
-    void reconfigurePopup() {
-        // RT-26861. Don't call getPopup() here because it may cause the popup
-        // to be created too early, which leads to memory leaks like those noted
-        // in RT-32827.
-        if (popup == null) return;
-
-        final boolean isShowing = popup.isShowing();
-        if (! isShowing) return;
-
-        if (! popupNeedsReconfiguring) return;
-        popupNeedsReconfiguring = false;
-
-        final Point2D p = getPrefPopupPosition();
-
-        final Node popupContent = getPopupContent();
-        final double minWidth = popupContent.prefWidth(Region.USE_COMPUTED_SIZE);
-        final double minHeight = popupContent.prefHeight(Region.USE_COMPUTED_SIZE);
-
-        if (p.getX() > -1) popup.setAnchorX(p.getX());
-        if (p.getY() > -1) popup.setAnchorY(p.getY());
-        if (minWidth > -1) popup.setMinWidth(minWidth);
-        if (minHeight > -1) popup.setMinHeight(minHeight);
-
-        final Bounds b = popupContent.getLayoutBounds();
-        final double currentWidth = b.getWidth();
-        final double currentHeight = b.getHeight();
-        final double newWidth  = currentWidth < minWidth ? minWidth : currentWidth;
-        final double newHeight = currentHeight < minHeight ? minHeight : currentHeight;
-
-        if (newWidth != currentWidth || newHeight != currentHeight) {
-            // Resizing content to resolve issues such as RT-32582 and RT-33700
-            // (where RT-33700 was introduced due to a previous fix for RT-32582)
-            popupContent.resize(newWidth, newHeight);
-            if (popupContent instanceof Region) {
-                ((Region)popupContent).setMinSize(newWidth, newHeight);
-                ((Region)popupContent).setPrefSize(newWidth, newHeight);
-            }
-        }
-    }
-
-
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * TextField Listeners                                                     *
-     *                                                                         *
-     **************************************************************************/
-    
-    private EventHandler<MouseEvent> textFieldMouseEventHandler = event -> {
-        ComboBoxBase<T> comboBoxBase = getSkinnable();
-        if (!event.getTarget().equals(comboBoxBase)) {
-            comboBoxBase.fireEvent(event.copyFor(comboBoxBase, comboBoxBase));
-            event.consume();
-        }
-    };
-    private EventHandler<DragEvent> textFieldDragEventHandler = event -> {
-        ComboBoxBase<T> comboBoxBase = getSkinnable();
-        if (!event.getTarget().equals(comboBoxBase)) {
-            comboBoxBase.fireEvent(event.copyFor(comboBoxBase, comboBoxBase));
-            event.consume();
-        }
-    };
-
-
-    /**
-     * Subclasses are responsible for getting the editor. This will be removed
-     * in FX 9 when the editor property is moved up to ComboBoxBase.
-     *
-     * Note: ComboBoxListViewSkin should return null if editable is false, even
-     * if the ComboBox does have an editor set.
-     */
-    protected abstract TextField getEditor();
-
-    /**
-     * Subclasses are responsible for getting the converter. This will be
-     * removed in FX 9 when the converter property is moved up to ComboBoxBase.
-     */
-    protected abstract StringConverter<T> getConverter();
-
-    private String initialTextFieldValue = null;
-    protected TextField getEditableInputNode() {
-        if (textField == null && getEditor() != null) {
-            textField = getEditor();
-            textField.setFocusTraversable(false);
-            textField.promptTextProperty().bind(comboBoxBase.promptTextProperty());
-            textField.tooltipProperty().bind(comboBoxBase.tooltipProperty());
-
-            // Fix for RT-21406: ComboBox do not show initial text value
-            initialTextFieldValue = textField.getText();
-            // End of fix (see updateDisplayNode below for the related code)
-        }
-
-        return textField;
-    }
-
-    protected void setTextFromTextFieldIntoComboBoxValue() {
-        if (getEditor() != null) {
-            StringConverter<T> c = getConverter();
-            if (c != null) {
-                T oldValue = comboBoxBase.getValue();
-                T value = oldValue;
-                String text = textField.getText();
-
-                // conditional check here added due to RT-28245
-                if (oldValue == null && (text == null || text.isEmpty())) {
-                    value = null;
-                } else {
-                    try {
-                        value = c.fromString(text);
-                    } catch (Exception ex) {
-                        // Most likely a parsing error, such as DateTimeParseException
-                    }
-                }
-
-                if ((value != null || oldValue != null) && (value == null || !value.equals(oldValue))) {
-                    // no point updating values needlessly if they are the same
-                    comboBoxBase.setValue(value);
-                }
-
-                updateDisplayNode();
-            }
-        }
-    }
-
-    protected void updateDisplayNode() {
-        if (textField != null && getEditor() != null) {
-            T value = comboBoxBase.getValue();
-            StringConverter<T> c = getConverter();
-
-            if (initialTextFieldValue != null && ! initialTextFieldValue.isEmpty()) {
-                // Remainder of fix for RT-21406: ComboBox do not show initial text value
-                textField.setText(initialTextFieldValue);
-                initialTextFieldValue = null;
-                // end of fix
-            } else {
-                String stringValue = c.toString(value);
-                if (value == null || stringValue == null) {
-                    textField.setText("");
-                } else if (! stringValue.equals(textField.getText())) {
-                    textField.setText(stringValue);
-                }
-            }
-        }
-    }
-
-
-    private void handleKeyEvent(KeyEvent ke, boolean doConsume) {
-        // When the user hits the enter or F4 keys, we respond before
-        // ever giving the event to the TextField.
-        if (ke.getCode() == KeyCode.ENTER) {
-            setTextFromTextFieldIntoComboBoxValue();
-
-            if (doConsume && comboBoxBase.getOnAction() != null) {
-                ke.consume();
-            } else {
-                forwardToParent(ke);
-            }
-        } else if (ke.getCode() == KeyCode.F4) {
-            if (ke.getEventType() == KeyEvent.KEY_RELEASED) {
-                if (comboBoxBase.isShowing()) comboBoxBase.hide();
-                else comboBoxBase.show();
-            }
-            ke.consume(); // we always do a consume here (otherwise unit tests fail)
-        }
-    }
-
-    private void forwardToParent(KeyEvent event) {
-        if (comboBoxBase.getParent() != null) {
-            comboBoxBase.getParent().fireEvent(event);
-        }
-    }
-
-    protected void updateEditable() {
-        TextField newTextField = getEditor();
-
-        if (getEditor() == null) {
-            // remove event filters
-            if (textField != null) {
-                textField.removeEventFilter(MouseEvent.DRAG_DETECTED, textFieldMouseEventHandler);
-                textField.removeEventFilter(DragEvent.ANY, textFieldDragEventHandler);
-
-                comboBoxBase.setInputMethodRequests(null);
-            }
-        } else if (newTextField != null) {
-            // add event filters
-
-            // Fix for RT-31093 - drag events from the textfield were not surfacing
-            // properly for the ComboBox.
-            newTextField.addEventFilter(MouseEvent.DRAG_DETECTED, textFieldMouseEventHandler);
-            newTextField.addEventFilter(DragEvent.ANY, textFieldDragEventHandler);
-
-            // RT-38978: Forward input method requests to TextField.
-            comboBoxBase.setInputMethodRequests(new ExtendedInputMethodRequests() {
-                @Override public Point2D getTextLocation(int offset) {
-                    return newTextField.getInputMethodRequests().getTextLocation(offset);
-                }
-
-                @Override public int getLocationOffset(int x, int y) {
-                    return newTextField.getInputMethodRequests().getLocationOffset(x, y);
-                }
-
-                @Override public void cancelLatestCommittedText() {
-                    newTextField.getInputMethodRequests().cancelLatestCommittedText();
-                }
-
-                @Override public String getSelectedText() {
-                    return newTextField.getInputMethodRequests().getSelectedText();
-                }
-
-                @Override public int getInsertPositionOffset() {
-                    return ((ExtendedInputMethodRequests)newTextField.getInputMethodRequests()).getInsertPositionOffset();
-                }
-
-                @Override public String getCommittedText(int begin, int end) {
-                    return ((ExtendedInputMethodRequests)newTextField.getInputMethodRequests()).getCommittedText(begin, end);
-                }
-
-                @Override public int getCommittedTextLength() {
-                    return ((ExtendedInputMethodRequests)newTextField.getInputMethodRequests()).getCommittedTextLength();
-                }
-            });
-        }
-
-        textField = newTextField;
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Support classes                                                         *
-     *                                                                         *
-     **************************************************************************/
-
-    public static final class FakeFocusTextField extends TextField {
-
-        @Override public void requestFocus() {
-            if (getParent() != null) {
-                getParent().requestFocus();
-            }
-        }
-
-        public void setFakeFocus(boolean b) {
-            setFocused(b);
-        }
-
-        @Override
-        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-            switch (attribute) {
-                case FOCUS_ITEM: 
-                    /* Internally comboBox reassign its focus the text field.
-                     * For the accessibility perspective it is more meaningful
-                     * if the focus stays with the comboBox control.
-                     */
-                    return getParent();
-                default: return super.queryAccessibleAttribute(attribute, parameters);
-            }
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-
-    private static PseudoClass CONTAINS_FOCUS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("contains-focus");
-
-}
--- /dev/null	2015-09-03 15:18:59.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ComboBoxPopupControl.java	2015-09-03 15:18:57.415051000 -0700
@@ -0,0 +1,586 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.FakeFocusTextField;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.input.ExtendedInputMethodRequests;
+import com.sun.javafx.scene.traversal.Algorithm;
+import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalContext;
+import javafx.beans.InvalidationListener;
+import javafx.beans.value.ObservableValue;
+import javafx.css.PseudoClass;
+import javafx.css.Styleable;
+import javafx.event.EventHandler;
+import javafx.geometry.Bounds;
+import javafx.geometry.HPos;
+import javafx.geometry.Point2D;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.ComboBoxBase;
+import javafx.scene.control.PopupControl;
+import javafx.scene.control.Skin;
+import javafx.scene.control.Skinnable;
+import javafx.scene.control.TextField;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import javafx.stage.WindowEvent;
+import javafx.util.StringConverter;
+
+/**
+ * An abstract class that extends the functionality of {@link ComboBoxBaseSkin}
+ * to include API related to showing ComboBox-like controls as popups.
+ *
+ * @param <T> The type of the ComboBox-like control.
+ * @since 9
+ */
+public abstract class ComboBoxPopupControl<T> extends ComboBoxBaseSkin<T> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+    
+    PopupControl popup;
+
+    private boolean popupNeedsReconfiguring = true;
+
+    private final ComboBoxBase<T> comboBoxBase;
+    private TextField textField;
+
+    private String initialTextFieldValue = null;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * TextField Listeners                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    private EventHandler<MouseEvent> textFieldMouseEventHandler = event -> {
+        ComboBoxBase<T> comboBoxBase = getSkinnable();
+        if (!event.getTarget().equals(comboBoxBase)) {
+            comboBoxBase.fireEvent(event.copyFor(comboBoxBase, comboBoxBase));
+            event.consume();
+        }
+    };
+    private EventHandler<DragEvent> textFieldDragEventHandler = event -> {
+        ComboBoxBase<T> comboBoxBase = getSkinnable();
+        if (!event.getTarget().equals(comboBoxBase)) {
+            comboBoxBase.fireEvent(event.copyFor(comboBoxBase, comboBoxBase));
+            event.consume();
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new instance of ComboBoxPopupControl, although note that this
+     * instance does not handle any behavior / input mappings - this needs to be
+     * handled appropriately by subclasses.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ComboBoxPopupControl(ComboBoxBase<T> control) {
+        super(control);
+        this.comboBoxBase = control;
+
+        // editable input node
+        this.textField = getEditor() != null ? getEditableInputNode() : null;
+        
+        // Fix for RT-29565. Without this the textField does not have a correct
+        // pref width at startup, as it is not part of the scenegraph (and therefore
+        // has no pref width until after the first measurements have been taken).
+        if (this.textField != null) {
+            getChildren().add(textField);
+        }
+        
+        // move fake focus in to the textfield if the comboBox is editable
+        comboBoxBase.focusedProperty().addListener((ov, t, hasFocus) -> {
+            if (getEditor() != null) {
+                // Fix for the regression noted in a comment in RT-29885.
+                ((FakeFocusTextField)textField).setFakeFocus(hasFocus);
+            }
+        });
+
+        comboBoxBase.addEventFilter(KeyEvent.ANY, ke -> {
+            if (textField == null || getEditor() == null) {
+                handleKeyEvent(ke, false);
+            } else {
+                // This prevents a stack overflow from our rebroadcasting of the
+                // event to the textfield that occurs in the final else statement
+                // of the conditions below.
+                if (ke.getTarget().equals(textField)) return;
+
+                switch (ke.getCode()) {
+                  case ESCAPE:
+                  case F10:
+                      // Allow to bubble up.
+                      break;
+
+                  case ENTER:
+                    handleKeyEvent(ke, true);
+                    break;
+
+                  default:
+                    // Fix for the regression noted in a comment in RT-29885.
+                    // This forwards the event down into the TextField when
+                    // the key event is actually received by the ComboBox.
+                    textField.fireEvent(ke.copyFor(textField, textField));
+                    ke.consume();
+                }
+            }
+        });
+
+        // RT-38978: Forward input method events to TextField if editable.
+        if (comboBoxBase.getOnInputMethodTextChanged() == null) {
+            comboBoxBase.setOnInputMethodTextChanged(event -> {
+                if (textField != null && getEditor() != null && comboBoxBase.getScene().getFocusOwner() == comboBoxBase) {
+                    if (textField.getOnInputMethodTextChanged() != null) {
+                        textField.getOnInputMethodTextChanged().handle(event);
+                    }
+                }
+            });
+        }
+
+        // Fix for RT-36902, where focus traversal was getting stuck inside the ComboBox
+        comboBoxBase.setImpl_traversalEngine(new ParentTraversalEngine(comboBoxBase, new Algorithm() {
+            @Override public Node select(Node owner, Direction dir, TraversalContext context) {
+                return null;
+            }
+
+            @Override public Node selectFirst(TraversalContext context) {
+                return null;
+            }
+
+            @Override public Node selectLast(TraversalContext context) {
+                return null;
+            }
+        }));
+
+        updateEditable();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * This method should return the Node that will be displayed when the user
+     * clicks on the ComboBox 'button' area.
+     */
+    protected abstract Node getPopupContent();
+
+    /**
+     * Subclasses are responsible for getting the editor. This will be removed
+     * in FX 9 when the editor property is moved up to ComboBoxBase with
+     * JDK-8130354
+     *
+     * Note: ComboBoxListViewSkin should return null if editable is false, even
+     * if the ComboBox does have an editor set.
+     */
+    protected abstract TextField getEditor();
+
+    /**
+     * Subclasses are responsible for getting the converter. This will be
+     * removed in FX 9 when the converter property is moved up to ComboBoxBase
+     * with JDK-8130354.
+     */
+    protected abstract StringConverter<T> getConverter();
+
+    /** {@inheritDoc} */
+    @Override public void show() {
+        if (getSkinnable() == null) {
+            throw new IllegalStateException("ComboBox is null");
+        }
+        
+        Node content = getPopupContent();
+        if (content == null) {
+            throw new IllegalStateException("Popup node is null");
+        }
+        
+        if (getPopup().isShowing()) return;
+        
+        positionAndShowPopup();
+    }
+
+    /** {@inheritDoc} */
+    @Override public void hide() {
+        if (popup != null && popup.isShowing()) {
+            popup.hide();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    PopupControl getPopup() {
+        if (popup == null) {
+            createPopup();
+        }
+        return popup;
+    }
+
+    TextField getEditableInputNode() {
+        if (textField == null && getEditor() != null) {
+            textField = getEditor();
+            textField.setFocusTraversable(false);
+            textField.promptTextProperty().bind(comboBoxBase.promptTextProperty());
+            textField.tooltipProperty().bind(comboBoxBase.tooltipProperty());
+
+            // Fix for RT-21406: ComboBox do not show initial text value
+            initialTextFieldValue = textField.getText();
+            // End of fix (see updateDisplayNode below for the related code)
+        }
+
+        return textField;
+    }
+
+    void setTextFromTextFieldIntoComboBoxValue() {
+        if (getEditor() != null) {
+            StringConverter<T> c = getConverter();
+            if (c != null) {
+                T oldValue = comboBoxBase.getValue();
+                T value = oldValue;
+                String text = textField.getText();
+
+                // conditional check here added due to RT-28245
+                if (oldValue == null && (text == null || text.isEmpty())) {
+                    value = null;
+                } else {
+                    try {
+                        value = c.fromString(text);
+                    } catch (Exception ex) {
+                        // Most likely a parsing error, such as DateTimeParseException
+                    }
+                }
+
+                if ((value != null || oldValue != null) && (value == null || !value.equals(oldValue))) {
+                    // no point updating values needlessly if they are the same
+                    comboBoxBase.setValue(value);
+                }
+
+                updateDisplayNode();
+            }
+        }
+    }
+
+    void updateDisplayNode() {
+        if (textField != null && getEditor() != null) {
+            T value = comboBoxBase.getValue();
+            StringConverter<T> c = getConverter();
+
+            if (initialTextFieldValue != null && ! initialTextFieldValue.isEmpty()) {
+                // Remainder of fix for RT-21406: ComboBox do not show initial text value
+                textField.setText(initialTextFieldValue);
+                initialTextFieldValue = null;
+                // end of fix
+            } else {
+                String stringValue = c.toString(value);
+                if (value == null || stringValue == null) {
+                    textField.setText("");
+                } else if (! stringValue.equals(textField.getText())) {
+                    textField.setText(stringValue);
+                }
+            }
+        }
+    }
+
+    void updateEditable() {
+        TextField newTextField = getEditor();
+
+        if (getEditor() == null) {
+            // remove event filters
+            if (textField != null) {
+                textField.removeEventFilter(MouseEvent.DRAG_DETECTED, textFieldMouseEventHandler);
+                textField.removeEventFilter(DragEvent.ANY, textFieldDragEventHandler);
+
+                comboBoxBase.setInputMethodRequests(null);
+            }
+        } else if (newTextField != null) {
+            // add event filters
+
+            // Fix for RT-31093 - drag events from the textfield were not surfacing
+            // properly for the ComboBox.
+            newTextField.addEventFilter(MouseEvent.DRAG_DETECTED, textFieldMouseEventHandler);
+            newTextField.addEventFilter(DragEvent.ANY, textFieldDragEventHandler);
+
+            // RT-38978: Forward input method requests to TextField.
+            comboBoxBase.setInputMethodRequests(new ExtendedInputMethodRequests() {
+                @Override public Point2D getTextLocation(int offset) {
+                    return newTextField.getInputMethodRequests().getTextLocation(offset);
+                }
+
+                @Override public int getLocationOffset(int x, int y) {
+                    return newTextField.getInputMethodRequests().getLocationOffset(x, y);
+                }
+
+                @Override public void cancelLatestCommittedText() {
+                    newTextField.getInputMethodRequests().cancelLatestCommittedText();
+                }
+
+                @Override public String getSelectedText() {
+                    return newTextField.getInputMethodRequests().getSelectedText();
+                }
+
+                @Override public int getInsertPositionOffset() {
+                    return ((ExtendedInputMethodRequests)newTextField.getInputMethodRequests()).getInsertPositionOffset();
+                }
+
+                @Override public String getCommittedText(int begin, int end) {
+                    return ((ExtendedInputMethodRequests)newTextField.getInputMethodRequests()).getCommittedText(begin, end);
+                }
+
+                @Override public int getCommittedTextLength() {
+                    return ((ExtendedInputMethodRequests)newTextField.getInputMethodRequests()).getCommittedTextLength();
+                }
+            });
+        }
+
+        textField = newTextField;
+    }
+
+    private Point2D getPrefPopupPosition() {
+        return com.sun.javafx.util.Utils.pointRelativeTo(getSkinnable(), getPopupContent(), HPos.CENTER, VPos.BOTTOM, 0, 0, true);
+    }
+    
+    private void positionAndShowPopup() {
+        final PopupControl _popup = getPopup();
+        _popup.getScene().setNodeOrientation(getSkinnable().getEffectiveNodeOrientation());
+
+
+        final Node popupContent = getPopupContent();
+        sizePopup();
+
+        Point2D p = getPrefPopupPosition();
+
+        popupNeedsReconfiguring = true;
+        reconfigurePopup();
+        
+        final ComboBoxBase<T> comboBoxBase = getSkinnable();
+        _popup.show(comboBoxBase.getScene().getWindow(),
+                snapPosition(p.getX()),
+                snapPosition(p.getY()));
+
+        popupContent.requestFocus();
+
+        // second call to sizePopup here to enable proper sizing _after_ the popup
+        // has been displayed. See RT-37622 for more detail.
+        sizePopup();
+    }
+
+    private void sizePopup() {
+        final Node popupContent = getPopupContent();
+
+        if (popupContent instanceof Region) {
+            // snap to pixel
+            final Region r = (Region) popupContent;
+
+            // 0 is used here for the width due to RT-46097
+            double prefHeight = snapSize(r.prefHeight(0));
+            double minHeight = snapSize(r.minHeight(0));
+            double maxHeight = snapSize(r.maxHeight(0));
+            double h = snapSize(Math.min(Math.max(prefHeight, minHeight), Math.max(minHeight, maxHeight)));
+
+            double prefWidth = snapSize(r.prefWidth(h));
+            double minWidth = snapSize(r.minWidth(h));
+            double maxWidth = snapSize(r.maxWidth(h));
+            double w = snapSize(Math.min(Math.max(prefWidth, minWidth), Math.max(minWidth, maxWidth)));
+
+            popupContent.resize(w, h);
+        } else {
+            popupContent.autosize();
+        }
+    }
+    
+    private void createPopup() {
+        popup = new PopupControl() {
+            @Override public Styleable getStyleableParent() {
+                return ComboBoxPopupControl.this.getSkinnable();
+            }
+            {
+                setSkin(new Skin<Skinnable>() {
+                    @Override public Skinnable getSkinnable() { return ComboBoxPopupControl.this.getSkinnable(); }
+                    @Override public Node getNode() { return getPopupContent(); }
+                    @Override public void dispose() { }
+                });
+            }
+        };
+        popup.getStyleClass().add(Properties.COMBO_BOX_STYLE_CLASS);
+        popup.setConsumeAutoHidingEvents(false);
+        popup.setAutoHide(true);
+        popup.setAutoFix(true);
+        popup.setHideOnEscape(true);
+        popup.setOnAutoHide(e -> getBehavior().onAutoHide(popup));
+        popup.addEventHandler(MouseEvent.MOUSE_CLICKED, t -> {
+            // RT-18529: We listen to mouse input that is received by the popup
+            // but that is not consumed, and assume that this is due to the mouse
+            // clicking outside of the node, but in areas such as the
+            // dropshadow.
+            getBehavior().onAutoHide(popup);
+        });
+        popup.addEventHandler(WindowEvent.WINDOW_HIDDEN, t -> {
+            // Make sure the accessibility focus returns to the combo box
+            // after the window closes.
+            getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_NODE);
+        });
+        
+        // Fix for RT-21207
+        InvalidationListener layoutPosListener = o -> {
+            popupNeedsReconfiguring = true;
+            reconfigurePopup();
+        };
+        getSkinnable().layoutXProperty().addListener(layoutPosListener);
+        getSkinnable().layoutYProperty().addListener(layoutPosListener);
+        getSkinnable().widthProperty().addListener(layoutPosListener);
+        getSkinnable().heightProperty().addListener(layoutPosListener);
+
+        // RT-36966 - if skinnable's scene becomes null, ensure popup is closed
+        getSkinnable().sceneProperty().addListener(o -> {
+            if (((ObservableValue)o).getValue() == null) {
+                hide();
+            }
+        });
+
+    }
+
+    void reconfigurePopup() {
+        // RT-26861. Don't call getPopup() here because it may cause the popup
+        // to be created too early, which leads to memory leaks like those noted
+        // in RT-32827.
+        if (popup == null) return;
+
+        final boolean isShowing = popup.isShowing();
+        if (! isShowing) return;
+
+        if (! popupNeedsReconfiguring) return;
+        popupNeedsReconfiguring = false;
+
+        final Point2D p = getPrefPopupPosition();
+
+        final Node popupContent = getPopupContent();
+        final double minWidth = popupContent.prefWidth(Region.USE_COMPUTED_SIZE);
+        final double minHeight = popupContent.prefHeight(Region.USE_COMPUTED_SIZE);
+
+        if (p.getX() > -1) popup.setAnchorX(p.getX());
+        if (p.getY() > -1) popup.setAnchorY(p.getY());
+        if (minWidth > -1) popup.setMinWidth(minWidth);
+        if (minHeight > -1) popup.setMinHeight(minHeight);
+
+        final Bounds b = popupContent.getLayoutBounds();
+        final double currentWidth = b.getWidth();
+        final double currentHeight = b.getHeight();
+        final double newWidth  = currentWidth < minWidth ? minWidth : currentWidth;
+        final double newHeight = currentHeight < minHeight ? minHeight : currentHeight;
+
+        if (newWidth != currentWidth || newHeight != currentHeight) {
+            // Resizing content to resolve issues such as RT-32582 and RT-33700
+            // (where RT-33700 was introduced due to a previous fix for RT-32582)
+            popupContent.resize(newWidth, newHeight);
+            if (popupContent instanceof Region) {
+                ((Region)popupContent).setMinSize(newWidth, newHeight);
+                ((Region)popupContent).setPrefSize(newWidth, newHeight);
+            }
+        }
+    }
+
+    private void handleKeyEvent(KeyEvent ke, boolean doConsume) {
+        // When the user hits the enter or F4 keys, we respond before
+        // ever giving the event to the TextField.
+        if (ke.getCode() == KeyCode.ENTER) {
+            setTextFromTextFieldIntoComboBoxValue();
+
+            if (doConsume && comboBoxBase.getOnAction() != null) {
+                ke.consume();
+            } else {
+                forwardToParent(ke);
+            }
+        } else if (ke.getCode() == KeyCode.F4) {
+            if (ke.getEventType() == KeyEvent.KEY_RELEASED) {
+                if (comboBoxBase.isShowing()) comboBoxBase.hide();
+                else comboBoxBase.show();
+            }
+            ke.consume(); // we always do a consume here (otherwise unit tests fail)
+        } else if (ke.getCode() == KeyCode.F10 || ke.getCode() == KeyCode.ESCAPE) {
+            // RT-23275: The TextField fires F10 and ESCAPE key events
+            // up to the parent, which are then fired back at the
+            // TextField, and this ends up in an infinite loop until
+            // the stack overflows. So, here we consume these two
+            // events and stop them from going any further.
+            if (doConsume) ke.consume();
+        }
+    }
+
+    private void forwardToParent(KeyEvent event) {
+        if (comboBoxBase.getParent() != null) {
+            comboBoxBase.getParent().fireEvent(event);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    private static PseudoClass CONTAINS_FOCUS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("contains-focus");
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ContextMenuSkin.java	2015-09-03 15:19:05.809531100 -0700
+++ /dev/null	2015-09-03 15:19:06.000000000 -0700
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2010, 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.event.Event;
-import javafx.event.EventHandler;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Menu;
-import javafx.scene.control.Skin;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.Region;
-import javafx.stage.WindowEvent;
-import com.sun.javafx.scene.control.behavior.TwoLevelFocusPopupBehavior;
-
-/**
- * Default Skin implementation for PopupMenu. Several controls use PopupMenu in
- * order to display items in a drop down. It deals mostly with show hide logic for
- * Popup based controls, and specifically in this case for PopupMenu. This is
- * explained in the superclass {@link PopupControlSkin}.
- * <p>
- * Region/css based skin implementation for PopupMenu is the {@link PopupMenuContent}
- * class.
- */
-public class ContextMenuSkin implements Skin<ContextMenu> {
-
-    /* need to hold a reference to popupMenu here because getSkinnable() deliberately
-     * returns null in PopupControlSkin. */
-    private ContextMenu popupMenu;
-    
-    private final Region root;
-    private TwoLevelFocusPopupBehavior tlFocus;
-    
-    // Fix for RT-18247
-    private final EventHandler<KeyEvent> keyListener = new EventHandler<KeyEvent>() {
-        @Override public void handle(KeyEvent event) {
-            if (event.getEventType() != KeyEvent.KEY_PRESSED) return;
-            
-            // We only care if the root container still has focus
-            if (! root.isFocused()) return;
-            
-            final KeyCode code = event.getCode();
-            switch (code) {
-                case ENTER: 
-                case SPACE: popupMenu.hide(); return;
-                default:    return;
-            }
-        }
-    };
-
-    /***/
-    public ContextMenuSkin(final ContextMenu popupMenu) {
-        this.popupMenu = popupMenu;
-        
-        // When a contextMenu is shown, requestFocus on its content to enable
-        // keyboard navigation.
-        popupMenu.addEventHandler(Menu.ON_SHOWN, new EventHandler<Event>() {
-            @Override public void handle(Event event) {
-                Node cmContent = popupMenu.getSkin().getNode();
-                if (cmContent != null) {
-                    cmContent.requestFocus();
-                    if (cmContent instanceof ContextMenuContent) {
-                        Node accMenu = ((ContextMenuContent)cmContent).getItemsContainer();
-                        accMenu.notifyAccessibleAttributeChanged(AccessibleAttribute.VISIBLE);
-                    }
-                }
-                
-                root.addEventHandler(KeyEvent.KEY_PRESSED, keyListener);
-            }
-        });
-        popupMenu.addEventHandler(Menu.ON_HIDDEN, new EventHandler<Event>() {
-            @Override public void handle(Event event) {
-                Node cmContent = popupMenu.getSkin().getNode();
-                if (cmContent != null) cmContent.requestFocus();
-                
-                root.removeEventHandler(KeyEvent.KEY_PRESSED, keyListener);
-            }
-        });
-
-        // For accessibility Menu.ON_HIDING does not work because isShowing is true
-        // during the event, Menu.ON_HIDDEN does not work because the Window (in glass)
-        // has already being disposed. The fix is to use WINDOW_HIDING (WINDOW_HIDDEN).
-        popupMenu.addEventFilter(WindowEvent.WINDOW_HIDING, new EventHandler<Event>() {
-            @Override public void handle(Event event) {
-                Node cmContent = popupMenu.getSkin().getNode();
-                if (cmContent instanceof ContextMenuContent) {
-                    Node accMenu = ((ContextMenuContent)cmContent).getItemsContainer();
-                    accMenu.notifyAccessibleAttributeChanged(AccessibleAttribute.VISIBLE);
-                }
-            }
-        });
-
-        if (BehaviorSkinBase.IS_TOUCH_SUPPORTED &&
-            popupMenu.getStyleClass().contains("text-input-context-menu")) {
-            root = new EmbeddedTextContextMenuContent(popupMenu);
-        } else {
-            root = new ContextMenuContent(popupMenu);
-        }
-        root.idProperty().bind(popupMenu.idProperty());
-        root.styleProperty().bind(popupMenu.styleProperty());
-        root.getStyleClass().addAll(popupMenu.getStyleClass()); // TODO needs to handle updates
-
-        // Only add this if we're on an embedded platform that supports 5-button navigation
-        if (Utils.isTwoLevelFocus()) {
-            tlFocus = new TwoLevelFocusPopupBehavior(popupMenu); // needs to be last.
-        }
-    }
-
-    @Override public ContextMenu getSkinnable() {
-        return popupMenu;
-    }
-
-    @Override public Node getNode() {
-        return root;
-    }
-
-    @Override public void dispose() {
-        root.idProperty().unbind();
-        root.styleProperty().unbind();
-        if (tlFocus != null) tlFocus.dispose();
-    }
-}
--- /dev/null	2015-09-03 15:19:07.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ContextMenuSkin.java	2015-09-03 15:19:05.076489200 -0700
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.javafx.scene.control.ContextMenuContent;
+import com.sun.javafx.scene.control.EmbeddedTextContextMenuContent;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Control;
+import javafx.scene.control.Menu;
+import javafx.scene.control.Skin;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.Region;
+import javafx.stage.WindowEvent;
+import com.sun.javafx.scene.control.behavior.TwoLevelFocusPopupBehavior;
+
+/**
+ * Default Skin implementation for ContextMenu. Several controls use ContextMenu in
+ * order to display items in a drop down. This class mostly deals mostly with
+ * show / hide logic - the actual content of the context menu is contained within
+ * the {@link #getNode() root node}.
+ *
+ * @since 9
+ * @see ContextMenu
+ */
+public class ContextMenuSkin implements Skin<ContextMenu> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /* need to hold a reference to popupMenu here because getSkinnable() deliberately
+     * returns null in PopupControlSkin. */
+    private ContextMenu popupMenu;
+    
+    private final Region root;
+    private TwoLevelFocusPopupBehavior tlFocus;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+    
+    // Fix for RT-18247
+    private final EventHandler<KeyEvent> keyListener = new EventHandler<KeyEvent>() {
+        @Override public void handle(KeyEvent event) {
+            if (event.getEventType() != KeyEvent.KEY_PRESSED) return;
+            
+            // We only care if the root container still has focus
+            if (! root.isFocused()) return;
+            
+            final KeyCode code = event.getCode();
+            switch (code) {
+                case ENTER: 
+                case SPACE: popupMenu.hide(); return;
+                default:    return;
+            }
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ContextMenuSkin instance.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ContextMenuSkin(final ContextMenu control) {
+        this.popupMenu = control;
+        
+        // When a contextMenu is shown, requestFocus on its content to enable
+        // keyboard navigation.
+        popupMenu.addEventHandler(Menu.ON_SHOWN, new EventHandler<Event>() {
+            @Override public void handle(Event event) {
+                Node cmContent = popupMenu.getSkin().getNode();
+                if (cmContent != null) {
+                    cmContent.requestFocus();
+                    if (cmContent instanceof ContextMenuContent) {
+                        Node accMenu = ((ContextMenuContent)cmContent).getItemsContainer();
+                        accMenu.notifyAccessibleAttributeChanged(AccessibleAttribute.VISIBLE);
+                    }
+                }
+                
+                root.addEventHandler(KeyEvent.KEY_PRESSED, keyListener);
+            }
+        });
+        popupMenu.addEventHandler(Menu.ON_HIDDEN, new EventHandler<Event>() {
+            @Override public void handle(Event event) {
+                Node cmContent = popupMenu.getSkin().getNode();
+                if (cmContent != null) cmContent.requestFocus();
+                
+                root.removeEventHandler(KeyEvent.KEY_PRESSED, keyListener);
+            }
+        });
+
+        // For accessibility Menu.ON_HIDING does not work because isShowing is true
+        // during the event, Menu.ON_HIDDEN does not work because the Window (in glass)
+        // has already being disposed. The fix is to use WINDOW_HIDING (WINDOW_HIDDEN).
+        popupMenu.addEventFilter(WindowEvent.WINDOW_HIDING, new EventHandler<Event>() {
+            @Override public void handle(Event event) {
+                Node cmContent = popupMenu.getSkin().getNode();
+                if (cmContent instanceof ContextMenuContent) {
+                    Node accMenu = ((ContextMenuContent)cmContent).getItemsContainer();
+                    accMenu.notifyAccessibleAttributeChanged(AccessibleAttribute.VISIBLE);
+                }
+            }
+        });
+
+        if (Properties.IS_TOUCH_SUPPORTED &&
+            popupMenu.getStyleClass().contains("text-input-context-menu")) {
+            root = new EmbeddedTextContextMenuContent(popupMenu);
+        } else {
+            root = new ContextMenuContent(popupMenu);
+        }
+        root.idProperty().bind(popupMenu.idProperty());
+        root.styleProperty().bind(popupMenu.styleProperty());
+        root.getStyleClass().addAll(popupMenu.getStyleClass()); // TODO needs to handle updates
+
+        // Only add this if we're on an embedded platform that supports 5-button navigation
+        if (Utils.isTwoLevelFocus()) {
+            tlFocus = new TwoLevelFocusPopupBehavior(popupMenu); // needs to be last.
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public ContextMenu getSkinnable() {
+        return popupMenu;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getNode() {
+        return root;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        root.idProperty().unbind();
+        root.styleProperty().unbind();
+        if (tlFocus != null) tlFocus.dispose();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DateCellSkin.java	2015-09-03 15:19:13.662980300 -0700
+++ /dev/null	2015-09-03 15:19:14.000000000 -0700
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 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.scene.control.skin;
-
-import javafx.scene.control.DateCell;
-import javafx.scene.text.Text;
-
-import com.sun.javafx.scene.control.behavior.DateCellBehavior;
-
-public class DateCellSkin extends CellSkinBase<DateCell, DateCellBehavior> {
-
-    public DateCellSkin(DateCell control) {
-        super(control, new DateCellBehavior(control));
-
-        control.setMaxWidth(Double.MAX_VALUE); // make the cell grow to fill a GridPane's cell
-    }
-
-    @Override protected void updateChildren() {
-        super.updateChildren();
-
-        Text secondaryText = (Text)getSkinnable().getProperties().get("DateCell.secondaryText");
-        if (secondaryText != null) {
-            // LabeledSkinBase rebuilds the children list each time, so it's
-            // safe to add more here.
-            secondaryText.setManaged(false);
-            getChildren().add(secondaryText);
-        }
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-                                            final double w, final double h) {
-        super.layoutChildren(x,y,w,h);
-
-        Text secondaryText = (Text)getSkinnable().getProperties().get("DateCell.secondaryText");
-        if (secondaryText != null) {
-            // Place the secondary Text node at BOTTOM_RIGHT.
-            double textX = x + w - rightLabelPadding()  - secondaryText.getLayoutBounds().getWidth();
-            double textY = y + h - bottomLabelPadding() - secondaryText.getLayoutBounds().getHeight();
-            secondaryText.relocate(snapPosition(textX), snapPosition(textY));
-        }
-    }
-
-    private double cellSize() {
-        double cellSize = getCellSize();
-        Text secondaryText = (Text)getSkinnable().getProperties().get("DateCell.secondaryText");
-        if (secondaryText != null && cellSize == DEFAULT_CELL_SIZE) {
-            // Workaround for RT-31643. The cellSize property was not yet set from CSS.
-            cellSize = 36;
-        }
-        return cellSize;
-    }
-
-    @Override protected double computePrefWidth(double height,
-                                                double topInset, double rightInset,
-                                                double bottomInset, double leftInset) {
-        double pref = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-        return snapSize(Math.max(pref, cellSize()));
-    }
-
-    @Override protected double computePrefHeight(double width,
-                                                 double topInset, double rightInset,
-                                                 double bottomInset, double leftInset) {
-        double pref = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-        return snapSize(Math.max(pref, cellSize()));
-    }
-}
--- /dev/null	2015-09-03 15:19:15.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/DateCellSkin.java	2015-09-03 15:19:12.948939500 -0700
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2013, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.DateCell;
+import javafx.scene.text.Text;
+
+import com.sun.javafx.scene.control.behavior.DateCellBehavior;
+
+/**
+ * Default skin implementation for the {@link DateCell} control.
+ *
+ * @see DateCell
+ * @since 9
+ */
+public class DateCellSkin extends CellSkinBase<DateCell> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final BehaviorBase<DateCell> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new DateCellSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public DateCellSkin(DateCell control) {
+        super(control);
+
+        // install default input map for the DateCell control
+        behavior = new DateCellBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        control.setMaxWidth(Double.MAX_VALUE); // make the cell grow to fill a GridPane's cell
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void updateChildren() {
+        super.updateChildren();
+
+        Text secondaryText = (Text)getSkinnable().getProperties().get("DateCell.secondaryText");
+        if (secondaryText != null) {
+            // LabeledSkinBase rebuilds the children list each time, so it's
+            // safe to add more here.
+            secondaryText.setManaged(false);
+            getChildren().add(secondaryText);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        super.layoutChildren(x, y, w, h);
+
+        Text secondaryText = (Text)getSkinnable().getProperties().get("DateCell.secondaryText");
+        if (secondaryText != null) {
+            // Place the secondary Text node at BOTTOM_RIGHT.
+            double textX = x + w - rightLabelPadding()  - secondaryText.getLayoutBounds().getWidth();
+            double textY = y + h - bottomLabelPadding() - secondaryText.getLayoutBounds().getHeight();
+            secondaryText.relocate(snapPosition(textX), snapPosition(textY));
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height,
+                                                double topInset, double rightInset,
+                                                double bottomInset, double leftInset) {
+        double pref = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+        return snapSize(Math.max(pref, cellSize()));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width,
+                                                 double topInset, double rightInset,
+                                                 double bottomInset, double leftInset) {
+        double pref = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+        return snapSize(Math.max(pref, cellSize()));
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Pirvate implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private double cellSize() {
+        double cellSize = getCellSize();
+        Text secondaryText = (Text)getSkinnable().getProperties().get("DateCell.secondaryText");
+        if (secondaryText != null && cellSize == DEFAULT_CELL_SIZE) {
+            // Workaround for RT-31643. The cellSize property was not yet set from CSS.
+            cellSize = 36;
+        }
+        return cellSize;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/DatePickerSkin.java	2015-09-03 15:19:21.682439000 -0700
+++ /dev/null	2015-09-03 15:19:22.000000000 -0700
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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 java.time.LocalDate;
-import java.time.YearMonth;
-import java.time.chrono.HijrahChronology;
-import java.time.format.DateTimeParseException;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.event.ActionEvent;
-import javafx.geometry.Insets;
-import javafx.scene.Node;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
-
-import com.sun.javafx.scene.control.behavior.DatePickerBehavior;
-
-public class DatePickerSkin extends ComboBoxPopupControl<LocalDate> {
-
-    private DatePicker datePicker;
-    private TextField displayNode;
-    private DatePickerContent datePickerContent;
-
-    public DatePickerSkin(final DatePicker datePicker) {
-        super(datePicker, new DatePickerBehavior(datePicker));
-
-        this.datePicker = datePicker;
-
-        // The "arrow" is actually a rectangular svg icon resembling a calendar.
-        // Round the size of the icon to whole integers to get sharp edges.
-        arrow.paddingProperty().addListener(new InvalidationListener() {
-            // This boolean protects against unwanted recursion.
-            private boolean rounding = false;
-            @Override public void invalidated(Observable observable) {
-                if (!rounding) {
-                    Insets padding = arrow.getPadding();
-                    Insets rounded = new Insets(Math.round(padding.getTop()), Math.round(padding.getRight()), 
-                                                Math.round(padding.getBottom()), Math.round(padding.getLeft()));
-                    if (!rounded.equals(padding)) {
-                        rounding = true;
-                        arrow.setPadding(rounded);
-                        rounding = false;
-                    }
-                }
-            }
-        });
-
-        registerChangeListener(datePicker.chronologyProperty(), "CHRONOLOGY");
-        registerChangeListener(datePicker.converterProperty(), "CONVERTER");
-        registerChangeListener(datePicker.dayCellFactoryProperty(), "DAY_CELL_FACTORY");
-        registerChangeListener(datePicker.showWeekNumbersProperty(), "SHOW_WEEK_NUMBERS");
-        registerChangeListener(datePicker.valueProperty(), "VALUE");
-    }
-
-    @Override public Node getPopupContent() {
-        if (datePickerContent == null) {
-            if (datePicker.getChronology() instanceof HijrahChronology) {
-                datePickerContent = new DatePickerHijrahContent(datePicker);
-            } else {
-                datePickerContent = new DatePickerContent(datePicker);
-            }
-        }
-
-        return datePickerContent;
-    }
-
-    @Override protected double computeMinWidth(double height,
-                                               double topInset, double rightInset,
-                                               double bottomInset, double leftInset) {
-        return 50;
-    }
-
-    @Override protected void focusLost() {
-        // do nothing
-    }
-
-
-    @Override public void show() {
-        super.show();
-        datePickerContent.clearFocus();
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-
-        if ("CHRONOLOGY".equals(p) ||
-            "DAY_CELL_FACTORY".equals(p)) {
-
-            updateDisplayNode();
-//             if (datePickerContent != null) {
-//                 datePickerContent.refresh();
-//             }
-            datePickerContent = null;
-            popup = null;
-        } else if ("CONVERTER".equals(p)) {
-            updateDisplayNode();
-        } else if ("EDITOR".equals(p)) {
-            getEditableInputNode();
-        } else if ("SHOWING".equals(p)) {
-            if (datePicker.isShowing()) {
-                if (datePickerContent != null) {
-                    LocalDate date = datePicker.getValue();
-                    datePickerContent.displayedYearMonthProperty().set((date != null) ? YearMonth.from(date) : YearMonth.now());
-                    datePickerContent.updateValues();
-                }
-                show();
-            } else {
-                hide();
-            }
-        } else if ("SHOW_WEEK_NUMBERS".equals(p)) {
-            if (datePickerContent != null) {
-                datePickerContent.updateGrid();
-                datePickerContent.updateWeeknumberDateCells();
-            }
-        } else if ("VALUE".equals(p)) {
-            updateDisplayNode();
-            if (datePickerContent != null) {
-                LocalDate date = datePicker.getValue();
-                datePickerContent.displayedYearMonthProperty().set((date != null) ? YearMonth.from(date) : YearMonth.now());
-                datePickerContent.updateValues();
-            }
-            datePicker.fireEvent(new ActionEvent());
-        } else {
-            super.handleControlPropertyChanged(p);
-        }
-    }
-
-    @Override protected TextField getEditor() {
-        // Use getSkinnable() here because this method is called from
-        // the super constructor before datePicker is initialized.
-        return ((DatePicker)getSkinnable()).getEditor();
-    }
-
-    @Override protected StringConverter<LocalDate> getConverter() {
-        return ((DatePicker)getSkinnable()).getConverter();
-    }
-
-    @Override public Node getDisplayNode() {
-        if (displayNode == null) {
-            displayNode = getEditableInputNode();
-            displayNode.getStyleClass().add("date-picker-display-node");
-            updateDisplayNode();
-        }
-        displayNode.setEditable(datePicker.isEditable());
-
-        return displayNode;
-    }
-
-    public void syncWithAutoUpdate() {
-        if (!getPopup().isShowing() && datePicker.isShowing()) {
-            // Popup was dismissed. Maybe user clicked outside or typed ESCAPE.
-            // Make sure DatePicker button is in sync.
-            datePicker.hide();
-        }
-    }
-}
--- /dev/null	2015-09-03 15:19:22.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/DatePickerSkin.java	2015-09-03 15:19:20.925395700 -0700
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2013, 2015, 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 java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.chrono.HijrahChronology;
+
+import com.sun.javafx.scene.control.DatePickerContent;
+import com.sun.javafx.scene.control.DatePickerHijrahContent;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.ComboBoxBaseBehavior;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.event.ActionEvent;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.TextField;
+import javafx.util.StringConverter;
+
+import com.sun.javafx.scene.control.behavior.DatePickerBehavior;
+
+/**
+ * Default skin implementation for the {@link DatePicker} control.
+ *
+ * @see DatePicker
+ * @since 9
+ */
+public class DatePickerSkin extends ComboBoxPopupControl<LocalDate> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final DatePicker datePicker;
+    private TextField displayNode;
+    private DatePickerContent datePickerContent;
+
+    private final DatePickerBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new DatePickerSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public DatePickerSkin(final DatePicker control) {
+        super(control);
+
+        this.datePicker = control;
+
+        // install default input map for the control
+        this.behavior = new DatePickerBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        // The "arrow" is actually a rectangular svg icon resembling a calendar.
+        // Round the size of the icon to whole integers to get sharp edges.
+        arrow.paddingProperty().addListener(new InvalidationListener() {
+            // This boolean protects against unwanted recursion.
+            private boolean rounding = false;
+            @Override public void invalidated(Observable observable) {
+                if (!rounding) {
+                    Insets padding = arrow.getPadding();
+                    Insets rounded = new Insets(Math.round(padding.getTop()), Math.round(padding.getRight()), 
+                                                Math.round(padding.getBottom()), Math.round(padding.getLeft()));
+                    if (!rounded.equals(padding)) {
+                        rounding = true;
+                        arrow.setPadding(rounded);
+                        rounding = false;
+                    }
+                }
+            }
+        });
+
+        registerChangeListener(control.chronologyProperty(), e -> {
+            updateDisplayNode();
+            datePickerContent = null;
+            popup = null;
+        });
+        registerChangeListener(control.converterProperty(), e -> updateDisplayNode());
+        registerChangeListener(control.dayCellFactoryProperty(), e -> {
+            updateDisplayNode();
+            datePickerContent = null;
+            popup = null;
+        });
+        registerChangeListener(control.showWeekNumbersProperty(), e -> {
+            if (datePickerContent != null) {
+                datePickerContent.updateGrid();
+                datePickerContent.updateWeeknumberDateCells();
+            }
+        });
+        registerChangeListener(control.valueProperty(), e -> {
+            updateDisplayNode();
+            if (datePickerContent != null) {
+                LocalDate date = control.getValue();
+                datePickerContent.displayedYearMonthProperty().set((date != null) ? YearMonth.from(date) : YearMonth.now());
+                datePickerContent.updateValues();
+            }
+            control.fireEvent(new ActionEvent());
+        });
+        registerChangeListener(control.showingProperty(), e -> {
+            if (control.isShowing()) {
+                if (datePickerContent != null) {
+                    LocalDate date = control.getValue();
+                    datePickerContent.displayedYearMonthProperty().set((date != null) ? YearMonth.from(date) : YearMonth.now());
+                    datePickerContent.updateValues();
+                }
+                show();
+            } else {
+                hide();
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getPopupContent() {
+        if (datePickerContent == null) {
+            if (datePicker.getChronology() instanceof HijrahChronology) {
+                datePickerContent = new DatePickerHijrahContent(datePicker);
+            } else {
+                datePickerContent = new DatePickerContent(datePicker);
+            }
+        }
+
+        return datePickerContent;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height,
+                                               double topInset, double rightInset,
+                                               double bottomInset, double leftInset) {
+        return 50;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void show() {
+        super.show();
+        datePickerContent.clearFocus();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected TextField getEditor() {
+        // Use getSkinnable() here because this method is called from
+        // the super constructor before datePicker is initialized.
+        return ((DatePicker)getSkinnable()).getEditor();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected StringConverter<LocalDate> getConverter() {
+        return ((DatePicker)getSkinnable()).getConverter();
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getDisplayNode() {
+        if (displayNode == null) {
+            displayNode = getEditableInputNode();
+            displayNode.getStyleClass().add("date-picker-display-node");
+            updateDisplayNode();
+        }
+        displayNode.setEditable(datePicker.isEditable());
+
+        return displayNode;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override void focusLost() {
+        // do nothing
+    }
+
+    /** {@inheritDoc} */
+    @Override ComboBoxBaseBehavior getBehavior() {
+        return behavior;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/HyperlinkSkin.java	2015-09-03 15:19:29.386879700 -0700
+++ /dev/null	2015-09-03 15:19:30.000000000 -0700
@@ -1,47 +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 com.sun.javafx.scene.control.skin;
-
-import javafx.scene.control.Hyperlink;
-
-import com.sun.javafx.scene.control.behavior.ButtonBehavior;
-
-/**
- * A Skin for Hyperlinks.
- */
-public class HyperlinkSkin extends LabeledSkinBase<Hyperlink, ButtonBehavior<Hyperlink>> {
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public HyperlinkSkin(Hyperlink link) {
-        super(link, new ButtonBehavior<Hyperlink>(link));
-    }
-
-}
--- /dev/null	2015-09-03 15:19:30.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/HyperlinkSkin.java	2015-09-03 15:19:28.666838500 -0700
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.Hyperlink;
+
+import com.sun.javafx.scene.control.behavior.ButtonBehavior;
+
+/**
+ * Default skin implementation for the {@link Hyperlink} control.
+ *
+ * @see Hyperlink
+ * @since 9
+ */
+public class HyperlinkSkin extends LabeledSkinBase<Hyperlink> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final BehaviorBase<Hyperlink> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new HyperlinkSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public HyperlinkSkin(Hyperlink control) {
+        super(control);
+
+        // install default input map for the Hyperlink control
+        behavior = new ButtonBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/LabelSkin.java	2015-09-03 15:19:37.633351400 -0700
+++ /dev/null	2015-09-03 15:19:38.000000000 -0700
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2010, 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.Label;
-import java.util.Collections;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-
-/**
- * A Skin for Labels.
- */
-public class LabelSkin extends LabeledSkinBase<Label, BehaviorBase<Label>> {
-
-    public LabelSkin(final Label label) {
-        super(label, new BehaviorBase<>(label, Collections.emptyList()));
-
-        // Labels do not block the mouse by default, unlike most other UI Controls.
-        consumeMouseEvents(false);
-
-        registerChangeListener(label.labelForProperty(), "LABEL_FOR");
-    }
-
-
-    @Override protected void handleControlPropertyChanged(String p) {     
-        super.handleControlPropertyChanged(p);
-        if ("LABEL_FOR".equals(p)) {
-            mnemonicTargetChanged();
-        }
-    }
-}
--- /dev/null	2015-09-03 15:19:38.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/LabelSkin.java	2015-09-03 15:19:36.821304900 -0700
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2010, 2015, 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.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+
+/**
+ * Default skin implementation for the {@link Label} control.
+ *
+ * @see Label
+ * @since 9
+ */
+public class LabelSkin extends LabeledSkinBase<Label> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new LabelSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public LabelSkin(final Label control) {
+        super(control);
+
+        // Labels do not block the mouse by default, unlike most other UI Controls.
+        consumeMouseEvents(false);
+
+        registerChangeListener(control.labelForProperty(), e -> mnemonicTargetChanged());
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/LabeledSkinBase.java	2015-09-03 15:19:45.118779500 -0700
+++ /dev/null	2015-09-03 15:19:46.000000000 -0700
@@ -1,1158 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.application.Platform;
-import javafx.beans.InvalidationListener;
-import javafx.geometry.HPos;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.Orientation;
-import javafx.geometry.Pos;
-import javafx.geometry.VPos;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Control;
-import javafx.scene.control.Label;
-import javafx.scene.control.Labeled;
-import javafx.scene.control.OverrunStyle;
-import javafx.scene.input.KeyCombination;
-import javafx.scene.input.Mnemonic;
-import javafx.scene.shape.Line;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.control.behavior.TextBinding;
-
-import static javafx.scene.control.ContentDisplay.*;
-import static javafx.scene.control.OverrunStyle.*;
-import javafx.scene.image.ImageView;
-
-public abstract class LabeledSkinBase<C extends Labeled, B extends BehaviorBase<C>> extends BehaviorSkinBase<C, B> {
-
-    /**
-     *  The Text node used to display the text. This is package only
-     *  for the sake of testing!
-     */
-    LabeledText text;
-
-    /**
-     * Indicates that the text content is invalid and needs to be updated.
-     * This is package private only for the sake of testing.
-     */
-    boolean invalidText = true;
-
-    /**
-     * A reference to the last-known graphic on the Labeled. This reference
-     * is kept so that we can remove listeners from the old graphic later
-     */
-    Node graphic;
-
-    /**
-     * The cached full width of the non-truncated text. We only want to
-     * recompute this if the text has itself changed, or if the font has changed.
-     * This is package private ONLY FOR THE SAKE OF TESTING
-     */
-    double textWidth = Double.NEGATIVE_INFINITY;
-
-    /**
-     * The cached width of the ellipsis string. This will be recomputed
-     * if the font or the ellipsisString property have changed.
-     * This is package private ONLY FOR THE SAKE OF TESTING
-     */
-    double ellipsisWidth = Double.NEGATIVE_INFINITY;
-
-    /**
-     * A listener which is applied to the graphic whenever the graphic is set
-     * and is visible within the labeled. For example, if there is a graphic
-     * defined on the Labeled but the ContentDisplay is set to TEXT_ONLY, then
-     * we will not bother installing this listener on the graphic. In all
-     * other cases, if the graphic is defined, it will have this listener
-     * added to it, which ensures that if the graphic's layout bounds change,
-     * we end up performing a layout and potentially update the visible text.
-     *
-     * This is package private ONLY FOR THE SAKE OF TESTING
-     */
-    final InvalidationListener graphicPropertyChangedListener = valueModel -> {
-        invalidText = true;
-        getSkinnable().requestLayout();
-    };
-
-    private Rectangle textClip;
-    private double wrapWidth;
-    private double wrapHeight;
-
-
-    /**
-     * Constructor for LabeledSkinBase. The Labeled must be specified, and cannot be null.
-     * At the conclusion of the constructor call, the skin will be marked as
-     * needsLayout, and will be fully configured based on the current state of
-     * the labeled. Any subsequent changes to the Labeled will be handled via
-     * listeners and applied appropriately.
-     *
-     * @param labeled
-     */
-    public LabeledSkinBase(final C labeled, final B behavior) {
-        super(labeled, behavior);
-
-        // Configure the Text node with all of the attributes from the
-        // Labeled which apply to it.
-        text = new LabeledText(labeled);
-        
-        updateChildren();
-
-        // Labels do not block the mouse by default, unlike most other UI Controls.
-        //consumeMouseEvents(false);
-
-        // Register listeners
-        registerChangeListener(labeled.ellipsisStringProperty(), "ELLIPSIS_STRING");
-        registerChangeListener(labeled.widthProperty(), "WIDTH");
-        registerChangeListener(labeled.heightProperty(), "HEIGHT");
-        registerChangeListener(labeled.textFillProperty(), "TEXT_FILL");
-        registerChangeListener(labeled.fontProperty(), "FONT");
-        registerChangeListener(labeled.graphicProperty(), "GRAPHIC");
-        registerChangeListener(labeled.contentDisplayProperty(), "CONTENT_DISPLAY");
-        registerChangeListener(labeled.labelPaddingProperty(), "LABEL_PADDING");
-        registerChangeListener(labeled.graphicTextGapProperty(), "GRAPHIC_TEXT_GAP");
-        registerChangeListener(labeled.alignmentProperty(), "ALIGNMENT");
-        registerChangeListener(labeled.mnemonicParsingProperty(), "MNEMONIC_PARSING");
-        registerChangeListener(labeled.textProperty(), "TEXT");
-        registerChangeListener(labeled.textAlignmentProperty(), "TEXT_ALIGNMENT");
-        registerChangeListener(labeled.textOverrunProperty(), "TEXT_OVERRUN");
-        registerChangeListener(labeled.wrapTextProperty(), "WRAP_TEXT");
-        registerChangeListener(labeled.underlineProperty(), "UNDERLINE");
-        registerChangeListener(labeled.lineSpacingProperty(), "LINE_SPACING");
-        registerChangeListener(labeled.sceneProperty(), "SCENE");
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Control State Changes                                                   *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        /*
-         * There are basically 2 things to worry about in each of these handlers
-         *  1) Update the Text node
-         *  2) Have the text metrics changed?
-         *
-         * If the metrics have changed, we need to request a layout and invalidate
-         * the text so that we recompute the display text on next read.
-         */
-        if ("WIDTH".equals(p)) {
-            updateWrappingWidth();
-            invalidText = true;
-            // No requestLayout() because Control will force a layout
-        } else if ("HEIGHT".equals(p)) {
-            invalidText = true;
-            // No requestLayout() because Control will force a layout
-        } else if ("FONT".equals(p)) {
-            textMetricsChanged();
-            invalidateWidths();
-            ellipsisWidth = Double.NEGATIVE_INFINITY;
-        } else if ("GRAPHIC".equals(p)) {
-            updateChildren();
-            textMetricsChanged();
-        } else if ("CONTENT_DISPLAY".equals(p)) {
-            updateChildren();
-            textMetricsChanged();
-        } else if ("LABEL_PADDING".equals(p)) {
-            textMetricsChanged();
-        } else if ("GRAPHIC_TEXT_GAP".equals(p)) {
-            textMetricsChanged();
-        } else if ("ALIGNMENT".equals(p)) {
-            // Doesn't involve text metrics because if the text is too long, then
-            // it will already have fit all available width and a change to hpos
-            // has no effect. Or it is too short (i.e. it all fits) and we don't
-            // have to worry about truncation. So just call request layout.
-            // Doesn't involve text metrics because if the text is too long, then
-            // it will already have fit all available height and a change to vpos
-            // has no effect. Or it is too short (i.e. it all fits) and we don't
-            // have to worry about truncation. So just call request layout.
-            getSkinnable().requestLayout();
-        } else if ("MNEMONIC_PARSING".equals(p)) {
-            containsMnemonic = false;
-            textMetricsChanged();
-        } else if ("TEXT".equals(p)) {
-            updateChildren();
-            textMetricsChanged();
-            invalidateWidths();
-        } else if ("TEXT_ALIGNMENT".equals(p)) {
-            // NO-OP
-        } else if ("TEXT_OVERRUN".equals(p)) {
-            textMetricsChanged();
-        } else if ("ELLIPSIS_STRING".equals(p)) {
-            textMetricsChanged();
-            invalidateWidths();
-            ellipsisWidth = Double.NEGATIVE_INFINITY;
-        } else if ("WRAP_TEXT".equals(p)) {
-            updateWrappingWidth();
-            textMetricsChanged();
-        } else if ("UNDERLINE".equals(p)) {
-            textMetricsChanged();
-        } else if ("LINE_SPACING".equals(p)) {
-            textMetricsChanged();
-        } else if ("SCENE".equals(p)) {
-            sceneChanged();
-        }
-    }
-
-    protected double topLabelPadding() { // TODOJASPER remove these if you can
-        return snapSize(getSkinnable().getLabelPadding().getTop());
-    }
-
-    protected double bottomLabelPadding() {
-        return snapSize(getSkinnable().getLabelPadding().getBottom());
-    }
-
-    protected double leftLabelPadding() {
-        return snapSize(getSkinnable().getLabelPadding().getLeft());
-    }
-
-    protected double rightLabelPadding() {
-        return snapSize(getSkinnable().getLabelPadding().getRight());
-    }
-
-
-    /**
-     * Called whenever some state has changed that affects the text metrics.
-     * Changes here will involve invalidating the display text so the next
-     * call to updateDisplayedText computes a new value, and call requestLayout.
-     */
-    private void textMetricsChanged() {
-        invalidText = true;
-        getSkinnable().requestLayout();
-    }
-
-    /*
-    ** The Label is a mnemonic, and it's target node
-    ** has changed, but it's label hasn't so just
-    ** swap them over, and tidy up.
-    */
-    protected void mnemonicTargetChanged() {
-        if (containsMnemonic == true) {
-            /*
-            ** was there previously a labelFor  
-            */
-            removeMnemonic();
-
-            /*
-            ** is there a new labelFor
-            */
-            Control control = getSkinnable();
-            if (control instanceof Label) {
-                labeledNode = ((Label)control).getLabelFor();
-                addMnemonic();
-            }
-            else {
-                labeledNode = null;
-            }
-        }
-    }
-
-    private void sceneChanged() {
-        final Labeled labeled = getSkinnable();
-        Scene scene = labeled.getScene();
-
-        if (scene != null && containsMnemonic) {
-            addMnemonic();
-        }
-
-    }
-
-    /**
-     * Marks minWidth as being invalid and in need of recomputation.
-     */
-    private void invalidateWidths() {
-        textWidth = Double.NEGATIVE_INFINITY;
-    }
-
-    /**
-     * Updates the content of the underlying Text node. This method should
-     * only be called when necessary. If the invalidText flag is not set, then
-     * the method is a no-op. This care is taken because recomputing the
-     * text to display is an expensive operation. Package private ONLY FOR THE
-     * SAKE OF TESTING.
-     */
-    void updateDisplayedText() {
-        updateDisplayedText(-1, -1);
-    }
-
-    private void updateDisplayedText(double w, double h) {
-        if (invalidText) {
-            final Labeled labeled = getSkinnable();
-            String s = labeled.getText();
-
-            int mnemonicIndex = -1;
-
-            /*
-            ** if there's a valid string then parse it
-            */
-            if (s != null && s.length() > 0) {
-                bindings = new TextBinding(s);
-
-                if (!com.sun.javafx.PlatformUtil.isMac() && getSkinnable().isMnemonicParsing() == true) {
-                    /*
-                    ** the Labeled has a MnemonicParsing property,
-                    ** if set true, then auto-parsing will check for
-                    ** a mnemonic
-                    */
-                    if (labeled instanceof Label) {
-                        // buttons etc
-                        labeledNode = ((Label)labeled).getLabelFor();
-                    } else {
-                        labeledNode = labeled;
-                    }
-
-                    if (labeledNode == null) {
-                        labeledNode = labeled;
-                    }
-                    mnemonicIndex = bindings.getMnemonicIndex() ;
-                }
-            }
-
-            /*
-            ** we were previously a mnemonic
-            */
-            if (containsMnemonic) {
-                /*
-                ** are we no longer a mnemonic, or have we changed code?
-                */
-                if (mnemonicScene != null) {
-                    if (mnemonicIndex == -1 ||
-                            (bindings != null && !bindings.getMnemonicKeyCombination().equals(mnemonicCode))) {
-                        removeMnemonic();
-                    }
-                    containsMnemonic = false;
-                }
-            }
-            else {
-                /*
-                ** this can happen if mnemonic parsing is
-                ** disabled on a previously valid mnemonic
-                */
-                removeMnemonic();
-            }
-
-            /*
-            ** check we have a labeled
-            */
-            if (s != null && s.length() > 0) {
-                if (mnemonicIndex >= 0 && containsMnemonic == false) {
-                    containsMnemonic = true;
-                    mnemonicCode = bindings.getMnemonicKeyCombination();
-                    addMnemonic();
-                }
-            }
-
-            if (containsMnemonic == true) {
-                s = bindings.getText();
-                if (mnemonic_underscore == null) {
-                    mnemonic_underscore = new Line();
-                    mnemonic_underscore.setStartX(0.0f);
-                    mnemonic_underscore.setStartY(0.0f);
-                    mnemonic_underscore.setEndY(0.0f);
-                    mnemonic_underscore.getStyleClass().clear();
-                    mnemonic_underscore.getStyleClass().setAll("mnemonic-underline");
-                }
-                if (!getChildren().contains(mnemonic_underscore)) {
-                    getChildren().add(mnemonic_underscore);
-                }
-            } else {
-                /*
-                ** we don't need a mnemonic....
-                */
-                if (getSkinnable().isMnemonicParsing() == true && com.sun.javafx.PlatformUtil.isMac() && bindings != null) {
-                    s = bindings.getText();
-                }
-                else {
-                    s = labeled.getText();
-                }
-                if (mnemonic_underscore != null) {
-                    if (getChildren().contains(mnemonic_underscore)) {
-                        Platform.runLater(() -> {
-                              getChildren().remove(mnemonic_underscore);
-                              mnemonic_underscore = null;
-                        });
-                    }
-                }
-            }
-
-            int len = s != null ? s.length() : 0;
-            boolean multiline = false;
-
-            if (s != null && len > 0) {
-                int i = s.indexOf('\n');
-                if (i > -1 && i < len - 1) {
-                    // Multiline text with embedded newlines - not
-                    // taking into account a potential trailing newline.
-                    multiline = true;
-                }
-            }
-
-            String result;
-            boolean horizontalPosition =
-                    (labeled.getContentDisplay() == ContentDisplay.LEFT ||
-                    labeled.getContentDisplay() == ContentDisplay.RIGHT);
-
-            double availableWidth = labeled.getWidth() - snappedLeftInset() - leftLabelPadding() -
-                                    snappedRightInset() - rightLabelPadding();
-            availableWidth = Math.max(availableWidth, 0);
-
-            if (w == -1) {
-                w = availableWidth;
-            }
-            double minW = Math.min(computeMinLabeledPartWidth(-1, snappedTopInset() , snappedRightInset(), snappedBottomInset(), snappedLeftInset()), availableWidth);
-            if (horizontalPosition && !isIgnoreGraphic()) {
-                double graphicW = (labeled.getGraphic().getLayoutBounds().getWidth() + labeled.getGraphicTextGap());
-                w -= graphicW;
-                minW -= graphicW;
-            }
-            wrapWidth = Math.max(minW, w);
-
-            boolean verticalPosition =
-                    (labeled.getContentDisplay() == ContentDisplay.TOP ||
-                    labeled.getContentDisplay() == ContentDisplay.BOTTOM);
-
-            double availableHeight = labeled.getHeight() - snappedTopInset() - topLabelPadding() -
-                                     snappedBottomInset() - bottomLabelPadding();
-            availableHeight = Math.max(availableHeight, 0);
-
-            if (h == -1) {
-                h = availableHeight;
-            }
-            double minH = Math.min(computeMinLabeledPartHeight(wrapWidth, snappedTopInset() , snappedRightInset(), snappedBottomInset(), snappedLeftInset()), availableHeight);
-            if (verticalPosition && labeled.getGraphic() != null) {
-                double graphicH = labeled.getGraphic().getLayoutBounds().getHeight() + labeled.getGraphicTextGap();
-                h -= graphicH;
-                minH -= graphicH;
-            }
-            wrapHeight = Math.max(minH, h);
-
-            updateWrappingWidth();
-
-            Font font = text.getFont();
-            OverrunStyle truncationStyle = labeled.getTextOverrun();
-            String ellipsisString = labeled.getEllipsisString();
-
-            if (labeled.isWrapText()) {
-                result = Utils.computeClippedWrappedText(font, s, wrapWidth, wrapHeight, truncationStyle, ellipsisString, text.getBoundsType());
-            } else if (multiline) {
-                StringBuilder sb = new StringBuilder();
-
-                String[] splits = s.split("\n");
-                for (int i = 0; i < splits.length; i++) {
-                    sb.append(Utils.computeClippedText(font, splits[i], wrapWidth, truncationStyle, ellipsisString));
-                    if (i < splits.length - 1) {
-                        sb.append('\n');
-                    }
-                }
-
-                // TODO: Consider what to do in the case where vertical space is
-                // limited and the last visible line isn't already truncated
-                // with a trailing ellipsis. What if the style calls for leading
-                // or center ellipses? We could possibly add an additional
-                // trailing ellipsis to the last visible line, like this:
-
-                // +--------------------------------+
-                // |  This is some long text with multiple lines\n
-                // |  where more than one exceed the|width\n
-                // |  and wrapText is false, and all|lines\n
-                // +--don't fit.--------------------+
-                //
-                // +--------------------------------+
-                // |  This is some...multiple lines |
-                // |  where more t...ceed the width |
-                // |  and wrapText...d all lines... |
-                // +--------------------------------+
-
-                result = sb.toString();
-            } else {
-                result = Utils.computeClippedText(font, s, wrapWidth, truncationStyle, ellipsisString);
-            }
-
-            if (result != null && result.endsWith("\n")) {
-                // Strip ending newline so we don't display another row.
-                result = result.substring(0, result.length() - 1);
-            }
-
-            text.setText(result);
-            updateWrappingWidth();
-            invalidText = false;
-        }
-    }
-
-    private void addMnemonic() {
-        if (labeledNode != null) {
-            mnemonicScene = labeledNode.getScene();
-            if (mnemonicScene != null) {
-                mnemonicScene.addMnemonic(new Mnemonic(labeledNode, mnemonicCode));
-            }
-        }
-    }
-
-
-    private void removeMnemonic() {
-        if (mnemonicScene != null && labeledNode != null) {
-            mnemonicScene.removeMnemonic(new Mnemonic(labeledNode, mnemonicCode));
-            mnemonicScene = null;
-        }
-    }
-
-    /**
-     * Updates the wrapping width of the text node. Although changing the font
-     * does affect the metrics used for text layout, this method does not
-     * call requestLayout or invalidate the text, since it may be called
-     * from the constructor and such work would be duplicative and wasted.
-     */
-    private void updateWrappingWidth() {
-        final Labeled labeled = getSkinnable();
-        text.setWrappingWidth(0);
-        if (labeled.isWrapText()) {
-            // Note that the wrapping width needs to be set to zero before
-            // getting the text's real preferred width.
-            double w = Math.min(text.prefWidth(-1), wrapWidth);
-            text.setWrappingWidth(w);
-        }
-    }
-
-    /**
-     * Updates the children managed by LabeledSkinBase, which can be the Labeled
-     * graphic and/or a Text node. Only those nodes which actually must
-     * be used are used. For example, with a ContentDisplay of
-     * GRAPHIC_ONLY the text node is not added, and with a ContentDisplay
-     * of TEXT_ONLY, the graphic is not added.
-     */
-    protected void updateChildren() {
-        final Labeled labeled = getSkinnable();
-        // Only in some situations do we want to have the graphicPropertyChangedListener
-        // installed. Since updateChildren() is not called much, we'll just remove it always
-        // and reinstall it later if it is necessary to do so.
-        if (graphic != null) {
-            graphic.layoutBoundsProperty().removeListener(graphicPropertyChangedListener);
-        }
-        // Now update the graphic (since it may have changed)
-        graphic = labeled.getGraphic();
-        
-        // RT-19851 Only setMouseTransparent(true) for an ImageView.  This allows the button 
-        // to be picked regardless of the changing images on top of it. 
-        if (graphic instanceof ImageView) {
-            graphic.setMouseTransparent(true);
-        }                
-        
-        // Now update the children (and add the graphicPropertyChangedListener as necessary)
-        if (isIgnoreGraphic()) {
-            if (labeled.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) {
-                getChildren().clear();
-            } else {
-                getChildren().setAll(text);
-            }
-        } else {
-            graphic.layoutBoundsProperty().addListener(graphicPropertyChangedListener);
-            if (isIgnoreText()) {
-                getChildren().setAll(graphic);
-            } else {
-                getChildren().setAll(graphic, text);
-            }
-
-            // RT-37420
-            graphic.impl_processCSS(false);
-
-        }
-
-    }
-
-    /**
-     * Gets whether for various computations we can ignore the presence of the graphic
-     * (or lack thereof). 
-     * @return
-     */
-    protected boolean isIgnoreGraphic() {
-        return (graphic == null ||
-                !graphic.isManaged() ||
-                getSkinnable().getContentDisplay() == ContentDisplay.TEXT_ONLY);
-    }
-
-    /**
-     * Gets whether for various computations we can ignore the presence of the text.
-     * @return
-     */
-    protected boolean isIgnoreText() {
-        final Labeled labeled = getSkinnable();
-        final String txt = labeled.getText();
-        return (txt == null ||
-                txt.equals("") ||
-                labeled.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY);
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Skin Layout                                                             *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Compute and return the minimum width of this Labeled. The minimum width is
-     * the smaller of the width of "..." and the width with the actual text.
-     * In this way, if the text width itself is smaller than the ellipsis then
-     * we should use that as the min width, otherwise the ellipsis needs to be the
-     * min width.
-     * <p>
-     * We use the same calculation here regardless of whether we are talking
-     * about a single or multiline labeled. So a multiline labeled may find that
-     * the width of the "..." is as small as it will ever get.
-     */
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computeMinLabeledPartWidth(height, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    private double computeMinLabeledPartWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        // First compute the minTextWidth by checking the width of the string
-        // made by the ellipsis "...", and then by checking the width of the
-        // string made up by labeled.text. We want the smaller of the two.
-        final Labeled labeled = getSkinnable();
-        final ContentDisplay contentDisplay = labeled.getContentDisplay();
-        final double gap = labeled.getGraphicTextGap();
-        double minTextWidth = 0;
-
-        final Font font = text.getFont();
-        OverrunStyle truncationStyle = labeled.getTextOverrun();
-        String ellipsisString = labeled.getEllipsisString();
-        final String string = labeled.getText();
-        final boolean emptyText = string == null || string.isEmpty();
-
-        if (!emptyText) {
-            // We only want to recompute the full text width if the font or text changed
-            if (truncationStyle == CLIP) {
-                if (textWidth == Double.NEGATIVE_INFINITY) {
-                    // Show at minimum the first character
-                    textWidth = Utils.computeTextWidth(font, string.substring(0, 1), 0);
-                }
-                minTextWidth = textWidth;
-            } else {
-                if (textWidth == Double.NEGATIVE_INFINITY) {
-                    textWidth = Utils.computeTextWidth(font, string, 0);
-                }
-                // We only want to recompute the ellipsis width if the font has changed
-                if (ellipsisWidth == Double.NEGATIVE_INFINITY) {
-                    ellipsisWidth = Utils.computeTextWidth(font, ellipsisString, 0);
-                }
-                minTextWidth = Math.min(textWidth, ellipsisWidth);
-            }
-        }
-
-        // Now inspect the graphic and the hpos to determine the the minWidth
-        final Node graphic = labeled.getGraphic();
-        double width;
-        if (isIgnoreGraphic()) {
-            width = minTextWidth;
-        } else if (isIgnoreText()) {
-            width = graphic.minWidth(-1);
-        } else if (contentDisplay == LEFT || contentDisplay == RIGHT){
-            width = (minTextWidth + graphic.minWidth(-1) + gap);
-        } else {
-            width = Math.max(minTextWidth, graphic.minWidth(-1));
-        }
-
-        return width + leftInset + leftLabelPadding() +
-                rightInset + rightLabelPadding();
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computeMinLabeledPartHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    private double computeMinLabeledPartHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Labeled labeled = getSkinnable();
-        final Font font = text.getFont();
-
-        String str = labeled.getText();
-        if (str != null && str.length() > 0) {
-            int newlineIndex = str.indexOf('\n');
-            if (newlineIndex >= 0) {
-                str = str.substring(0, newlineIndex);
-            }
-        }
-
-        // TODO figure out how to cache this effectively.
-        // Base minimum height on one line (ignoring wrapping here).
-        double s = labeled.getLineSpacing();
-        final double textHeight = Utils.computeTextHeight(font, str, 0, s, text.getBoundsType());
-
-        double h = textHeight;
-
-        // Now we want to add on the graphic if necessary!
-        if (!isIgnoreGraphic()) {
-            final Node graphic = labeled.getGraphic();
-            if (labeled.getContentDisplay() == ContentDisplay.TOP
-                || labeled.getContentDisplay() == ContentDisplay.BOTTOM) {
-                h = graphic.minHeight(width) + labeled.getGraphicTextGap() + textHeight;
-            } else {
-                h = Math.max(textHeight, graphic.minHeight(width));
-            }
-        }
-
-        return topInset + h + bottomInset + topLabelPadding() - bottomLabelPadding();
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        // Get the preferred width of the text
-        final Labeled labeled = getSkinnable();
-        final Font font = text.getFont();
-        final String string = labeled.getText();
-        boolean emptyText = string == null || string.isEmpty();
-        double widthPadding = leftInset + leftLabelPadding() +
-                              rightInset + rightLabelPadding();
-
-        double textWidth = emptyText ? 0 : Utils.computeTextWidth(font, string, 0);
-
-        // Fix for RT-39889
-        double graphicWidth = graphic == null ? 0.0 :
-                Utils.boundedSize(graphic.prefWidth(-1), graphic.minWidth(-1), graphic.maxWidth(-1));
-
-        // Now add on the graphic, gap, and padding as appropriate
-        final Node graphic = labeled.getGraphic();
-        if (isIgnoreGraphic()) {
-            return textWidth + widthPadding;
-        } else if (isIgnoreText()) {
-            return graphicWidth + widthPadding;
-        } else if (labeled.getContentDisplay() == ContentDisplay.LEFT
-                || labeled.getContentDisplay() == ContentDisplay.RIGHT) {
-            return textWidth + labeled.getGraphicTextGap() + graphicWidth + widthPadding;
-        } else {
-            return Math.max(textWidth, graphicWidth) + widthPadding;
-        }
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Labeled labeled = getSkinnable();
-        final Font font = text.getFont();
-        final ContentDisplay contentDisplay = labeled.getContentDisplay();
-        final double gap = labeled.getGraphicTextGap();
-        width -= leftInset + leftLabelPadding() +
-                rightInset + rightLabelPadding();
-
-        String str = labeled.getText();
-        if (str != null && str.endsWith("\n")) {
-            // Strip ending newline so we don't count another row.
-            str = str.substring(0, str.length() - 1);
-        }
-
-        double textWidth = width;
-        if (!isIgnoreGraphic() &&
-            (contentDisplay == LEFT || contentDisplay == RIGHT)) {
-            textWidth -= (graphic.prefWidth(-1) + gap);
-        }
-
-        // TODO figure out how to cache this effectively.
-        final double textHeight = Utils.computeTextHeight(font, str,
-                                                          labeled.isWrapText() ? textWidth : 0,
-                                                          labeled.getLineSpacing(), text.getBoundsType());
-
-        // Now we want to add on the graphic if necessary!
-        double h = textHeight;
-        if (!isIgnoreGraphic()) {
-            final Node graphic = labeled.getGraphic();
-            if (contentDisplay == TOP || contentDisplay == BOTTOM) {
-                h = graphic.prefHeight(width) + gap + textHeight;
-            } else {
-                h = Math.max(textHeight, graphic.prefHeight(width));
-            }
-        }
-
-        return topInset + h + bottomInset + topLabelPadding() + bottomLabelPadding();
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefWidth(height);
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-
-    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        double textBaselineOffset = text.getBaselineOffset();
-        double h = textBaselineOffset;
-        final Labeled labeled = getSkinnable();
-        final Node g = labeled.getGraphic();
-        if (!isIgnoreGraphic()) {
-            ContentDisplay contentDisplay = labeled.getContentDisplay();
-            if (contentDisplay == ContentDisplay.TOP) {
-                h = g.prefHeight(-1) + labeled.getGraphicTextGap() + textBaselineOffset;
-            } else if (contentDisplay == ContentDisplay.LEFT || contentDisplay == RIGHT) {
-                h = textBaselineOffset + (g.prefHeight(-1) - text.prefHeight(-1)) / 2;
-            }
-        }
-                
-        return topInset + topLabelPadding() + h;
-    }
-
-    public TextBinding bindings;
-    Line mnemonic_underscore;
-
-    private boolean containsMnemonic = false;
-    private Scene mnemonicScene = null;
-    private KeyCombination mnemonicCode;
-    // needs to be an object, as MenuItem isn't a node
-    private Node labeledNode = null;
-
-    /**
-     * The Layout algorithm works like this:
-     *
-     *  - Get the labeled w/h, graphic w/h, text w/h
-     *  - Compute content w/h based on graphicVPos, graphicHPos,
-     *    graphicTextGap, and graphic w/h and text w/h
-     *  - (Note that the text content has been pre-truncated where
-     *    necessary)
-     *  - compute content x/y based on content w/h and labeled w/h
-     *    and the labeled's hpos and vpos
-     *  - position the graphic and text
-     */
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        layoutLabelInArea(x, y, w, h);
-    }
-
-    /**
-     * Performs the actual layout of the label content within the area given.
-     * This method is called by subclasses that override layoutChildren().
-     *
-     * @param x The x position of the label part of the control, inside padding
-     *
-     * @param y The y position of the label part of the control, inside padding
-     *
-     * @param w The width of the label part of the control, not including padding
-     *
-     * @param h The height of the label part of the control, not including padding
-     */
-    protected void layoutLabelInArea(double x, double y, double w, double h) {
-        layoutLabelInArea(x, y, w, h, null);
-    }
-
-    /**
-     * Performs the actual layout of the label content within the area given.
-     * This method is called by subclasses that override layoutChildren().
-     *
-     * @param x The x position of the label part of the control, inside padding
-     *
-     * @param y The y position of the label part of the control, inside padding
-     *
-     * @param w The width of the label part of the control, not including padding
-     *
-     * @param h The height of the label part of the control, not including padding
-     *
-     * @param alignment The alignment of the label part of the control within the given area. If null, then the control's alignment will be used.
-     */
-    protected void layoutLabelInArea(double x, double y, double w, double h, Pos alignment) {
-        // References to essential labeled state
-        final Labeled labeled = getSkinnable();
-        final ContentDisplay contentDisplay = labeled.getContentDisplay();
-
-        if (alignment == null) {
-            alignment = labeled.getAlignment();
-        }
-
-        final HPos hpos = alignment == null ? HPos.LEFT   : alignment.getHpos();
-        final VPos vpos = alignment == null ? VPos.CENTER : alignment.getVpos();
-
-        // Figure out whether we should ignore the Graphic, and/or
-        // ignore the Text
-        final boolean ignoreGraphic = isIgnoreGraphic();
-        final boolean ignoreText = isIgnoreText();
-
-        x += leftLabelPadding();
-        y += topLabelPadding();
-        w -= leftLabelPadding() + rightLabelPadding();
-        h -= topLabelPadding() + bottomLabelPadding();
-
-        // Compute some standard useful numbers for the graphic, text, and gap
-        double graphicWidth;
-        double graphicHeight;
-        double textWidth;
-        double textHeight;
-
-        if (ignoreGraphic) {
-            graphicWidth = graphicHeight = 0;
-        } else if (ignoreText) {
-            if (graphic.isResizable()) {
-                Orientation contentBias = graphic.getContentBias();
-                if (contentBias == Orientation.HORIZONTAL) {
-                    graphicWidth  = Utils.boundedSize(w, graphic.minWidth(-1), graphic.maxWidth(-1));
-                    graphicHeight = Utils.boundedSize(h, graphic.minHeight(graphicWidth), graphic.maxHeight(graphicWidth));
-                } else if (contentBias == Orientation.VERTICAL) {
-                    graphicHeight = Utils.boundedSize(h, graphic.minHeight(-1), graphic.maxHeight(-1));
-                    graphicWidth  = Utils.boundedSize(w, graphic.minWidth(graphicHeight), graphic.maxWidth(graphicHeight));
-                } else {
-                    graphicWidth  = Utils.boundedSize(w, graphic.minWidth(-1), graphic.maxWidth(-1));
-                    graphicHeight = Utils.boundedSize(h, graphic.minHeight(-1), graphic.maxHeight(-1));
-                }
-                graphic.resize(graphicWidth, graphicHeight);
-            } else {
-                graphicWidth = graphic.getLayoutBounds().getWidth();
-                graphicHeight = graphic.getLayoutBounds().getHeight();
-            }
-        } else {
-            graphic.autosize(); // We have to do this before getting metrics
-            graphicWidth = graphic.getLayoutBounds().getWidth();
-            graphicHeight = graphic.getLayoutBounds().getHeight();
-        }
-
-        if (ignoreText) {
-            textWidth  = textHeight = 0;
-            text.setText("");
-        } else {
-            updateDisplayedText(w, h); // Have to do this just in case it needs to be recomputed
-            textWidth  = snapSize(Math.min(text.getLayoutBounds().getWidth(),  wrapWidth));
-            textHeight = snapSize(Math.min(text.getLayoutBounds().getHeight(), wrapHeight));
-        }
-
-        final double gap = (ignoreText || ignoreGraphic) ? 0 : labeled.getGraphicTextGap();
-
-        // Figure out the contentWidth and contentHeight. This is the width
-        // and height of the Labeled and Graphic together, not the available
-        // content area (which would be a different calculation).
-        double contentWidth = Math.max(graphicWidth, textWidth);
-        double contentHeight = Math.max(graphicHeight, textHeight);
-        if (contentDisplay == ContentDisplay.TOP || contentDisplay == ContentDisplay.BOTTOM) {
-            contentHeight = graphicHeight + gap + textHeight;
-        } else if (contentDisplay == ContentDisplay.LEFT || contentDisplay == ContentDisplay.RIGHT) {
-            contentWidth = graphicWidth + gap + textWidth;
-        }
-
-        // Now we want to compute the x/y location to place the content at.
-
-         // Compute the contentX position based on hpos and the space available
-        double contentX;
-        if (hpos == HPos.LEFT) {
-           contentX = x;
-        } else if (hpos == HPos.RIGHT) {
-           contentX = x + (w - contentWidth);
-        } else {
-            // TODO Baseline may not be handled correctly
-            // may have been CENTER or null, treat as center
-            contentX = (x + ((w - contentWidth) / 2.0));
-        }
-
-        // Compute the contentY position based on vpos and the space available
-        double contentY;
-        if (vpos == VPos.TOP) {
-            contentY = y;
-        } else if (vpos == VPos.BOTTOM) {
-            contentY = (y + (h - contentHeight));
-        } else {
-            // TODO Baseline may not be handled correctly
-            // may have been CENTER, BASELINE, or null, treat as center
-            contentY = (y + ((h - contentHeight) / 2.0));
-        }
-
-        double preMnemonicWidth = 0.0;
-        double mnemonicWidth = 0.0;
-        double mnemonicHeight = 0.0;
-        if (containsMnemonic) {
-            final Font font = text.getFont();
-            String preSt = bindings.getText();
-            preMnemonicWidth = Utils.computeTextWidth(font, preSt.substring(0,bindings.getMnemonicIndex()) , 0);
-            mnemonicWidth = Utils.computeTextWidth(font, preSt.substring(bindings.getMnemonicIndex(),bindings.getMnemonicIndex()+1) , 0);
-            mnemonicHeight = Utils.computeTextHeight(font, "_", 0, text.getBoundsType());
-        }
-
-
-        // Now to position the graphic and text. At this point I know the
-        // contentX and contentY locations (including the padding and whatnot
-        // that was defined on the Labeled). I also know the content width and
-        // height. So now I just need to lay out the graphic and text within
-        // that content x/y/w/h area.
-        if ((!ignoreGraphic || !ignoreText) && !text.isManaged()) {
-            text.setManaged(true);
-        }
-
-        if (ignoreGraphic && ignoreText) {
-            // There might be a text node as a child, or a graphic node as
-            // a child. However we don't have to do anything for the graphic
-            // node because the only way it can be a child and still have
-            // ignoreGraphic true is if it is unmanaged. Text however might
-            // be a child but still not matter, in which case we will just
-            // stop managing it (although really I wish it just wasn't here
-            // all all in that case)
-            if (text.isManaged()) {
-                text.setManaged(false);
-            }
-            text.relocate(snapPosition(contentX), snapPosition(contentY));
-        } else if (ignoreGraphic) {
-            // Since I only have to position the text, it goes at the
-            // contentX/contentY location. Note that positionNode will
-            // adjust the text based on the text's minX/minY so no need to
-            // worry about that here
-            text.relocate(snapPosition(contentX), snapPosition(contentY));
-            if (containsMnemonic) {
-                mnemonic_underscore.setEndX(mnemonicWidth-2.0);
-                mnemonic_underscore.relocate(contentX+preMnemonicWidth, contentY+mnemonicHeight-1);
-            }
-
-        } else if (ignoreText) {
-            // there isn't text to display, so we need to position it
-            // such that it doesn't affect the content area (although when
-            // there is a graphic, the text isn't even in the scene)
-            text.relocate(snapPosition(contentX), snapPosition(contentY));
-            graphic.relocate(snapPosition(contentX), snapPosition(contentY));
-            if (containsMnemonic) {
-                mnemonic_underscore.setEndX(mnemonicWidth);
-                mnemonic_underscore.setStrokeWidth(mnemonicHeight/10.0);
-                mnemonic_underscore.relocate(contentX+preMnemonicWidth, contentY+mnemonicHeight-1);
-
-            }
-        } else {
-            // There is both text and a graphic, so I need to position them
-            // relative to each other
-            double graphicX = 0;
-            double graphicY = 0;
-            double textX = 0;
-            double textY = 0;
-
-            if (contentDisplay == ContentDisplay.TOP) {
-                graphicX = contentX + ((contentWidth - graphicWidth) / 2.0);
-                textX = contentX + ((contentWidth - textWidth) / 2.0);
-                // The graphic is above the text, so it is positioned at
-                // graphicY and the text below it.
-                graphicY = contentY;
-                textY = graphicY + graphicHeight + gap;
-            } else if (contentDisplay == ContentDisplay.RIGHT) {
-                // The graphic is to the right of the text
-                textX = contentX;
-                graphicX = textX + textWidth + gap;
-                graphicY = contentY + ((contentHeight - graphicHeight) / 2.0);
-                textY = contentY + ((contentHeight - textHeight) / 2.0);
-            } else if (contentDisplay == ContentDisplay.BOTTOM) {
-                graphicX = contentX + ((contentWidth - graphicWidth) / 2.0);
-                textX = contentX + ((contentWidth - textWidth) / 2.0);
-                // The graphic is below the text
-                textY = contentY;
-                graphicY = textY + textHeight + gap;
-            } else if (contentDisplay == ContentDisplay.LEFT) {
-                // The graphic is to the left of the text, so the graphicX is
-                // simply the contentX and the textX is to the right of it.
-                graphicX = contentX;
-                textX = graphicX + graphicWidth + gap;
-                graphicY = contentY + ((contentHeight - graphicHeight) / 2.0);
-                textY = contentY + ((contentHeight - textHeight) / 2.0);
-            } else if (contentDisplay == ContentDisplay.CENTER) {
-                graphicX = contentX + ((contentWidth - graphicWidth) / 2.0);
-                textX = contentX + ((contentWidth - textWidth) / 2.0);
-                graphicY = contentY + ((contentHeight - graphicHeight) / 2.0);
-                textY = contentY + ((contentHeight - textHeight) / 2.0);
-            }
-            text.relocate(snapPosition(textX), snapPosition(textY));
-            if (containsMnemonic) {
-                mnemonic_underscore.setEndX(mnemonicWidth);
-                mnemonic_underscore.setStrokeWidth(mnemonicHeight/10.0);
-                mnemonic_underscore.relocate(snapPosition(textX+preMnemonicWidth), snapPosition(textY+mnemonicHeight-1));
-            }
-            graphic.relocate(snapPosition(graphicX), snapPosition(graphicY));
-        }
-
-        /**
-         * check if the label text overflows it's bounds.
-         * If there's an overflow, and no text clip then
-         * we'll clip it. 
-         * If there is no overflow, and the label text has a
-         * clip, then remove it.
-         */
-        if ((text != null) && 
-            ((text.getLayoutBounds().getHeight() > wrapHeight) ||
-             (text.getLayoutBounds().getWidth() > wrapWidth))) {
-
-            if (textClip == null) {
-                textClip = new Rectangle();
-            }
-
-            if (labeled.getEffectiveNodeOrientation() == NodeOrientation.LEFT_TO_RIGHT) {
-                textClip.setX(text.getLayoutBounds().getMinX());
-            } else {
-                textClip.setX(text.getLayoutBounds().getMaxX() - wrapWidth);
-            }
-            textClip.setY(text.getLayoutBounds().getMinY());
-            textClip.setWidth(wrapWidth);
-            textClip.setHeight(wrapHeight);
-            if (text.getClip() == null) {
-                text.setClip(textClip);
-            }
-        }
-        else {
-            /**
-             * content fits inside bounds, no need
-             * for a clip
-             */
-            if (text.getClip() != null) {
-                text.setClip(null);
-            }
-        }
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case TEXT: {
-                Labeled labeled = getSkinnable();
-                String accText = labeled.getAccessibleText();
-                if (accText != null && !accText.isEmpty()) return accText;
-
-                /* Use the text in the binding if available to handle mnemonics */
-                if (bindings != null) {
-                    String text = bindings.getText(); 
-                    if (text != null && !text.isEmpty()) return text;
-                }
-                /* Avoid the content in text.getText() as it can contain ellipses 
-                 * for clipping
-                 */
-                if (labeled != null) {
-                    String text = labeled.getText(); 
-                    if (text != null && !text.isEmpty()) return text;
-                }
-                /* Use the graphic as last resource. Note that this implementation
-                 * does not attempt to combine the label and graphics if both
-                 * are being displayed
-                 */
-                if (graphic != null) {
-                    Object result = graphic.queryAccessibleAttribute(AccessibleAttribute.TEXT);
-                    if (result != null) return result;
-                }
-                return null;
-            }
-            case MNEMONIC: {
-                if (bindings != null) {
-                    return bindings.getMnemonic();
-                }
-                return null;
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:19:46.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/LabeledSkinBase.java	2015-09-03 15:19:44.318733700 -0700
@@ -0,0 +1,1172 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.LabeledText;
+import com.sun.javafx.scene.control.behavior.TextBinding;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.geometry.HPos;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.OverrunStyle;
+import javafx.scene.control.SkinBase;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCombination;
+import javafx.scene.input.Mnemonic;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+
+import static javafx.scene.control.ContentDisplay.BOTTOM;
+import static javafx.scene.control.ContentDisplay.LEFT;
+import static javafx.scene.control.ContentDisplay.RIGHT;
+import static javafx.scene.control.ContentDisplay.TOP;
+import static javafx.scene.control.OverrunStyle.CLIP;
+
+/**
+ * Default skin implementation for controls extends {@link Labeled}.
+ *
+ * @see Labeled
+ * @since 9
+ */
+public abstract class LabeledSkinBase<C extends Labeled> extends SkinBase<C> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     *  The Text node used to display the text. This is package only
+     *  for the sake of testing!
+     */
+    LabeledText text;
+
+    /**
+     * Indicates that the text content is invalid and needs to be updated.
+     * This is package private only for the sake of testing.
+     */
+    boolean invalidText = true;
+
+    /**
+     * A reference to the last-known graphic on the Labeled. This reference
+     * is kept so that we can remove listeners from the old graphic later
+     */
+    Node graphic;
+
+    /**
+     * The cached full width of the non-truncated text. We only want to
+     * recompute this if the text has itself changed, or if the font has changed.
+     * This is package private ONLY FOR THE SAKE OF TESTING
+     */
+    double textWidth = Double.NEGATIVE_INFINITY;
+
+    /**
+     * The cached width of the ellipsis string. This will be recomputed
+     * if the font or the ellipsisString property have changed.
+     * This is package private ONLY FOR THE SAKE OF TESTING
+     */
+    double ellipsisWidth = Double.NEGATIVE_INFINITY;
+
+    /**
+     * A listener which is applied to the graphic whenever the graphic is set
+     * and is visible within the labeled. For example, if there is a graphic
+     * defined on the Labeled but the ContentDisplay is set to TEXT_ONLY, then
+     * we will not bother installing this listener on the graphic. In all
+     * other cases, if the graphic is defined, it will have this listener
+     * added to it, which ensures that if the graphic's layout bounds change,
+     * we end up performing a layout and potentially update the visible text.
+     *
+     * This is package private ONLY FOR THE SAKE OF TESTING
+     */
+    final InvalidationListener graphicPropertyChangedListener = valueModel -> {
+        invalidText = true;
+        getSkinnable().requestLayout();
+    };
+
+    private Rectangle textClip;
+    private double wrapWidth;
+    private double wrapHeight;
+
+    private TextBinding bindings;
+    private Line mnemonic_underscore;
+
+    private boolean containsMnemonic = false;
+    private Scene mnemonicScene = null;
+    private KeyCombination mnemonicCode;
+    // needs to be an object, as MenuItem isn't a node
+    private Node labeledNode = null;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Constructor for LabeledSkinBase. The Labeled must be specified, and cannot be null.
+     * At the conclusion of the constructor call, the skin will be marked as
+     * needsLayout, and will be fully configured based on the current state of
+     * the labeled. Any subsequent changes to the Labeled will be handled via
+     * listeners and applied appropriately.
+     *
+     * @param labeled The labeled that this skin should be installed onto.
+     */
+    public LabeledSkinBase(final C labeled) {
+        super(labeled);
+
+        // Configure the Text node with all of the attributes from the
+        // Labeled which apply to it.
+        text = new LabeledText(labeled);
+        
+        updateChildren();
+
+        // Labels do not block the mouse by default, unlike most other UI Controls.
+        //consumeMouseEvents(false);
+
+        // Register listeners
+        /*
+         * There are basically 2 things to worry about in each of these handlers
+         *  1) Update the Text node
+         *  2) Have the text metrics changed?
+         *
+         * If the metrics have changed, we need to request a layout and invalidate
+         * the text so that we recompute the display text on next read.
+         */
+        registerChangeListener(labeled.ellipsisStringProperty(), o -> {
+            textMetricsChanged();
+            invalidateWidths();
+            ellipsisWidth = Double.NEGATIVE_INFINITY;
+        });
+        registerChangeListener(labeled.widthProperty(), o -> {
+            updateWrappingWidth();
+            invalidText = true;
+            // No requestLayout() because Control will force a layout
+        });
+        registerChangeListener(labeled.heightProperty(), o -> {
+            invalidText = true;
+            // No requestLayout() because Control will force a layout
+        });
+        registerChangeListener(labeled.fontProperty(), o -> {
+            textMetricsChanged();
+            invalidateWidths();
+            ellipsisWidth = Double.NEGATIVE_INFINITY;
+        });
+        registerChangeListener(labeled.graphicProperty(), o -> {
+            updateChildren();
+            textMetricsChanged();
+        });
+        registerChangeListener(labeled.contentDisplayProperty(), o -> {
+            updateChildren();
+            textMetricsChanged();
+        });
+        registerChangeListener(labeled.labelPaddingProperty(), o -> textMetricsChanged());
+        registerChangeListener(labeled.graphicTextGapProperty(), o -> textMetricsChanged());
+        registerChangeListener(labeled.alignmentProperty(), o -> {
+            // Doesn't involve text metrics because if the text is too long, then
+            // it will already have fit all available width and a change to hpos
+            // has no effect. Or it is too short (i.e. it all fits) and we don't
+            // have to worry about truncation. So just call request layout.
+            // Doesn't involve text metrics because if the text is too long, then
+            // it will already have fit all available height and a change to vpos
+            // has no effect. Or it is too short (i.e. it all fits) and we don't
+            // have to worry about truncation. So just call request layout.
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(labeled.mnemonicParsingProperty(), o -> {
+            containsMnemonic = false;
+            textMetricsChanged();
+        });
+        registerChangeListener(labeled.textProperty(), o -> {
+            updateChildren();
+            textMetricsChanged();
+            invalidateWidths();
+        });
+        registerChangeListener(labeled.textAlignmentProperty(), o -> { /* NO-OP */ });
+        registerChangeListener(labeled.textOverrunProperty(), o -> textMetricsChanged());
+        registerChangeListener(labeled.wrapTextProperty(), o -> {
+            updateWrappingWidth();
+            textMetricsChanged();
+        });
+        registerChangeListener(labeled.underlineProperty(), o -> textMetricsChanged());
+        registerChangeListener(labeled.lineSpacingProperty(), o -> textMetricsChanged());
+        registerChangeListener(labeled.sceneProperty(), o -> sceneChanged());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Updates the children managed by LabeledSkinBase, which can be the Labeled
+     * graphic and/or a Text node. Only those nodes which actually must
+     * be used are used. For example, with a ContentDisplay of
+     * GRAPHIC_ONLY the text node is not added, and with a ContentDisplay
+     * of TEXT_ONLY, the graphic is not added.
+     */
+    protected void updateChildren() {
+        final Labeled labeled = getSkinnable();
+        // Only in some situations do we want to have the graphicPropertyChangedListener
+        // installed. Since updateChildren() is not called much, we'll just remove it always
+        // and reinstall it later if it is necessary to do so.
+        if (graphic != null) {
+            graphic.layoutBoundsProperty().removeListener(graphicPropertyChangedListener);
+        }
+        // Now update the graphic (since it may have changed)
+        graphic = labeled.getGraphic();
+
+        // RT-19851 Only setMouseTransparent(true) for an ImageView.  This allows the button
+        // to be picked regardless of the changing images on top of it.
+        if (graphic instanceof ImageView) {
+            graphic.setMouseTransparent(true);
+        }
+
+        // Now update the children (and add the graphicPropertyChangedListener as necessary)
+        if (isIgnoreGraphic()) {
+            if (labeled.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) {
+                getChildren().clear();
+            } else {
+                getChildren().setAll(text);
+            }
+        } else {
+            graphic.layoutBoundsProperty().addListener(graphicPropertyChangedListener);
+            if (isIgnoreText()) {
+                getChildren().setAll(graphic);
+            } else {
+                getChildren().setAll(graphic, text);
+            }
+
+            // RT-37420
+            graphic.impl_processCSS(false);
+
+        }
+
+    }
+
+    /**
+     * Compute and return the minimum width of this Labeled. The minimum width is
+     * the smaller of the width of "..." and the width with the actual text.
+     * In this way, if the text width itself is smaller than the ellipsis then
+     * we should use that as the min width, otherwise the ellipsis needs to be the
+     * min width.
+     * <p>
+     * We use the same calculation here regardless of whether we are talking
+     * about a single or multiline labeled. So a multiline labeled may find that
+     * the width of the "..." is as small as it will ever get.
+     */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computeMinLabeledPartWidth(height, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computeMinLabeledPartHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        // Get the preferred width of the text
+        final Labeled labeled = getSkinnable();
+        final Font font = text.getFont();
+        final String string = labeled.getText();
+        boolean emptyText = string == null || string.isEmpty();
+        double widthPadding = leftInset + leftLabelPadding() +
+                rightInset + rightLabelPadding();
+
+        double textWidth = emptyText ? 0 : Utils.computeTextWidth(font, string, 0);
+
+        // Fix for RT-39889
+        double graphicWidth = graphic == null ? 0.0 :
+                Utils.boundedSize(graphic.prefWidth(-1), graphic.minWidth(-1), graphic.maxWidth(-1));
+
+        // Now add on the graphic, gap, and padding as appropriate
+        final Node graphic = labeled.getGraphic();
+        if (isIgnoreGraphic()) {
+            return textWidth + widthPadding;
+        } else if (isIgnoreText()) {
+            return graphicWidth + widthPadding;
+        } else if (labeled.getContentDisplay() == ContentDisplay.LEFT
+                || labeled.getContentDisplay() == ContentDisplay.RIGHT) {
+            return textWidth + labeled.getGraphicTextGap() + graphicWidth + widthPadding;
+        } else {
+            return Math.max(textWidth, graphicWidth) + widthPadding;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Labeled labeled = getSkinnable();
+        final Font font = text.getFont();
+        final ContentDisplay contentDisplay = labeled.getContentDisplay();
+        final double gap = labeled.getGraphicTextGap();
+        width -= leftInset + leftLabelPadding() +
+                rightInset + rightLabelPadding();
+
+        String str = labeled.getText();
+        if (str != null && str.endsWith("\n")) {
+            // Strip ending newline so we don't count another row.
+            str = str.substring(0, str.length() - 1);
+        }
+
+        double textWidth = width;
+        if (!isIgnoreGraphic() &&
+                (contentDisplay == LEFT || contentDisplay == RIGHT)) {
+            textWidth -= (graphic.prefWidth(-1) + gap);
+        }
+
+        // TODO figure out how to cache this effectively.
+        final double textHeight = Utils.computeTextHeight(font, str,
+                labeled.isWrapText() ? textWidth : 0,
+                labeled.getLineSpacing(), text.getBoundsType());
+
+        // Now we want to add on the graphic if necessary!
+        double h = textHeight;
+        if (!isIgnoreGraphic()) {
+            final Node graphic = labeled.getGraphic();
+            if (contentDisplay == TOP || contentDisplay == BOTTOM) {
+                h = graphic.prefHeight(width) + gap + textHeight;
+            } else {
+                h = Math.max(textHeight, graphic.prefHeight(width));
+            }
+        }
+
+        return topInset + h + bottomInset + topLabelPadding() + bottomLabelPadding();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        double textBaselineOffset = text.getBaselineOffset();
+        double h = textBaselineOffset;
+        final Labeled labeled = getSkinnable();
+        final Node g = labeled.getGraphic();
+        if (!isIgnoreGraphic()) {
+            ContentDisplay contentDisplay = labeled.getContentDisplay();
+            if (contentDisplay == ContentDisplay.TOP) {
+                h = g.prefHeight(-1) + labeled.getGraphicTextGap() + textBaselineOffset;
+            } else if (contentDisplay == ContentDisplay.LEFT || contentDisplay == RIGHT) {
+                h = textBaselineOffset + (g.prefHeight(-1) - text.prefHeight(-1)) / 2;
+            }
+        }
+
+        return topInset + topLabelPadding() + h;
+    }
+
+    /**
+     * The Layout algorithm works like this:
+     *
+     *  - Get the labeled w/h, graphic w/h, text w/h
+     *  - Compute content w/h based on graphicVPos, graphicHPos,
+     *    graphicTextGap, and graphic w/h and text w/h
+     *  - (Note that the text content has been pre-truncated where
+     *    necessary)
+     *  - compute content x/y based on content w/h and labeled w/h
+     *    and the labeled's hpos and vpos
+     *  - position the graphic and text
+     */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        layoutLabelInArea(x, y, w, h);
+    }
+
+    /**
+     * Performs the actual layout of the label content within the area given.
+     * This method is called by subclasses that override layoutChildren().
+     *
+     * @param x The x position of the label part of the control, inside padding
+     *
+     * @param y The y position of the label part of the control, inside padding
+     *
+     * @param w The width of the label part of the control, not including padding
+     *
+     * @param h The height of the label part of the control, not including padding
+     */
+    protected void layoutLabelInArea(double x, double y, double w, double h) {
+        layoutLabelInArea(x, y, w, h, null);
+    }
+
+    /**
+     * Performs the actual layout of the label content within the area given.
+     * This method is called by subclasses that override layoutChildren().
+     *
+     * @param x The x position of the label part of the control, inside padding
+     *
+     * @param y The y position of the label part of the control, inside padding
+     *
+     * @param w The width of the label part of the control, not including padding
+     *
+     * @param h The height of the label part of the control, not including padding
+     *
+     * @param alignment The alignment of the label part of the control within the given area. If null, then the control's alignment will be used.
+     */
+    protected void layoutLabelInArea(double x, double y, double w, double h, Pos alignment) {
+        // References to essential labeled state
+        final Labeled labeled = getSkinnable();
+        final ContentDisplay contentDisplay = labeled.getContentDisplay();
+
+        if (alignment == null) {
+            alignment = labeled.getAlignment();
+        }
+
+        final HPos hpos = alignment == null ? HPos.LEFT   : alignment.getHpos();
+        final VPos vpos = alignment == null ? VPos.CENTER : alignment.getVpos();
+
+        // Figure out whether we should ignore the Graphic, and/or
+        // ignore the Text
+        final boolean ignoreGraphic = isIgnoreGraphic();
+        final boolean ignoreText = isIgnoreText();
+
+        x += leftLabelPadding();
+        y += topLabelPadding();
+        w -= leftLabelPadding() + rightLabelPadding();
+        h -= topLabelPadding() + bottomLabelPadding();
+
+        // Compute some standard useful numbers for the graphic, text, and gap
+        double graphicWidth;
+        double graphicHeight;
+        double textWidth;
+        double textHeight;
+
+        if (ignoreGraphic) {
+            graphicWidth = graphicHeight = 0;
+        } else if (ignoreText) {
+            if (graphic.isResizable()) {
+                Orientation contentBias = graphic.getContentBias();
+                if (contentBias == Orientation.HORIZONTAL) {
+                    graphicWidth  = Utils.boundedSize(w, graphic.minWidth(-1), graphic.maxWidth(-1));
+                    graphicHeight = Utils.boundedSize(h, graphic.minHeight(graphicWidth), graphic.maxHeight(graphicWidth));
+                } else if (contentBias == Orientation.VERTICAL) {
+                    graphicHeight = Utils.boundedSize(h, graphic.minHeight(-1), graphic.maxHeight(-1));
+                    graphicWidth  = Utils.boundedSize(w, graphic.minWidth(graphicHeight), graphic.maxWidth(graphicHeight));
+                } else {
+                    graphicWidth  = Utils.boundedSize(w, graphic.minWidth(-1), graphic.maxWidth(-1));
+                    graphicHeight = Utils.boundedSize(h, graphic.minHeight(-1), graphic.maxHeight(-1));
+                }
+                graphic.resize(graphicWidth, graphicHeight);
+            } else {
+                graphicWidth = graphic.getLayoutBounds().getWidth();
+                graphicHeight = graphic.getLayoutBounds().getHeight();
+            }
+        } else {
+            graphic.autosize(); // We have to do this before getting metrics
+            graphicWidth = graphic.getLayoutBounds().getWidth();
+            graphicHeight = graphic.getLayoutBounds().getHeight();
+        }
+
+        if (ignoreText) {
+            textWidth  = textHeight = 0;
+            text.setText("");
+        } else {
+            updateDisplayedText(w, h); // Have to do this just in case it needs to be recomputed
+            textWidth  = snapSize(Math.min(text.getLayoutBounds().getWidth(),  wrapWidth));
+            textHeight = snapSize(Math.min(text.getLayoutBounds().getHeight(), wrapHeight));
+        }
+
+        final double gap = (ignoreText || ignoreGraphic) ? 0 : labeled.getGraphicTextGap();
+
+        // Figure out the contentWidth and contentHeight. This is the width
+        // and height of the Labeled and Graphic together, not the available
+        // content area (which would be a different calculation).
+        double contentWidth = Math.max(graphicWidth, textWidth);
+        double contentHeight = Math.max(graphicHeight, textHeight);
+        if (contentDisplay == ContentDisplay.TOP || contentDisplay == ContentDisplay.BOTTOM) {
+            contentHeight = graphicHeight + gap + textHeight;
+        } else if (contentDisplay == ContentDisplay.LEFT || contentDisplay == ContentDisplay.RIGHT) {
+            contentWidth = graphicWidth + gap + textWidth;
+        }
+
+        // Now we want to compute the x/y location to place the content at.
+
+        // Compute the contentX position based on hpos and the space available
+        double contentX;
+        if (hpos == HPos.LEFT) {
+            contentX = x;
+        } else if (hpos == HPos.RIGHT) {
+            contentX = x + (w - contentWidth);
+        } else {
+            // TODO Baseline may not be handled correctly
+            // may have been CENTER or null, treat as center
+            contentX = (x + ((w - contentWidth) / 2.0));
+        }
+
+        // Compute the contentY position based on vpos and the space available
+        double contentY;
+        if (vpos == VPos.TOP) {
+            contentY = y;
+        } else if (vpos == VPos.BOTTOM) {
+            contentY = (y + (h - contentHeight));
+        } else {
+            // TODO Baseline may not be handled correctly
+            // may have been CENTER, BASELINE, or null, treat as center
+            contentY = (y + ((h - contentHeight) / 2.0));
+        }
+
+        double preMnemonicWidth = 0.0;
+        double mnemonicWidth = 0.0;
+        double mnemonicHeight = 0.0;
+        if (containsMnemonic) {
+            final Font font = text.getFont();
+            String preSt = bindings.getText();
+            preMnemonicWidth = Utils.computeTextWidth(font, preSt.substring(0, bindings.getMnemonicIndex()), 0);
+            mnemonicWidth = Utils.computeTextWidth(font, preSt.substring(bindings.getMnemonicIndex(), bindings.getMnemonicIndex() + 1), 0);
+            mnemonicHeight = Utils.computeTextHeight(font, "_", 0, text.getBoundsType());
+        }
+
+
+        // Now to position the graphic and text. At this point I know the
+        // contentX and contentY locations (including the padding and whatnot
+        // that was defined on the Labeled). I also know the content width and
+        // height. So now I just need to lay out the graphic and text within
+        // that content x/y/w/h area.
+        if ((!ignoreGraphic || !ignoreText) && !text.isManaged()) {
+            text.setManaged(true);
+        }
+
+        if (ignoreGraphic && ignoreText) {
+            // There might be a text node as a child, or a graphic node as
+            // a child. However we don't have to do anything for the graphic
+            // node because the only way it can be a child and still have
+            // ignoreGraphic true is if it is unmanaged. Text however might
+            // be a child but still not matter, in which case we will just
+            // stop managing it (although really I wish it just wasn't here
+            // all all in that case)
+            if (text.isManaged()) {
+                text.setManaged(false);
+            }
+            text.relocate(snapPosition(contentX), snapPosition(contentY));
+        } else if (ignoreGraphic) {
+            // Since I only have to position the text, it goes at the
+            // contentX/contentY location. Note that positionNode will
+            // adjust the text based on the text's minX/minY so no need to
+            // worry about that here
+            text.relocate(snapPosition(contentX), snapPosition(contentY));
+            if (containsMnemonic) {
+                mnemonic_underscore.setEndX(mnemonicWidth-2.0);
+                mnemonic_underscore.relocate(contentX+preMnemonicWidth, contentY+mnemonicHeight-1);
+            }
+
+        } else if (ignoreText) {
+            // there isn't text to display, so we need to position it
+            // such that it doesn't affect the content area (although when
+            // there is a graphic, the text isn't even in the scene)
+            text.relocate(snapPosition(contentX), snapPosition(contentY));
+            graphic.relocate(snapPosition(contentX), snapPosition(contentY));
+            if (containsMnemonic) {
+                mnemonic_underscore.setEndX(mnemonicWidth);
+                mnemonic_underscore.setStrokeWidth(mnemonicHeight/10.0);
+                mnemonic_underscore.relocate(contentX+preMnemonicWidth, contentY+mnemonicHeight-1);
+
+            }
+        } else {
+            // There is both text and a graphic, so I need to position them
+            // relative to each other
+            double graphicX = 0;
+            double graphicY = 0;
+            double textX = 0;
+            double textY = 0;
+
+            if (contentDisplay == ContentDisplay.TOP) {
+                graphicX = contentX + ((contentWidth - graphicWidth) / 2.0);
+                textX = contentX + ((contentWidth - textWidth) / 2.0);
+                // The graphic is above the text, so it is positioned at
+                // graphicY and the text below it.
+                graphicY = contentY;
+                textY = graphicY + graphicHeight + gap;
+            } else if (contentDisplay == ContentDisplay.RIGHT) {
+                // The graphic is to the right of the text
+                textX = contentX;
+                graphicX = textX + textWidth + gap;
+                graphicY = contentY + ((contentHeight - graphicHeight) / 2.0);
+                textY = contentY + ((contentHeight - textHeight) / 2.0);
+            } else if (contentDisplay == ContentDisplay.BOTTOM) {
+                graphicX = contentX + ((contentWidth - graphicWidth) / 2.0);
+                textX = contentX + ((contentWidth - textWidth) / 2.0);
+                // The graphic is below the text
+                textY = contentY;
+                graphicY = textY + textHeight + gap;
+            } else if (contentDisplay == ContentDisplay.LEFT) {
+                // The graphic is to the left of the text, so the graphicX is
+                // simply the contentX and the textX is to the right of it.
+                graphicX = contentX;
+                textX = graphicX + graphicWidth + gap;
+                graphicY = contentY + ((contentHeight - graphicHeight) / 2.0);
+                textY = contentY + ((contentHeight - textHeight) / 2.0);
+            } else if (contentDisplay == ContentDisplay.CENTER) {
+                graphicX = contentX + ((contentWidth - graphicWidth) / 2.0);
+                textX = contentX + ((contentWidth - textWidth) / 2.0);
+                graphicY = contentY + ((contentHeight - graphicHeight) / 2.0);
+                textY = contentY + ((contentHeight - textHeight) / 2.0);
+            }
+            text.relocate(snapPosition(textX), snapPosition(textY));
+            if (containsMnemonic) {
+                mnemonic_underscore.setEndX(mnemonicWidth);
+                mnemonic_underscore.setStrokeWidth(mnemonicHeight/10.0);
+                mnemonic_underscore.relocate(snapPosition(textX+preMnemonicWidth), snapPosition(textY+mnemonicHeight-1));
+            }
+            graphic.relocate(snapPosition(graphicX), snapPosition(graphicY));
+        }
+
+        /**
+         * check if the label text overflows it's bounds.
+         * If there's an overflow, and no text clip then
+         * we'll clip it.
+         * If there is no overflow, and the label text has a
+         * clip, then remove it.
+         */
+        if ((text != null) &&
+                ((text.getLayoutBounds().getHeight() > wrapHeight) ||
+                        (text.getLayoutBounds().getWidth() > wrapWidth))) {
+
+            if (textClip == null) {
+                textClip = new Rectangle();
+            }
+
+            if (labeled.getEffectiveNodeOrientation() == NodeOrientation.LEFT_TO_RIGHT) {
+                textClip.setX(text.getLayoutBounds().getMinX());
+            } else {
+                textClip.setX(text.getLayoutBounds().getMaxX() - wrapWidth);
+            }
+            textClip.setY(text.getLayoutBounds().getMinY());
+            textClip.setWidth(wrapWidth);
+            textClip.setHeight(wrapHeight);
+            if (text.getClip() == null) {
+                text.setClip(textClip);
+            }
+        }
+        else {
+            /**
+             * content fits inside bounds, no need
+             * for a clip
+             */
+            if (text.getClip() != null) {
+                text.setClip(null);
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case TEXT: {
+                Labeled labeled = getSkinnable();
+                String accText = labeled.getAccessibleText();
+                if (accText != null && !accText.isEmpty()) return accText;
+
+                /* Use the text in the binding if available to handle mnemonics */
+                if (bindings != null) {
+                    String text = bindings.getText();
+                    if (text != null && !text.isEmpty()) return text;
+                }
+                /* Avoid the content in text.getText() as it can contain ellipses
+                 * for clipping
+                 */
+                if (labeled != null) {
+                    String text = labeled.getText();
+                    if (text != null && !text.isEmpty()) return text;
+                }
+                /* Use the graphic as last resource. Note that this implementation
+                 * does not attempt to combine the label and graphics if both
+                 * are being displayed
+                 */
+                if (graphic != null) {
+                    Object result = graphic.queryAccessibleAttribute(AccessibleAttribute.TEXT);
+                    if (result != null) return result;
+                }
+                return null;
+            }
+            case MNEMONIC: {
+                if (bindings != null) {
+                    return bindings.getMnemonic();
+                }
+                return null;
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private double computeMinLabeledPartWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        // First compute the minTextWidth by checking the width of the string
+        // made by the ellipsis "...", and then by checking the width of the
+        // string made up by labeled.text. We want the smaller of the two.
+        final Labeled labeled = getSkinnable();
+        final ContentDisplay contentDisplay = labeled.getContentDisplay();
+        final double gap = labeled.getGraphicTextGap();
+        double minTextWidth = 0;
+
+        final Font font = text.getFont();
+        OverrunStyle truncationStyle = labeled.getTextOverrun();
+        String ellipsisString = labeled.getEllipsisString();
+        final String string = labeled.getText();
+        final boolean emptyText = string == null || string.isEmpty();
+
+        if (!emptyText) {
+            // We only want to recompute the full text width if the font or text changed
+            if (truncationStyle == CLIP) {
+                if (textWidth == Double.NEGATIVE_INFINITY) {
+                    // Show at minimum the first character
+                    textWidth = Utils.computeTextWidth(font, string.substring(0, 1), 0);
+                }
+                minTextWidth = textWidth;
+            } else {
+                if (textWidth == Double.NEGATIVE_INFINITY) {
+                    textWidth = Utils.computeTextWidth(font, string, 0);
+                }
+                // We only want to recompute the ellipsis width if the font has changed
+                if (ellipsisWidth == Double.NEGATIVE_INFINITY) {
+                    ellipsisWidth = Utils.computeTextWidth(font, ellipsisString, 0);
+                }
+                minTextWidth = Math.min(textWidth, ellipsisWidth);
+            }
+        }
+
+        // Now inspect the graphic and the hpos to determine the the minWidth
+        final Node graphic = labeled.getGraphic();
+        double width;
+        if (isIgnoreGraphic()) {
+            width = minTextWidth;
+        } else if (isIgnoreText()) {
+            width = graphic.minWidth(-1);
+        } else if (contentDisplay == LEFT || contentDisplay == RIGHT){
+            width = (minTextWidth + graphic.minWidth(-1) + gap);
+        } else {
+            width = Math.max(minTextWidth, graphic.minWidth(-1));
+        }
+
+        return width + leftInset + leftLabelPadding() +
+                rightInset + rightLabelPadding();
+    }
+
+    private double computeMinLabeledPartHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Labeled labeled = getSkinnable();
+        final Font font = text.getFont();
+
+        String str = labeled.getText();
+        if (str != null && str.length() > 0) {
+            int newlineIndex = str.indexOf('\n');
+            if (newlineIndex >= 0) {
+                str = str.substring(0, newlineIndex);
+            }
+        }
+
+        // TODO figure out how to cache this effectively.
+        // Base minimum height on one line (ignoring wrapping here).
+        double s = labeled.getLineSpacing();
+        final double textHeight = Utils.computeTextHeight(font, str, 0, s, text.getBoundsType());
+
+        double h = textHeight;
+
+        // Now we want to add on the graphic if necessary!
+        if (!isIgnoreGraphic()) {
+            final Node graphic = labeled.getGraphic();
+            if (labeled.getContentDisplay() == ContentDisplay.TOP
+                    || labeled.getContentDisplay() == ContentDisplay.BOTTOM) {
+                h = graphic.minHeight(width) + labeled.getGraphicTextGap() + textHeight;
+            } else {
+                h = Math.max(textHeight, graphic.minHeight(width));
+            }
+        }
+
+        return topInset + h + bottomInset + topLabelPadding() - bottomLabelPadding();
+    }
+
+    double topLabelPadding() {
+        return snapSize(getSkinnable().getLabelPadding().getTop());
+    }
+
+    double bottomLabelPadding() {
+        return snapSize(getSkinnable().getLabelPadding().getBottom());
+    }
+
+    double leftLabelPadding() {
+        return snapSize(getSkinnable().getLabelPadding().getLeft());
+    }
+
+    double rightLabelPadding() {
+        return snapSize(getSkinnable().getLabelPadding().getRight());
+    }
+
+
+    /**
+     * Called whenever some state has changed that affects the text metrics.
+     * Changes here will involve invalidating the display text so the next
+     * call to updateDisplayedText computes a new value, and call requestLayout.
+     */
+    private void textMetricsChanged() {
+        invalidText = true;
+        getSkinnable().requestLayout();
+    }
+
+    /*
+    ** The Label is a mnemonic, and it's target node
+    ** has changed, but it's label hasn't so just
+    ** swap them over, and tidy up.
+    */
+    void mnemonicTargetChanged() {
+        if (containsMnemonic == true) {
+            /*
+            ** was there previously a labelFor  
+            */
+            removeMnemonic();
+
+            /*
+            ** is there a new labelFor
+            */
+            Control control = getSkinnable();
+            if (control instanceof Label) {
+                labeledNode = ((Label)control).getLabelFor();
+                addMnemonic();
+            }
+            else {
+                labeledNode = null;
+            }
+        }
+    }
+
+    private void sceneChanged() {
+        final Labeled labeled = getSkinnable();
+        Scene scene = labeled.getScene();
+
+        if (scene != null && containsMnemonic) {
+            addMnemonic();
+        }
+
+    }
+
+    /**
+     * Marks minWidth as being invalid and in need of recomputation.
+     */
+    private void invalidateWidths() {
+        textWidth = Double.NEGATIVE_INFINITY;
+    }
+
+    /**
+     * Updates the content of the underlying Text node. This method should
+     * only be called when necessary. If the invalidText flag is not set, then
+     * the method is a no-op. This care is taken because recomputing the
+     * text to display is an expensive operation. Package private ONLY FOR THE
+     * SAKE OF TESTING.
+     */
+    void updateDisplayedText() {
+        updateDisplayedText(-1, -1);
+    }
+
+    private void updateDisplayedText(double w, double h) {
+        if (invalidText) {
+            final Labeled labeled = getSkinnable();
+            String s = labeled.getText();
+
+            int mnemonicIndex = -1;
+
+            /*
+            ** if there's a valid string then parse it
+            */
+            if (s != null && s.length() > 0) {
+                bindings = new TextBinding(s);
+
+                if (!com.sun.javafx.PlatformUtil.isMac() && getSkinnable().isMnemonicParsing() == true) {
+                    /*
+                    ** the Labeled has a MnemonicParsing property,
+                    ** if set true, then auto-parsing will check for
+                    ** a mnemonic
+                    */
+                    if (labeled instanceof Label) {
+                        // buttons etc
+                        labeledNode = ((Label)labeled).getLabelFor();
+                    } else {
+                        labeledNode = labeled;
+                    }
+
+                    if (labeledNode == null) {
+                        labeledNode = labeled;
+                    }
+                    mnemonicIndex = bindings.getMnemonicIndex() ;
+                }
+            }
+
+            /*
+            ** we were previously a mnemonic
+            */
+            if (containsMnemonic) {
+                /*
+                ** are we no longer a mnemonic, or have we changed code?
+                */
+                if (mnemonicScene != null) {
+                    if (mnemonicIndex == -1 ||
+                            (bindings != null && !bindings.getMnemonicKeyCombination().equals(mnemonicCode))) {
+                        removeMnemonic();
+                    }
+                    containsMnemonic = false;
+                }
+            }
+            else {
+                /*
+                ** this can happen if mnemonic parsing is
+                ** disabled on a previously valid mnemonic
+                */
+                removeMnemonic();
+            }
+
+            /*
+            ** check we have a labeled
+            */
+            if (s != null && s.length() > 0) {
+                if (mnemonicIndex >= 0 && containsMnemonic == false) {
+                    containsMnemonic = true;
+                    mnemonicCode = bindings.getMnemonicKeyCombination();
+                    addMnemonic();
+                }
+            }
+
+            if (containsMnemonic == true) {
+                s = bindings.getText();
+                if (mnemonic_underscore == null) {
+                    mnemonic_underscore = new Line();
+                    mnemonic_underscore.setStartX(0.0f);
+                    mnemonic_underscore.setStartY(0.0f);
+                    mnemonic_underscore.setEndY(0.0f);
+                    mnemonic_underscore.getStyleClass().clear();
+                    mnemonic_underscore.getStyleClass().setAll("mnemonic-underline");
+                }
+                if (!getChildren().contains(mnemonic_underscore)) {
+                    getChildren().add(mnemonic_underscore);
+                }
+            } else {
+                /*
+                ** we don't need a mnemonic....
+                */
+                if (getSkinnable().isMnemonicParsing() == true && com.sun.javafx.PlatformUtil.isMac() && bindings != null) {
+                    s = bindings.getText();
+                }
+                else {
+                    s = labeled.getText();
+                }
+                if (mnemonic_underscore != null) {
+                    if (getChildren().contains(mnemonic_underscore)) {
+                        Platform.runLater(() -> {
+                              getChildren().remove(mnemonic_underscore);
+                              mnemonic_underscore = null;
+                        });
+                    }
+                }
+            }
+
+            int len = s != null ? s.length() : 0;
+            boolean multiline = false;
+
+            if (s != null && len > 0) {
+                int i = s.indexOf('\n');
+                if (i > -1 && i < len - 1) {
+                    // Multiline text with embedded newlines - not
+                    // taking into account a potential trailing newline.
+                    multiline = true;
+                }
+            }
+
+            String result;
+            boolean horizontalPosition =
+                    (labeled.getContentDisplay() == ContentDisplay.LEFT ||
+                    labeled.getContentDisplay() == ContentDisplay.RIGHT);
+
+            double availableWidth = labeled.getWidth() - snappedLeftInset() - leftLabelPadding() -
+                                    snappedRightInset() - rightLabelPadding();
+            availableWidth = Math.max(availableWidth, 0);
+
+            if (w == -1) {
+                w = availableWidth;
+            }
+            double minW = Math.min(computeMinLabeledPartWidth(-1, snappedTopInset() , snappedRightInset(), snappedBottomInset(), snappedLeftInset()), availableWidth);
+            if (horizontalPosition && !isIgnoreGraphic()) {
+                double graphicW = (labeled.getGraphic().getLayoutBounds().getWidth() + labeled.getGraphicTextGap());
+                w -= graphicW;
+                minW -= graphicW;
+            }
+            wrapWidth = Math.max(minW, w);
+
+            boolean verticalPosition =
+                    (labeled.getContentDisplay() == ContentDisplay.TOP ||
+                    labeled.getContentDisplay() == ContentDisplay.BOTTOM);
+
+            double availableHeight = labeled.getHeight() - snappedTopInset() - topLabelPadding() -
+                                     snappedBottomInset() - bottomLabelPadding();
+            availableHeight = Math.max(availableHeight, 0);
+
+            if (h == -1) {
+                h = availableHeight;
+            }
+            double minH = Math.min(computeMinLabeledPartHeight(wrapWidth, snappedTopInset() , snappedRightInset(), snappedBottomInset(), snappedLeftInset()), availableHeight);
+            if (verticalPosition && labeled.getGraphic() != null) {
+                double graphicH = labeled.getGraphic().getLayoutBounds().getHeight() + labeled.getGraphicTextGap();
+                h -= graphicH;
+                minH -= graphicH;
+            }
+            wrapHeight = Math.max(minH, h);
+
+            updateWrappingWidth();
+
+            Font font = text.getFont();
+            OverrunStyle truncationStyle = labeled.getTextOverrun();
+            String ellipsisString = labeled.getEllipsisString();
+
+            if (labeled.isWrapText()) {
+                result = Utils.computeClippedWrappedText(font, s, wrapWidth, wrapHeight, truncationStyle, ellipsisString, text.getBoundsType());
+            } else if (multiline) {
+                StringBuilder sb = new StringBuilder();
+
+                String[] splits = s.split("\n");
+                for (int i = 0; i < splits.length; i++) {
+                    sb.append(Utils.computeClippedText(font, splits[i], wrapWidth, truncationStyle, ellipsisString));
+                    if (i < splits.length - 1) {
+                        sb.append('\n');
+                    }
+                }
+
+                // TODO: Consider what to do in the case where vertical space is
+                // limited and the last visible line isn't already truncated
+                // with a trailing ellipsis. What if the style calls for leading
+                // or center ellipses? We could possibly add an additional
+                // trailing ellipsis to the last visible line, like this:
+
+                // +--------------------------------+
+                // |  This is some long text with multiple lines\n
+                // |  where more than one exceed the|width\n
+                // |  and wrapText is false, and all|lines\n
+                // +--don't fit.--------------------+
+                //
+                // +--------------------------------+
+                // |  This is some...multiple lines |
+                // |  where more t...ceed the width |
+                // |  and wrapText...d all lines... |
+                // +--------------------------------+
+
+                result = sb.toString();
+            } else {
+                result = Utils.computeClippedText(font, s, wrapWidth, truncationStyle, ellipsisString);
+            }
+
+            if (result != null && result.endsWith("\n")) {
+                // Strip ending newline so we don't display another row.
+                result = result.substring(0, result.length() - 1);
+            }
+
+            text.setText(result);
+            updateWrappingWidth();
+            invalidText = false;
+        }
+    }
+
+    private void addMnemonic() {
+        if (labeledNode != null) {
+            mnemonicScene = labeledNode.getScene();
+            if (mnemonicScene != null) {
+                mnemonicScene.addMnemonic(new Mnemonic(labeledNode, mnemonicCode));
+            }
+        }
+    }
+
+
+    private void removeMnemonic() {
+        if (mnemonicScene != null && labeledNode != null) {
+            mnemonicScene.removeMnemonic(new Mnemonic(labeledNode, mnemonicCode));
+            mnemonicScene = null;
+        }
+    }
+
+    /**
+     * Updates the wrapping width of the text node. Although changing the font
+     * does affect the metrics used for text layout, this method does not
+     * call requestLayout or invalidate the text, since it may be called
+     * from the constructor and such work would be duplicative and wasted.
+     */
+    private void updateWrappingWidth() {
+        final Labeled labeled = getSkinnable();
+        text.setWrappingWidth(0);
+        if (labeled.isWrapText()) {
+            // Note that the wrapping width needs to be set to zero before
+            // getting the text's real preferred width.
+            double w = Math.min(text.prefWidth(-1), wrapWidth);
+            text.setWrappingWidth(w);
+        }
+    }
+
+    /**
+     * Gets whether for various computations we can ignore the presence of the graphic
+     * (or lack thereof).
+     * @return
+     */
+    boolean isIgnoreGraphic() {
+        return (graphic == null ||
+                !graphic.isManaged() ||
+                getSkinnable().getContentDisplay() == ContentDisplay.TEXT_ONLY);
+    }
+
+    /**
+     * Gets whether for various computations we can ignore the presence of the text.
+     * @return
+     */
+    boolean isIgnoreText() {
+        final Labeled labeled = getSkinnable();
+        final String txt = labeled.getText();
+        return (txt == null ||
+                txt.equals("") ||
+                labeled.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ListCellSkin.java	2015-09-03 15:19:53.068234200 -0700
+++ /dev/null	2015-09-03 15:19:54.000000000 -0700
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2010, 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.geometry.Orientation;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-
-import com.sun.javafx.scene.control.behavior.ListCellBehavior;
-
-public class ListCellSkin<T> extends CellSkinBase<ListCell<T>, ListCellBehavior<T>> {
-
-    private double fixedCellSize;
-    private boolean fixedCellSizeEnabled;
-
-    public ListCellSkin(ListCell<T> control) {
-        super(control, new ListCellBehavior<T>(control));
-
-        this.fixedCellSize = control.getListView().getFixedCellSize();
-        this.fixedCellSizeEnabled = fixedCellSize > 0;
-
-        registerChangeListener(control.getListView().fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("FIXED_CELL_SIZE".equals(p)) {
-            this.fixedCellSize = getSkinnable().getListView().getFixedCellSize();
-            this.fixedCellSizeEnabled = fixedCellSize > 0;
-        }
-    }
-    
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double pref = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-        ListView<T> listView = getSkinnable().getListView();
-        return listView == null ? 0 :
-            listView.getOrientation() == Orientation.VERTICAL ? pref : Math.max(pref, getCellSize());
-    }
- 
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        // Added the comparison between the default cell size and the requested
-        // cell size to prevent the issue identified in RT-19873.
-        final double cellSize = getCellSize();
-        final double prefHeight = cellSize == DEFAULT_CELL_SIZE ? super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset) : cellSize;
-        return prefHeight;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        return super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-}
--- /dev/null	2015-09-03 15:19:54.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ListCellSkin.java	2015-09-03 15:19:52.367194100 -0700
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+
+import com.sun.javafx.scene.control.behavior.ListCellBehavior;
+
+/**
+ * Default skin implementation for the {@link ListCell} control.
+ *
+ * @see ListCell
+ * @since 9
+ */
+public class ListCellSkin<T> extends CellSkinBase<ListCell<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private double fixedCellSize;
+    private boolean fixedCellSizeEnabled;
+    private final BehaviorBase<ListCell<T>> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ListCellSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ListCellSkin(ListCell<T> control) {
+        super(control);
+
+        // install default input map for the ListCell control
+        behavior = new ListCellBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        this.fixedCellSize = control.getListView().getFixedCellSize();
+        this.fixedCellSizeEnabled = fixedCellSize > 0;
+
+        registerChangeListener(control.getListView().fixedCellSizeProperty(), e -> {
+            this.fixedCellSize = getSkinnable().getListView().getFixedCellSize();
+            this.fixedCellSizeEnabled = fixedCellSize > 0;
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double pref = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+        ListView<T> listView = getSkinnable().getListView();
+        return listView == null ? 0 :
+            listView.getOrientation() == Orientation.VERTICAL ? pref : Math.max(pref, getCellSize());
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        // Added the comparison between the default cell size and the requested
+        // cell size to prevent the issue identified in RT-19873.
+        final double cellSize = getCellSize();
+        final double prefHeight = cellSize == DEFAULT_CELL_SIZE ? super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset) : cellSize;
+        return prefHeight;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        return super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ListViewSkin.java	2015-09-03 15:20:00.837678600 -0700
+++ /dev/null	2015-09-03 15:20:01.000000000 -0700
@@ -1,591 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.WeakInvalidationListener;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.ObservableMap;
-import javafx.collections.WeakListChangeListener;
-import javafx.event.EventHandler;
-import javafx.geometry.Orientation;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.FocusModel;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.control.MultipleSelectionModel;
-import javafx.scene.control.SelectionModel;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.StackPane;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import com.sun.javafx.scene.control.behavior.ListViewBehavior;
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
-
-/**
- *
- */
-public class ListViewSkin<T> extends VirtualContainerBase<ListView<T>, ListViewBehavior<T>, ListCell<T>> {
-
-    public static final String RECREATE = "listRecreateKey";
-    
-    /**
-     * Region placed over the top of the flow (and possibly the header row) if
-     * there is no data.
-     */
-    // FIXME this should not be a StackPane
-    private StackPane placeholderRegion;
-    private Node placeholderNode;
-//    private Label placeholderLabel;
-    private static final String EMPTY_LIST_TEXT = ControlResources.getString("ListView.noContent");
-
-    // RT-34744 : IS_PANNABLE will be false unless
-    // com.sun.javafx.scene.control.skin.ListViewSkin.pannable
-    // is set to true. This is done in order to make ListView functional
-    // on embedded systems with touch screens which do not generate scroll
-    // events for touch drag gestures.
-    private static final boolean IS_PANNABLE =
-            AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> Boolean.getBoolean("com.sun.javafx.scene.control.skin.ListViewSkin.pannable"));
-
-    private ObservableList<T> listViewItems;
-    private final InvalidationListener itemsChangeListener = observable -> updateListViewItems();
-
-    public ListViewSkin(final ListView<T> listView) {
-        super(listView, new ListViewBehavior<T>(listView));
-
-        updateListViewItems();
-
-        // init the VirtualFlow
-        flow.setId("virtual-flow");
-        flow.setPannable(IS_PANNABLE);
-        flow.setVertical(getSkinnable().getOrientation() == Orientation.VERTICAL);
-        flow.setCreateCell(flow1 -> ListViewSkin.this.createCell());
-        flow.setFixedCellSize(listView.getFixedCellSize());
-        getChildren().add(flow);
-        
-        EventHandler<MouseEvent> ml = event -> {
-            // RT-15127: cancel editing on scroll. This is a bit extreme
-            // (we are cancelling editing on touching the scrollbars).
-            // This can be improved at a later date.
-            if (listView.getEditingIndex() > -1) {
-                listView.edit(-1);
-            }
-
-            // This ensures that the list maintains the focus, even when the vbar
-            // and hbar controls inside the flow are clicked. Without this, the
-            // focus border will not be shown when the user interacts with the
-            // scrollbars, and more importantly, keyboard navigation won't be
-            // available to the user.
-            if (listView.isFocusTraversable()) {
-                listView.requestFocus();
-            }
-        };
-        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-        
-        updateRowCount();
-
-        listView.itemsProperty().addListener(new WeakInvalidationListener(itemsChangeListener));
-
-        final ObservableMap<Object, Object> properties = listView.getProperties();
-        properties.remove(RECREATE);
-        properties.addListener(propertiesMapListener);
-
-        // init the behavior 'closures'
-        getBehavior().setOnFocusPreviousRow(() -> { onFocusPreviousCell(); });
-        getBehavior().setOnFocusNextRow(() -> { onFocusNextCell(); });
-        getBehavior().setOnMoveToFirstCell(() -> { onMoveToFirstCell(); });
-        getBehavior().setOnMoveToLastCell(() -> { onMoveToLastCell(); });
-        getBehavior().setOnScrollPageDown(isFocusDriven -> onScrollPageDown(isFocusDriven));
-        getBehavior().setOnScrollPageUp(isFocusDriven -> onScrollPageUp(isFocusDriven));
-        getBehavior().setOnSelectPreviousRow(() -> { onSelectPreviousCell(); });
-        getBehavior().setOnSelectNextRow(() -> { onSelectNextCell(); });
-
-        // Register listeners
-        registerChangeListener(listView.itemsProperty(), "ITEMS");
-        registerChangeListener(listView.orientationProperty(), "ORIENTATION");
-        registerChangeListener(listView.cellFactoryProperty(), "CELL_FACTORY");
-        registerChangeListener(listView.parentProperty(), "PARENT");
-        registerChangeListener(listView.placeholderProperty(), "PLACEHOLDER");
-        registerChangeListener(listView.fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-    }
-    
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("ITEMS".equals(p)) {
-            updateListViewItems();
-        } else if ("ORIENTATION".equals(p)) {
-            flow.setVertical(getSkinnable().getOrientation() == Orientation.VERTICAL);
-        } else if ("CELL_FACTORY".equals(p)) {
-            flow.recreateCells();
-        } else if ("PARENT".equals(p)) {
-            if (getSkinnable().getParent() != null && getSkinnable().isVisible()) {
-                getSkinnable().requestLayout();
-            }
-        } else if ("PLACEHOLDER".equals(p)) {
-            updatePlaceholderRegionVisibility();
-        } else if ("FIXED_CELL_SIZE".equals(p)) {
-            flow.setFixedCellSize(getSkinnable().getFixedCellSize());
-        }
-    }
-
-    private MapChangeListener<Object, Object> propertiesMapListener = c -> {
-        if (! c.wasAdded()) return;
-        if (RECREATE.equals(c.getKey())) {
-            needCellsRebuilt = true;
-            getSkinnable().requestLayout();
-            getSkinnable().getProperties().remove(RECREATE);
-        }
-    };
-
-    private final ListChangeListener<T> listViewItemsListener = new ListChangeListener<T>() {
-        @Override public void onChanged(Change<? extends T> c) {
-            while (c.next()) {
-                if (c.wasReplaced()) {
-                    // RT-28397: Support for when an item is replaced with itself (but
-                    // updated internal values that should be shown visually).
-                    // This code was updated for RT-36714 to not update all cells,
-                    // just those affected by the change
-                    for (int i = c.getFrom(); i < c.getTo(); i++) {
-                        flow.setCellDirty(i);
-                    }
-
-                    break;
-                } else if (c.getRemovedSize() == itemCount) {
-                    // RT-22463: If the user clears out an items list then we
-                    // should reset all cells (in particular their contained
-                    // items) such that a subsequent addition to the list of
-                    // an item which equals the old item (but is rendered
-                    // differently) still displays as expected (i.e. with the
-                    // updated display, not the old display).
-                    itemCount = 0;
-                    break;
-                }
-            }
-
-            // fix for RT-37853
-            getSkinnable().edit(-1);
-            
-            rowCountDirty = true;
-            getSkinnable().requestLayout();
-        }
-    };
-    
-    private final WeakListChangeListener<T> weakListViewItemsListener =
-            new WeakListChangeListener<T>(listViewItemsListener);
-
-    public void updateListViewItems() {
-        if (listViewItems != null) {
-            listViewItems.removeListener(weakListViewItemsListener);
-        }
-
-        this.listViewItems = getSkinnable().getItems();
-
-        if (listViewItems != null) {
-            listViewItems.addListener(weakListViewItemsListener);
-        }
-
-        rowCountDirty = true;
-        getSkinnable().requestLayout();
-    }
-    
-    private int itemCount = -1;
-
-    @Override public int getItemCount() {
-//        return listViewItems == null ? 0 : listViewItems.size();
-        return itemCount;
-    }
-    
-    private boolean needCellsRebuilt = true;
-    private boolean needCellsReconfigured = false;
-
-    @Override protected void updateRowCount() {
-        if (flow == null) return;
-        
-        int oldCount = itemCount;
-        int newCount = listViewItems == null ? 0 : listViewItems.size();
-        
-        itemCount = newCount;
-        
-        flow.setCellCount(newCount);
-        
-        updatePlaceholderRegionVisibility();
-        if (newCount != oldCount) {
-            needCellsRebuilt = true;
-        } else {
-            needCellsReconfigured = true;
-        }
-    }
-    
-    protected final void updatePlaceholderRegionVisibility() {
-        boolean visible = getItemCount() == 0;
-        
-        if (visible) {
-            placeholderNode = getSkinnable().getPlaceholder();
-            if (placeholderNode == null && (EMPTY_LIST_TEXT != null && ! EMPTY_LIST_TEXT.isEmpty())) {
-                placeholderNode = new Label();
-                ((Label)placeholderNode).setText(EMPTY_LIST_TEXT);
-            }
-
-            if (placeholderNode != null) {
-                if (placeholderRegion == null) {
-                    placeholderRegion = new StackPane();
-                    placeholderRegion.getStyleClass().setAll("placeholder");
-                    getChildren().add(placeholderRegion);
-                }
-
-                placeholderRegion.getChildren().setAll(placeholderNode);
-            }
-        }
-
-        flow.setVisible(! visible);
-        if (placeholderRegion != null) {
-            placeholderRegion.setVisible(visible);
-        }
-    }
-
-    @Override public ListCell<T> createCell() {
-        ListCell<T> cell;
-        if (getSkinnable().getCellFactory() != null) {
-            cell = getSkinnable().getCellFactory().call(getSkinnable());
-        } else {
-            cell = createDefaultCellImpl();
-        }
-
-        cell.updateListView(getSkinnable());
-
-        return cell;
-    }
-
-    private static <T> ListCell<T> createDefaultCellImpl() {
-        return new ListCell<T>() {
-            @Override public void updateItem(T item, boolean empty) {
-                super.updateItem(item, empty);
-                
-                if (empty) {
-                    setText(null);
-                    setGraphic(null);
-                } else if (item instanceof Node) {
-                    setText(null);
-                    Node currentNode = getGraphic();
-                    Node newNode = (Node) item;
-                    if (currentNode == null || ! currentNode.equals(newNode)) {
-                        setGraphic(newNode);
-                    }
-                } else {
-                    /**
-                     * This label is used if the item associated with this cell is to be
-                     * represented as a String. While we will lazily instantiate it
-                     * we never clear it, being more afraid of object churn than a minor
-                     * "leak" (which will not become a "major" leak).
-                     */
-                    setText(item == null ? "null" : item.toString());
-                    setGraphic(null);
-                }
-            }
-        };
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        super.layoutChildren(x, y, w, h);
-        
-        if (needCellsRebuilt) {
-            flow.rebuildCells();
-        } else if (needCellsReconfigured) {
-            flow.reconfigureCells();
-        } 
-        
-        needCellsRebuilt = false;
-        needCellsReconfigured = false;
-        
-        if (getItemCount() == 0) {
-            // show message overlay instead of empty listview
-            if (placeholderRegion != null) {
-                placeholderRegion.setVisible(w > 0 && h > 0);
-                placeholderRegion.resizeRelocate(x, y, w, h);
-            }
-        } else {
-            flow.resizeRelocate(x, y, w, h);
-        }
-    }
-    
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        checkState();
-
-        if (getItemCount() == 0) {
-            if (placeholderRegion == null) {
-                updatePlaceholderRegionVisibility();
-            }
-            if (placeholderRegion != null) {
-                return placeholderRegion.prefWidth(height) + leftInset + rightInset;
-            }
-        }
-
-        return computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset) * 0.618033987;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return 400;
-    }
-    
-    private void onFocusPreviousCell() {
-        FocusModel<T> fm = getSkinnable().getFocusModel();
-        if (fm == null) return;
-        flow.show(fm.getFocusedIndex());
-    }
-
-    private void onFocusNextCell() {
-        FocusModel<T> fm = getSkinnable().getFocusModel();
-        if (fm == null) return;
-        flow.show(fm.getFocusedIndex());
-    }
-
-    private void onSelectPreviousCell() {
-        SelectionModel<T> sm = getSkinnable().getSelectionModel();
-        if (sm == null) return;
-
-        int pos = sm.getSelectedIndex();
-        flow.show(pos);
-
-        // Fix for RT-11299
-        IndexedCell<T> cell = flow.getFirstVisibleCell();
-        if (cell == null || pos < cell.getIndex()) {
-            flow.setPosition(pos / (double) getItemCount());
-        }
-    }
-
-    private void onSelectNextCell() {
-        SelectionModel<T> sm = getSkinnable().getSelectionModel();
-        if (sm == null) return;
-
-        int pos = sm.getSelectedIndex();
-        flow.show(pos);
-
-        // Fix for RT-11299
-        ListCell<T> cell = flow.getLastVisibleCell();
-        if (cell == null || cell.getIndex() < pos) {
-            flow.setPosition(pos / (double) getItemCount());
-        }
-    }
-
-    private void onMoveToFirstCell() {
-        flow.show(0);
-        flow.setPosition(0);
-    }
-
-    private void onMoveToLastCell() {
-//        SelectionModel sm = getSkinnable().getSelectionModel();
-//        if (sm == null) return;
-//
-        int endPos = getItemCount() - 1;
-//        sm.select(endPos);
-        flow.show(endPos);
-        flow.setPosition(1);
-    }
-
-    /**
-     * Function used to scroll the container down by one 'page', although
-     * if this is a horizontal container, then the scrolling will be to the right.
-     */
-    private int onScrollPageDown(boolean isFocusDriven) {
-        ListCell<T> lastVisibleCell = flow.getLastVisibleCellWithinViewPort();
-        if (lastVisibleCell == null) return -1;
-
-        final SelectionModel<T> sm = getSkinnable().getSelectionModel();
-        final FocusModel<T> fm = getSkinnable().getFocusModel();
-        if (sm == null || fm == null) return -1;
-
-        int lastVisibleCellIndex = lastVisibleCell.getIndex();
-
-//        boolean isSelected = sm.isSelected(lastVisibleCellIndex) || fm.isFocused(lastVisibleCellIndex) || lastVisibleCellIndex == anchor;
-        // isSelected represents focus OR selection
-        boolean isSelected = false;
-        if (isFocusDriven) {
-            isSelected = lastVisibleCell.isFocused() || fm.isFocused(lastVisibleCellIndex);
-        } else {
-            isSelected = lastVisibleCell.isSelected() || sm.isSelected(lastVisibleCellIndex);
-        }
-
-        if (isSelected) {
-            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == lastVisibleCellIndex)
-                               || (! isFocusDriven && sm.getSelectedIndex() == lastVisibleCellIndex);
-
-            if (isLeadIndex) {
-                // if the last visible cell is selected, we want to shift that cell up
-                // to be the top-most cell, or at least as far to the top as we can go.
-                flow.showAsFirst(lastVisibleCell);
-
-                ListCell<T> newLastVisibleCell = flow.getLastVisibleCellWithinViewPort();
-                lastVisibleCell = newLastVisibleCell == null ? lastVisibleCell : newLastVisibleCell;
-            }
-        } else {
-            // if the selection is not on the 'bottom' most cell, we firstly move
-            // the selection down to that, without scrolling the contents, so
-            // this is a no-op
-        }
-
-        int newSelectionIndex = lastVisibleCell.getIndex();
-        flow.show(lastVisibleCell);
-        return newSelectionIndex;
-    }
-
-    /**
-     * Function used to scroll the container up by one 'page', although
-     * if this is a horizontal container, then the scrolling will be to the left.
-     */
-    private int onScrollPageUp(boolean isFocusDriven) {
-        ListCell<T> firstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
-        if (firstVisibleCell == null) return -1;
-
-        final SelectionModel<T> sm = getSkinnable().getSelectionModel();
-        final FocusModel<T> fm = getSkinnable().getFocusModel();
-        if (sm == null || fm == null) return -1;
-
-        int firstVisibleCellIndex = firstVisibleCell.getIndex();
-
-        // isSelected represents focus OR selection
-        boolean isSelected = false;
-        if (isFocusDriven) {
-            isSelected = firstVisibleCell.isFocused() || fm.isFocused(firstVisibleCellIndex);
-        } else {
-            isSelected = firstVisibleCell.isSelected() || sm.isSelected(firstVisibleCellIndex);
-        }
-
-        if (isSelected) {
-            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == firstVisibleCellIndex)
-                               || (! isFocusDriven && sm.getSelectedIndex() == firstVisibleCellIndex);
-
-            if (isLeadIndex) {
-                // if the first visible cell is selected, we want to shift that cell down
-                // to be the bottom-most cell, or at least as far to the bottom as we can go.
-                flow.showAsLast(firstVisibleCell);
-
-                ListCell<T> newFirstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
-                firstVisibleCell = newFirstVisibleCell == null ? firstVisibleCell : newFirstVisibleCell;
-            }
-        } else {
-            // if the selection is not on the 'top' most cell, we firstly move
-            // the selection up to that, without scrolling the contents, so
-            // this is a no-op
-        }
-
-        int newSelectionIndex = firstVisibleCell.getIndex();
-        flow.show(firstVisibleCell);
-        return newSelectionIndex;
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_ITEM: {
-                FocusModel<?> fm = getSkinnable().getFocusModel();
-                int focusedIndex = fm.getFocusedIndex();
-                if (focusedIndex == -1) {
-                    if (placeholderRegion != null && placeholderRegion.isVisible()) {
-                        return placeholderRegion.getChildren().get(0);
-                    }
-                    if (getItemCount() > 0) {
-                        focusedIndex = 0;
-                    } else {
-                        return null;
-                    }
-                }
-                return flow.getPrivateCell(focusedIndex);
-            }
-            case ITEM_COUNT: return getItemCount();
-            case ITEM_AT_INDEX: {
-                Integer rowIndex = (Integer)parameters[0];
-                if (rowIndex == null) return null;
-                if (0 <= rowIndex && rowIndex < getItemCount()) {
-                    return flow.getPrivateCell(rowIndex);
-                }
-                return null;
-            }
-            case SELECTED_ITEMS: {
-                MultipleSelectionModel<T> sm = getSkinnable().getSelectionModel();
-                ObservableList<Integer> indices = sm.getSelectedIndices();
-                List<Node> selection = new ArrayList<>(indices.size());
-                for (int i : indices) {
-                    ListCell<T> row = flow.getPrivateCell(i);
-                    if (row != null) selection.add(row);
-                }
-                return FXCollections.observableArrayList(selection);
-            }
-            case VERTICAL_SCROLLBAR: return flow.getVbar();
-            case HORIZONTAL_SCROLLBAR: return flow.getHbar();
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-    @Override
-    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-        switch (action) {
-            case SHOW_ITEM: {
-                Node item = (Node)parameters[0];
-                if (item instanceof ListCell) {
-                    @SuppressWarnings("unchecked")
-                    ListCell<T> cell = (ListCell<T>)item;
-                    flow.show(cell.getIndex());
-                }
-                break;
-            }
-            case SET_SELECTED_ITEMS: {
-                @SuppressWarnings("unchecked")
-                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
-                if (items != null) {
-                    MultipleSelectionModel<T> sm = getSkinnable().getSelectionModel();
-                    if (sm != null) {
-                        sm.clearSelection();
-                        for (Node item : items) {
-                            if (item instanceof ListCell) {
-                                @SuppressWarnings("unchecked")
-                                ListCell<T> cell = (ListCell<T>)item;
-                                sm.select(cell.getIndex());
-                            }
-                        }
-                    }
-                }
-                break;
-            }
-            default: super.executeAccessibleAction(action, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:20:02.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ListViewSkin.java	2015-09-03 15:20:00.087635700 -0700
@@ -0,0 +1,658 @@
+/*
+ * Copyright (c) 2010, 2015, 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 java.util.ArrayList;
+import java.util.List;
+
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.MapChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
+import javafx.collections.WeakListChangeListener;
+import javafx.event.EventHandler;
+import javafx.geometry.Orientation;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.FocusModel;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.scene.control.MultipleSelectionModel;
+import javafx.scene.control.SelectionModel;
+import com.sun.javafx.scene.control.behavior.ListViewBehavior;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.StackPane;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import com.sun.javafx.scene.control.skin.resources.ControlResources;
+
+/**
+ * Default skin implementation for the {@link ListView} control.
+ *
+ * @see ListView
+ * @since 9
+ */
+public class ListViewSkin<T> extends VirtualContainerBase<ListView<T>, ListCell<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static Fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final String EMPTY_LIST_TEXT = ControlResources.getString("ListView.noContent");
+
+    // RT-34744 : IS_PANNABLE will be false unless
+    // javafx.scene.control.skin.ListViewSkin.pannable
+    // is set to true. This is done in order to make ListView functional
+    // on embedded systems with touch screens which do not generate scroll
+    // events for touch drag gestures.
+    private static final boolean IS_PANNABLE =
+            AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> Boolean.getBoolean("javafx.scene.control.skin.ListViewSkin.pannable"));
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Internal Fields                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    private final VirtualFlow<ListCell<T>> flow;
+
+    /**
+     * Region placed over the top of the flow (and possibly the header row) if
+     * there is no data.
+     */
+    // FIXME this should not be a StackPane
+    private StackPane placeholderRegion;
+    private Node placeholderNode;
+
+    private ObservableList<T> listViewItems;
+    private final InvalidationListener itemsChangeListener = observable -> updateListViewItems();
+
+    private boolean needCellsRebuilt = true;
+    private boolean needCellsReconfigured = false;
+
+    private int itemCount = -1;
+    private ListViewBehavior<T> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private MapChangeListener<Object, Object> propertiesMapListener = c -> {
+        if (! c.wasAdded()) return;
+        if (Properties.RECREATE.equals(c.getKey())) {
+            needCellsRebuilt = true;
+            getSkinnable().requestLayout();
+            getSkinnable().getProperties().remove(Properties.RECREATE);
+        }
+    };
+
+    private final ListChangeListener<T> listViewItemsListener = new ListChangeListener<T>() {
+        @Override public void onChanged(Change<? extends T> c) {
+            while (c.next()) {
+                if (c.wasReplaced()) {
+                    // RT-28397: Support for when an item is replaced with itself (but
+                    // updated internal values that should be shown visually).
+                    // This code was updated for RT-36714 to not update all cells,
+                    // just those affected by the change
+                    for (int i = c.getFrom(); i < c.getTo(); i++) {
+                        flow.setCellDirty(i);
+                    }
+
+                    break;
+                } else if (c.getRemovedSize() == itemCount) {
+                    // RT-22463: If the user clears out an items list then we
+                    // should reset all cells (in particular their contained
+                    // items) such that a subsequent addition to the list of
+                    // an item which equals the old item (but is rendered
+                    // differently) still displays as expected (i.e. with the
+                    // updated display, not the old display).
+                    itemCount = 0;
+                    break;
+                }
+            }
+
+            // fix for RT-37853
+            getSkinnable().edit(-1);
+
+            rowCountDirty = true;
+            getSkinnable().requestLayout();
+        }
+    };
+
+    private final WeakListChangeListener<T> weakListViewItemsListener =
+            new WeakListChangeListener<T>(listViewItemsListener);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ListViewSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ListViewSkin(final ListView<T> control) {
+        super(control);
+
+        // install default input map for the ListView control
+        behavior = new ListViewBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        // init the behavior 'closures'
+        behavior.setOnFocusPreviousRow(() -> onFocusPreviousCell());
+        behavior.setOnFocusNextRow(() -> onFocusNextCell());
+        behavior.setOnMoveToFirstCell(() -> onMoveToFirstCell());
+        behavior.setOnMoveToLastCell(() -> onMoveToLastCell());
+        behavior.setOnSelectPreviousRow(() -> onSelectPreviousCell());
+        behavior.setOnSelectNextRow(() -> onSelectNextCell());
+        behavior.setOnScrollPageDown(this::onScrollPageDown);
+        behavior.setOnScrollPageUp(this::onScrollPageUp);
+
+        updateListViewItems();
+
+        // init the VirtualFlow
+        flow = getVirtualFlow();
+        flow.setId("virtual-flow");
+        flow.setPannable(IS_PANNABLE);
+        flow.setVertical(control.getOrientation() == Orientation.VERTICAL);
+        flow.setCellFactory(flow -> createCell());
+        flow.setFixedCellSize(control.getFixedCellSize());
+        getChildren().add(flow);
+        
+        EventHandler<MouseEvent> ml = event -> {
+            // RT-15127: cancel editing on scroll. This is a bit extreme
+            // (we are cancelling editing on touching the scrollbars).
+            // This can be improved at a later date.
+            if (control.getEditingIndex() > -1) {
+                control.edit(-1);
+            }
+
+            // This ensures that the list maintains the focus, even when the vbar
+            // and hbar controls inside the flow are clicked. Without this, the
+            // focus border will not be shown when the user interacts with the
+            // scrollbars, and more importantly, keyboard navigation won't be
+            // available to the user.
+            if (control.isFocusTraversable()) {
+                control.requestFocus();
+            }
+        };
+        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+        
+        updateRowCount();
+
+        control.itemsProperty().addListener(new WeakInvalidationListener(itemsChangeListener));
+
+        final ObservableMap<Object, Object> properties = control.getProperties();
+        properties.remove(Properties.RECREATE);
+        properties.addListener(propertiesMapListener);
+
+        // Register listeners
+        registerChangeListener(control.itemsProperty(), o -> updateListViewItems());
+        registerChangeListener(control.orientationProperty(), o ->
+            flow.setVertical(control.getOrientation() == Orientation.VERTICAL)
+        );
+        registerChangeListener(control.cellFactoryProperty(), o -> flow.recreateCells());
+        registerChangeListener(control.parentProperty(), o -> {
+            if (control.getParent() != null && control.isVisible()) {
+                control.requestLayout();
+            }
+        });
+        registerChangeListener(control.placeholderProperty(), o -> updatePlaceholderRegionVisibility());
+        registerChangeListener(control.fixedCellSizeProperty(), o ->
+            flow.setFixedCellSize(control.getFixedCellSize())
+        );
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        super.layoutChildren(x, y, w, h);
+
+        if (needCellsRebuilt) {
+            flow.rebuildCells();
+        } else if (needCellsReconfigured) {
+            flow.reconfigureCells();
+        }
+
+        needCellsRebuilt = false;
+        needCellsReconfigured = false;
+
+        if (getItemCount() == 0) {
+            // show message overlay instead of empty listview
+            if (placeholderRegion != null) {
+                placeholderRegion.setVisible(w > 0 && h > 0);
+                placeholderRegion.resizeRelocate(x, y, w, h);
+            }
+        } else {
+            flow.resizeRelocate(x, y, w, h);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        checkState();
+
+        if (getItemCount() == 0) {
+            if (placeholderRegion == null) {
+                updatePlaceholderRegionVisibility();
+            }
+            if (placeholderRegion != null) {
+                return placeholderRegion.prefWidth(height) + leftInset + rightInset;
+            }
+        }
+
+        return computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset) * 0.618033987;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return 400;
+    }
+
+    /** {@inheritDoc} */
+    @Override int getItemCount() {
+        return itemCount;
+    }
+
+    /** {@inheritDoc} */
+    @Override void updateRowCount() {
+        if (flow == null) return;
+
+        int oldCount = itemCount;
+        int newCount = listViewItems == null ? 0 : listViewItems.size();
+
+        itemCount = newCount;
+
+        flow.setCellCount(newCount);
+
+        updatePlaceholderRegionVisibility();
+        if (newCount != oldCount) {
+            needCellsRebuilt = true;
+        } else {
+            needCellsReconfigured = true;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: {
+                FocusModel<?> fm = getSkinnable().getFocusModel();
+                int focusedIndex = fm.getFocusedIndex();
+                if (focusedIndex == -1) {
+                    if (placeholderRegion != null && placeholderRegion.isVisible()) {
+                        return placeholderRegion.getChildren().get(0);
+                    }
+                    if (getItemCount() > 0) {
+                        focusedIndex = 0;
+                    } else {
+                        return null;
+                    }
+                }
+                return flow.getPrivateCell(focusedIndex);
+            }
+            case ITEM_COUNT: return getItemCount();
+            case ITEM_AT_INDEX: {
+                Integer rowIndex = (Integer)parameters[0];
+                if (rowIndex == null) return null;
+                if (0 <= rowIndex && rowIndex < getItemCount()) {
+                    return flow.getPrivateCell(rowIndex);
+                }
+                return null;
+            }
+            case SELECTED_ITEMS: {
+                MultipleSelectionModel<T> sm = getSkinnable().getSelectionModel();
+                ObservableList<Integer> indices = sm.getSelectedIndices();
+                List<Node> selection = new ArrayList<>(indices.size());
+                for (int i : indices) {
+                    ListCell<T> row = flow.getPrivateCell(i);
+                    if (row != null) selection.add(row);
+                }
+                return FXCollections.observableArrayList(selection);
+            }
+            case VERTICAL_SCROLLBAR: return flow.getVbar();
+            case HORIZONTAL_SCROLLBAR: return flow.getHbar();
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+        switch (action) {
+            case SHOW_ITEM: {
+                Node item = (Node)parameters[0];
+                if (item instanceof ListCell) {
+                    @SuppressWarnings("unchecked")
+                    ListCell<T> cell = (ListCell<T>)item;
+                    flow.scrollTo(cell.getIndex());
+                }
+                break;
+            }
+            case SET_SELECTED_ITEMS: {
+                @SuppressWarnings("unchecked")
+                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
+                if (items != null) {
+                    MultipleSelectionModel<T> sm = getSkinnable().getSelectionModel();
+                    if (sm != null) {
+                        sm.clearSelection();
+                        for (Node item : items) {
+                            if (item instanceof ListCell) {
+                                @SuppressWarnings("unchecked")
+                                ListCell<T> cell = (ListCell<T>)item;
+                                sm.select(cell.getIndex());
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+            default: super.executeAccessibleAction(action, parameters);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    private ListCell<T> createCell() {
+        ListCell<T> cell;
+        if (getSkinnable().getCellFactory() != null) {
+            cell = getSkinnable().getCellFactory().call(getSkinnable());
+        } else {
+            cell = createDefaultCellImpl();
+        }
+
+        cell.updateListView(getSkinnable());
+
+        return cell;
+    }
+
+    private void updateListViewItems() {
+        if (listViewItems != null) {
+            listViewItems.removeListener(weakListViewItemsListener);
+        }
+
+        this.listViewItems = getSkinnable().getItems();
+
+        if (listViewItems != null) {
+            listViewItems.addListener(weakListViewItemsListener);
+        }
+
+        rowCountDirty = true;
+        getSkinnable().requestLayout();
+    }
+    
+    private final void updatePlaceholderRegionVisibility() {
+        boolean visible = getItemCount() == 0;
+        
+        if (visible) {
+            placeholderNode = getSkinnable().getPlaceholder();
+            if (placeholderNode == null && (EMPTY_LIST_TEXT != null && ! EMPTY_LIST_TEXT.isEmpty())) {
+                placeholderNode = new Label();
+                ((Label)placeholderNode).setText(EMPTY_LIST_TEXT);
+            }
+
+            if (placeholderNode != null) {
+                if (placeholderRegion == null) {
+                    placeholderRegion = new StackPane();
+                    placeholderRegion.getStyleClass().setAll("placeholder");
+                    getChildren().add(placeholderRegion);
+                }
+
+                placeholderRegion.getChildren().setAll(placeholderNode);
+            }
+        }
+
+        flow.setVisible(!visible);
+        if (placeholderRegion != null) {
+            placeholderRegion.setVisible(visible);
+        }
+    }
+
+    private static <T> ListCell<T> createDefaultCellImpl() {
+        return new ListCell<T>() {
+            @Override public void updateItem(T item, boolean empty) {
+                super.updateItem(item, empty);
+                
+                if (empty) {
+                    setText(null);
+                    setGraphic(null);
+                } else if (item instanceof Node) {
+                    setText(null);
+                    Node currentNode = getGraphic();
+                    Node newNode = (Node) item;
+                    if (currentNode == null || ! currentNode.equals(newNode)) {
+                        setGraphic(newNode);
+                    }
+                } else {
+                    /**
+                     * This label is used if the item associated with this cell is to be
+                     * represented as a String. While we will lazily instantiate it
+                     * we never clear it, being more afraid of object churn than a minor
+                     * "leak" (which will not become a "major" leak).
+                     */
+                    setText(item == null ? "null" : item.toString());
+                    setGraphic(null);
+                }
+            }
+        };
+    }
+
+    private void onFocusPreviousCell() {
+        FocusModel<T> fm = getSkinnable().getFocusModel();
+        if (fm == null) return;
+        flow.scrollTo(fm.getFocusedIndex());
+    }
+
+    private void onFocusNextCell() {
+        FocusModel<T> fm = getSkinnable().getFocusModel();
+        if (fm == null) return;
+        flow.scrollTo(fm.getFocusedIndex());
+    }
+
+    private void onSelectPreviousCell() {
+        SelectionModel<T> sm = getSkinnable().getSelectionModel();
+        if (sm == null) return;
+
+        int pos = sm.getSelectedIndex();
+        flow.scrollTo(pos);
+
+        // Fix for RT-11299
+        IndexedCell<T> cell = flow.getFirstVisibleCell();
+        if (cell == null || pos < cell.getIndex()) {
+            flow.setPosition(pos / (double) getItemCount());
+        }
+    }
+
+    private void onSelectNextCell() {
+        SelectionModel<T> sm = getSkinnable().getSelectionModel();
+        if (sm == null) return;
+
+        int pos = sm.getSelectedIndex();
+        flow.scrollTo(pos);
+
+        // Fix for RT-11299
+        ListCell<T> cell = flow.getLastVisibleCell();
+        if (cell == null || cell.getIndex() < pos) {
+            flow.setPosition(pos / (double) getItemCount());
+        }
+    }
+
+    private void onMoveToFirstCell() {
+        flow.scrollTo(0);
+        flow.setPosition(0);
+    }
+
+    private void onMoveToLastCell() {
+//        SelectionModel sm = getSkinnable().getSelectionModel();
+//        if (sm == null) return;
+//
+        int endPos = getItemCount() - 1;
+//        sm.select(endPos);
+        flow.scrollTo(endPos);
+        flow.setPosition(1);
+    }
+
+    /**
+     * Function used to scroll the container down by one 'page', although
+     * if this is a horizontal container, then the scrolling will be to the right.
+     */
+    private int onScrollPageDown(boolean isFocusDriven) {
+        ListCell<T> lastVisibleCell = flow.getLastVisibleCellWithinViewPort();
+        if (lastVisibleCell == null) return -1;
+
+        final SelectionModel<T> sm = getSkinnable().getSelectionModel();
+        final FocusModel<T> fm = getSkinnable().getFocusModel();
+        if (sm == null || fm == null) return -1;
+
+        int lastVisibleCellIndex = lastVisibleCell.getIndex();
+
+//        boolean isSelected = sm.isSelected(lastVisibleCellIndex) || fm.isFocused(lastVisibleCellIndex) || lastVisibleCellIndex == anchor;
+        // isSelected represents focus OR selection
+        boolean isSelected = false;
+        if (isFocusDriven) {
+            isSelected = lastVisibleCell.isFocused() || fm.isFocused(lastVisibleCellIndex);
+        } else {
+            isSelected = lastVisibleCell.isSelected() || sm.isSelected(lastVisibleCellIndex);
+        }
+
+        if (isSelected) {
+            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == lastVisibleCellIndex)
+                               || (! isFocusDriven && sm.getSelectedIndex() == lastVisibleCellIndex);
+
+            if (isLeadIndex) {
+                // if the last visible cell is selected, we want to shift that cell up
+                // to be the top-most cell, or at least as far to the top as we can go.
+                flow.scrollToTop(lastVisibleCell);
+
+                ListCell<T> newLastVisibleCell = flow.getLastVisibleCellWithinViewPort();
+                lastVisibleCell = newLastVisibleCell == null ? lastVisibleCell : newLastVisibleCell;
+            }
+        } else {
+            // if the selection is not on the 'bottom' most cell, we firstly move
+            // the selection down to that, without scrolling the contents, so
+            // this is a no-op
+        }
+
+        int newSelectionIndex = lastVisibleCell.getIndex();
+        flow.scrollTo(lastVisibleCell);
+        return newSelectionIndex;
+    }
+
+    /**
+     * Function used to scroll the container up by one 'page', although
+     * if this is a horizontal container, then the scrolling will be to the left.
+     */
+    private int onScrollPageUp(boolean isFocusDriven) {
+        ListCell<T> firstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
+        if (firstVisibleCell == null) return -1;
+
+        final SelectionModel<T> sm = getSkinnable().getSelectionModel();
+        final FocusModel<T> fm = getSkinnable().getFocusModel();
+        if (sm == null || fm == null) return -1;
+
+        int firstVisibleCellIndex = firstVisibleCell.getIndex();
+
+        // isSelected represents focus OR selection
+        boolean isSelected = false;
+        if (isFocusDriven) {
+            isSelected = firstVisibleCell.isFocused() || fm.isFocused(firstVisibleCellIndex);
+        } else {
+            isSelected = firstVisibleCell.isSelected() || sm.isSelected(firstVisibleCellIndex);
+        }
+
+        if (isSelected) {
+            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == firstVisibleCellIndex)
+                               || (! isFocusDriven && sm.getSelectedIndex() == firstVisibleCellIndex);
+
+            if (isLeadIndex) {
+                // if the first visible cell is selected, we want to shift that cell down
+                // to be the bottom-most cell, or at least as far to the bottom as we can go.
+                flow.scrollToBottom(firstVisibleCell);
+
+                ListCell<T> newFirstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
+                firstVisibleCell = newFirstVisibleCell == null ? firstVisibleCell : newFirstVisibleCell;
+            }
+        } else {
+            // if the selection is not on the 'top' most cell, we firstly move
+            // the selection up to that, without scrolling the contents, so
+            // this is a no-op
+        }
+
+        int newSelectionIndex = firstVisibleCell.getIndex();
+        flow.scrollTo(firstVisibleCell);
+        return newSelectionIndex;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuBarSkin.java	2015-09-03 15:20:08.929141400 -0700
+++ /dev/null	2015-09-03 15:20:09.000000000 -0700
@@ -1,1254 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import javafx.beans.InvalidationListener;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.WeakChangeListener;
-import javafx.beans.value.WritableValue;
-import javafx.collections.ListChangeListener;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableList;
-import javafx.css.CssMetaData;
-import javafx.css.Styleable;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.event.WeakEventHandler;
-import javafx.geometry.Bounds;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.Pos;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.CustomMenuItem;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuBar;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.SkinBase;
-import javafx.scene.input.KeyCombination;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.stage.Stage;
-
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import com.sun.javafx.menu.MenuBase;
-import com.sun.javafx.scene.SceneHelper;
-import com.sun.javafx.scene.control.GlobalMenuAdapter;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import com.sun.javafx.scene.traversal.TraverseListener;
-import com.sun.javafx.stage.StageHelper;
-import com.sun.javafx.tk.Toolkit;
-import javafx.stage.Window;
-
-
-/**
- * The skin for the MenuBar. In essence it is a simple toolbar. For the time
- * being there is no overflow behavior and we just hide nodes which fall
- * outside the bounds.
- */
-public class MenuBarSkin extends BehaviorSkinBase<MenuBar, BehaviorBase<MenuBar>> implements TraverseListener {
-    
-    private final HBox container;
-
-    private Menu openMenu;
-    private MenuBarButton openMenuButton;
-    private int focusedMenuIndex = -1;
-
-    private static WeakHashMap<Stage, Reference<MenuBarSkin>> systemMenuMap;
-    private static List<MenuBase> wrappedDefaultMenus = new ArrayList<MenuBase>();
-    private static Stage currentMenuBarStage;
-    private List<MenuBase> wrappedMenus;
-
-    public static void setDefaultSystemMenuBar(final MenuBar menuBar) {
-        if (Toolkit.getToolkit().getSystemMenu().isSupported()) {
-            wrappedDefaultMenus.clear();
-            for (Menu menu : menuBar.getMenus()) {
-                wrappedDefaultMenus.add(GlobalMenuAdapter.adapt(menu));
-            }
-            menuBar.getMenus().addListener((ListChangeListener<Menu>) c -> {
-                wrappedDefaultMenus.clear();
-                for (Menu menu : menuBar.getMenus()) {
-                    wrappedDefaultMenus.add(GlobalMenuAdapter.adapt(menu));
-                }
-            });
-        }
-    }
-
-    private static MenuBarSkin getMenuBarSkin(Stage stage) {
-        if (systemMenuMap == null) return null;
-        Reference<MenuBarSkin> skinRef = systemMenuMap.get(stage);
-        return skinRef == null ? null : skinRef.get();
-    }
-
-    private static void setSystemMenu(Stage stage) {
-        if (stage != null && stage.isFocused()) {
-            while (stage != null && stage.getOwner() instanceof Stage) {
-                MenuBarSkin skin = getMenuBarSkin(stage);
-                if (skin != null && skin.wrappedMenus != null) {
-                    break;
-                } else {
-                    // This is a secondary stage (dialog) that doesn't
-                    // have own menu bar.
-                    //
-                    // Continue looking for a menu bar in the parent stage.
-                    stage = (Stage)stage.getOwner();
-                }
-            }
-        } else {
-            stage = null;
-        }
-
-        if (stage != currentMenuBarStage) {
-            List<MenuBase> menuList = null;
-            if (stage != null) {
-                MenuBarSkin skin = getMenuBarSkin(stage);
-                if (skin != null) {
-                    menuList = skin.wrappedMenus;
-                }
-            }
-            if (menuList == null) {
-                menuList = wrappedDefaultMenus;
-            }
-            Toolkit.getToolkit().getSystemMenu().setMenus(menuList);
-            currentMenuBarStage = stage;
-        }
-    }
-
-    private static void initSystemMenuBar() {
-        systemMenuMap = new WeakHashMap<>();
-
-        final InvalidationListener focusedStageListener = ov -> {
-            setSystemMenu((Stage)((ReadOnlyProperty<?>)ov).getBean());
-        };
-
-        final ObservableList<Stage> stages = StageHelper.getStages();
-        for (Stage stage : stages) {
-            stage.focusedProperty().addListener(focusedStageListener);
-        }
-        stages.addListener((ListChangeListener<Stage>) c -> {
-            while (c.next()) {
-                for (Stage stage : c.getRemoved()) {
-                    stage.focusedProperty().removeListener(focusedStageListener);
-                }
-                for (Stage stage : c.getAddedSubList()) {
-                    stage.focusedProperty().addListener(focusedStageListener);
-                    setSystemMenu(stage);
-                }
-            }
-        });
-    }
-
-    private WeakEventHandler<KeyEvent> weakSceneKeyEventHandler;
-    private WeakEventHandler<MouseEvent> weakSceneMouseEventHandler;
-    private WeakChangeListener<Boolean> weakWindowFocusListener;
-    private WeakChangeListener<Window> weakWindowSceneListener;
-    private EventHandler<KeyEvent> keyEventHandler;
-    private EventHandler<MouseEvent> mouseEventHandler;
-    private ChangeListener<Boolean> menuBarFocusedPropertyListener;
-    private ChangeListener<Scene> sceneChangeListener;
-
-    EventHandler<KeyEvent> getKeyEventHandler() {
-        return keyEventHandler;
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public MenuBarSkin(final MenuBar control) {
-        super(control, new BehaviorBase<>(control, Collections.emptyList()));
-        
-        container = new HBox();
-        container.getStyleClass().add("container");
-        getChildren().add(container);
-        
-        // Key navigation 
-        keyEventHandler = event -> {
-            // process right left and may be tab key events
-            if (openMenu != null) {
-                switch (event.getCode()) {
-                    case LEFT: {
-                        boolean isRTL = control.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
-                        if (control.getScene().getWindow().isFocused()) {
-                            if (openMenu == null) return;
-                            if ( !openMenu.isShowing()) {
-                                if (isRTL) {
-                                    selectNextMenu(); // just move the selection bar
-                                } else {
-                                    selectPrevMenu(); // just move the selection bar
-                                }
-                                event.consume();
-                                return;
-                            }
-                            if (isRTL) {
-                                showNextMenu();
-                            } else {
-                                showPrevMenu();
-                            }
-                        }
-                        event.consume();
-                        break;
-                    }
-                    case RIGHT:
-                    {
-                        boolean isRTL = control.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
-                        if (control.getScene().getWindow().isFocused()) {
-                            if (openMenu == null) return;
-                            if (! openMenu.isShowing()) {
-                                if (isRTL) {
-                                    selectPrevMenu(); // just move the selection bar
-                                } else {
-                                    selectNextMenu(); // just move the selection bar
-                                }
-                                event.consume();
-                                return;
-                            }
-                            if (isRTL) {
-                                showPrevMenu();
-                            } else {
-                                showNextMenu();
-                            }
-                        }
-                        event.consume();
-                        break;
-                    }
-                    case DOWN:
-                    //case SPACE:
-                    //case ENTER:
-                        // RT-18859: Doing nothing for space and enter
-                        if (control.getScene().getWindow().isFocused()) {
-                            if (focusedMenuIndex != -1 && openMenu != null) {
-                                openMenu = getSkinnable().getMenus().get(focusedMenuIndex);
-                                if (!isMenuEmpty(getSkinnable().getMenus().get(focusedMenuIndex))) {
-                                    openMenu.show();
-                                }
-                                event.consume();
-                            }
-                        }
-                        break;
-                    case ESCAPE:
-                        unSelectMenus();
-                        event.consume();
-                        break;
-                default:
-                    break;
-                }
-            }
-        };
-        menuBarFocusedPropertyListener = (ov, t, t1) -> {
-            if (t1) {
-                // RT-23147 when MenuBar's focusTraversable is true the first
-                // menu will visually indicate focus
-                unSelectMenus();
-                menuModeStart(0);
-                openMenuButton = ((MenuBarButton)container.getChildren().get(0));
-                openMenu = getSkinnable().getMenus().get(0);
-                openMenuButton.setHover();
-            } else {
-                unSelectMenus();
-             }
-         };
-        weakSceneKeyEventHandler = new WeakEventHandler<KeyEvent>(keyEventHandler);
-        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
-            scene.addEventFilter(KeyEvent.KEY_PRESSED, weakSceneKeyEventHandler);
-        });
-        
-        // When we click else where in the scene - menu selection should be cleared.
-        mouseEventHandler = t -> {
-            if (!container.localToScreen(container.getLayoutBounds()).contains(t.getScreenX(), t.getScreenY())) {
-                unSelectMenus();
-            }
-        };
-        weakSceneMouseEventHandler = new WeakEventHandler<MouseEvent>(mouseEventHandler);
-        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
-            scene.addEventFilter(MouseEvent.MOUSE_CLICKED, weakSceneMouseEventHandler);
-        });
-        
-        weakWindowFocusListener = new WeakChangeListener<Boolean>((ov, t, t1) -> {
-            if (!t1) {
-              unSelectMenus();
-            }
-        });
-        // When the parent window looses focus - menu selection should be cleared
-        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
-            if (scene.getWindow() != null) {
-                scene.getWindow().focusedProperty().addListener(weakWindowFocusListener);
-            } else {
-                ChangeListener<Window> sceneWindowListener = (observable, oldValue, newValue) -> {
-                    if (oldValue != null)
-                        oldValue.focusedProperty().removeListener(weakWindowFocusListener);
-                    if (newValue != null)
-                        newValue.focusedProperty().addListener(weakWindowFocusListener);
-                };
-                weakWindowSceneListener = new WeakChangeListener<>(sceneWindowListener);
-                scene.windowProperty().addListener(weakWindowSceneListener);
-            }
-        });
-
-        rebuildUI();
-        control.getMenus().addListener((ListChangeListener<Menu>) c -> {
-            rebuildUI();
-        });
-        for (final Menu menu : getSkinnable().getMenus()) {
-            menu.visibleProperty().addListener((ov, t, t1) -> {
-                rebuildUI();
-            });
-        }
-
-        if (Toolkit.getToolkit().getSystemMenu().isSupported()) {
-            control.useSystemMenuBarProperty().addListener(valueModel -> {
-                rebuildUI();
-            });
-        }
-
-        // When the mouse leaves the menu, the last hovered item should lose
-        // it's focus so that it is no longer selected. This code returns focus
-        // to the MenuBar itself, such that keyboard navigation can continue.
-          // fix RT-12254 : menu bar should not request focus on mouse exit.
-//        addEventFilter(MouseEvent.MOUSE_EXITED, new EventHandler<MouseEvent>() {
-//            @Override
-//            public void handle(MouseEvent event) {
-//                requestFocus();
-//            }
-//        });
-
-        /*
-        ** add an accelerator for F10 on windows and ctrl+F10 on mac/linux
-        ** pressing f10 will select the first menu button on a menubar
-        */
-        final KeyCombination acceleratorKeyCombo;
-        if (com.sun.javafx.util.Utils.isMac()) {
-           acceleratorKeyCombo = KeyCombination.keyCombination("ctrl+F10");
-        } else {
-           acceleratorKeyCombo = KeyCombination.keyCombination("F10");
-        }
-        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
-            scene.getAccelerators().put(acceleratorKeyCombo, firstMenuRunnable);
-
-            // put focus on the first menu when the alt key is pressed
-            scene.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
-                if (e.isAltDown()  && !e.isConsumed()) {
-                    firstMenuRunnable.run();
-                }
-            });
-        });
-
-        ParentTraversalEngine engine = new ParentTraversalEngine(getSkinnable());
-        engine.addTraverseListener(this);
-        getSkinnable().setImpl_traversalEngine(engine);
-
-        control.sceneProperty().addListener((ov, t, t1) -> {
-            if (weakSceneKeyEventHandler != null) {
-                // remove event filter from the old scene (t)
-                if (t != null)
-                    t.removeEventFilter(KeyEvent.KEY_PRESSED, weakSceneKeyEventHandler);
-            }
-            if (weakSceneMouseEventHandler != null) {
-                // remove event filter from the old scene (t)
-                if (t != null)
-                    t.removeEventFilter(MouseEvent.MOUSE_CLICKED, weakSceneMouseEventHandler);
-            }
-
-            /**
-             * remove the f10 accelerator from the old scene
-             * add it to the new scene
-             */
-            if (t != null) {
-                t.getAccelerators().remove(acceleratorKeyCombo);
-            }
-            if (t1 != null ) {
-                t1.getAccelerators().put(acceleratorKeyCombo, firstMenuRunnable);
-            }
-        });
-    }
-    
-    
-    Runnable firstMenuRunnable = new Runnable() {
-            public void run() {
-                /*
-                ** check that this menubar's container has contents,
-                ** and that the first item is a MenuButton.... 
-                ** otherwise the transfer is off!
-                */
-                if (container.getChildren().size() > 0) {
-                    if (container.getChildren().get(0) instanceof MenuButton) {
-//                        container.getChildren().get(0).requestFocus();
-                        if (focusedMenuIndex != 0) {
-                            unSelectMenus();
-                            menuModeStart(0);
-                            openMenuButton = ((MenuBarButton)container.getChildren().get(0));
-                            openMenu = getSkinnable().getMenus().get(0);
-                            openMenuButton.setHover();
-                        }
-                        else {
-                            unSelectMenus();
-                        }
-                    }
-                }
-            }
-        };
-
-
-    private boolean pendingDismiss = false;
-
-    // For testing purpose only. 
-    MenuButton getNodeForMenu(int i) {
-        if (i < container.getChildren().size()) {
-            return (MenuBarButton)container.getChildren().get(i);
-        }
-        return null;
-    }
-    
-    int getFocusedMenuIndex() {
-        return focusedMenuIndex;
-    }
-    
-    private boolean menusContainCustomMenuItem() {
-        for (Menu menu : getSkinnable().getMenus()) {
-            if (menuContainsCustomMenuItem(menu)) {
-                System.err.println("Warning: MenuBar ignored property useSystemMenuBar because menus contain CustomMenuItem");
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean menuContainsCustomMenuItem(Menu menu) {
-        for (MenuItem mi : menu.getItems()) {
-            if (mi instanceof CustomMenuItem && !(mi instanceof SeparatorMenuItem)) {
-                return true;
-            } else if (mi instanceof Menu) {
-                if (menuContainsCustomMenuItem((Menu)mi)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private int getMenuBarButtonIndex(MenuBarButton m) {
-        for (int i= 0; i < container.getChildren().size(); i++) {
-            MenuBarButton menuButton = (MenuBarButton)container.getChildren().get(i);
-            if (m == menuButton) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    
-    // RT-20411 : reset menu selected/focused state 
-    private EventHandler<ActionEvent> menuActionEventHandler = t -> {
-        if (t.getSource() instanceof CustomMenuItem) {
-            // RT-29614 If CustomMenuItem hideOnClick is false, dont hide
-            CustomMenuItem cmi = (CustomMenuItem)t.getSource();
-            if (!cmi.isHideOnClick()) return;
-        }
-        unSelectMenus();
-    };
-
-    private ListChangeListener<MenuItem> menuItemListener = (c) -> {
-        while (c.next()) {
-            for (MenuItem mi : c.getAddedSubList()) {
-                mi.addEventHandler(ActionEvent.ACTION, menuActionEventHandler);
-            }
-            for (MenuItem mi: c.getRemoved()) {
-                mi.removeEventHandler(ActionEvent.ACTION, menuActionEventHandler);
-            }
-        }
-    };
-
-    private void updateActionListeners(Menu m, boolean add) {
-        if (add) {
-            m.getItems().addListener(menuItemListener);
-        } else {
-            m.getItems().removeListener(menuItemListener);
-        }
-        for (MenuItem mi : m.getItems()) {
-            if (mi instanceof Menu) {
-                updateActionListeners((Menu)mi, add);
-            } else {
-                if (add) {
-                    mi.addEventHandler(ActionEvent.ACTION, menuActionEventHandler);
-                } else {
-                    mi.removeEventHandler(ActionEvent.ACTION, menuActionEventHandler);
-                }
-            }
-        }
-    }
-    
-    private void rebuildUI() {
-        getSkinnable().focusedProperty().removeListener(menuBarFocusedPropertyListener);
-        for (Menu m : getSkinnable().getMenus()) {
-            // remove action listeners 
-            updateActionListeners(m, false);
-        }
-        for (Node n : container.getChildren()) {
-            // Stop observing menu's showing & disable property for changes.
-            // Need to unbind before clearing container's children.
-            MenuBarButton menuButton = (MenuBarButton)n;
-            menuButton.hide();
-            menuButton.menu.showingProperty().removeListener(menuButton.menuListener);
-            menuButton.disableProperty().unbind();
-            menuButton.textProperty().unbind();
-            menuButton.graphicProperty().unbind();
-            menuButton.styleProperty().unbind();
-
-            menuButton.dispose();
-
-            // RT-29729 : old instance of context menu window/popup for this MenuButton needs 
-            // to be cleaned up. Setting the skin to null - results in a call to dispose() 
-            // on the skin which in this case MenuButtonSkinBase - does the subsequent 
-            // clean up to ContextMenu/popup window.
-            menuButton.setSkin(null);
-            menuButton = null;
-        }
-        container.getChildren().clear();
-
-        if (Toolkit.getToolkit().getSystemMenu().isSupported()) {
-
-            final Scene scene = getSkinnable().getScene();
-            if (scene != null) {
-                // RT-36554 - make sure system menu is updated when this MenuBar's scene changes.
-                if (sceneChangeListener == null) {
-                    sceneChangeListener = (observable, oldValue, newValue) -> {
-
-                        if (oldValue != null) {
-                            if (oldValue.getWindow() instanceof Stage) {
-                                final Stage stage = (Stage) oldValue.getWindow();
-                                final MenuBarSkin curMBSkin = getMenuBarSkin(stage);
-                                if (curMBSkin == MenuBarSkin.this) {
-                                    curMBSkin.wrappedMenus = null;
-                                    systemMenuMap.remove(stage);
-                                    if (currentMenuBarStage == stage) {
-                                        currentMenuBarStage = null;
-                                        setSystemMenu(stage);
-                                    }
-                                } else {
-                                    if (curMBSkin != null && curMBSkin.getSkinnable() != null &&
-                                            curMBSkin.getSkinnable().isUseSystemMenuBar()) {
-                                        curMBSkin.getSkinnable().setUseSystemMenuBar(false);
-                                    }
-                                }
-                            }
-                        }
-
-                        if (newValue != null) {
-                            if (getSkinnable().isUseSystemMenuBar() && !menusContainCustomMenuItem()) {
-                                if (newValue.getWindow() instanceof Stage) {
-                                    final Stage stage = (Stage) newValue.getWindow();
-                                    if (systemMenuMap == null) {
-                                        initSystemMenuBar();
-                                    }
-                                    wrappedMenus = new ArrayList<>();
-                                    systemMenuMap.put(stage, new WeakReference<>(this));
-                                    for (Menu menu : getSkinnable().getMenus()) {
-                                        wrappedMenus.add(GlobalMenuAdapter.adapt(menu));
-                                    }
-                                    currentMenuBarStage = null;
-                                    setSystemMenu(stage);
-
-                                    // TODO: Why two request layout calls here?
-                                    getSkinnable().requestLayout();
-                                    javafx.application.Platform.runLater(() -> getSkinnable().requestLayout());
-                                }
-                            }
-                        }
-                    };
-                    getSkinnable().sceneProperty().addListener(sceneChangeListener);
-                }
-
-                // Fake a change event to trigger an update to the system menu.
-                sceneChangeListener.changed(getSkinnable().sceneProperty(), scene, scene);
-
-                // If the system menu references this MenuBarSkin, then we're done with rebuilding the UI.
-                // If the system menu does not reference this MenuBarSkin, then the MenuBar is a child of the scene
-                // and we continue with the update.
-                // If there is no system menu but this skinnable uses the system menu bar, then the
-                // stage just isn't focused yet (see setSystemMenu) and we're done rebuilding the UI.
-                if (currentMenuBarStage != null ? getMenuBarSkin(currentMenuBarStage) == MenuBarSkin.this : getSkinnable().isUseSystemMenuBar()) {
-                    return;
-                }
-
-            } else {
-                // if scene is null, make sure this MenuBarSkin isn't left behind as the system menu
-                if (currentMenuBarStage != null) {
-                    final MenuBarSkin curMBSkin = getMenuBarSkin(currentMenuBarStage);
-                    if (curMBSkin == MenuBarSkin.this) {
-                        setSystemMenu(null);
-                    }
-                }
-            }
-        }
-
-        getSkinnable().focusedProperty().addListener(menuBarFocusedPropertyListener);
-        for (final Menu menu : getSkinnable().getMenus()) {
-            if (!menu.isVisible()) continue;
-            final MenuBarButton menuButton = new MenuBarButton(this, menu);
-            menuButton.setFocusTraversable(false);
-            menuButton.getStyleClass().add("menu");
-            menuButton.setStyle(menu.getStyle()); // copy style
-
-            menuButton.getItems().setAll(menu.getItems());
-            container.getChildren().add(menuButton);
-
-            menuButton.menuListener = (observable, oldValue, newValue) -> {
-                if (menu.isShowing()) {
-                    menuButton.show();
-                    menuModeStart(container.getChildren().indexOf(menuButton));
-                } else {
-                    menuButton.hide();
-                }
-            };
-            menuButton.menu = menu;
-            menu.showingProperty().addListener(menuButton.menuListener);
-            menuButton.disableProperty().bindBidirectional(menu.disableProperty());
-            menuButton.textProperty().bind(menu.textProperty());
-            menuButton.graphicProperty().bind(menu.graphicProperty());
-            menuButton.styleProperty().bind(menu.styleProperty());
-            menuButton.getProperties().addListener((MapChangeListener<Object, Object>) c -> {
-                 if (c.wasAdded() && MenuButtonSkin.AUTOHIDE.equals(c.getKey())) {
-                    menuButton.getProperties().remove(MenuButtonSkin.AUTOHIDE);
-                    menu.hide();
-                }
-            });
-            menuButton.showingProperty().addListener((observable, oldValue, isShowing) -> {
-                if (isShowing) {
-                    if (openMenuButton != null && openMenuButton != menuButton) {
-                        openMenuButton.hide();
-                    }
-                    openMenuButton = menuButton;
-                    openMenu = menu;
-                    if (!menu.isShowing())menu.show();
-                }
-            });
-
-            menuButton.setOnMousePressed(event -> {
-                pendingDismiss = menuButton.isShowing();
-
-                // check if the owner window has focus
-                if (menuButton.getScene().getWindow().isFocused()) {
-                    openMenu = menu;
-                    if (!isMenuEmpty(menu)){
-                        openMenu.show();
-                    }
-                    // update FocusedIndex
-                    menuModeStart(getMenuBarButtonIndex(menuButton));
-                }
-            });
-            
-            menuButton.setOnMouseReleased(event -> {
-                // check if the owner window has focus
-                if (menuButton.getScene().getWindow().isFocused()) {
-                    if (pendingDismiss) {
-                        resetOpenMenu();
-//                            menuButton.hide();
-                    }
-                }
-                pendingDismiss = false;
-            });
-
-//            menuButton. setOnKeyPressed(new EventHandler<javafx.scene.input.KeyEvent>() {
-//                @Override public void handle(javafx.scene.input.KeyEvent ke) {
-//                    switch (ke.getCode()) {
-//                        case LEFT:
-//                            if (menuButton.getScene().getWindow().isFocused()) {
-//                                Menu prevMenu = findPreviousSibling();
-//                                if (openMenu == null || ! openMenu.isShowing()) {
-//                                    return;
-//                                }
-////                                if (focusedMenuIndex == container.getChildren().size() - 1) {
-////                                   ((MenuBarButton)container.getChildren().get(focusedMenuIndex)).requestFocus();
-////                                }
-//                                 // hide the currently visible menu, and move to the previous one
-//                                openMenu.hide();
-//                                if (!isMenuEmpty(prevMenu)) {
-//                                    openMenu = prevMenu;
-//                                    openMenu.show();
-//                                } else {
-//                                    openMenu = null;
-//                                }
-//                            }
-//                            ke.consume();
-//                            break;
-//                        case RIGHT:
-//                            if (menuButton.getScene().getWindow().isFocused()) {
-//                                Menu nextMenu = findNextSibling();
-//                                if (openMenu == null || ! openMenu.isShowing()) {
-//                                    return;
-//                                }
-////                                if (focusedMenuIndex == 0) {
-////                                    ((MenuBarButton)container.getChildren().get(focusedMenuIndex)).requestFocus();
-////                                }
-//                                 // hide the currently visible menu, and move to the next one
-//                                openMenu.hide();
-//                                if (!isMenuEmpty(nextMenu)) {
-//                                    openMenu = nextMenu;
-//                                    openMenu.show();
-//                                } else {
-//                                    openMenu = null;
-//                                }
-//                            }
-//                            ke.consume();
-//                            break;
-//
-//                        case DOWN:
-//                        case SPACE:
-//                        case ENTER:
-//                            if (menuButton.getScene().getWindow().isFocused()) {
-//                                if (focusedMenuIndex != -1) {
-//                                    if (!isMenuEmpty(getSkinnable().getMenus().get(focusedMenuIndex))) {
-//                                        openMenu = getSkinnable().getMenus().get(focusedMenuIndex);
-//                                        openMenu.show();
-//                                    } else {
-//                                        openMenu = null;
-//                                    }
-//                                    ke.consume();
-//                                }
-//                            }
-//                            break;
-//                    }
-//                }
-//            });
-            menuButton.setOnMouseEntered(event -> {
-                // check if the owner window has focus
-                if (menuButton.getScene() != null && menuButton.getScene().getWindow() != null &&
-                        menuButton.getScene().getWindow().isFocused()) {
-                    if (openMenuButton != null && openMenuButton != menuButton) {
-                            openMenuButton.clearHover();
-                            openMenuButton = null;
-                            openMenuButton = menuButton;
-                    }
-                    updateFocusedIndex();
-                    if (openMenu != null && openMenu != menu) {
-                     // hide the currently visible menu, and move to the new one
-                        openMenu.hide();
-                        openMenu = menu;
-                        updateFocusedIndex();
-                        if (!isMenuEmpty(menu)) {
-                            openMenu.show();
-                        }
-                    }
-                }
-            });
-            updateActionListeners(menu, true);
-        }
-        getSkinnable().requestLayout();
-    }
-    
-    /*
-     *  if (openMenu == null) return;
-                            if ( !openMenu.isShowing()) {
-                                selectPrevMenu(); // just move the selection bar
-                                return;
-                            }
-                            showPrevMenu();
-                        }
-     */
-    private DoubleProperty spacing;
-    public final void setSpacing(double value) {
-        spacingProperty().set(snapSpace(value));
-    }
-
-    public final double getSpacing() {
-        return spacing == null ? 0.0 : snapSpace(spacing.get());
-    }
-
-    public final DoubleProperty spacingProperty() {
-        if (spacing == null) {
-            spacing = new StyleableDoubleProperty() {
-
-                @Override
-                protected void invalidated() {
-                    final double value = get();
-                    container.setSpacing(value);
-                }
-
-                @Override
-                public Object getBean() {
-                    return MenuBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "spacing";
-                }
-
-                @Override
-                public CssMetaData<MenuBar,Number> getCssMetaData() {
-                    return SPACING;
-                }
-            };
-        }
-        return spacing;
-    }
-
-    private ObjectProperty<Pos> containerAlignment;
-    public final void setContainerAlignment(Pos value) {
-        containerAlignmentProperty().set(value);
-    }
-
-    public final Pos getContainerAlignment() {
-        return containerAlignment == null ? Pos.TOP_LEFT : containerAlignment.get();
-    }
-
-    public final ObjectProperty<Pos> containerAlignmentProperty() {
-        if (containerAlignment == null) {
-            containerAlignment = new StyleableObjectProperty<Pos>(Pos.TOP_LEFT) {
-
-                @Override
-                public void invalidated() {
-                    final Pos value = get();
-                    container.setAlignment(value);
-                }
-
-                @Override
-                public Object getBean() {
-                    return MenuBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "containerAlignment";
-                }
-
-                @Override
-                public CssMetaData<MenuBar,Pos> getCssMetaData() {
-                    return ALIGNMENT;
-                }
-            };
-        }
-        return containerAlignment;
-    }
-
-    @Override
-    public void dispose() {
-        cleanUpSystemMenu();
-        // call super.dispose last since it sets control to null
-        super.dispose();
-    }
-
-    private void cleanUpSystemMenu() {
-
-        if (sceneChangeListener != null && getSkinnable() != null) {
-            getSkinnable().sceneProperty().removeListener(sceneChangeListener);
-            // rebuildUI creates sceneChangeListener and adds sceneChangeListener to sceneProperty,
-            // so sceneChangeListener needs to be reset to null in the off chance that this
-            // skin instance is reused.
-            sceneChangeListener = null;
-        }
-
-        if (currentMenuBarStage != null && getMenuBarSkin(currentMenuBarStage) == MenuBarSkin.this) {
-            setSystemMenu(null);
-        }
-
-        if (systemMenuMap != null) {
-            Iterator<Map.Entry<Stage,Reference<MenuBarSkin>>> iterator = systemMenuMap.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry<Stage,Reference<MenuBarSkin>> entry = iterator.next();
-                Reference<MenuBarSkin> ref = entry.getValue();
-                MenuBarSkin skin = ref != null ? ref.get() : null;
-                if (skin == null || skin == MenuBarSkin.this) {
-                    iterator.remove();
-                }
-            }
-        }
-    }
-
-    private boolean isMenuEmpty(Menu menu) {
-        boolean retVal = true;
-        if (menu != null) {
-            for (MenuItem m : menu.getItems()) {
-                if (m != null && m.isVisible()) retVal = false;
-            }
-        }
-        return retVal;
-    }
-
-    private void resetOpenMenu() {
-        if (openMenu != null) {
-            openMenu.hide();
-            openMenu = null;
-            openMenuButton = (MenuBarButton)container.getChildren().get(focusedMenuIndex);
-            openMenuButton.clearHover();
-            openMenuButton = null;
-            menuModeEnd();
-        }
-    }
-    
-    private void unSelectMenus() {
-        clearMenuButtonHover();
-        if (focusedMenuIndex == -1) return;
-        if (openMenu != null) {
-            openMenu.hide();
-            openMenu = null;
-        }
-        if (openMenuButton != null) {
-            openMenuButton.clearHover();
-            openMenuButton = null;
-        }
-        menuModeEnd();
-    }
-
-    private void menuModeStart(int newIndex) {
-        if (focusedMenuIndex == -1) {
-            SceneHelper.getSceneAccessor().setTransientFocusContainer(getSkinnable().getScene(), getSkinnable());
-        }
-        focusedMenuIndex = newIndex;
-    }
-
-    private void menuModeEnd() {
-        if (focusedMenuIndex != -1) {
-            SceneHelper.getSceneAccessor().setTransientFocusContainer(getSkinnable().getScene(), null);
-
-            /* Return the a11y focus to a control in the scene. */
-            getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_NODE);
-        }
-        focusedMenuIndex = -1;
-    }
-    
-    private void selectNextMenu() {
-        Menu nextMenu = findNextSibling();
-        if (nextMenu != null && focusedMenuIndex != -1) {
-            openMenuButton = (MenuBarButton)container.getChildren().get(focusedMenuIndex);
-            openMenuButton.setHover();
-            openMenu = nextMenu;
-        }
-    }
-    
-    private void selectPrevMenu() {
-        Menu prevMenu = findPreviousSibling();
-        if (prevMenu != null && focusedMenuIndex != -1) {
-            openMenuButton = (MenuBarButton)container.getChildren().get(focusedMenuIndex);
-            openMenuButton.setHover();
-            openMenu = prevMenu;
-        }
-    }
-    
-    private void showNextMenu() {
-        Menu nextMenu = findNextSibling();
-        // hide the currently visible menu, and move to the next one
-        if (openMenu != null) openMenu.hide();
-        openMenu = nextMenu;
-        if (!isMenuEmpty(nextMenu)) {
-            openMenu.show();
-        } 
-    }
-
-    private void showPrevMenu() {
-        Menu prevMenu = findPreviousSibling();
-        // hide the currently visible menu, and move to the next one
-        if (openMenu != null) openMenu.hide();
-        openMenu = prevMenu;
-        if (!isMenuEmpty(prevMenu)) {
-            openMenu.show();
-        } 
-    }
-    
-    private Menu findPreviousSibling() {
-        if (focusedMenuIndex == -1) return null;
-        if (focusedMenuIndex == 0) {
-            focusedMenuIndex = container.getChildren().size() - 1;
-        } else {
-            focusedMenuIndex--;
-        }
-        // RT-19359
-        if (getSkinnable().getMenus().get(focusedMenuIndex).isDisable()) return findPreviousSibling();
-        clearMenuButtonHover();
-        return getSkinnable().getMenus().get(focusedMenuIndex);
-    }
-
-    private Menu findNextSibling() {
-        if (focusedMenuIndex == -1) return null;
-        if (focusedMenuIndex == container.getChildren().size() - 1) {
-            focusedMenuIndex = 0;
-        } else {
-            focusedMenuIndex++;
-        }
-        // RT_19359
-        if (getSkinnable().getMenus().get(focusedMenuIndex).isDisable()) return findNextSibling();
-        clearMenuButtonHover();
-        return getSkinnable().getMenus().get(focusedMenuIndex);
-    }
-
-    private void updateFocusedIndex() {
-        int index = 0;
-        for(Node n : container.getChildren()) {
-            if (n.isHover()) {
-                focusedMenuIndex = index;
-                return;
-            }
-            index++;
-        }
-        menuModeEnd();
-    }
-
-    private void clearMenuButtonHover() {
-         for(Node n : container.getChildren()) {
-            if (n.isHover()) {
-                ((MenuBarButton)n).clearHover();
-                return;
-            }
-        }
-    }
-
-    @Override
-    public void onTraverse(Node node, Bounds bounds) {
-        if (openMenu != null) openMenu.hide();
-        focusedMenuIndex = 0;
-    }
-
-    static class MenuBarButton extends MenuButton {
-        private ChangeListener<Boolean> menuListener;
-        private MenuBarSkin menuBarSkin;
-        private Menu menu;
-
-        private final ListChangeListener<MenuItem> itemsListener;
-        private final ListChangeListener<String> styleClassListener;
-
-        public MenuBarButton(MenuBarSkin menuBarSkin, Menu menu) {
-            super(menu.getText(), menu.getGraphic());
-            this.menuBarSkin = menuBarSkin;
-            setAccessibleRole(AccessibleRole.MENU);
-
-            // listen to changes in menu items & update menuButton items
-            menu.getItems().addListener(itemsListener = c -> {
-                while (c.next()) {
-                    getItems().removeAll(c.getRemoved());
-                    getItems().addAll(c.getFrom(), c.getAddedSubList());
-                }
-            });
-            menu.getStyleClass().addListener(styleClassListener = c -> {
-                while(c.next()) {
-                    for(int i=c.getFrom(); i<c.getTo(); i++) {
-                        getStyleClass().add(menu.getStyleClass().get(i));
-                    }
-                    for (String str : c.getRemoved()) {
-                        getStyleClass().remove(str);
-                    }
-                }
-            });
-            idProperty().bind(menu.idProperty());
-        }
-
-        public MenuBarSkin getMenuBarSkin() {
-            return menuBarSkin;
-        }
-
-        private void clearHover() {
-            setHover(false);
-        }
-        
-        private void setHover() {
-            setHover(true);
-
-            /* Transfer the a11y focus to an item in the menu bar. */
-            menuBarSkin.getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_NODE);
-        }
-
-        void dispose() {
-            menu.getItems().removeListener(itemsListener);
-            menu.getStyleClass().removeListener(styleClassListener);
-            idProperty().unbind();
-        }
-
-        @Override
-        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-            switch (attribute) {
-                case FOCUS_ITEM: return MenuBarButton.this;
-                default: return super.queryAccessibleAttribute(attribute, parameters);
-            }
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    // Return empty insets when "container" is empty, which happens
-    // when using the system menu bar.
-
-    @Override protected double snappedTopInset() {
-        return container.getChildren().isEmpty() ? 0 : super.snappedTopInset();
-    }
-    @Override protected double snappedBottomInset() {
-        return container.getChildren().isEmpty() ? 0 : super.snappedBottomInset();
-    }
-    @Override protected double snappedLeftInset() {
-        return container.getChildren().isEmpty() ? 0 : super.snappedLeftInset();
-    }
-    @Override protected double snappedRightInset() {
-        return container.getChildren().isEmpty() ? 0 : super.snappedRightInset();
-    }
-
-    /**
-     * Layout the menu bar. This is a simple horizontal layout like an hbox.
-     * Any menu items which don't fit into it will simply be made invisible.
-     */
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        // layout the menus one after another
-        container.resizeRelocate(x, y, w, h);
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return container.minWidth(height) + snappedLeftInset() + snappedRightInset();
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return container.prefWidth(height) + snappedLeftInset() + snappedRightInset();
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return container.minHeight(width) + snappedTopInset() + snappedBottomInset();
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return container.prefHeight(width) + snappedTopInset() + snappedBottomInset();
-    }
-
-    // grow horizontally, but not vertically
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(-1);
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * CSS                                                                     *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final CssMetaData<MenuBar,Number> SPACING =
-            new CssMetaData<MenuBar,Number>("-fx-spacing",
-                    SizeConverter.getInstance(), 0.0) {
-
-                @Override
-                public boolean isSettable(MenuBar n) {
-                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
-                    return skin.spacing == null || !skin.spacing.isBound();
-                }
-
-                @Override
-                public StyleableProperty<Number> getStyleableProperty(MenuBar n) {
-                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
-                    return (StyleableProperty<Number>)(WritableValue<Number>)skin.spacingProperty();
-                }
-            };
-
-    private static final CssMetaData<MenuBar,Pos> ALIGNMENT =
-            new CssMetaData<MenuBar,Pos>("-fx-alignment",
-                    new EnumConverter<Pos>(Pos.class), Pos.TOP_LEFT ) {
-
-                @Override
-                public boolean isSettable(MenuBar n) {
-                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
-                    return skin.containerAlignment == null || !skin.containerAlignment.isBound();
-                }
-
-                @Override
-                public StyleableProperty<Pos> getStyleableProperty(MenuBar n) {
-                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
-                    return (StyleableProperty<Pos>)(WritableValue<Pos>)skin.containerAlignmentProperty();
-                }
-            };
-
-
-    private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-    static {
-
-        final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-
-        // StackPane also has -fx-alignment. Replace it with 
-        // MenuBarSkin's. 
-        // TODO: Really should be able to reference StackPane.StyleableProperties.ALIGNMENT
-        final String alignmentProperty = ALIGNMENT.getProperty();
-        for (int n=0, nMax=styleables.size(); n<nMax; n++) {
-            final CssMetaData<?,?> prop = styleables.get(n);
-            if (alignmentProperty.equals(prop.getProperty())) styleables.remove(prop);
-        }
-
-        styleables.add(SPACING);
-        styleables.add(ALIGNMENT);
-        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 STYLEABLES;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Accessibility handling                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_NODE: return openMenuButton;
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:20:10.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/MenuBarSkin.java	2015-09-03 15:20:08.150096800 -0700
@@ -0,0 +1,1246 @@
+/*
+ * Copyright (c) 2010, 2015, 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.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.MenuBarButton;
+import com.sun.javafx.scene.control.skin.Utils;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import javafx.beans.InvalidationListener;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.WeakChangeListener;
+import javafx.beans.value.WritableValue;
+import javafx.collections.ListChangeListener;
+import javafx.collections.MapChangeListener;
+import javafx.collections.ObservableList;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.event.WeakEventHandler;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Pos;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.Control;
+import javafx.scene.control.CustomMenuItem;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.SkinBase;
+import javafx.scene.input.KeyCombination;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import com.sun.javafx.menu.MenuBase;
+import com.sun.javafx.scene.SceneHelper;
+import com.sun.javafx.scene.control.GlobalMenuAdapter;
+import com.sun.javafx.stage.StageHelper;
+import com.sun.javafx.tk.Toolkit;
+import javafx.stage.Window;
+
+/**
+ * Default skin implementation for the {@link MenuBar} control. In essence it is
+ * a simple toolbar. For the time being there is no overflow behavior and we just
+ * hide nodes which fall outside the bounds.
+ *
+ * @see MenuBar
+ * @since 9
+ */
+public class MenuBarSkin extends SkinBase<MenuBar> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+    
+    private final HBox container;
+
+    private Menu openMenu;
+    private MenuBarButton openMenuButton;
+    private int focusedMenuIndex = -1;
+
+    private static WeakHashMap<Stage, Reference<MenuBarSkin>> systemMenuMap;
+    private static List<MenuBase> wrappedDefaultMenus = new ArrayList<>();
+    private static Stage currentMenuBarStage;
+    private List<MenuBase> wrappedMenus;
+
+    private WeakEventHandler<KeyEvent> weakSceneKeyEventHandler;
+    private WeakEventHandler<MouseEvent> weakSceneMouseEventHandler;
+    private WeakChangeListener<Boolean> weakWindowFocusListener;
+    private WeakChangeListener<Window> weakWindowSceneListener;
+    private EventHandler<KeyEvent> keyEventHandler;
+    private EventHandler<MouseEvent> mouseEventHandler;
+    private ChangeListener<Boolean> menuBarFocusedPropertyListener;
+    private ChangeListener<Scene> sceneChangeListener;
+
+    private boolean pendingDismiss = false;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners / Callbacks                                                   *
+     *                                                                         *
+     **************************************************************************/
+
+    // RT-20411 : reset menu selected/focused state
+    private EventHandler<ActionEvent> menuActionEventHandler = t -> {
+        if (t.getSource() instanceof CustomMenuItem) {
+            // RT-29614 If CustomMenuItem hideOnClick is false, dont hide
+            CustomMenuItem cmi = (CustomMenuItem)t.getSource();
+            if (!cmi.isHideOnClick()) return;
+        }
+        unSelectMenus();
+    };
+
+    private ListChangeListener<MenuItem> menuItemListener = (c) -> {
+        while (c.next()) {
+            for (MenuItem mi : c.getAddedSubList()) {
+                mi.addEventHandler(ActionEvent.ACTION, menuActionEventHandler);
+            }
+            for (MenuItem mi: c.getRemoved()) {
+                mi.removeEventHandler(ActionEvent.ACTION, menuActionEventHandler);
+            }
+        }
+    };
+
+    Runnable firstMenuRunnable = new Runnable() {
+        public void run() {
+            /*
+            ** check that this menubar's container has contents,
+            ** and that the first item is a MenuButton....
+            ** otherwise the transfer is off!
+            */
+            if (container.getChildren().size() > 0) {
+                if (container.getChildren().get(0) instanceof MenuButton) {
+//                        container.getChildren().get(0).requestFocus();
+                    if (focusedMenuIndex != 0) {
+                        unSelectMenus();
+                        menuModeStart(0);
+                        openMenuButton = ((MenuBarButton)container.getChildren().get(0));
+                        openMenu = getSkinnable().getMenus().get(0);
+                        openMenuButton.setHover();
+                    }
+                    else {
+                        unSelectMenus();
+                    }
+                }
+            }
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new MenuBarSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public MenuBarSkin(final MenuBar control) {
+        super(control);
+        
+        container = new HBox();
+        container.getStyleClass().add("container");
+        getChildren().add(container);
+        
+        // Key navigation 
+        keyEventHandler = event -> {
+            // process right left and may be tab key events
+            if (openMenu != null) {
+                switch (event.getCode()) {
+                    case LEFT: {
+                        boolean isRTL = control.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
+                        if (control.getScene().getWindow().isFocused()) {
+                            if (openMenu == null) return;
+                            if ( !openMenu.isShowing()) {
+                                if (isRTL) {
+                                    selectNextMenu(); // just move the selection bar
+                                } else {
+                                    selectPrevMenu(); // just move the selection bar
+                                }
+                                event.consume();
+                                return;
+                            }
+                            if (isRTL) {
+                                showNextMenu();
+                            } else {
+                                showPrevMenu();
+                            }
+                        }
+                        event.consume();
+                        break;
+                    }
+                    case RIGHT:
+                    {
+                        boolean isRTL = control.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
+                        if (control.getScene().getWindow().isFocused()) {
+                            if (openMenu == null) return;
+                            if (! openMenu.isShowing()) {
+                                if (isRTL) {
+                                    selectPrevMenu(); // just move the selection bar
+                                } else {
+                                    selectNextMenu(); // just move the selection bar
+                                }
+                                event.consume();
+                                return;
+                            }
+                            if (isRTL) {
+                                showPrevMenu();
+                            } else {
+                                showNextMenu();
+                            }
+                        }
+                        event.consume();
+                        break;
+                    }
+                    case DOWN:
+                    //case SPACE:
+                    //case ENTER:
+                        // RT-18859: Doing nothing for space and enter
+                        if (control.getScene().getWindow().isFocused()) {
+                            if (focusedMenuIndex != -1 && openMenu != null) {
+                                openMenu = getSkinnable().getMenus().get(focusedMenuIndex);
+                                if (!isMenuEmpty(getSkinnable().getMenus().get(focusedMenuIndex))) {
+                                    openMenu.show();
+                                }
+                                event.consume();
+                            }
+                        }
+                        break;
+                    case ESCAPE:
+                        unSelectMenus();
+                        event.consume();
+                        break;
+                default:
+                    break;
+                }
+            }
+        };
+        menuBarFocusedPropertyListener = (ov, t, t1) -> {
+            if (t1) {
+                // RT-23147 when MenuBar's focusTraversable is true the first
+                // menu will visually indicate focus
+                unSelectMenus();
+                menuModeStart(0);
+                openMenuButton = ((MenuBarButton)container.getChildren().get(0));
+                openMenu = getSkinnable().getMenus().get(0);
+                openMenuButton.setHover();
+            } else {
+                unSelectMenus();
+             }
+         };
+        weakSceneKeyEventHandler = new WeakEventHandler<KeyEvent>(keyEventHandler);
+        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
+            scene.addEventFilter(KeyEvent.KEY_PRESSED, weakSceneKeyEventHandler);
+        });
+        
+        // When we click else where in the scene - menu selection should be cleared.
+        mouseEventHandler = t -> {
+            if (!container.localToScreen(container.getLayoutBounds()).contains(t.getScreenX(), t.getScreenY())) {
+                unSelectMenus();
+            }
+        };
+        weakSceneMouseEventHandler = new WeakEventHandler<MouseEvent>(mouseEventHandler);
+        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
+            scene.addEventFilter(MouseEvent.MOUSE_CLICKED, weakSceneMouseEventHandler);
+        });
+        
+        weakWindowFocusListener = new WeakChangeListener<Boolean>((ov, t, t1) -> {
+            if (!t1) {
+              unSelectMenus();
+            }
+        });
+        // When the parent window looses focus - menu selection should be cleared
+        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
+            if (scene.getWindow() != null) {
+                scene.getWindow().focusedProperty().addListener(weakWindowFocusListener);
+            } else {
+                ChangeListener<Window> sceneWindowListener = (observable, oldValue, newValue) -> {
+                    if (oldValue != null)
+                        oldValue.focusedProperty().removeListener(weakWindowFocusListener);
+                    if (newValue != null)
+                        newValue.focusedProperty().addListener(weakWindowFocusListener);
+                };
+                weakWindowSceneListener = new WeakChangeListener<>(sceneWindowListener);
+                scene.windowProperty().addListener(weakWindowSceneListener);
+            }
+        });
+
+        rebuildUI();
+        control.getMenus().addListener((ListChangeListener<Menu>) c -> {
+            rebuildUI();
+        });
+        for (final Menu menu : getSkinnable().getMenus()) {
+            menu.visibleProperty().addListener((ov, t, t1) -> {
+                rebuildUI();
+            });
+        }
+
+        if (Toolkit.getToolkit().getSystemMenu().isSupported()) {
+            control.useSystemMenuBarProperty().addListener(valueModel -> {
+                rebuildUI();
+            });
+        }
+
+        // When the mouse leaves the menu, the last hovered item should lose
+        // it's focus so that it is no longer selected. This code returns focus
+        // to the MenuBar itself, such that keyboard navigation can continue.
+          // fix RT-12254 : menu bar should not request focus on mouse exit.
+//        addEventFilter(MouseEvent.MOUSE_EXITED, new EventHandler<MouseEvent>() {
+//            @Override
+//            public void handle(MouseEvent event) {
+//                requestFocus();
+//            }
+//        });
+
+        /*
+        ** add an accelerator for F10 on windows and ctrl+F10 on mac/linux
+        ** pressing f10 will select the first menu button on a menubar
+        */
+        final KeyCombination acceleratorKeyCombo;
+        if (com.sun.javafx.util.Utils.isMac()) {
+           acceleratorKeyCombo = KeyCombination.keyCombination("ctrl+F10");
+        } else {
+           acceleratorKeyCombo = KeyCombination.keyCombination("F10");
+        }
+        Utils.executeOnceWhenPropertyIsNonNull(control.sceneProperty(), (Scene scene) -> {
+            scene.getAccelerators().put(acceleratorKeyCombo, firstMenuRunnable);
+
+            // put focus on the first menu when the alt key is pressed
+            scene.addEventHandler(KeyEvent.KEY_PRESSED, e -> {
+                if (e.isAltDown() && !e.isConsumed()) {
+                    firstMenuRunnable.run();
+                }
+            });
+        });
+
+        ParentTraversalEngine engine = new ParentTraversalEngine(getSkinnable());
+        engine.addTraverseListener((node, bounds) -> {
+            if (openMenu != null) openMenu.hide();
+            focusedMenuIndex = 0;
+        });
+        getSkinnable().setImpl_traversalEngine(engine);
+
+        control.sceneProperty().addListener((ov, t, t1) -> {
+            if (weakSceneKeyEventHandler != null) {
+                // remove event filter from the old scene (t)
+                if (t != null)
+                    t.removeEventFilter(KeyEvent.KEY_PRESSED, weakSceneKeyEventHandler);
+            }
+            if (weakSceneMouseEventHandler != null) {
+                // remove event filter from the old scene (t)
+                if (t != null)
+                    t.removeEventFilter(MouseEvent.MOUSE_CLICKED, weakSceneMouseEventHandler);
+            }
+
+            /**
+             * remove the f10 accelerator from the old scene
+             * add it to the new scene
+             */
+            if (t != null) {
+                t.getAccelerators().remove(acceleratorKeyCombo);
+            }
+            if (t1 != null ) {
+                t1.getAccelerators().put(acceleratorKeyCombo, firstMenuRunnable);
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Static methods                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    // RT-22480: This is intended as private API for SceneBuilder,
+    // pending fix for RT-19857: Keeping menu in the Mac menu bar when
+    // there is no more stage
+    public static void setDefaultSystemMenuBar(final MenuBar menuBar) {
+        if (Toolkit.getToolkit().getSystemMenu().isSupported()) {
+            wrappedDefaultMenus.clear();
+            for (Menu menu : menuBar.getMenus()) {
+                wrappedDefaultMenus.add(GlobalMenuAdapter.adapt(menu));
+            }
+            menuBar.getMenus().addListener((ListChangeListener<Menu>) c -> {
+                wrappedDefaultMenus.clear();
+                for (Menu menu : menuBar.getMenus()) {
+                    wrappedDefaultMenus.add(GlobalMenuAdapter.adapt(menu));
+                }
+            });
+        }
+    }
+
+    private static MenuBarSkin getMenuBarSkin(Stage stage) {
+        if (systemMenuMap == null) return null;
+        Reference<MenuBarSkin> skinRef = systemMenuMap.get(stage);
+        return skinRef == null ? null : skinRef.get();
+    }
+
+    private static void setSystemMenu(Stage stage) {
+        if (stage != null && stage.isFocused()) {
+            while (stage != null && stage.getOwner() instanceof Stage) {
+                MenuBarSkin skin = getMenuBarSkin(stage);
+                if (skin != null && skin.wrappedMenus != null) {
+                    break;
+                } else {
+                    // This is a secondary stage (dialog) that doesn't
+                    // have own menu bar.
+                    //
+                    // Continue looking for a menu bar in the parent stage.
+                    stage = (Stage)stage.getOwner();
+                }
+            }
+        } else {
+            stage = null;
+        }
+
+        if (stage != currentMenuBarStage) {
+            List<MenuBase> menuList = null;
+            if (stage != null) {
+                MenuBarSkin skin = getMenuBarSkin(stage);
+                if (skin != null) {
+                    menuList = skin.wrappedMenus;
+                }
+            }
+            if (menuList == null) {
+                menuList = wrappedDefaultMenus;
+            }
+            Toolkit.getToolkit().getSystemMenu().setMenus(menuList);
+            currentMenuBarStage = stage;
+        }
+    }
+
+    private static void initSystemMenuBar() {
+        systemMenuMap = new WeakHashMap<>();
+
+        final InvalidationListener focusedStageListener = ov -> {
+            setSystemMenu((Stage)((ReadOnlyProperty<?>)ov).getBean());
+        };
+
+        final ObservableList<Stage> stages = StageHelper.getStages();
+        for (Stage stage : stages) {
+            stage.focusedProperty().addListener(focusedStageListener);
+        }
+        stages.addListener((ListChangeListener<Stage>) c -> {
+            while (c.next()) {
+                for (Stage stage : c.getRemoved()) {
+                    stage.focusedProperty().removeListener(focusedStageListener);
+                }
+                for (Stage stage : c.getAddedSubList()) {
+                    stage.focusedProperty().addListener(focusedStageListener);
+                    setSystemMenu(stage);
+                }
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Specifies the spacing between menu buttons on the MenuBar.
+     */
+    // --- spacing
+    private DoubleProperty spacing;
+    public final void setSpacing(double value) {
+        spacingProperty().set(snapSpace(value));
+    }
+
+    public final double getSpacing() {
+        return spacing == null ? 0.0 : snapSpace(spacing.get());
+    }
+
+    public final DoubleProperty spacingProperty() {
+        if (spacing == null) {
+            spacing = new StyleableDoubleProperty() {
+
+                @Override
+                protected void invalidated() {
+                    final double value = get();
+                    container.setSpacing(value);
+                }
+
+                @Override
+                public Object getBean() {
+                    return MenuBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "spacing";
+                }
+
+                @Override
+                public CssMetaData<MenuBar,Number> getCssMetaData() {
+                    return SPACING;
+                }
+            };
+        }
+        return spacing;
+    }
+
+    /**
+     * Specifies the alignment of the menu buttons inside the MenuBar (by default
+     * it is Pos.TOP_LEFT).
+     */
+    // --- container alignment
+    private ObjectProperty<Pos> containerAlignment;
+    public final void setContainerAlignment(Pos value) {
+        containerAlignmentProperty().set(value);
+    }
+
+    public final Pos getContainerAlignment() {
+        return containerAlignment == null ? Pos.TOP_LEFT : containerAlignment.get();
+    }
+
+    public final ObjectProperty<Pos> containerAlignmentProperty() {
+        if (containerAlignment == null) {
+            containerAlignment = new StyleableObjectProperty<Pos>(Pos.TOP_LEFT) {
+
+                @Override
+                public void invalidated() {
+                    final Pos value = get();
+                    container.setAlignment(value);
+                }
+
+                @Override
+                public Object getBean() {
+                    return MenuBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "containerAlignment";
+                }
+
+                @Override
+                public CssMetaData<MenuBar,Pos> getCssMetaData() {
+                    return ALIGNMENT;
+                }
+            };
+        }
+        return containerAlignment;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        cleanUpSystemMenu();
+        // call super.dispose last since it sets control to null
+        super.dispose();
+    }
+
+    // Return empty insets when "container" is empty, which happens
+    // when using the system menu bar.
+
+    /** {@inheritDoc} */
+    @Override protected double snappedTopInset() {
+        return container.getChildren().isEmpty() ? 0 : super.snappedTopInset();
+    }
+    /** {@inheritDoc} */
+    @Override protected double snappedBottomInset() {
+        return container.getChildren().isEmpty() ? 0 : super.snappedBottomInset();
+    }
+    /** {@inheritDoc} */
+    @Override protected double snappedLeftInset() {
+        return container.getChildren().isEmpty() ? 0 : super.snappedLeftInset();
+    }
+    /** {@inheritDoc} */
+    @Override protected double snappedRightInset() {
+        return container.getChildren().isEmpty() ? 0 : super.snappedRightInset();
+    }
+
+    /**
+     * Layout the menu bar. This is a simple horizontal layout like an hbox.
+     * Any menu items which don't fit into it will simply be made invisible.
+     */
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        // layout the menus one after another
+        container.resizeRelocate(x, y, w, h);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return container.minWidth(height) + snappedLeftInset() + snappedRightInset();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return container.prefWidth(height) + snappedLeftInset() + snappedRightInset();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return container.minHeight(width) + snappedTopInset() + snappedBottomInset();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return container.prefHeight(width) + snappedTopInset() + snappedBottomInset();
+    }
+
+    // grow horizontally, but not vertically
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(-1);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    // For testing purpose only. 
+    MenuButton getNodeForMenu(int i) {
+        if (i < container.getChildren().size()) {
+            return (MenuBarButton)container.getChildren().get(i);
+        }
+        return null;
+    }
+    
+    int getFocusedMenuIndex() {
+        return focusedMenuIndex;
+    }
+    
+    private boolean menusContainCustomMenuItem() {
+        for (Menu menu : getSkinnable().getMenus()) {
+            if (menuContainsCustomMenuItem(menu)) {
+                System.err.println("Warning: MenuBar ignored property useSystemMenuBar because menus contain CustomMenuItem");
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean menuContainsCustomMenuItem(Menu menu) {
+        for (MenuItem mi : menu.getItems()) {
+            if (mi instanceof CustomMenuItem && !(mi instanceof SeparatorMenuItem)) {
+                return true;
+            } else if (mi instanceof Menu) {
+                if (menuContainsCustomMenuItem((Menu)mi)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private int getMenuBarButtonIndex(MenuBarButton m) {
+        for (int i= 0; i < container.getChildren().size(); i++) {
+            MenuBarButton menuButton = (MenuBarButton)container.getChildren().get(i);
+            if (m == menuButton) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    
+    private void updateActionListeners(Menu m, boolean add) {
+        if (add) {
+            m.getItems().addListener(menuItemListener);
+        } else {
+            m.getItems().removeListener(menuItemListener);
+        }
+        for (MenuItem mi : m.getItems()) {
+            if (mi instanceof Menu) {
+                updateActionListeners((Menu)mi, add);
+            } else {
+                if (add) {
+                    mi.addEventHandler(ActionEvent.ACTION, menuActionEventHandler);
+                } else {
+                    mi.removeEventHandler(ActionEvent.ACTION, menuActionEventHandler);
+                }
+            }
+        }
+    }
+    
+    private void rebuildUI() {
+        getSkinnable().focusedProperty().removeListener(menuBarFocusedPropertyListener);
+        for (Menu m : getSkinnable().getMenus()) {
+            // remove action listeners 
+            updateActionListeners(m, false);
+        }
+        for (Node n : container.getChildren()) {
+            // Stop observing menu's showing & disable property for changes.
+            // Need to unbind before clearing container's children.
+            MenuBarButton menuButton = (MenuBarButton)n;
+            menuButton.hide();
+            menuButton.menu.showingProperty().removeListener(menuButton.menuListener);
+            menuButton.disableProperty().unbind();
+            menuButton.textProperty().unbind();
+            menuButton.graphicProperty().unbind();
+            menuButton.styleProperty().unbind();
+
+            menuButton.dispose();
+
+            // RT-29729 : old instance of context menu window/popup for this MenuButton needs 
+            // to be cleaned up. Setting the skin to null - results in a call to dispose() 
+            // on the skin which in this case MenuButtonSkinBase - does the subsequent 
+            // clean up to ContextMenu/popup window.
+            menuButton.setSkin(null);
+            menuButton = null;
+        }
+        container.getChildren().clear();
+
+        if (Toolkit.getToolkit().getSystemMenu().isSupported()) {
+
+            final Scene scene = getSkinnable().getScene();
+            if (scene != null) {
+                // RT-36554 - make sure system menu is updated when this MenuBar's scene changes.
+                if (sceneChangeListener == null) {
+                    sceneChangeListener = (observable, oldValue, newValue) -> {
+
+                        if (oldValue != null) {
+                            if (oldValue.getWindow() instanceof Stage) {
+                                final Stage stage = (Stage) oldValue.getWindow();
+                                final MenuBarSkin curMBSkin = getMenuBarSkin(stage);
+                                if (curMBSkin == MenuBarSkin.this) {
+                                    curMBSkin.wrappedMenus = null;
+                                    systemMenuMap.remove(stage);
+                                    if (currentMenuBarStage == stage) {
+                                        currentMenuBarStage = null;
+                                        setSystemMenu(stage);
+                                    }
+                                } else {
+                                    if (curMBSkin != null && curMBSkin.getSkinnable() != null &&
+                                            curMBSkin.getSkinnable().isUseSystemMenuBar()) {
+                                        curMBSkin.getSkinnable().setUseSystemMenuBar(false);
+                                    }
+                                }
+                            }
+                        }
+
+                        if (newValue != null) {
+                            if (getSkinnable().isUseSystemMenuBar() && !menusContainCustomMenuItem()) {
+                                if (newValue.getWindow() instanceof Stage) {
+                                    final Stage stage = (Stage) newValue.getWindow();
+                                    if (systemMenuMap == null) {
+                                        initSystemMenuBar();
+                                    }
+                                    wrappedMenus = new ArrayList<>();
+                                    systemMenuMap.put(stage, new WeakReference<>(this));
+                                    for (Menu menu : getSkinnable().getMenus()) {
+                                        wrappedMenus.add(GlobalMenuAdapter.adapt(menu));
+                                    }
+                                    currentMenuBarStage = null;
+                                    setSystemMenu(stage);
+
+                                    // TODO: Why two request layout calls here?
+                                    getSkinnable().requestLayout();
+                                    javafx.application.Platform.runLater(() -> getSkinnable().requestLayout());
+                                }
+                            }
+                        }
+                    };
+                    getSkinnable().sceneProperty().addListener(sceneChangeListener);
+                }
+
+                // Fake a change event to trigger an update to the system menu.
+                sceneChangeListener.changed(getSkinnable().sceneProperty(), scene, scene);
+
+                // If the system menu references this MenuBarSkin, then we're done with rebuilding the UI.
+                // If the system menu does not reference this MenuBarSkin, then the MenuBar is a child of the scene
+                // and we continue with the update.
+                // If there is no system menu but this skinnable uses the system menu bar, then the
+                // stage just isn't focused yet (see setSystemMenu) and we're done rebuilding the UI.
+                if (currentMenuBarStage != null ? getMenuBarSkin(currentMenuBarStage) == MenuBarSkin.this : getSkinnable().isUseSystemMenuBar()) {
+                    return;
+                }
+
+            } else {
+                // if scene is null, make sure this MenuBarSkin isn't left behind as the system menu
+                if (currentMenuBarStage != null) {
+                    final MenuBarSkin curMBSkin = getMenuBarSkin(currentMenuBarStage);
+                    if (curMBSkin == MenuBarSkin.this) {
+                        setSystemMenu(null);
+                    }
+                }
+            }
+        }
+
+        getSkinnable().focusedProperty().addListener(menuBarFocusedPropertyListener);
+        for (final Menu menu : getSkinnable().getMenus()) {
+            if (!menu.isVisible()) continue;
+            final MenuBarButton menuButton = new MenuBarButton(this, menu);
+            menuButton.setFocusTraversable(false);
+            menuButton.getStyleClass().add("menu");
+            menuButton.setStyle(menu.getStyle()); // copy style
+
+            menuButton.getItems().setAll(menu.getItems());
+            container.getChildren().add(menuButton);
+
+            menuButton.menuListener = (observable, oldValue, newValue) -> {
+                if (menu.isShowing()) {
+                    menuButton.show();
+                    menuModeStart(container.getChildren().indexOf(menuButton));
+                } else {
+                    menuButton.hide();
+                }
+            };
+            menuButton.menu = menu;
+            menu.showingProperty().addListener(menuButton.menuListener);
+            menuButton.disableProperty().bindBidirectional(menu.disableProperty());
+            menuButton.textProperty().bind(menu.textProperty());
+            menuButton.graphicProperty().bind(menu.graphicProperty());
+            menuButton.styleProperty().bind(menu.styleProperty());
+            menuButton.getProperties().addListener((MapChangeListener<Object, Object>) c -> {
+                 if (c.wasAdded() && MenuButtonSkin.AUTOHIDE.equals(c.getKey())) {
+                    menuButton.getProperties().remove(MenuButtonSkin.AUTOHIDE);
+                    menu.hide();
+                }
+            });
+            menuButton.showingProperty().addListener((observable, oldValue, isShowing) -> {
+                if (isShowing) {
+                    if (openMenuButton != null && openMenuButton != menuButton) {
+                        openMenuButton.hide();
+                    }
+                    openMenuButton = menuButton;
+                    openMenu = menu;
+                    if (!menu.isShowing())menu.show();
+                }
+            });
+
+            menuButton.setOnMousePressed(event -> {
+                pendingDismiss = menuButton.isShowing();
+
+                // check if the owner window has focus
+                if (menuButton.getScene().getWindow().isFocused()) {
+                    openMenu = menu;
+                    if (!isMenuEmpty(menu)){
+                        openMenu.show();
+                    }
+                    // update FocusedIndex
+                    menuModeStart(getMenuBarButtonIndex(menuButton));
+                }
+            });
+            
+            menuButton.setOnMouseReleased(event -> {
+                // check if the owner window has focus
+                if (menuButton.getScene().getWindow().isFocused()) {
+                    if (pendingDismiss) {
+                        resetOpenMenu();
+//                            menuButton.hide();
+                    }
+                }
+                pendingDismiss = false;
+            });
+
+//            menuButton. setOnKeyPressed(new EventHandler<javafx.scene.input.KeyEvent>() {
+//                @Override public void handle(javafx.scene.input.KeyEvent ke) {
+//                    switch (ke.getCode()) {
+//                        case LEFT:
+//                            if (menuButton.getScene().getWindow().isFocused()) {
+//                                Menu prevMenu = findPreviousSibling();
+//                                if (openMenu == null || ! openMenu.isShowing()) {
+//                                    return;
+//                                }
+////                                if (focusedMenuIndex == container.getChildren().size() - 1) {
+////                                   ((MenuBarButton)container.getChildren().get(focusedMenuIndex)).requestFocus();
+////                                }
+//                                 // hide the currently visible menu, and move to the previous one
+//                                openMenu.hide();
+//                                if (!isMenuEmpty(prevMenu)) {
+//                                    openMenu = prevMenu;
+//                                    openMenu.show();
+//                                } else {
+//                                    openMenu = null;
+//                                }
+//                            }
+//                            ke.consume();
+//                            break;
+//                        case RIGHT:
+//                            if (menuButton.getScene().getWindow().isFocused()) {
+//                                Menu nextMenu = findNextSibling();
+//                                if (openMenu == null || ! openMenu.isShowing()) {
+//                                    return;
+//                                }
+////                                if (focusedMenuIndex == 0) {
+////                                    ((MenuBarButton)container.getChildren().get(focusedMenuIndex)).requestFocus();
+////                                }
+//                                 // hide the currently visible menu, and move to the next one
+//                                openMenu.hide();
+//                                if (!isMenuEmpty(nextMenu)) {
+//                                    openMenu = nextMenu;
+//                                    openMenu.show();
+//                                } else {
+//                                    openMenu = null;
+//                                }
+//                            }
+//                            ke.consume();
+//                            break;
+//
+//                        case DOWN:
+//                        case SPACE:
+//                        case ENTER:
+//                            if (menuButton.getScene().getWindow().isFocused()) {
+//                                if (focusedMenuIndex != -1) {
+//                                    if (!isMenuEmpty(getSkinnable().getMenus().get(focusedMenuIndex))) {
+//                                        openMenu = getSkinnable().getMenus().get(focusedMenuIndex);
+//                                        openMenu.show();
+//                                    } else {
+//                                        openMenu = null;
+//                                    }
+//                                    ke.consume();
+//                                }
+//                            }
+//                            break;
+//                    }
+//                }
+//            });
+            menuButton.setOnMouseEntered(event -> {
+                // check if the owner window has focus
+                if (menuButton.getScene() != null && menuButton.getScene().getWindow() != null &&
+                        menuButton.getScene().getWindow().isFocused()) {
+                    if (openMenuButton != null && openMenuButton != menuButton) {
+                            openMenuButton.clearHover();
+                            openMenuButton = null;
+                            openMenuButton = menuButton;
+                    }
+                    updateFocusedIndex();
+                    if (openMenu != null && openMenu != menu) {
+                     // hide the currently visible menu, and move to the new one
+                        openMenu.hide();
+                        openMenu = menu;
+                        updateFocusedIndex();
+                        if (!isMenuEmpty(menu)) {
+                            openMenu.show();
+                        }
+                    }
+                }
+            });
+            updateActionListeners(menu, true);
+        }
+        getSkinnable().requestLayout();
+    }
+
+    private void cleanUpSystemMenu() {
+        if (sceneChangeListener != null && getSkinnable() != null) {
+            getSkinnable().sceneProperty().removeListener(sceneChangeListener);
+            // rebuildUI creates sceneChangeListener and adds sceneChangeListener to sceneProperty,
+            // so sceneChangeListener needs to be reset to null in the off chance that this
+            // skin instance is reused.
+            sceneChangeListener = null;
+        }
+
+        if (currentMenuBarStage != null && getMenuBarSkin(currentMenuBarStage) == MenuBarSkin.this) {
+            setSystemMenu(null);
+        }
+
+        if (systemMenuMap != null) {
+            Iterator<Map.Entry<Stage,Reference<MenuBarSkin>>> iterator = systemMenuMap.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<Stage,Reference<MenuBarSkin>> entry = iterator.next();
+                Reference<MenuBarSkin> ref = entry.getValue();
+                MenuBarSkin skin = ref != null ? ref.get() : null;
+                if (skin == null || skin == MenuBarSkin.this) {
+                    iterator.remove();
+                }
+            }
+        }
+    }
+
+    private boolean isMenuEmpty(Menu menu) {
+        boolean retVal = true;
+        if (menu != null) {
+            for (MenuItem m : menu.getItems()) {
+                if (m != null && m.isVisible()) retVal = false;
+            }
+        }
+        return retVal;
+    }
+
+    private void resetOpenMenu() {
+        if (openMenu != null) {
+            openMenu.hide();
+            openMenu = null;
+            openMenuButton = (MenuBarButton)container.getChildren().get(focusedMenuIndex);
+            openMenuButton.clearHover();
+            openMenuButton = null;
+            menuModeEnd();
+        }
+    }
+    
+    private void unSelectMenus() {
+        clearMenuButtonHover();
+        if (focusedMenuIndex == -1) return;
+        if (openMenu != null) {
+            openMenu.hide();
+            openMenu = null;
+        }
+        if (openMenuButton != null) {
+            openMenuButton.clearHover();
+            openMenuButton = null;
+        }
+        menuModeEnd();
+    }
+
+    private void menuModeStart(int newIndex) {
+        if (focusedMenuIndex == -1) {
+            SceneHelper.getSceneAccessor().setTransientFocusContainer(getSkinnable().getScene(), getSkinnable());
+        }
+        focusedMenuIndex = newIndex;
+    }
+
+    private void menuModeEnd() {
+        if (focusedMenuIndex != -1) {
+            SceneHelper.getSceneAccessor().setTransientFocusContainer(getSkinnable().getScene(), null);
+
+            /* Return the a11y focus to a control in the scene. */
+            getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_NODE);
+        }
+        focusedMenuIndex = -1;
+    }
+    
+    private void selectNextMenu() {
+        Menu nextMenu = findNextSibling();
+        if (nextMenu != null && focusedMenuIndex != -1) {
+            openMenuButton = (MenuBarButton)container.getChildren().get(focusedMenuIndex);
+            openMenuButton.setHover();
+            openMenu = nextMenu;
+        }
+    }
+    
+    private void selectPrevMenu() {
+        Menu prevMenu = findPreviousSibling();
+        if (prevMenu != null && focusedMenuIndex != -1) {
+            openMenuButton = (MenuBarButton)container.getChildren().get(focusedMenuIndex);
+            openMenuButton.setHover();
+            openMenu = prevMenu;
+        }
+    }
+    
+    private void showNextMenu() {
+        Menu nextMenu = findNextSibling();
+        // hide the currently visible menu, and move to the next one
+        if (openMenu != null) openMenu.hide();
+        openMenu = nextMenu;
+        if (!isMenuEmpty(nextMenu)) {
+            openMenu.show();
+        } 
+    }
+
+    private void showPrevMenu() {
+        Menu prevMenu = findPreviousSibling();
+        // hide the currently visible menu, and move to the next one
+        if (openMenu != null) openMenu.hide();
+        openMenu = prevMenu;
+        if (!isMenuEmpty(prevMenu)) {
+            openMenu.show();
+        } 
+    }
+    
+    private Menu findPreviousSibling() {
+        if (focusedMenuIndex == -1) return null;
+        if (focusedMenuIndex == 0) {
+            focusedMenuIndex = container.getChildren().size() - 1;
+        } else {
+            focusedMenuIndex--;
+        }
+        // RT-19359
+        if (getSkinnable().getMenus().get(focusedMenuIndex).isDisable()) return findPreviousSibling();
+        clearMenuButtonHover();
+        return getSkinnable().getMenus().get(focusedMenuIndex);
+    }
+
+    private Menu findNextSibling() {
+        if (focusedMenuIndex == -1) return null;
+        if (focusedMenuIndex == container.getChildren().size() - 1) {
+            focusedMenuIndex = 0;
+        } else {
+            focusedMenuIndex++;
+        }
+        // RT_19359
+        if (getSkinnable().getMenus().get(focusedMenuIndex).isDisable()) return findNextSibling();
+        clearMenuButtonHover();
+        return getSkinnable().getMenus().get(focusedMenuIndex);
+    }
+
+    private void updateFocusedIndex() {
+        int index = 0;
+        for(Node n : container.getChildren()) {
+            if (n.isHover()) {
+                focusedMenuIndex = index;
+                return;
+            }
+            index++;
+        }
+        menuModeEnd();
+    }
+
+    private void clearMenuButtonHover() {
+         for(Node n : container.getChildren()) {
+            if (n.isHover()) {
+                ((MenuBarButton)n).clearHover();
+                return;
+            }
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * CSS                                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final CssMetaData<MenuBar,Number> SPACING =
+            new CssMetaData<MenuBar,Number>("-fx-spacing",
+                    SizeConverter.getInstance(), 0.0) {
+
+                @Override
+                public boolean isSettable(MenuBar n) {
+                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
+                    return skin.spacing == null || !skin.spacing.isBound();
+                }
+
+                @Override
+                public StyleableProperty<Number> getStyleableProperty(MenuBar n) {
+                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
+                    return (StyleableProperty<Number>)(WritableValue<Number>)skin.spacingProperty();
+                }
+            };
+
+    private static final CssMetaData<MenuBar,Pos> ALIGNMENT =
+            new CssMetaData<MenuBar,Pos>("-fx-alignment",
+                    new EnumConverter<Pos>(Pos.class), Pos.TOP_LEFT ) {
+
+                @Override
+                public boolean isSettable(MenuBar n) {
+                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
+                    return skin.containerAlignment == null || !skin.containerAlignment.isBound();
+                }
+
+                @Override
+                public StyleableProperty<Pos> getStyleableProperty(MenuBar n) {
+                    final MenuBarSkin skin = (MenuBarSkin) n.getSkin();
+                    return (StyleableProperty<Pos>)(WritableValue<Pos>)skin.containerAlignmentProperty();
+                }
+            };
+
+
+    private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+    static {
+
+        final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+
+        // StackPane also has -fx-alignment. Replace it with 
+        // MenuBarSkin's. 
+        // TODO: Really should be able to reference StackPane.StyleableProperties.ALIGNMENT
+        final String alignmentProperty = ALIGNMENT.getProperty();
+        for (int n=0, nMax=styleables.size(); n<nMax; n++) {
+            final CssMetaData<?,?> prop = styleables.get(n);
+            if (alignmentProperty.equals(prop.getProperty())) styleables.remove(prop);
+        }
+
+        styleables.add(SPACING);
+        styleables.add(ALIGNMENT);
+        STYLEABLES = Collections.unmodifiableList(styleables);
+
+    }
+
+    /**
+     * Returns the CssMetaData associated with this class, which may include the
+     * CssMetaData of its super classes.
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return STYLEABLES;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     * Accessibility handling                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_NODE: return openMenuButton;
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuButtonSkin.java	2015-09-03 15:20:17.028604600 -0700
+++ /dev/null	2015-09-03 15:20:18.000000000 -0700
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2010, 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.event.Event;
-import javafx.event.EventHandler;
-import javafx.scene.control.MenuButton;
-
-import com.sun.javafx.scene.control.behavior.MenuButtonBehavior;
-
-/**
- * Skin for MenuButton Control.
- */
-public class MenuButtonSkin extends MenuButtonSkinBase<MenuButton, MenuButtonBehavior> {
-
-    static final String AUTOHIDE = "autoHide";
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Creates a new MenuButtonSkin for the given MenuButton
-     * 
-     * @param menuButton the MenuButton
-     */
-    public MenuButtonSkin(final MenuButton menuButton) {
-        super(menuButton, new MenuButtonBehavior(menuButton));
-        // MenuButton's showing does not get updated when autoHide happens,
-        // as that hide happens under the covers. So we add to the menuButton's
-        // properties map to which the MenuButton can react and update accordingly..
-        popup.setOnAutoHide(new EventHandler<Event>() {
-            @Override public void handle(Event t) {
-                MenuButton menuButton = (MenuButton)getSkinnable();
-                // work around for the fact autohide happens twice
-                // remove this check when that is fixed.
-                if (!menuButton.getProperties().containsKey(AUTOHIDE)) {
-                    menuButton.getProperties().put(AUTOHIDE, Boolean.TRUE);
-                }
-                }
-        });
-        // request focus on content when the popup is shown
-        popup.setOnShown(event -> {
-            ContextMenuContent cmContent = (ContextMenuContent)popup.getSkin().getNode();
-            if (cmContent != null) cmContent.requestFocus();
-        });
-
-        if (menuButton.getOnAction() == null) {
-            menuButton.setOnAction(e -> {
-                menuButton.show();
-            });
-        }
-
-        label.setLabelFor(menuButton);
-    }
-}
--- /dev/null	2015-09-03 15:20:18.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/MenuButtonSkin.java	2015-09-03 15:20:16.313563700 -0700
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.javafx.scene.control.ContextMenuContent;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.MenuButton;
+
+import com.sun.javafx.scene.control.behavior.MenuButtonBehavior;
+
+/**
+ * Default skin implementation for the {@link MenuButton} control.
+ *
+ * @see MenuButton
+ * @since 9
+ */
+public class MenuButtonSkin extends MenuButtonSkinBase<MenuButton> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    static final String AUTOHIDE = "autoHide";
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final MenuButtonBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new MenuButtonSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public MenuButtonSkin(final MenuButton control) {
+        super(control);
+
+        // install default input map for the MenuButton-like controls
+        this.behavior = new MenuButtonBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        // MenuButton's showing does not get updated when autoHide happens,
+        // as that hide happens under the covers. So we add to the menuButton's
+        // properties map to which the MenuButton can react and update accordingly..
+        popup.setOnAutoHide(e -> {
+            MenuButton menuButton = getSkinnable();
+            // work around for the fact autohide happens twice
+            // remove this check when that is fixed.
+            if (!menuButton.getProperties().containsKey(AUTOHIDE)) {
+                menuButton.getProperties().put(AUTOHIDE, Boolean.TRUE);
+            }
+        });
+
+        // request focus on content when the popup is shown
+        popup.setOnShown(event -> {
+            ContextMenuContent cmContent = (ContextMenuContent)popup.getSkin().getNode();
+            if (cmContent != null) cmContent.requestFocus();
+        });
+
+        if (control.getOnAction() == null) {
+            control.setOnAction(e -> control.show());
+        }
+
+        label.setLabelFor(control);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    @Override MenuButtonBehavior getBehavior() {
+        return behavior;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/MenuButtonSkinBase.java	2015-09-03 15:20:25.073064800 -0700
+++ /dev/null	2015-09-03 15:20:26.000000000 -0700
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 2010, 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 com.sun.javafx.scene.control.ControlAcceleratorSupport;
-import javafx.collections.ListChangeListener;
-import javafx.event.ActionEvent;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.MenuItem;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import com.sun.javafx.scene.control.behavior.MenuButtonBehaviorBase;
-
-/**
- * Base class for MenuButtonSkin and SplitMenuButtonSkin. It consists of the
- * label, the arrowButton with its arrow shape, and the popup.
- */
-public abstract class MenuButtonSkinBase<C extends MenuButton, B extends MenuButtonBehaviorBase<C>> extends BehaviorSkinBase<C, B> {
-
-    /***************************************************************************
-     *                                                                         *
-     * UI Subcomponents                                                        *
-     *                                                                         *
-     **************************************************************************/
-
-    protected final LabeledImpl label;
-    protected final StackPane arrow;
-    protected final StackPane arrowButton;
-    protected ContextMenu popup;
-
-    /**
-     * If true, the control should behave like a button for mouse button events.
-     */
-    protected boolean behaveLikeButton = false;
-    private ListChangeListener<MenuItem> itemsChangedListener;
-
-
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public MenuButtonSkinBase(final C control, final B behavior) {
-        super(control, behavior);
-
-        if (control.getOnMousePressed() == null) {
-            control.addEventHandler(MouseEvent.MOUSE_PRESSED, e -> {
-                getBehavior().mousePressed(e, behaveLikeButton);
-            });
-        }
-
-        if (control.getOnMouseReleased() == null) {
-            control.addEventHandler(MouseEvent.MOUSE_RELEASED, e -> {
-                getBehavior().mouseReleased(e, behaveLikeButton);
-            });
-        }
-
-        /*
-         * Create the objects we will be displaying.
-         */
-        label = new MenuLabeledImpl(getSkinnable());
-        label.setMnemonicParsing(control.isMnemonicParsing());
-        label.setLabelFor(control);
-
-        arrow = new StackPane();
-        arrow.getStyleClass().setAll("arrow");
-        arrow.setMaxWidth(Region.USE_PREF_SIZE);
-        arrow.setMaxHeight(Region.USE_PREF_SIZE);
-
-        arrowButton = new StackPane();
-        arrowButton.getStyleClass().setAll("arrow-button");
-        arrowButton.getChildren().add(arrow);
-
-        popup = new ContextMenu();
-        popup.getItems().clear();
-        popup.getItems().addAll(getSkinnable().getItems());
-
-        getChildren().clear();
-        getChildren().addAll(label, arrowButton);
-
-        getSkinnable().requestLayout();
-        
-        itemsChangedListener = c -> {
-            while (c.next()) {
-                popup.getItems().removeAll(c.getRemoved());
-                popup.getItems().addAll(c.getFrom(), c.getAddedSubList());
-            }
-        };
-        control.getItems().addListener(itemsChangedListener);
-        
-        if (getSkinnable().getScene() != null) {
-            ControlAcceleratorSupport.addAcceleratorsIntoScene(getSkinnable().getItems(), getSkinnable());
-        }
-        control.sceneProperty().addListener((scene, oldValue, newValue) -> {
-            if (getSkinnable() != null && getSkinnable().getScene() != null) {
-                ControlAcceleratorSupport.addAcceleratorsIntoScene(getSkinnable().getItems(), getSkinnable());
-            }
-        });
-
-//        If setOnAction() is overridden the code below causes the popup to show and hide.
-//        control.addEventHandler(ActionEvent.ACTION, new EventHandler<ActionEvent>() {
-//                @Override public void handle(ActionEvent e) {
-//                    if (!popup.isVisible()) {
-//                        show();
-//                    }
-//                    else {
-//                        hide();
-//                    }
-//
-//                }
-//            });
-
-        // Register listeners
-        registerChangeListener(control.showingProperty(), "SHOWING");
-        registerChangeListener(control.focusedProperty(), "FOCUSED");
-        registerChangeListener(control.mnemonicParsingProperty(), "MNEMONIC_PARSING");
-        registerChangeListener(popup.showingProperty(), "POPUP_VISIBLE");
-    }
-
-     /** {@inheritDoc} */
-    @Override public void dispose() { 
-        getSkinnable().getItems().removeListener(itemsChangedListener);
-        super.dispose();
-        if (popup != null ) {
-            if (popup.getSkin() != null && popup.getSkin().getNode() != null) {
-                ContextMenuContent cmContent = (ContextMenuContent)popup.getSkin().getNode();
-                cmContent.dispose();
-                cmContent = null;
-            }
-            popup.setSkin(null);
-            popup = null;
-        }
-    }
-    /***************************************************************************
-     *                                                                         *
-     * Control change handlers                                                 *
-     *                                                                         *
-     **************************************************************************/
-
-    private void show() {
-        if (!popup.isShowing()) {
-            popup.show(getSkinnable(), getSkinnable().getPopupSide(), 0, 0);
-            
-//            if (getSkinnable().isOpenVertically()) {
-//                // FIXME ugly hack - need to work out why we need '12' for
-//                // MenuButton/SplitMenuButton, but not for Menus
-//                double indent = getSkinnable().getStyleClass().contains("menu") ? 0 : 12;
-//                popup.show(getSkinnable(), Side.BOTTOM, indent, 0);
-//            } else {
-//                popup.show(getSkinnable(), Side.RIGHT, 0, 12);
-//            }
-        }
-    }
-
-    private void hide() {
-        if (popup.isShowing()) {
-            popup.hide();
-//            popup.getAnchor().requestFocus();
-        }
-    }
-
-    /**
-     * Handles changes to properties of the MenuButton.
-     */
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("SHOWING".equals(p)) {
-            if (getSkinnable().isShowing()) {
-                show();
-            } else {
-                hide();
-            }
-        } else if ("FOCUSED".equals(p)) {
-           // Handle tabbing away from an open MenuButton
-           if (!getSkinnable().isFocused() && getSkinnable().isShowing()) {
-               hide();
-           }
-           if (!getSkinnable().isFocused() && popup.isShowing()) {
-               hide();
-           }
-        } else if ("POPUP_VISIBLE".equals(p)) {
-            if (!popup.isShowing() && getSkinnable().isShowing()) {
-                // Popup was dismissed. Maybe user clicked outside or typed ESCAPE.
-                // Make sure button is in sync.
-                getSkinnable().hide();
-            }
-
-            if (popup.isShowing()) {
-                Utils.addMnemonics(popup, getSkinnable().getScene(), getSkinnable().impl_isShowMnemonics());
-            }
-            else {
-                Utils.removeMnemonics(popup, getSkinnable().getScene());
-            }
-
-
-        } else if ("MNEMONIC_PARSING".equals(p)) {
-            label.setMnemonicParsing(getSkinnable().isMnemonicParsing());
-            getSkinnable().requestLayout();
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-    
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return leftInset
-                + label.minWidth(height)
-                + snapSize(arrowButton.minWidth(height))
-                + rightInset;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return topInset
-                + Math.max(label.minHeight(width), snapSize(arrowButton.minHeight(-1)))
-                + bottomInset;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return leftInset
-                + label.prefWidth(height)
-                + snapSize(arrowButton.prefWidth(height))
-                + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return topInset
-                + Math.max(label.prefHeight(width), snapSize(arrowButton.prefHeight(-1)))
-                + bottomInset;
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefWidth(height);
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-                                            final double w, final double h) {
-        final double arrowButtonWidth = snapSize(arrowButton.prefWidth(-1));
-        label.resizeRelocate(x, y, w - arrowButtonWidth, h);
-        arrowButton.resizeRelocate(x+(w-arrowButtonWidth), y, arrowButtonWidth, h);
-    }
-
-    private class MenuLabeledImpl extends LabeledImpl {
-        MenuButton button;
-        public MenuLabeledImpl(MenuButton b) {
-            super(b);
-            button = b;
-            addEventHandler(ActionEvent.ACTION, e -> {
-                button.fireEvent(new ActionEvent());
-                e.consume();
-            });
-        }
-    }
-}
--- /dev/null	2015-09-03 15:20:26.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/MenuButtonSkinBase.java	2015-09-03 15:20:24.201014900 -0700
@@ -0,0 +1,317 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.ContextMenuContent;
+import com.sun.javafx.scene.control.ControlAcceleratorSupport;
+import com.sun.javafx.scene.control.LabeledImpl;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.SkinBase;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import com.sun.javafx.scene.control.behavior.MenuButtonBehaviorBase;
+
+/**
+ * Base class for MenuButtonSkin and SplitMenuButtonSkin. It consists of the
+ * label, the arrowButton with its arrow shape, and the popup.
+ */
+public class MenuButtonSkinBase<C extends MenuButton> extends SkinBase<C> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    final LabeledImpl label;
+    final StackPane arrow;
+    final StackPane arrowButton;
+    ContextMenu popup;
+
+    /**
+     * If true, the control should behave like a button for mouse button events.
+     */
+    boolean behaveLikeButton = false;
+    private ListChangeListener<MenuItem> itemsChangedListener;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new instance of MenuButtonSkinBase, although note that this
+     * instance does not handle any behavior / input mappings - this needs to be
+     * handled appropriately by subclasses.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public MenuButtonSkinBase(final C control) {
+        super(control);
+
+        if (control.getOnMousePressed() == null) {
+            control.addEventHandler(MouseEvent.MOUSE_PRESSED, e -> {
+                MenuButtonBehaviorBase behavior = getBehavior();
+                if (behavior != null) {
+                    behavior.mousePressed(e, behaveLikeButton);
+                }
+            });
+        }
+
+        if (control.getOnMouseReleased() == null) {
+            control.addEventHandler(MouseEvent.MOUSE_RELEASED, e -> {
+                MenuButtonBehaviorBase behavior = getBehavior();
+                if (behavior != null) {
+                    behavior.mouseReleased(e, behaveLikeButton);
+                }
+            });
+        }
+
+        /*
+         * Create the objects we will be displaying.
+         */
+        label = new MenuLabeledImpl(getSkinnable());
+        label.setMnemonicParsing(control.isMnemonicParsing());
+        label.setLabelFor(control);
+
+        arrow = new StackPane();
+        arrow.getStyleClass().setAll("arrow");
+        arrow.setMaxWidth(Region.USE_PREF_SIZE);
+        arrow.setMaxHeight(Region.USE_PREF_SIZE);
+
+        arrowButton = new StackPane();
+        arrowButton.getStyleClass().setAll("arrow-button");
+        arrowButton.getChildren().add(arrow);
+
+        popup = new ContextMenu();
+        popup.getItems().clear();
+        popup.getItems().addAll(getSkinnable().getItems());
+
+        getChildren().clear();
+        getChildren().addAll(label, arrowButton);
+
+        getSkinnable().requestLayout();
+        
+        itemsChangedListener = c -> {
+            while (c.next()) {
+                popup.getItems().removeAll(c.getRemoved());
+                popup.getItems().addAll(c.getFrom(), c.getAddedSubList());
+            }
+        };
+        control.getItems().addListener(itemsChangedListener);
+        
+        if (getSkinnable().getScene() != null) {
+            ControlAcceleratorSupport.addAcceleratorsIntoScene(getSkinnable().getItems(), getSkinnable());
+        }
+        control.sceneProperty().addListener((scene, oldValue, newValue) -> {
+            if (getSkinnable() != null && getSkinnable().getScene() != null) {
+                ControlAcceleratorSupport.addAcceleratorsIntoScene(getSkinnable().getItems(), getSkinnable());
+            }
+        });
+
+//        If setOnAction() is overridden the code below causes the popup to show and hide.
+//        control.addEventHandler(ActionEvent.ACTION, new EventHandler<ActionEvent>() {
+//                @Override public void handle(ActionEvent e) {
+//                    if (!popup.isVisible()) {
+//                        show();
+//                    }
+//                    else {
+//                        hide();
+//                    }
+//
+//                }
+//            });
+
+        // Register listeners
+        registerChangeListener(control.showingProperty(), e -> {
+            if (getSkinnable().isShowing()) {
+                show();
+            } else {
+                hide();
+            }
+        });
+        registerChangeListener(control.focusedProperty(), e -> {
+            // Handle tabbing away from an open MenuButton
+            if (!getSkinnable().isFocused() && getSkinnable().isShowing()) {
+                hide();
+            }
+            if (!getSkinnable().isFocused() && popup.isShowing()) {
+                hide();
+            }
+        });
+        registerChangeListener(control.mnemonicParsingProperty(), e -> {
+            label.setMnemonicParsing(getSkinnable().isMnemonicParsing());
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(popup.showingProperty(), e -> {
+            if (!popup.isShowing() && getSkinnable().isShowing()) {
+                // Popup was dismissed. Maybe user clicked outside or typed ESCAPE.
+                // Make sure button is in sync.
+                getSkinnable().hide();
+            }
+
+            if (popup.isShowing()) {
+                Utils.addMnemonics(popup, getSkinnable().getScene(), getSkinnable().impl_isShowMnemonics());
+            }
+            else {
+                Utils.removeMnemonics(popup, getSkinnable().getScene());
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        getSkinnable().getItems().removeListener(itemsChangedListener);
+        super.dispose();
+        if (popup != null ) {
+            if (popup.getSkin() != null && popup.getSkin().getNode() != null) {
+                ContextMenuContent cmContent = (ContextMenuContent)popup.getSkin().getNode();
+                cmContent.dispose();
+            }
+            popup.setSkin(null);
+            popup = null;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return leftInset
+                + label.minWidth(height)
+                + snapSize(arrowButton.minWidth(height))
+                + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return topInset
+                + Math.max(label.minHeight(width), snapSize(arrowButton.minHeight(-1)))
+                + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return leftInset
+                + label.prefWidth(height)
+                + snapSize(arrowButton.prefWidth(height))
+                + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return topInset
+                + Math.max(label.prefHeight(width), snapSize(arrowButton.prefHeight(-1)))
+                + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        final double arrowButtonWidth = snapSize(arrowButton.prefWidth(-1));
+        label.resizeRelocate(x, y, w - arrowButtonWidth, h);
+        arrowButton.resizeRelocate(x + (w - arrowButtonWidth), y, arrowButtonWidth, h);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    MenuButtonBehaviorBase<C> getBehavior() {
+        return null;
+    }
+
+    private void show() {
+        if (!popup.isShowing()) {
+            popup.show(getSkinnable(), getSkinnable().getPopupSide(), 0, 0);
+            
+//            if (getSkinnable().isOpenVertically()) {
+//                // FIXME ugly hack - need to work out why we need '12' for
+//                // MenuButton/SplitMenuButton, but not for Menus
+//                double indent = getSkinnable().getStyleClass().contains("menu") ? 0 : 12;
+//                popup.show(getSkinnable(), Side.BOTTOM, indent, 0);
+//            } else {
+//                popup.show(getSkinnable(), Side.RIGHT, 0, 12);
+//            }
+        }
+    }
+
+    private void hide() {
+        if (popup.isShowing()) {
+            popup.hide();
+//            popup.getAnchor().requestFocus();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    private static class MenuLabeledImpl extends LabeledImpl {
+        MenuButton button;
+        public MenuLabeledImpl(MenuButton b) {
+            super(b);
+            button = b;
+            addEventHandler(ActionEvent.ACTION, e -> {
+                button.fireEvent(new ActionEvent());
+                e.consume();
+            });
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/NestedTableColumnHeader.java	2015-09-03 15:20:33.201529700 -0700
+++ /dev/null	2015-09-03 15:20:34.000000000 -0700
@@ -1,594 +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.collections.WeakListChangeListener;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.event.EventHandler;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
-
-/**
- * <p>This class is used to construct the header of a TableView. We take the approach
- * that every TableView header is nested - even if it isn't. This allows for us
- * to use the same code for building a single row of TableColumns as we would
- * with a heavily nested sequences of TableColumns. Because of this, the
- * TableHeaderRow class consists of just one instance of a NestedTableColumnHeader.
- *
- */
-public class NestedTableColumnHeader extends TableColumnHeader {
-
-    /***************************************************************************
-     *                                                                         *
-     * Static Fields                                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final int DRAG_RECT_WIDTH = 4;
-
-    private static final String TABLE_COLUMN_KEY = "TableColumn";
-    private static final String TABLE_COLUMN_HEADER_KEY = "TableColumnHeader";
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Represents the actual columns directly contained in this nested column.
-     * It does NOT include ANY of the children of these columns, if any exist.
-     */
-    private ObservableList<? extends TableColumnBase> columns;
-
-    private TableColumnHeader label;
-
-    private ObservableList<TableColumnHeader> columnHeaders;
-
-    // used for column resizing
-    private double lastX = 0.0F;
-    private double dragAnchorX = 0.0;
-
-    // drag rectangle overlays
-    private Map<TableColumnBase<?,?>, Rectangle> dragRects = new WeakHashMap<>();
-
-    boolean updateColumns = true;
-
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
-    
-    public NestedTableColumnHeader(final TableViewSkinBase skin, final TableColumnBase tc) {
-        super(skin, tc);
-        
-        getStyleClass().setAll("nested-column-header");
-        setFocusTraversable(false);
-
-        // init UI
-        label = new TableColumnHeader(skin, getTableColumn());
-        label.setTableHeaderRow(getTableHeaderRow());
-        label.setParentHeader(getParentHeader());
-        label.setNestedColumnHeader(this);
-
-        if (getTableColumn() != null) {
-            changeListenerHandler.registerChangeListener(getTableColumn().textProperty(), "TABLE_COLUMN_TEXT");
-        }
-
-        changeListenerHandler.registerChangeListener(skin.columnResizePolicyProperty(), "TABLE_VIEW_COLUMN_RESIZE_POLICY");
-    }
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-    
-    private final ListChangeListener<TableColumnBase> columnsListener = c -> {
-        setHeadersNeedUpdate();
-    };
-    
-    private final WeakListChangeListener weakColumnsListener =
-            new WeakListChangeListener(columnsListener);
-
-    private static final EventHandler<MouseEvent> rectMousePressed = new EventHandler<MouseEvent>() {
-        @Override public void handle(MouseEvent me) {
-            Rectangle rect = (Rectangle) me.getSource();
-            TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
-            NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
-
-            if (! header.isColumnResizingEnabled()) return;
-
-            if (me.getClickCount() == 2 && me.isPrimaryButtonDown()) {
-                // the user wants to resize the column such that its
-                // width is equal to the widest element in the column
-                header.getTableViewSkin().resizeColumnToFitContent(column, -1);
-            } else {
-                // rather than refer to the rect variable, we just grab
-                // it from the source to prevent a small memory leak.
-                Rectangle innerRect = (Rectangle) me.getSource();
-                double startX = header.getTableHeaderRow().sceneToLocal(innerRect.localToScene(innerRect.getBoundsInLocal())).getMinX() + 2;
-                header.dragAnchorX = me.getSceneX();
-                header.columnResizingStarted(startX);
-            }
-            me.consume();
-        }
-    };
-
-    private static final EventHandler<MouseEvent> rectMouseDragged = new EventHandler<MouseEvent>() {
-        @Override public void handle(MouseEvent me) {
-            Rectangle rect = (Rectangle) me.getSource();
-            TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
-            NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
-
-            if (! header.isColumnResizingEnabled()) return;
-
-            header.columnResizing(column, me);
-            me.consume();
-        }
-    };
-
-    private static final EventHandler<MouseEvent> rectMouseReleased = new EventHandler<MouseEvent>() {
-        @Override public void handle(MouseEvent me) {
-            Rectangle rect = (Rectangle) me.getSource();
-            TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
-            NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
-
-            if (! header.isColumnResizingEnabled()) return;
-
-            header.columnResizingComplete(column, me);
-            me.consume();
-        }
-    };
-
-    private static final EventHandler<MouseEvent> rectCursorChangeListener = new EventHandler<MouseEvent>() {
-        @Override public void handle(MouseEvent me) {
-            Rectangle rect = (Rectangle) me.getSource();
-            TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
-            NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
-
-            if (header.getCursor() == null) { // If there's a cursor for the whole header, don't override it
-                rect.setCursor(header.isColumnResizingEnabled() && rect.isHover() &&
-                        column.isResizable() ? Cursor.H_RESIZE : null);
-            }
-        }
-    };
-    
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Public Methods                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handlePropertyChanged(String p) {
-        super.handlePropertyChanged(p);
-
-        if ("TABLE_VIEW_COLUMN_RESIZE_POLICY".equals(p)) {
-            updateContent();
-        } else if ("TABLE_COLUMN_TEXT".equals(p)) {
-            label.setVisible(getTableColumn().getText() != null && ! getTableColumn().getText().isEmpty());
-        }
-    }
-
-    @Override public void setTableHeaderRow(TableHeaderRow header) {
-        super.setTableHeaderRow(header);
-
-        label.setTableHeaderRow(header);
-
-        // tell all children columns what TableHeader they belong to
-        for (TableColumnHeader c : getColumnHeaders()) {
-            c.setTableHeaderRow(header);
-        }
-    }
-
-    @Override public void setParentHeader(NestedTableColumnHeader parentHeader) {
-        super.setParentHeader(parentHeader);
-        label.setParentHeader(parentHeader);
-    }
-
-    ObservableList<? extends TableColumnBase> getColumns() {
-        return columns;
-    }
-
-    void setColumns(ObservableList<? extends TableColumnBase> newColumns) {
-        if (this.columns != null) {
-            this.columns.removeListener(weakColumnsListener);
-        }
-        
-        this.columns = newColumns;  
-        
-        if (this.columns != null) {
-            this.columns.addListener(weakColumnsListener);
-        }
-    }
-    
-    void updateTableColumnHeaders() {
-        // watching for changes to the view columns in either table or tableColumn.
-        if (getTableColumn() == null && getTableViewSkin() != null) {
-            setColumns(getTableViewSkin().getColumns());
-        } else if (getTableColumn() != null) {
-            setColumns(getTableColumn().getColumns());
-        }
-
-        // update the column headers...
-
-        // iterate through all columns, unless we've got no child columns
-        // any longer, in which case we should switch to a TableColumnHeader 
-        // instead
-        if (getColumns().isEmpty()) {
-            // iterate through all current headers, telling them to clean up
-            for (int i = 0; i < getColumnHeaders().size(); i++) {
-                TableColumnHeader header = getColumnHeaders().get(i);
-                header.dispose();
-            }
-
-            // switch out to be a TableColumn instead, if we have a parent header
-            NestedTableColumnHeader parentHeader = getParentHeader();
-            if (parentHeader != null) {
-                List<TableColumnHeader> parentColumnHeaders = parentHeader.getColumnHeaders();
-                int index = parentColumnHeaders.indexOf(this);
-                if (index >= 0 && index < parentColumnHeaders.size()) {
-                    parentColumnHeaders.set(index, createColumnHeader(getTableColumn()));
-                }
-            } else {
-                // otherwise just remove all the columns
-                getColumnHeaders().clear();
-            }
-        } else {
-            List<TableColumnHeader> oldHeaders = new ArrayList<>(getColumnHeaders());
-            List<TableColumnHeader> newHeaders = new ArrayList<>();
-            
-            for (int i = 0; i < getColumns().size(); i++) {
-                TableColumnBase<?,?> column = getColumns().get(i);
-                if (column == null || ! column.isVisible()) continue;
-
-                // check if the header already exists and reuse it
-                boolean found = false;
-                for (int j = 0; j < oldHeaders.size(); j++) {
-                    TableColumnHeader oldColumn = oldHeaders.get(j);
-                    if (column == oldColumn.getTableColumn()) {
-                        newHeaders.add(oldColumn);
-                        found = true;
-                        break;
-                    }
-                }
-
-                // otherwise create a new table column header
-                if (!found) {
-                    newHeaders.add(createColumnHeader(column));
-                }
-            }
-            
-            getColumnHeaders().setAll(newHeaders);
-
-            // dispose all old headers
-            oldHeaders.removeAll(newHeaders);
-            for (int i = 0; i < oldHeaders.size(); i++) {
-                oldHeaders.get(i).dispose();
-            }
-        }
-        
-        // update the content
-        updateContent();
-        
-        // RT-33596: Do CSS now, as we are in the middle of layout pass and the headers are new Nodes w/o CSS done
-        for (TableColumnHeader header : getColumnHeaders()) {
-            header.applyCss();
-        }
-    }
-    
-    @Override void dispose() {
-        super.dispose();
-        
-        if (label != null) {
-            label.dispose();
-        }
-        
-        if (getColumns() != null) {
-            getColumns().removeListener(weakColumnsListener);
-        }
-
-        for (int i = 0; i < getColumnHeaders().size(); i++) {
-            TableColumnHeader header = getColumnHeaders().get(i);
-            header.dispose();
-        }
-
-        for (Rectangle rect : dragRects.values()) {
-            if (rect != null) {
-                rect.visibleProperty().unbind();
-            }
-        }
-        dragRects.clear();
-        getChildren().clear();
-        
-        changeListenerHandler.dispose();
-    }
-
-    public ObservableList<TableColumnHeader> getColumnHeaders() {
-        if (columnHeaders == null) columnHeaders = FXCollections.<TableColumnHeader>observableArrayList();
-        return columnHeaders; 
-    }
-
-    @Override protected void layoutChildren() {
-        double w = getWidth() - snappedLeftInset() - snappedRightInset();
-        double h = getHeight() - snappedTopInset() - snappedBottomInset();
-
-        int labelHeight = (int) label.prefHeight(-1);
-
-        if (label.isVisible()) {
-            // label gets to span whole width and sits at top
-            label.resize(w, labelHeight);
-            label.relocate(snappedLeftInset(), snappedTopInset());
-        }
-
-        // children columns need to share the total available width
-        double x = snappedLeftInset();
-        int pos = 0;
-        for (int i = 0, max = getColumnHeaders().size(); i < max; i++) {
-            TableColumnHeader n = getColumnHeaders().get(i);
-            if (! n.isVisible()) continue;
-
-            double prefWidth = snapSize(n.prefWidth(-1));
-//            double prefHeight = n.prefHeight(-1);
-
-            // position the column header in the default location...
-            n.resize(prefWidth, snapSize(h - labelHeight));
-            n.relocate(x, labelHeight + snappedTopInset());
-
-//            // ...but, if there are no children of this column, we should ensure
-//            // that it is resized vertically such that it goes to the very
-//            // bottom of the table header row.
-//            if (getTableHeaderRow() != null && n.getCol().getColumns().isEmpty()) {
-//                Bounds bounds = getTableHeaderRow().sceneToLocal(n.localToScene(n.getBoundsInLocal()));
-//                prefHeight = getTableHeaderRow().getHeight() - bounds.getMinY();
-//                n.resize(prefWidth, prefHeight);
-//            }
-
-            // shuffle along the x-axis appropriately
-            x += prefWidth;
-
-            // position drag overlay to intercept column resize requests
-            Rectangle dragRect = dragRects.get(n.getTableColumn());
-            if (dragRect != null) {
-                dragRect.setHeight(n.getDragRectHeight());
-                dragRect.relocate(x - DRAG_RECT_WIDTH / 2, snappedTopInset() + labelHeight);
-            }
-        }
-    }
-
-    @Override
-    double getDragRectHeight() {
-        return label.prefHeight(-1);
-    }
-
-    // sum up all children columns
-    @Override protected double computePrefWidth(double height) {
-        checkState();
-
-        double width = 0.0F;
-
-        if (getColumns() != null) {
-            for (TableColumnHeader c : getColumnHeaders()) {
-                if (c.isVisible()) {
-                    width += snapSize(c.computePrefWidth(height));
-                }
-            }
-        }
-
-        return width;
-    }
-
-    @Override protected double computePrefHeight(double width) {
-        checkState();
-
-        double height = 0.0F;
-
-        if (getColumnHeaders() != null) {
-            for (TableColumnHeader n : getColumnHeaders()) {
-                height = Math.max(height, n.prefHeight(-1));
-            }
-        }
-
-        return height + label.prefHeight(-1) + snappedTopInset() + snappedBottomInset();
-    }
-
-    // protected to allow subclasses to customise the column header types
-    protected TableColumnHeader createTableColumnHeader(TableColumnBase col) {
-        return col.getColumns().isEmpty() ?
-                new TableColumnHeader(getTableViewSkin(), col) :
-                new NestedTableColumnHeader(getTableViewSkin(), col);
-    }
-
-    // allowing subclasses to force an update on the headers
-    protected void setHeadersNeedUpdate() {
-        updateColumns = true;
-
-        // go through children columns - they should update too
-        for (int i = 0; i < getColumnHeaders().size(); i++) {
-            TableColumnHeader header = getColumnHeaders().get(i);
-            if (header instanceof NestedTableColumnHeader) {
-                ((NestedTableColumnHeader)header).setHeadersNeedUpdate();
-            }
-        }
-        requestLayout();
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    private void updateContent() {
-        // create a temporary list so we only do addAll into the main content
-        // observableArrayList once.
-        final List<Node> content = new ArrayList<Node>();
-
-        // the label is the region that sits above the children columns
-        content.add(label);
-
-        // all children columns
-        content.addAll(getColumnHeaders());
-
-        // Small transparent overlays that sit at the start and end of each
-        // column to intercept user drag gestures to enable column resizing.
-        if (isColumnResizingEnabled()) {
-            rebuildDragRects();
-            content.addAll(dragRects.values());
-        }
-
-        getChildren().setAll(content);
-    }
-    
-    private void rebuildDragRects() {
-        if (! isColumnResizingEnabled()) return;
-        
-        getChildren().removeAll(dragRects.values());
-        
-        for (Rectangle rect : dragRects.values()) {
-            rect.visibleProperty().unbind();
-        }
-        dragRects.clear();
-
-        List<? extends TableColumnBase> columns = getColumns();
-
-        if (columns == null) {
-            return;
-        }
-
-        final TableViewSkinBase<?,?,?,?,?,?> skin = getTableViewSkin();
-        Callback<ResizeFeaturesBase, Boolean> columnResizePolicy = skin.columnResizePolicyProperty().get();
-        boolean isConstrainedResize =
-                skin instanceof TableViewSkin ? TableView.CONSTRAINED_RESIZE_POLICY.equals(columnResizePolicy) :
-                skin instanceof TreeTableViewSkin ? TreeTableView.CONSTRAINED_RESIZE_POLICY.equals(columnResizePolicy) :
-                false;
-
-        // RT-32547 - don't show resize cursor when in constrained resize mode
-        // and there is only one column
-        if (isConstrainedResize && skin.getVisibleLeafColumns().size() == 1) {
-            return;
-        }
-
-        for (int col = 0; col < columns.size(); col++) {
-            if (isConstrainedResize && col == getColumns().size() - 1) {
-                break;
-            }
-
-            final TableColumnBase c = columns.get(col);
-            final Rectangle rect = new Rectangle();
-            rect.getProperties().put(TABLE_COLUMN_KEY, c);
-            rect.getProperties().put(TABLE_COLUMN_HEADER_KEY, this);
-            rect.setWidth(DRAG_RECT_WIDTH);
-            rect.setHeight(getHeight() - label.getHeight());
-            rect.setFill(Color.TRANSPARENT);
-            rect.visibleProperty().bind(c.visibleProperty());
-            rect.setOnMousePressed(rectMousePressed);
-            rect.setOnMouseDragged(rectMouseDragged);
-            rect.setOnMouseReleased(rectMouseReleased);
-            rect.setOnMouseEntered(rectCursorChangeListener);
-            rect.setOnMouseExited(rectCursorChangeListener);
-
-            dragRects.put(c, rect);
-        }
-    }
-
-    private void checkState() {
-        if (updateColumns) {
-            updateTableColumnHeaders();
-            updateColumns = false;
-        }
-    }
-
-    private TableColumnHeader createColumnHeader(TableColumnBase col) {
-        TableColumnHeader newCol = createTableColumnHeader(col);
-        newCol.setTableHeaderRow(getTableHeaderRow());
-        newCol.setParentHeader(this);
-        return newCol;
-    }
-    
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation: Column Resizing                                 *
-     *                                                                         *
-     **************************************************************************/
-
-    private boolean isColumnResizingEnabled() {
-        // this used to check if ! PlatformUtil.isEmbedded(), but has been changed
-        // to always return true (for now), as we want to support column resizing
-        // everywhere
-        return true;
-    }
-
-    private void columnResizingStarted(double startX) {
-        setCursor(Cursor.H_RESIZE);
-        columnReorderLine.setLayoutX(startX);
-    }
-
-    private void columnResizing(TableColumnBase col, MouseEvent me) {
-        double draggedX = me.getSceneX() - dragAnchorX;
-        if (getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
-            draggedX = -draggedX;
-        }
-        double delta = draggedX - lastX;
-        boolean allowed = getTableViewSkin().resizeColumn(col, delta);
-        if (allowed) {
-            lastX = draggedX;
-        }
-    }
-
-    private void columnResizingComplete(TableColumnBase col, MouseEvent me) {
-        setCursor(null);
-        columnReorderLine.setTranslateX(0.0F);
-        columnReorderLine.setLayoutX(0.0F);
-        lastX = 0.0F;
-    }
-}
--- /dev/null	2015-09-03 15:20:34.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/NestedTableColumnHeader.java	2015-09-03 15:20:32.380482700 -0700
@@ -0,0 +1,600 @@
+/*
+ * Copyright (c) 2011, 2015, 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 com.sun.javafx.collections.annotations.ReturnsUnmodifiableCollection;
+import javafx.collections.WeakListChangeListener;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.event.EventHandler;
+import javafx.geometry.NodeOrientation;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
+
+/**
+ * <p>This class is used to construct the header of a TableView. We take the approach
+ * that every TableView header is nested - even if it isn't. This allows for us
+ * to use the same code for building a single row of TableColumns as we would
+ * with a heavily nested sequences of TableColumns. Because of this, the
+ * TableHeaderRow class consists of just one instance of a NestedTableColumnHeader.
+ *
+ * @since 9
+ * @see TableColumnHeader
+ * @see TableHeaderRow
+ * @see TableColumnBase
+ */
+public class NestedTableColumnHeader extends TableColumnHeader {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static Fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final int DRAG_RECT_WIDTH = 4;
+
+    private static final String TABLE_COLUMN_KEY = "TableColumn";
+    private static final String TABLE_COLUMN_HEADER_KEY = "TableColumnHeader";
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Represents the actual columns directly contained in this nested column.
+     * It does NOT include ANY of the children of these columns, if any exist.
+     */
+    private ObservableList<? extends TableColumnBase> columns;
+
+    private TableColumnHeader label;
+
+    private ObservableList<TableColumnHeader> columnHeaders;
+    private ObservableList<TableColumnHeader> unmodifiableColumnHeaders;
+
+    // used for column resizing
+    private double lastX = 0.0F;
+    private double dragAnchorX = 0.0;
+
+    // drag rectangle overlays
+    private Map<TableColumnBase<?,?>, Rectangle> dragRects = new WeakHashMap<>();
+
+    boolean updateColumns = true;
+
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Constructor                                                             *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new NestedTableColumnHeader instance to visually represent the given
+     * {@link TableColumnBase} instance.
+     *
+     * @param skin The skin used by the UI control.
+     * @param tc The table column to be visually represented by this instance.
+     */
+    public NestedTableColumnHeader(final TableViewSkinBase skin, final TableColumnBase tc) {
+        super(skin, tc);
+        
+        getStyleClass().setAll("nested-column-header");
+        setFocusTraversable(false);
+
+        // init UI
+        label = new TableColumnHeader(skin, getTableColumn());
+        label.setTableHeaderRow(getTableHeaderRow());
+        label.setParentHeader(getParentHeader());
+        label.setNestedColumnHeader(this);
+
+        if (getTableColumn() != null) {
+            changeListenerHandler.registerChangeListener(getTableColumn().textProperty(), e ->
+                    label.setVisible(getTableColumn().getText() != null && ! getTableColumn().getText().isEmpty()));
+        }
+
+        changeListenerHandler.registerChangeListener(skin.columnResizePolicyProperty(), e -> updateContent());
+    }
+
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+    
+    private final ListChangeListener<TableColumnBase> columnsListener = c -> {
+        setHeadersNeedUpdate();
+    };
+    
+    private final WeakListChangeListener weakColumnsListener =
+            new WeakListChangeListener(columnsListener);
+
+    private static final EventHandler<MouseEvent> rectMousePressed = me -> {
+        Rectangle rect = (Rectangle) me.getSource();
+        TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
+        NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
+
+        if (! header.isColumnResizingEnabled()) return;
+
+        if (me.getClickCount() == 2 && me.isPrimaryButtonDown()) {
+            // the user wants to resize the column such that its
+            // width is equal to the widest element in the column
+            header.getTableViewSkin().resizeColumnToFitContent(column, -1);
+        } else {
+            // rather than refer to the rect variable, we just grab
+            // it from the source to prevent a small memory leak.
+            Rectangle innerRect = (Rectangle) me.getSource();
+            double startX = header.getTableHeaderRow().sceneToLocal(innerRect.localToScene(innerRect.getBoundsInLocal())).getMinX() + 2;
+            header.dragAnchorX = me.getSceneX();
+            header.columnResizingStarted(startX);
+        }
+        me.consume();
+    };
+
+    private static final EventHandler<MouseEvent> rectMouseDragged = me -> {
+        Rectangle rect = (Rectangle) me.getSource();
+        TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
+        NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
+
+        if (! header.isColumnResizingEnabled()) return;
+
+        header.columnResizing(column, me);
+        me.consume();
+    };
+
+    private static final EventHandler<MouseEvent> rectMouseReleased = me -> {
+        Rectangle rect = (Rectangle) me.getSource();
+        TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
+        NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
+
+        if (! header.isColumnResizingEnabled()) return;
+
+        header.columnResizingComplete(column, me);
+        me.consume();
+    };
+
+    private static final EventHandler<MouseEvent> rectCursorChangeListener = me -> {
+        Rectangle rect = (Rectangle) me.getSource();
+        TableColumnBase column = (TableColumnBase) rect.getProperties().get(TABLE_COLUMN_KEY);
+        NestedTableColumnHeader header = (NestedTableColumnHeader) rect.getProperties().get(TABLE_COLUMN_HEADER_KEY);
+
+        if (header.getCursor() == null) { // If there's a cursor for the whole header, don't override it
+            rect.setCursor(header.isColumnResizingEnabled() && rect.isHover() &&
+                    column.isResizable() ? Cursor.H_RESIZE : null);
+        }
+    };
+    
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public Methods                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override void dispose() {
+        super.dispose();
+        
+        if (label != null) {
+            label.dispose();
+        }
+        
+        if (getColumns() != null) {
+            getColumns().removeListener(weakColumnsListener);
+        }
+
+        for (int i = 0; i < getColumnHeaders().size(); i++) {
+            TableColumnHeader header = getColumnHeaders().get(i);
+            header.dispose();
+        }
+
+        for (Rectangle rect : dragRects.values()) {
+            if (rect != null) {
+                rect.visibleProperty().unbind();
+            }
+        }
+        dragRects.clear();
+        getChildren().clear();
+        
+        changeListenerHandler.dispose();
+    }
+
+    /**
+     * Returns an unmodifiable list of the {@link TableColumnHeader} instances
+     * that are children of this NestedTableColumnHeader.
+     */
+    @ReturnsUnmodifiableCollection
+    public final ObservableList<TableColumnHeader> getColumnHeaders() {
+        if (columnHeaders == null) {
+            columnHeaders = FXCollections.<TableColumnHeader>observableArrayList();
+            unmodifiableColumnHeaders = FXCollections.unmodifiableObservableList(columnHeaders);
+        }
+        return unmodifiableColumnHeaders;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren() {
+        double w = getWidth() - snappedLeftInset() - snappedRightInset();
+        double h = getHeight() - snappedTopInset() - snappedBottomInset();
+
+        int labelHeight = (int) label.prefHeight(-1);
+
+        if (label.isVisible()) {
+            // label gets to span whole width and sits at top
+            label.resize(w, labelHeight);
+            label.relocate(snappedLeftInset(), snappedTopInset());
+        }
+
+        // children columns need to share the total available width
+        double x = snappedLeftInset();
+        int pos = 0;
+        for (int i = 0, max = getColumnHeaders().size(); i < max; i++) {
+            TableColumnHeader n = getColumnHeaders().get(i);
+            if (! n.isVisible()) continue;
+
+            double prefWidth = snapSize(n.prefWidth(-1));
+//            double prefHeight = n.prefHeight(-1);
+
+            // position the column header in the default location...
+            n.resize(prefWidth, snapSize(h - labelHeight));
+            n.relocate(x, labelHeight + snappedTopInset());
+
+//            // ...but, if there are no children of this column, we should ensure
+//            // that it is resized vertically such that it goes to the very
+//            // bottom of the table header row.
+//            if (getTableHeaderRow() != null && n.getCol().getColumns().isEmpty()) {
+//                Bounds bounds = getTableHeaderRow().sceneToLocal(n.localToScene(n.getBoundsInLocal()));
+//                prefHeight = getTableHeaderRow().getHeight() - bounds.getMinY();
+//                n.resize(prefWidth, prefHeight);
+//            }
+
+            // shuffle along the x-axis appropriately
+            x += prefWidth;
+
+            // position drag overlay to intercept column resize requests
+            Rectangle dragRect = dragRects.get(n.getTableColumn());
+            if (dragRect != null) {
+                dragRect.setHeight(n.getDragRectHeight());
+                dragRect.relocate(x - DRAG_RECT_WIDTH / 2, snappedTopInset() + labelHeight);
+            }
+        }
+    }
+
+    // sum up all children columns
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height) {
+        checkState();
+
+        double width = 0.0F;
+
+        if (getColumns() != null) {
+            for (TableColumnHeader c : getColumnHeaders()) {
+                if (c.isVisible()) {
+                    width += snapSize(c.computePrefWidth(height));
+                }
+            }
+        }
+
+        return width;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width) {
+        checkState();
+
+        double height = 0.0F;
+
+        if (getColumnHeaders() != null) {
+            for (TableColumnHeader n : getColumnHeaders()) {
+                height = Math.max(height, n.prefHeight(-1));
+            }
+        }
+
+        return height + label.prefHeight(-1) + snappedTopInset() + snappedBottomInset();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    @Override void setTableHeaderRow(TableHeaderRow header) {
+        super.setTableHeaderRow(header);
+
+        label.setTableHeaderRow(header);
+
+        // tell all children columns what TableHeader they belong to
+        for (TableColumnHeader c : getColumnHeaders()) {
+            c.setTableHeaderRow(header);
+        }
+    }
+
+    @Override void setParentHeader(NestedTableColumnHeader parentHeader) {
+        super.setParentHeader(parentHeader);
+        label.setParentHeader(parentHeader);
+    }
+
+    ObservableList<? extends TableColumnBase> getColumns() {
+        return columns;
+    }
+
+    void setColumns(ObservableList<? extends TableColumnBase> newColumns) {
+        if (this.columns != null) {
+            this.columns.removeListener(weakColumnsListener);
+        }
+
+        this.columns = newColumns;
+
+        if (this.columns != null) {
+            this.columns.addListener(weakColumnsListener);
+        }
+    }
+
+    void updateTableColumnHeaders() {
+        // watching for changes to the view columns in either table or tableColumn.
+        if (getTableColumn() == null && getTableViewSkin() != null) {
+            setColumns(getTableViewSkin().getColumns());
+        } else if (getTableColumn() != null) {
+            setColumns(getTableColumn().getColumns());
+        }
+
+        // update the column headers...
+
+        // iterate through all columns, unless we've got no child columns
+        // any longer, in which case we should switch to a TableColumnHeader
+        // instead
+        if (getColumns().isEmpty()) {
+            // iterate through all current headers, telling them to clean up
+            for (int i = 0; i < getColumnHeaders().size(); i++) {
+                TableColumnHeader header = getColumnHeaders().get(i);
+                header.dispose();
+            }
+
+            // switch out to be a TableColumn instead, if we have a parent header
+            NestedTableColumnHeader parentHeader = getParentHeader();
+            if (parentHeader != null) {
+                List<TableColumnHeader> parentColumnHeaders = parentHeader.getColumnHeaders();
+                int index = parentColumnHeaders.indexOf(this);
+                if (index >= 0 && index < parentColumnHeaders.size()) {
+                    parentColumnHeaders.set(index, createColumnHeader(getTableColumn()));
+                }
+            } else {
+                // otherwise just remove all the columns
+                columnHeaders.clear();
+            }
+        } else {
+            List<TableColumnHeader> oldHeaders = new ArrayList<>(getColumnHeaders());
+            List<TableColumnHeader> newHeaders = new ArrayList<>();
+
+            for (int i = 0; i < getColumns().size(); i++) {
+                TableColumnBase<?,?> column = getColumns().get(i);
+                if (column == null || ! column.isVisible()) continue;
+
+                // check if the header already exists and reuse it
+                boolean found = false;
+                for (int j = 0; j < oldHeaders.size(); j++) {
+                    TableColumnHeader oldColumn = oldHeaders.get(j);
+                    if (column == oldColumn.getTableColumn()) {
+                        newHeaders.add(oldColumn);
+                        found = true;
+                        break;
+                    }
+                }
+
+                // otherwise create a new table column header
+                if (!found) {
+                    newHeaders.add(createColumnHeader(column));
+                }
+            }
+
+            columnHeaders.setAll(newHeaders);
+
+            // dispose all old headers
+            oldHeaders.removeAll(newHeaders);
+            for (int i = 0; i < oldHeaders.size(); i++) {
+                oldHeaders.get(i).dispose();
+            }
+        }
+
+        // update the content
+        updateContent();
+
+        // RT-33596: Do CSS now, as we are in the middle of layout pass and the headers are new Nodes w/o CSS done
+        for (TableColumnHeader header : getColumnHeaders()) {
+            header.applyCss();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override double getDragRectHeight() {
+        return label.prefHeight(-1);
+    }
+
+    TableColumnHeader createTableColumnHeader(TableColumnBase col) {
+        return col.getColumns().isEmpty() ?
+                new TableColumnHeader(getTableViewSkin(), col) :
+                new NestedTableColumnHeader(getTableViewSkin(), col);
+    }
+
+    void setHeadersNeedUpdate() {
+        updateColumns = true;
+
+        // go through children columns - they should update too
+        for (int i = 0; i < getColumnHeaders().size(); i++) {
+            TableColumnHeader header = getColumnHeaders().get(i);
+            if (header instanceof NestedTableColumnHeader) {
+                ((NestedTableColumnHeader)header).setHeadersNeedUpdate();
+            }
+        }
+        requestLayout();
+    }
+
+    private void updateContent() {
+        // create a temporary list so we only do addAll into the main content
+        // observableArrayList once.
+        final List<Node> content = new ArrayList<Node>();
+
+        // the label is the region that sits above the children columns
+        content.add(label);
+
+        // all children columns
+        content.addAll(getColumnHeaders());
+
+        // Small transparent overlays that sit at the start and end of each
+        // column to intercept user drag gestures to enable column resizing.
+        if (isColumnResizingEnabled()) {
+            rebuildDragRects();
+            content.addAll(dragRects.values());
+        }
+
+        getChildren().setAll(content);
+    }
+    
+    private void rebuildDragRects() {
+        if (! isColumnResizingEnabled()) return;
+        
+        getChildren().removeAll(dragRects.values());
+        
+        for (Rectangle rect : dragRects.values()) {
+            rect.visibleProperty().unbind();
+        }
+        dragRects.clear();
+
+        List<? extends TableColumnBase> columns = getColumns();
+
+        if (columns == null) {
+            return;
+        }
+
+        final TableViewSkinBase<?,?,?,?,?> skin = getTableViewSkin();
+        Callback<ResizeFeaturesBase, Boolean> columnResizePolicy = skin.columnResizePolicyProperty().get();
+        boolean isConstrainedResize =
+                skin instanceof TableViewSkin ? TableView.CONSTRAINED_RESIZE_POLICY.equals(columnResizePolicy) :
+                skin instanceof TreeTableViewSkin ? TreeTableView.CONSTRAINED_RESIZE_POLICY.equals(columnResizePolicy) :
+                false;
+
+        // RT-32547 - don't show resize cursor when in constrained resize mode
+        // and there is only one column
+        if (isConstrainedResize && skin.getVisibleLeafColumns().size() == 1) {
+            return;
+        }
+
+        for (int col = 0; col < columns.size(); col++) {
+            if (isConstrainedResize && col == getColumns().size() - 1) {
+                break;
+            }
+
+            final TableColumnBase c = columns.get(col);
+            final Rectangle rect = new Rectangle();
+            rect.getProperties().put(TABLE_COLUMN_KEY, c);
+            rect.getProperties().put(TABLE_COLUMN_HEADER_KEY, this);
+            rect.setWidth(DRAG_RECT_WIDTH);
+            rect.setHeight(getHeight() - label.getHeight());
+            rect.setFill(Color.TRANSPARENT);
+            rect.visibleProperty().bind(c.visibleProperty());
+            rect.setOnMousePressed(rectMousePressed);
+            rect.setOnMouseDragged(rectMouseDragged);
+            rect.setOnMouseReleased(rectMouseReleased);
+            rect.setOnMouseEntered(rectCursorChangeListener);
+            rect.setOnMouseExited(rectCursorChangeListener);
+
+            dragRects.put(c, rect);
+        }
+    }
+
+    private void checkState() {
+        if (updateColumns) {
+            updateTableColumnHeaders();
+            updateColumns = false;
+        }
+    }
+
+    private TableColumnHeader createColumnHeader(TableColumnBase col) {
+        TableColumnHeader newCol = createTableColumnHeader(col);
+        newCol.setTableHeaderRow(getTableHeaderRow());
+        newCol.setParentHeader(this);
+        return newCol;
+    }
+    
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation: Column Resizing                                 *
+     *                                                                         *
+     **************************************************************************/
+
+    private boolean isColumnResizingEnabled() {
+        // this used to check if ! PlatformUtil.isEmbedded(), but has been changed
+        // to always return true (for now), as we want to support column resizing
+        // everywhere
+        return true;
+    }
+
+    private void columnResizingStarted(double startX) {
+        setCursor(Cursor.H_RESIZE);
+        columnReorderLine.setLayoutX(startX);
+    }
+
+    private void columnResizing(TableColumnBase col, MouseEvent me) {
+        double draggedX = me.getSceneX() - dragAnchorX;
+        if (getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT) {
+            draggedX = -draggedX;
+        }
+        double delta = draggedX - lastX;
+        boolean allowed = getTableViewSkin().resizeColumn(col, delta);
+        if (allowed) {
+            lastX = draggedX;
+        }
+    }
+
+    private void columnResizingComplete(TableColumnBase col, MouseEvent me) {
+        setCursor(null);
+        columnReorderLine.setTranslateX(0.0F);
+        columnReorderLine.setLayoutX(0.0F);
+        lastX = 0.0F;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/PaginationSkin.java	2015-09-03 15:20:40.874968600 -0700
+++ /dev/null	2015-09-03 15:20:41.000000000 -0700
@@ -1,1404 +0,0 @@
-/*
- * Copyright (c) 2012, 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.beans.property.DoubleProperty;
-import javafx.css.StyleableBooleanProperty;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.CssMetaData;
-
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.behavior.PaginationBehavior;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javafx.animation.*;
-import javafx.application.Platform;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WritableValue;
-import javafx.collections.ListChangeListener;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.geometry.Side;
-import javafx.geometry.VPos;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.TouchEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Duration;
-
-import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
-
-public class PaginationSkin extends BehaviorSkinBase<Pagination, PaginationBehavior>  {
-
-    private static final Duration DURATION = new Duration(125.0);
-    private static final double SWIPE_THRESHOLD = 0.30;
-    private static final double TOUCH_THRESHOLD = 15;
-
-    private Pagination pagination;
-    private StackPane currentStackPane;
-    private StackPane nextStackPane;
-    private Timeline timeline;
-    private Rectangle clipRect;
-
-    private NavigationControl navigation;
-    private int fromIndex;
-    private int previousIndex;
-    private int currentIndex;
-    private int toIndex;
-    private int pageCount;
-    private int maxPageIndicatorCount;
-
-    private boolean animate = true;
-
-    public PaginationSkin(final Pagination pagination) {
-        super(pagination, new PaginationBehavior(pagination));
-
-//        setManaged(false);
-        clipRect = new Rectangle();
-        getSkinnable().setClip(clipRect);
-
-        this.pagination = pagination;
-
-        this.currentStackPane = new StackPane();
-        currentStackPane.getStyleClass().add("page");
-
-        this.nextStackPane = new StackPane();
-        nextStackPane.getStyleClass().add("page");
-        nextStackPane.setVisible(false);
-
-        resetIndexes(true);
-
-        this.navigation = new NavigationControl();
-
-        getChildren().addAll(currentStackPane, nextStackPane, navigation);
-
-        pagination.maxPageIndicatorCountProperty().addListener(o -> {
-            resetIndiciesAndNav();
-        });
-
-        registerChangeListener(pagination.widthProperty(), "WIDTH");
-        registerChangeListener(pagination.heightProperty(), "HEIGHT");
-        registerChangeListener(pagination.pageCountProperty(), "PAGE_COUNT");
-        registerChangeListener(pagination.pageFactoryProperty(), "PAGE_FACTORY");
-
-        initializeSwipeAndTouchHandlers();
-    }
-
-    protected void resetIndiciesAndNav() {
-        resetIndexes(false);
-        navigation.initializePageIndicators();
-        navigation.updatePageIndicators();
-    }
-
-    public void selectNext() {
-        if (getCurrentPageIndex() < getPageCount() - 1) {
-            pagination.setCurrentPageIndex(getCurrentPageIndex() + 1);
-        }
-    }
-
-    public void selectPrevious() {
-        if (getCurrentPageIndex() > 0) {
-            pagination.setCurrentPageIndex(getCurrentPageIndex() - 1);
-        }
-    }
-
-    private double startTouchPos;
-    private double lastTouchPos;
-    private long startTouchTime;
-    private long lastTouchTime;
-    private double touchVelocity;
-    private boolean touchThresholdBroken;
-    private int touchEventId = -1;
-    private boolean nextPageReached = false;
-    private boolean setInitialDirection = false;
-    private int direction;
-
-    private void initializeSwipeAndTouchHandlers() {
-        final Pagination control = getSkinnable();
-
-        getSkinnable().addEventHandler(TouchEvent.TOUCH_PRESSED, e -> {
-            if (touchEventId == -1) {
-                touchEventId = e.getTouchPoint().getId();
-            }
-            if (touchEventId != e.getTouchPoint().getId()) {
-                return;
-            }
-            lastTouchPos = startTouchPos = e.getTouchPoint().getX();
-            lastTouchTime = startTouchTime = System.currentTimeMillis();
-            touchThresholdBroken = false;
-            e.consume();
-        });
-
-        getSkinnable().addEventHandler(TouchEvent.TOUCH_MOVED, e -> {
-            if (touchEventId != e.getTouchPoint().getId()) {
-                return;
-            }
-
-            double drag = e.getTouchPoint().getX() - lastTouchPos;
-            long time = System.currentTimeMillis() - lastTouchTime;
-            touchVelocity = drag/time;
-            lastTouchPos = e.getTouchPoint().getX();
-            lastTouchTime = System.currentTimeMillis();
-            double delta = e.getTouchPoint().getX() - startTouchPos;
-
-            if (!touchThresholdBroken && Math.abs(delta) > TOUCH_THRESHOLD) {
-                touchThresholdBroken = true;
-            }
-
-            if (touchThresholdBroken) {
-                double width = control.getWidth() - (snappedLeftInset() + snappedRightInset());
-                double currentPaneX;
-                double nextPaneX;
-
-                if (!setInitialDirection) {
-                    // Remember the direction travelled so we can
-                    // load the next or previous page if the touch is not released.
-                    setInitialDirection = true;
-                    direction = delta < 0 ? 1 : -1;
-                }
-                if (delta < 0) {
-                    if (direction == -1) {
-                        nextStackPane.getChildren().clear();
-                        direction = 1;
-                    }
-                    // right to left
-                    if (Math.abs(delta) <= width) {
-                        currentPaneX = delta;
-                        nextPaneX = width + delta;
-                        nextPageReached = false;
-                    } else {
-                        currentPaneX = -width;
-                        nextPaneX = 0;
-                        nextPageReached = true;
-                    }
-                    currentStackPane.setTranslateX(currentPaneX);
-                    if (getCurrentPageIndex() < getPageCount() - 1) {
-                        createPage(nextStackPane, currentIndex + 1);
-                        nextStackPane.setVisible(true);
-                        nextStackPane.setTranslateX(nextPaneX);
-                    } else {
-                        currentStackPane.setTranslateX(0);
-                    }
-                } else {
-                    // left to right
-                    if (direction == 1) {
-                        nextStackPane.getChildren().clear();
-                        direction = -1;
-                    }
-                    if (Math.abs(delta) <= width) {
-                        currentPaneX = delta;
-                        nextPaneX = -width + delta;
-                        nextPageReached = false;
-                    } else {
-                        currentPaneX = width;
-                        nextPaneX = 0;
-                        nextPageReached = true;
-                    }
-                    currentStackPane.setTranslateX(currentPaneX);
-                    if (getCurrentPageIndex() != 0) {
-                        createPage(nextStackPane, currentIndex - 1);
-                        nextStackPane.setVisible(true);
-                        nextStackPane.setTranslateX(nextPaneX);
-                    } else {
-                        currentStackPane.setTranslateX(0);
-                    }
-                }
-            }
-            e.consume();
-        });
-
-        getSkinnable().addEventHandler(TouchEvent.TOUCH_RELEASED, e -> {
-            if (touchEventId != e.getTouchPoint().getId()) {
-                return;
-            } else {
-                touchEventId = -1;
-                setInitialDirection = false;
-            }
-
-            if (touchThresholdBroken) {
-                // determin if click or swipe
-                final double drag = e.getTouchPoint().getX() - startTouchPos;
-                // calculate complete time from start to end of drag
-                final long time = System.currentTimeMillis() - startTouchTime;
-                // if time is less than 300ms then considered a quick swipe and whole time is used
-                final boolean quick = time < 300;
-                // calculate velocity
-                final double velocity = quick ? (double)drag / time : touchVelocity; // pixels/ms
-                // calculate distance we would travel at this speed for 500ms of travel
-                final double distance = (velocity * 500);
-                final double width = control.getWidth() - (snappedLeftInset() + snappedRightInset());
-
-                // The swipe distance travelled.
-                final double threshold = Math.abs(distance/width);
-                // The touch and dragged distance travelled.
-                final double delta = Math.abs(drag/width);
-                if (threshold > SWIPE_THRESHOLD || delta > SWIPE_THRESHOLD) {
-                    if (startTouchPos > e.getTouchPoint().getX()) {
-                        selectNext();
-                    } else {
-                        selectPrevious();
-                    }
-                } else {
-                    animateClamping(startTouchPos > e.getTouchPoint().getSceneX());
-                }
-            }
-            e.consume();
-        });
-    }
-
-    private void resetIndexes(boolean usePageIndex) {
-        maxPageIndicatorCount = getMaxPageIndicatorCount();
-        // Used to indicate that we can change a set of pages.
-        pageCount = getPageCount();
-        if (pageCount > maxPageIndicatorCount) {
-            pageCount = maxPageIndicatorCount;
-        }
-
-        fromIndex = 0;
-        previousIndex = 0;
-        currentIndex = usePageIndex ? getCurrentPageIndex() : 0;
-        toIndex = pageCount - 1;
-
-        if (pageCount == Pagination.INDETERMINATE && maxPageIndicatorCount == Pagination.INDETERMINATE) {
-            // We do not know how many indicators  can fit.  Let the layout pass compute it.
-            toIndex = 0;
-        }
-
-        boolean isAnimate = animate;
-        if (isAnimate) {
-            animate = false;
-        }
-
-        // Remove the children in the pane before we create a new page.
-        currentStackPane.getChildren().clear();
-        nextStackPane.getChildren().clear();
-
-        pagination.setCurrentPageIndex(currentIndex);
-        createPage(currentStackPane, currentIndex);
-
-        if (isAnimate) {
-            animate = true;
-        }
-    }
-
-    private boolean createPage(StackPane pane, int index) {
-        if (pagination.getPageFactory() != null && pane.getChildren().isEmpty()) {
-            Node content = pagination.getPageFactory().call(index);
-            // If the content is null we don't want to switch pages.
-            if (content != null) {
-                pane.getChildren().setAll(content);
-                return true;
-            } else {
-                // Disable animation if the new page does not exist.  It is strange to
-                // see the same page animated out then in.
-                boolean isAnimate = animate;
-                if (isAnimate) {
-                    animate = false;
-                }
-
-                if (pagination.getPageFactory().call(previousIndex) != null) {
-                    pagination.setCurrentPageIndex(previousIndex);
-                } else {
-                    // Set the page index to 0 because both the current,
-                    // and the previous pages have no content.
-                    pagination.setCurrentPageIndex(0);
-                }
-
-                if (isAnimate) {
-                    animate = true;
-                }
-                return false;
-            }
-        }
-        return false;
-    }
-
-    private int getPageCount() {
-        if (getSkinnable().getPageCount() < 1) {
-            return 1;
-        }
-        return getSkinnable().getPageCount();
-    }
-
-    private int getMaxPageIndicatorCount() {
-        return getSkinnable().getMaxPageIndicatorCount();
-    }
-
-    private int getCurrentPageIndex() {
-        return getSkinnable().getCurrentPageIndex();
-    }
-
-    private static final Interpolator interpolator = Interpolator.SPLINE(0.4829, 0.5709, 0.6803, 0.9928);
-    private int currentAnimatedIndex;
-    private boolean hasPendingAnimation = false;
-
-    private void animateSwitchPage() {
-        if (timeline != null) {
-            timeline.setRate(8);
-            hasPendingAnimation = true;
-            return;
-        }
-
-        // We are handling a touch event if nextPane's page has already been
-        // created and visible == true.
-        if (!nextStackPane.isVisible()) {
-            if (!createPage(nextStackPane, currentAnimatedIndex)) {
-                // The next page does not exist just return without starting
-                // any animation.
-                return;
-            }
-        }
-        if (nextPageReached) {
-            // No animation is needed when the next page is already showing
-            // and in the correct position.  Just swap the panes and return
-            swapPanes();
-            nextPageReached = false;
-            return;
-        }
-
-        nextStackPane.setCache(true);
-        currentStackPane.setCache(true);
-
-        // wait one pulse then animate
-        Platform.runLater(() -> {
-            // We are handling a touch event if nextPane's translateX is not 0
-            boolean useTranslateX = nextStackPane.getTranslateX() != 0;
-            if (currentAnimatedIndex > previousIndex) {  // animate right to left
-                if (!useTranslateX) {
-                    nextStackPane.setTranslateX(currentStackPane.getWidth());
-                }
-                nextStackPane.setVisible(true);
-                timeline = new Timeline();
-                KeyFrame k1 =  new KeyFrame(Duration.millis(0),
-                    new KeyValue(currentStackPane.translateXProperty(),
-                        useTranslateX ? currentStackPane.getTranslateX() : 0,
-                        interpolator),
-                    new KeyValue(nextStackPane.translateXProperty(),
-                        useTranslateX ?
-                            nextStackPane.getTranslateX() : currentStackPane.getWidth(), interpolator));
-                KeyFrame k2 = new KeyFrame(DURATION,
-                    swipeAnimationEndEventHandler,
-                    new KeyValue(currentStackPane.translateXProperty(), -currentStackPane.getWidth(), interpolator),
-                    new KeyValue(nextStackPane.translateXProperty(), 0, interpolator));
-                timeline.getKeyFrames().setAll(k1, k2);
-                timeline.play();
-            } else { // animate left to right
-                if (!useTranslateX) {
-                    nextStackPane.setTranslateX(-currentStackPane.getWidth());
-                }
-                nextStackPane.setVisible(true);
-                timeline = new Timeline();
-                KeyFrame k1 = new KeyFrame(Duration.millis(0),
-                    new KeyValue(currentStackPane.translateXProperty(),
-                        useTranslateX ? currentStackPane.getTranslateX() : 0,
-                        interpolator),
-                    new KeyValue(nextStackPane.translateXProperty(),
-                        useTranslateX ? nextStackPane.getTranslateX() : -currentStackPane.getWidth(),
-                        interpolator));
-                KeyFrame k2 = new KeyFrame(DURATION,
-                    swipeAnimationEndEventHandler,
-                    new KeyValue(currentStackPane.translateXProperty(), currentStackPane.getWidth(), interpolator),
-                    new KeyValue(nextStackPane.translateXProperty(), 0, interpolator));
-                timeline.getKeyFrames().setAll(k1, k2);
-                timeline.play();
-            }
-        });
-    }
-
-    private EventHandler<ActionEvent> swipeAnimationEndEventHandler = new EventHandler<ActionEvent>() {
-        @Override public void handle(ActionEvent t) {
-            swapPanes();
-            timeline = null;
-
-            if (hasPendingAnimation) {
-                animateSwitchPage();
-                hasPendingAnimation = false;
-            }
-        }
-    };
-
-    private void swapPanes() {
-        StackPane temp = currentStackPane;
-        currentStackPane = nextStackPane;
-        nextStackPane = temp;
-
-        currentStackPane.setTranslateX(0);
-        currentStackPane.setCache(false);
-
-        nextStackPane.setTranslateX(0);
-        nextStackPane.setCache(false);
-        nextStackPane.setVisible(false);
-        nextStackPane.getChildren().clear();
-    }
-
-    // If the swipe hasn't reached the THRESHOLD we want to animate the clamping.
-    private void animateClamping(boolean rightToLeft) {
-        if (rightToLeft) {  // animate right to left
-            timeline = new Timeline();
-            KeyFrame k1 = new KeyFrame(Duration.millis(0),
-                new KeyValue(currentStackPane.translateXProperty(), currentStackPane.getTranslateX(), interpolator),
-                new KeyValue(nextStackPane.translateXProperty(), nextStackPane.getTranslateX(), interpolator));
-            KeyFrame k2 = new KeyFrame(DURATION,
-                clampAnimationEndEventHandler,
-                new KeyValue(currentStackPane.translateXProperty(), 0, interpolator),
-                new KeyValue(nextStackPane.translateXProperty(), currentStackPane.getWidth(), interpolator));
-            timeline.getKeyFrames().setAll(k1, k2);
-            timeline.play();
-        } else { // animate left to right
-            timeline = new Timeline();
-            KeyFrame k1 = new KeyFrame(Duration.millis(0),
-                new KeyValue(currentStackPane.translateXProperty(), currentStackPane.getTranslateX(), interpolator),
-                new KeyValue(nextStackPane.translateXProperty(), nextStackPane.getTranslateX(), interpolator));
-            KeyFrame k2 = new KeyFrame(DURATION,
-                clampAnimationEndEventHandler,
-                new KeyValue(currentStackPane.translateXProperty(), 0, interpolator),
-                new KeyValue(nextStackPane.translateXProperty(), -currentStackPane.getWidth(), interpolator));
-            timeline.getKeyFrames().setAll(k1, k2);
-            timeline.play();
-        }
-    }
-
-    private EventHandler<ActionEvent> clampAnimationEndEventHandler = new EventHandler<ActionEvent>() {
-        @Override public void handle(ActionEvent t) {
-            currentStackPane.setTranslateX(0);
-            nextStackPane.setTranslateX(0);
-            nextStackPane.setVisible(false);
-            timeline = null;
-        }
-    };
-
-    /** The size of the gap between number buttons and arrow buttons */
-    private final DoubleProperty arrowButtonGap = new StyleableDoubleProperty(60.0) {
-        @Override public Object getBean() {
-            return PaginationSkin.this;
-        }
-        @Override public String getName() {
-            return "arrowButtonGap";
-        }
-        @Override public CssMetaData<Pagination,Number> getCssMetaData() {
-            return StyleableProperties.ARROW_BUTTON_GAP;
-        }
-    };
-    private DoubleProperty arrowButtonGapProperty() {
-        return arrowButtonGap;
-    }
-
-    private BooleanProperty arrowsVisible;
-    public final void setArrowsVisible(boolean value) { arrowsVisibleProperty().set(value); }
-    public final boolean isArrowsVisible() { return arrowsVisible == null ? DEFAULT_ARROW_VISIBLE : arrowsVisible.get(); }
-    public final BooleanProperty arrowsVisibleProperty() {
-        if (arrowsVisible == null) {
-            arrowsVisible = new StyleableBooleanProperty(DEFAULT_ARROW_VISIBLE) {
-                @Override
-                protected void invalidated() {
-                    getSkinnable().requestLayout();
-                }
-
-                @Override
-                public CssMetaData<Pagination,Boolean> getCssMetaData() {
-                    return StyleableProperties.ARROWS_VISIBLE;
-                }
-
-                @Override
-                public Object getBean() {
-                    return PaginationSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "arrowVisible";
-                }
-            };
-        }
-        return arrowsVisible;
-    }
-
-    private BooleanProperty pageInformationVisible;
-    public final void setPageInformationVisible(boolean value) { pageInformationVisibleProperty().set(value); }
-    public final boolean isPageInformationVisible() { return pageInformationVisible == null ? DEFAULT_PAGE_INFORMATION_VISIBLE : pageInformationVisible.get(); }
-    public final BooleanProperty pageInformationVisibleProperty() {
-        if (pageInformationVisible == null) {
-            pageInformationVisible = new StyleableBooleanProperty(DEFAULT_PAGE_INFORMATION_VISIBLE) {
-                @Override
-                protected void invalidated() {
-                    getSkinnable().requestLayout();
-                }
-
-                @Override
-                public CssMetaData<Pagination,Boolean> getCssMetaData() {
-                    return StyleableProperties.PAGE_INFORMATION_VISIBLE;
-                }
-
-                @Override
-                public Object getBean() {
-                    return PaginationSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "pageInformationVisible";
-                }
-            };
-        }
-        return pageInformationVisible;
-    }
-
-    private ObjectProperty<Side> pageInformationAlignment;
-    public final void setPageInformationAlignment(Side value) { pageInformationAlignmentProperty().set(value); }
-    public final Side getPageInformationAlignment() { return pageInformationAlignment == null ? DEFAULT_PAGE_INFORMATION_ALIGNMENT : pageInformationAlignment.get(); }
-    public final ObjectProperty<Side> pageInformationAlignmentProperty() {
-        if (pageInformationAlignment == null) {
-            pageInformationAlignment = new StyleableObjectProperty<Side>(Side.BOTTOM) {
-                @Override
-                protected void invalidated() {
-                    getSkinnable().requestLayout();
-                }
-
-                @Override
-                public CssMetaData<Pagination,Side> getCssMetaData() {
-                    return StyleableProperties.PAGE_INFORMATION_ALIGNMENT;
-                }
-
-                @Override
-                public Object getBean() {
-                    return PaginationSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "pageInformationAlignment";
-                }
-            };
-        }
-        return pageInformationAlignment;
-    }
-
-    private BooleanProperty tooltipVisible;
-    public final void setTooltipVisible(boolean value) { tooltipVisibleProperty().set(value); }
-    public final boolean isTooltipVisible() { return tooltipVisible == null ? DEFAULT_TOOLTIP_VISIBLE : tooltipVisible.get(); }
-    public final BooleanProperty tooltipVisibleProperty() {
-        if (tooltipVisible == null) {
-            tooltipVisible = new StyleableBooleanProperty(DEFAULT_TOOLTIP_VISIBLE) {
-                @Override
-                protected void invalidated() {
-                    getSkinnable().requestLayout();
-                }
-
-                @Override
-                public CssMetaData<Pagination,Boolean> getCssMetaData() {
-                    return StyleableProperties.TOOLTIP_VISIBLE;
-                }
-
-                @Override
-                public Object getBean() {
-                    return PaginationSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "tooltipVisible";
-                }
-            };
-        }
-        return tooltipVisible;
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("PAGE_FACTORY".equals(p)) {
-            if (animate && timeline != null) {
-                // If we are in the middle of a page animation.
-                // Speedup and finish the animation then update the page factory.
-                timeline.setRate(8);
-                timeline.setOnFinished(arg0 -> {
-                    resetIndiciesAndNav();
-                });
-                return;
-            }
-            resetIndiciesAndNav();
-        } else if ("PAGE_COUNT".equals(p)) {
-            resetIndiciesAndNav();
-        } else if ("WIDTH".equals(p)) {
-            clipRect.setWidth(getSkinnable().getWidth());
-        } else if ("HEIGHT".equals(p)) {
-            clipRect.setHeight(getSkinnable().getHeight());
-        }
-
-        getSkinnable().requestLayout();
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double navigationWidth = navigation.isVisible() ? snapSize(navigation.minWidth(height)) : 0;
-        return leftInset + Math.max(currentStackPane.minWidth(height), navigationWidth) + rightInset;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double navigationHeight = navigation.isVisible() ? snapSize(navigation.minHeight(width)) : 0;
-        return topInset + currentStackPane.minHeight(width) + navigationHeight + bottomInset;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double navigationWidth = navigation.isVisible() ? snapSize(navigation.prefWidth(height)) : 0;
-        return leftInset + Math.max(currentStackPane.prefWidth(height), navigationWidth) + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double navigationHeight = navigation.isVisible() ? snapSize(navigation.prefHeight(width)) : 0;
-        return topInset + currentStackPane.prefHeight(width) + navigationHeight + bottomInset;
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        double navigationHeight = navigation.isVisible() ? snapSize(navigation.prefHeight(-1)) : 0;
-        double stackPaneHeight = snapSize(h - navigationHeight);
-
-        layoutInArea(currentStackPane, x, y, w, stackPaneHeight, 0, HPos.CENTER, VPos.CENTER);
-        layoutInArea(nextStackPane, x, y, w, stackPaneHeight, 0, HPos.CENTER, VPos.CENTER);
-        layoutInArea(navigation, x, stackPaneHeight, w, navigationHeight, 0, HPos.CENTER, VPos.CENTER);
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_ITEM: return navigation.indicatorButtons.getSelectedToggle();
-            case ITEM_COUNT: return navigation.indicatorButtons.getToggles().size();
-            case ITEM_AT_INDEX: {
-                Integer index = (Integer)parameters[0];
-                if (index == null) return null;
-                return navigation.indicatorButtons.getToggles().get(index);
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-    class NavigationControl extends StackPane {
-
-        private HBox controlBox;
-        private Button leftArrowButton;
-        private StackPane leftArrow;
-        private Button rightArrowButton;
-        private StackPane rightArrow;
-        private ToggleGroup indicatorButtons;
-        private Label pageInformation;
-        private double previousWidth = -1;
-        private double minButtonSize = -1;
-
-        public NavigationControl() {
-            getStyleClass().setAll("pagination-control");
-
-            // redirect mouse events to behavior
-            addEventHandler(MouseEvent.MOUSE_PRESSED,  (e) -> getBehavior().mousePressed(e));
-            addEventHandler(MouseEvent.MOUSE_RELEASED, (e) -> getBehavior().mouseReleased(e));
-            addEventHandler(MouseEvent.MOUSE_ENTERED,  (e) -> getBehavior().mouseEntered(e));
-            addEventHandler(MouseEvent.MOUSE_EXITED,   (e) -> getBehavior().mouseExited(e));
-
-            controlBox = new HBox();
-            controlBox.getStyleClass().add("control-box");
-
-            leftArrowButton = new Button();
-            leftArrowButton.setAccessibleText(getString("Accessibility.title.Pagination.PreviousButton"));
-            minButtonSize = leftArrowButton.getFont().getSize() * 2;
-            leftArrowButton.fontProperty().addListener((arg0, arg1, newFont) -> {
-                minButtonSize = newFont.getSize() * 2;
-                for(Node child: controlBox.getChildren()) {
-                    ((Control)child).setMinSize(minButtonSize, minButtonSize);
-                }
-                // We want to relayout the indicator buttons because the size has changed.
-                requestLayout();
-            });
-            leftArrowButton.setMinSize(minButtonSize, minButtonSize);
-            leftArrowButton.prefWidthProperty().bind(leftArrowButton.minWidthProperty());
-            leftArrowButton.prefHeightProperty().bind(leftArrowButton.minHeightProperty());
-            leftArrowButton.getStyleClass().add("left-arrow-button");
-            leftArrowButton.setFocusTraversable(false);
-            HBox.setMargin(leftArrowButton, new Insets(0, snapSize(arrowButtonGap.get()), 0, 0));
-            leftArrow = new StackPane();
-            leftArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
-            leftArrowButton.setGraphic(leftArrow);
-            leftArrow.getStyleClass().add("left-arrow");
-
-            rightArrowButton = new Button();
-            rightArrowButton.setAccessibleText(getString("Accessibility.title.Pagination.NextButton"));
-            rightArrowButton.setMinSize(minButtonSize, minButtonSize);
-            rightArrowButton.prefWidthProperty().bind(rightArrowButton.minWidthProperty());
-            rightArrowButton.prefHeightProperty().bind(rightArrowButton.minHeightProperty());
-            rightArrowButton.getStyleClass().add("right-arrow-button");
-            rightArrowButton.setFocusTraversable(false);
-            HBox.setMargin(rightArrowButton, new Insets(0, 0, 0, snapSize(arrowButtonGap.get())));
-            rightArrow = new StackPane();
-            rightArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
-            rightArrowButton.setGraphic(rightArrow);
-            rightArrow.getStyleClass().add("right-arrow");
-
-            indicatorButtons = new ToggleGroup();
-
-            pageInformation = new Label();
-            pageInformation.getStyleClass().add("page-information");
-
-            getChildren().addAll(controlBox, pageInformation);
-            initializeNavigationHandlers();
-            initializePageIndicators();
-            updatePageIndex();
-
-            // listen to changes to arrowButtonGap and update margins
-            arrowButtonGap.addListener((observable, oldValue, newValue) -> {
-                if (newValue.doubleValue() == 0) {
-                    HBox.setMargin(leftArrowButton, null);
-                    HBox.setMargin(rightArrowButton, null);
-
-                } else {
-                    HBox.setMargin(leftArrowButton, new Insets(0, snapSize(newValue.doubleValue()), 0, 0));
-                    HBox.setMargin(rightArrowButton, new Insets(0, 0, 0, snapSize(newValue.doubleValue())));
-                }
-            });
-        }
-
-        private void initializeNavigationHandlers() {
-            leftArrowButton.setOnAction(arg0 -> {
-                selectPrevious();
-                requestLayout();
-            });
-
-            rightArrowButton.setOnAction(arg0 -> {
-                selectNext();
-                requestLayout();
-            });
-
-            pagination.currentPageIndexProperty().addListener((arg0, arg1, arg2) -> {
-                previousIndex = arg1.intValue();
-                currentIndex = arg2.intValue();
-                updatePageIndex();
-                if (animate) {
-                    currentAnimatedIndex = currentIndex;
-                    animateSwitchPage();
-                } else {
-                    createPage(currentStackPane, currentIndex);
-                }
-            });
-        }
-
-        // Create the indicators using fromIndex and toIndex.
-        private void initializePageIndicators() {
-            previousIndicatorCount = 0;
-            controlBox.getChildren().clear();
-            clearIndicatorButtons();
-
-            controlBox.getChildren().add(leftArrowButton);
-            for (int i = fromIndex; i <= toIndex; i++) {
-                IndicatorButton ib = new IndicatorButton(i);
-                ib.setMinSize(minButtonSize, minButtonSize);
-                ib.setToggleGroup(indicatorButtons);
-                controlBox.getChildren().add(ib);
-            }
-            controlBox.getChildren().add(rightArrowButton);
-        }
-
-        private void clearIndicatorButtons() {
-            for (Toggle toggle : indicatorButtons.getToggles()) {
-                if (toggle instanceof IndicatorButton) {
-                    IndicatorButton indicatorButton = (IndicatorButton) toggle;
-                    indicatorButton.release();
-                }
-            }
-            indicatorButtons.getToggles().clear();
-        }
-
-        // Finds and selects the IndicatorButton using the currentIndex.
-         private void updatePageIndicators() {
-            for (int i = 0; i < indicatorButtons.getToggles().size(); i++) {
-                IndicatorButton ib = (IndicatorButton)indicatorButtons.getToggles().get(i);
-                if (ib.getPageNumber() == currentIndex) {
-                    ib.setSelected(true);
-                    updatePageInformation();
-                    break;
-                }
-            }
-            getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_ITEM);
-        }
-
-        // Update the page index using the currentIndex and updates the page set
-        // if necessary.
-        private void updatePageIndex() {
-            //System.out.println("SELECT PROPERTY FROM " + fromIndex + " TO " + toIndex + " PREVIOUS " + previousIndex + " CURRENT "+ currentIndex + " PAGE COUNT " + pageCount + " MAX PAGE INDICATOR COUNT " + maxPageIndicatorCount);
-            if (pageCount == maxPageIndicatorCount) {
-                if (changePageSet()) {
-                    initializePageIndicators();
-                }
-            }
-            updatePageIndicators();
-            requestLayout();
-        }
-
-        private void updatePageInformation() {
-            String currentPageNumber = Integer.toString(currentIndex + 1);
-            String lastPageNumber = getPageCount() == Pagination.INDETERMINATE ? "..." : Integer.toString(getPageCount());
-            pageInformation.setText(currentPageNumber + "/" + lastPageNumber);
-        }
-
-        private int previousIndicatorCount = 0;
-        // Layout the maximum number of page indicators we can fit within the width.
-        // And always show the selected indicator.
-        private void layoutPageIndicators() {
-            final double left = snappedLeftInset();
-            final double right = snappedRightInset();
-            final double width = snapSize(getWidth()) - (left + right);
-            final double controlBoxleft = controlBox.snappedLeftInset();
-            final double controlBoxRight = controlBox.snappedRightInset();
-            final double leftArrowWidth = snapSize(Utils.boundedSize(leftArrowButton.prefWidth(-1), leftArrowButton.minWidth(-1), leftArrowButton.maxWidth(-1)));
-            final double rightArrowWidth = snapSize(Utils.boundedSize(rightArrowButton.prefWidth(-1), rightArrowButton.minWidth(-1), rightArrowButton.maxWidth(-1)));
-            final double spacing = snapSize(controlBox.getSpacing());
-            double w = width - (controlBoxleft + leftArrowWidth + 2* arrowButtonGap.get() + spacing + rightArrowWidth + controlBoxRight);
-
-            if (isPageInformationVisible() &&
-                    (Side.LEFT.equals(getPageInformationAlignment()) ||
-                    Side.RIGHT.equals(getPageInformationAlignment()))) {
-                w -= snapSize(pageInformation.prefWidth(-1));
-            }
-
-            double x = 0;
-            int indicatorCount = 0;
-            for (int i = 0; i < getMaxPageIndicatorCount(); i++) {
-                int index = i < indicatorButtons.getToggles().size() ? i : indicatorButtons.getToggles().size() - 1;
-                double iw = minButtonSize;
-                if (index != -1) {
-                    IndicatorButton ib = (IndicatorButton)indicatorButtons.getToggles().get(index);
-                    iw = snapSize(Utils.boundedSize(ib.prefWidth(-1), ib.minWidth(-1), ib.maxWidth(-1)));
-                }
-
-                x += (iw + spacing);
-                if (x > w) {
-                    break;
-                }
-                indicatorCount++;
-            }
-            if (indicatorCount == 0) {
-               indicatorCount = 1; // The parent didn't respect the minSize of this Pagination.
-                                   // We will show at least one indicator nonetheless.
-            }
-
-            if (indicatorCount != previousIndicatorCount) {
-                if (indicatorCount < getMaxPageIndicatorCount()) {
-                    maxPageIndicatorCount = indicatorCount;
-                } else {
-                    maxPageIndicatorCount = getMaxPageIndicatorCount();
-                }
-
-                int lastIndicatorButtonIndex;
-                if (pageCount > maxPageIndicatorCount) {
-                    pageCount = maxPageIndicatorCount;
-                    lastIndicatorButtonIndex = maxPageIndicatorCount - 1;
-                 } else {
-                    if (indicatorCount > getPageCount()) {
-                        pageCount = getPageCount();
-                        lastIndicatorButtonIndex = getPageCount() - 1;
-                    } else {
-                        pageCount = indicatorCount;
-                        lastIndicatorButtonIndex = indicatorCount - 1;
-                    }
-                }
-
-                if (currentIndex >= toIndex) {
-                    // The current index has fallen off the right
-                    toIndex = currentIndex;
-                    fromIndex = toIndex - lastIndicatorButtonIndex;
-                } else if (currentIndex <= fromIndex) {
-                    // The current index has fallen off the left
-                    fromIndex = currentIndex;
-                    toIndex = fromIndex + lastIndicatorButtonIndex;
-                } else {
-                    toIndex = fromIndex + lastIndicatorButtonIndex;
-                }
-
-                if (toIndex > getPageCount() - 1) {
-                    toIndex = getPageCount() - 1;
-                    //fromIndex = toIndex - lastIndicatorButtonIndex;
-                }
-
-                if (fromIndex < 0) {
-                    fromIndex = 0;
-                    toIndex = fromIndex + lastIndicatorButtonIndex;
-                }
-
-                initializePageIndicators();
-                updatePageIndicators();
-                previousIndicatorCount = indicatorCount;
-            }
-        }
-
-        // Only change to the next set when the current index is at the start or the end of the set.
-        // Return true only if we have scrolled to the next/previous set.
-        private boolean changePageSet() {
-            int index = indexToIndicatorButtonsIndex(currentIndex);
-            int lastIndicatorButtonIndex = maxPageIndicatorCount - 1;
-            if (previousIndex < currentIndex &&
-                    index == 0 &&
-                    lastIndicatorButtonIndex != 0 &&
-                    index % lastIndicatorButtonIndex == 0) {
-                // Get the right page set
-                fromIndex = currentIndex;
-                toIndex = fromIndex + lastIndicatorButtonIndex;
-            } else if (currentIndex < previousIndex &&
-                    index == lastIndicatorButtonIndex &&
-                    lastIndicatorButtonIndex != 0 &&
-                    index % lastIndicatorButtonIndex == 0) {
-                // Get the left page set
-                toIndex = currentIndex;
-                fromIndex = toIndex - lastIndicatorButtonIndex;
-            } else {
-                // We need to get the new page set if the currentIndex is out of range.
-                // This can happen if setPageIndex() is called programatically.
-                if (currentIndex < fromIndex || currentIndex > toIndex) {
-                    fromIndex = currentIndex - index;
-                    toIndex = fromIndex + lastIndicatorButtonIndex;
-                } else {
-                    return false;
-                }
-            }
-
-            // We have gone past the total number of pages
-            if (toIndex > getPageCount() - 1) {
-                if (fromIndex > getPageCount() - 1) {
-                    return false;
-                } else {
-                  toIndex = getPageCount() - 1;
-                  //fromIndex = toIndex - lastIndicatorButtonIndex;
-                }
-            }
-
-            // We have gone past the starting page
-            if (fromIndex < 0) {
-                fromIndex = 0;
-                toIndex = fromIndex + lastIndicatorButtonIndex;
-            }
-            return true;
-        }
-
-        private int indexToIndicatorButtonsIndex(int index) {
-            // This should be in the indicator buttons toggle list.
-            if (index >= fromIndex && index <= toIndex) {
-                return index - fromIndex;
-            }
-            // The requested index is not in indicator buttons list we have to predict
-            // where the index will be.
-            int i = 0;
-            int from = fromIndex;
-            int to = toIndex;
-            if (currentIndex > previousIndex) {
-                while(from < getPageCount() && to < getPageCount()) {
-                    from += i;
-                    to += i;
-                    if (index >= from && index <= to) {
-                        if (index == from) {
-                            return 0;
-                        } else if (index == to) {
-                            return maxPageIndicatorCount - 1;
-                        }
-                        return index - from;
-                    }
-                    i += maxPageIndicatorCount;
-                }
-            } else {
-                while (from > 0 && to > 0) {
-                    from -= i;
-                    to -= i;
-                    if (index >= from && index <= to) {
-                        if (index == from) {
-                            return 0;
-                        } else if (index == to) {
-                            return maxPageIndicatorCount - 1;
-                        }
-                        return index - from;
-                    }
-                    i += maxPageIndicatorCount;
-                }
-            }
-            // We are on the last page set going back to the previous page set
-            return maxPageIndicatorCount - 1;
-        }
-
-        private Pos sideToPos(Side s) {
-            if (Side.TOP.equals(s)) {
-                return Pos.TOP_CENTER;
-            } else if (Side.RIGHT.equals(s)) {
-                return Pos.CENTER_RIGHT;
-            } else if (Side.BOTTOM.equals(s)) {
-                return Pos.BOTTOM_CENTER;
-            }
-            return Pos.CENTER_LEFT;
-        }
-
-        @Override protected double computeMinWidth(double height) {
-            double left = snappedLeftInset();
-            double right = snappedRightInset();
-            double leftArrowWidth = snapSize(Utils.boundedSize(leftArrowButton.prefWidth(-1), leftArrowButton.minWidth(-1), leftArrowButton.maxWidth(-1)));
-            double rightArrowWidth = snapSize(Utils.boundedSize(rightArrowButton.prefWidth(-1), rightArrowButton.minWidth(-1), rightArrowButton.maxWidth(-1)));
-            double spacing = snapSize(controlBox.getSpacing());
-            double pageInformationWidth = 0;
-            Side side = getPageInformationAlignment();
-            if (Side.LEFT.equals(side) || Side.RIGHT.equals(side)) {
-                pageInformationWidth = snapSize(pageInformation.prefWidth(-1));
-            }
-            double arrowGap = arrowButtonGap.get();
-
-            return left + leftArrowWidth + 2 *arrowGap + minButtonSize /*at least one button*/ 
-                    + 2 * spacing + rightArrowWidth + right + pageInformationWidth;
-        }
-
-        @Override protected double computeMinHeight(double width) {
-            return computePrefHeight(width);
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            final double left = snappedLeftInset();
-            final double right = snappedRightInset();
-            final double controlBoxWidth = snapSize(controlBox.prefWidth(height));
-            double pageInformationWidth = 0;
-            Side side = getPageInformationAlignment();
-            if (Side.LEFT.equals(side) || Side.RIGHT.equals(side)) {
-                pageInformationWidth = snapSize(pageInformation.prefWidth(-1));
-            }
-
-            return left + controlBoxWidth + right + pageInformationWidth;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            final double top = snappedTopInset();
-            final double bottom = snappedBottomInset();
-            final double boxHeight = snapSize(controlBox.prefHeight(width));
-            double pageInformationHeight = 0;
-            Side side = getPageInformationAlignment();
-            if (Side.TOP.equals(side) || Side.BOTTOM.equals(side)) {
-                pageInformationHeight = snapSize(pageInformation.prefHeight(-1));
-            }
-
-            return top + boxHeight + pageInformationHeight + bottom;
-        }
-
-        @Override protected void layoutChildren() {
-            final double top = snappedTopInset();
-            final double bottom = snappedBottomInset();
-            final double left = snappedLeftInset();
-            final double right = snappedRightInset();
-            final double width = snapSize(getWidth()) - (left + right);
-            final double height = snapSize(getHeight()) - (top + bottom);
-            final double controlBoxWidth = snapSize(controlBox.prefWidth(-1));
-            final double controlBoxHeight = snapSize(controlBox.prefHeight(-1));
-            final double pageInformationWidth = snapSize(pageInformation.prefWidth(-1));
-            final double pageInformationHeight = snapSize(pageInformation.prefHeight(-1));
-
-            leftArrowButton.setDisable(false);
-            rightArrowButton.setDisable(false);
-
-            if (currentIndex == 0) {
-                // Grey out the left arrow if we are at the beginning.
-                leftArrowButton.setDisable(true);
-            }
-            if (currentIndex == (getPageCount() - 1)) {
-                // Grey out the right arrow if we have reached the end.
-                rightArrowButton.setDisable(true);
-            }
-            // Reapply CSS so the left and right arrow button's disable state is updated
-            // immediately.
-            applyCss();
-
-            leftArrowButton.setVisible(isArrowsVisible());
-            rightArrowButton.setVisible(isArrowsVisible());
-            pageInformation.setVisible(isPageInformationVisible());
-
-            // Determine the number of indicators we can fit within the pagination width.
-//            if (snapSize(getWidth()) != previousWidth) {
-                layoutPageIndicators();
-//            }
-            previousWidth = getWidth();
-
-            HPos controlBoxHPos = controlBox.getAlignment().getHpos();
-            VPos controlBoxVPos = controlBox.getAlignment().getVpos();
-            double controlBoxX = left + Utils.computeXOffset(width, controlBoxWidth, controlBoxHPos);
-            double controlBoxY = top + Utils.computeYOffset(height, controlBoxHeight, controlBoxVPos);
-
-            if (isPageInformationVisible()) {
-                Pos p = sideToPos(getPageInformationAlignment());
-                HPos pageInformationHPos = p.getHpos();
-                VPos pageInformationVPos = p.getVpos();
-                double pageInformationX = left + Utils.computeXOffset(width, pageInformationWidth, pageInformationHPos);
-                double pageInformationY = top + Utils.computeYOffset(height, pageInformationHeight, pageInformationVPos);
-
-                if (Side.TOP.equals(getPageInformationAlignment())) {
-                    pageInformationY = top;
-                    controlBoxY = top + pageInformationHeight;
-                } else if (Side.RIGHT.equals(getPageInformationAlignment())) {
-                    pageInformationX = width - right - pageInformationWidth;
-                } else if (Side.BOTTOM.equals(getPageInformationAlignment())) {
-                    controlBoxY = top;
-                    pageInformationY = top + controlBoxHeight;
-                } else if (Side.LEFT.equals(getPageInformationAlignment())) {
-                    pageInformationX = left;
-                }
-                layoutInArea(pageInformation, pageInformationX, pageInformationY, pageInformationWidth, pageInformationHeight, 0, pageInformationHPos, pageInformationVPos);
-            }
-
-            layoutInArea(controlBox, controlBoxX, controlBoxY, controlBoxWidth, controlBoxHeight, 0, controlBoxHPos, controlBoxVPos);
-        }
-    }
-
-    class IndicatorButton extends ToggleButton {
-        private final ListChangeListener<String> updateSkinIndicatorType =
-                                                    c -> setIndicatorType();
-
-        private final ChangeListener<Boolean> updateTooltipVisibility =
-                       (ob, oldValue, newValue) -> setTooltipVisible(newValue);
-
-        private int pageNumber;
-
-        public IndicatorButton(int pageNumber) {
-            this.pageNumber = pageNumber;
-            setFocusTraversable(false);
-            setIndicatorType();
-            setTooltipVisible(isTooltipVisible());
-
-            getSkinnable().getStyleClass().addListener(updateSkinIndicatorType);
-
-            setOnAction(new EventHandler<ActionEvent>() {
-                @Override public void handle(ActionEvent arg0) {
-                    int selected = getCurrentPageIndex();
-                    // We do not need to update the selection if it has not changed.
-                    if (selected != IndicatorButton.this.pageNumber) {
-                        pagination.setCurrentPageIndex(IndicatorButton.this.pageNumber);
-                        requestLayout();
-                    }
-                }
-            });
-
-            tooltipVisibleProperty().addListener(updateTooltipVisibility);
-
-            prefHeightProperty().bind(minHeightProperty());
-            setAccessibleRole(AccessibleRole.PAGE_ITEM);
-        }
-
-        private void setIndicatorType() {
-            if (getSkinnable().getStyleClass().contains(Pagination.STYLE_CLASS_BULLET)) {
-                getStyleClass().remove("number-button");
-                getStyleClass().add("bullet-button");
-                setText(null);
-
-                // Bind the width in addition to the height to ensure the region is square
-                prefWidthProperty().bind(minWidthProperty());
-            } else {
-                getStyleClass().remove("bullet-button");
-                getStyleClass().add("number-button");
-                setText(Integer.toString(this.pageNumber + 1));
-
-                // Free the width to conform to the text content
-                prefWidthProperty().unbind();
-            }
-        }
-
-        private void setTooltipVisible(boolean b) {
-            if (b) {
-                setTooltip(new Tooltip(Integer.toString(IndicatorButton.this.pageNumber + 1)));
-            } else {
-                setTooltip(null);
-            }
-        }
-
-        public int getPageNumber() {
-            return this.pageNumber;
-        }
-
-        @Override public void fire() {
-            // we don't toggle from selected to not selected if part of a group
-            if (getToggleGroup() == null || !isSelected()) {
-                super.fire();
-            }
-        }
-
-        public void release() {
-            getSkinnable().getStyleClass().removeListener(updateSkinIndicatorType);
-            tooltipVisibleProperty().removeListener(updateTooltipVisibility);
-        }
-
-        @Override
-        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-            switch (attribute) {
-                case TEXT: return getText();
-                case SELECTED: return isSelected();
-                default: return super.queryAccessibleAttribute(attribute, parameters);
-            }
-        }
-
-        @Override
-        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-            switch (action) {
-                case REQUEST_FOCUS:
-                    getSkinnable().setCurrentPageIndex(pageNumber);
-                    break;
-                default: super.executeAccessibleAction(action);
-            }
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                         Stylesheet Handling                             *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final Boolean DEFAULT_ARROW_VISIBLE = Boolean.FALSE;
-    private static final Boolean DEFAULT_PAGE_INFORMATION_VISIBLE = Boolean.FALSE;
-    private static final Side DEFAULT_PAGE_INFORMATION_ALIGNMENT = Side.BOTTOM;
-    private static final Boolean DEFAULT_TOOLTIP_VISIBLE = Boolean.FALSE;
-
-    private static class StyleableProperties {
-        private static final CssMetaData<Pagination,Boolean> ARROWS_VISIBLE =
-            new CssMetaData<Pagination,Boolean>("-fx-arrows-visible",
-                BooleanConverter.getInstance(), DEFAULT_ARROW_VISIBLE) {
-
-            @Override
-            public boolean isSettable(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return skin.arrowsVisible == null || !skin.arrowsVisible.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Boolean> getStyleableProperty(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.arrowsVisibleProperty();
-            }
-        };
-
-        private static final CssMetaData<Pagination,Boolean> PAGE_INFORMATION_VISIBLE =
-            new CssMetaData<Pagination,Boolean>("-fx-page-information-visible",
-                BooleanConverter.getInstance(), DEFAULT_PAGE_INFORMATION_VISIBLE) {
-
-            @Override
-            public boolean isSettable(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return skin.pageInformationVisible == null || !skin.pageInformationVisible.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Boolean> getStyleableProperty(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.pageInformationVisibleProperty();
-            }
-        };
-
-        private static final CssMetaData<Pagination,Side> PAGE_INFORMATION_ALIGNMENT =
-            new CssMetaData<Pagination,Side>("-fx-page-information-alignment",
-                new EnumConverter<Side>(Side.class), DEFAULT_PAGE_INFORMATION_ALIGNMENT) {
-
-            @Override
-            public boolean isSettable(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return skin.pageInformationAlignment == null || !skin.pageInformationAlignment.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Side> getStyleableProperty(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return (StyleableProperty<Side>)(WritableValue<Side>)skin.pageInformationAlignmentProperty();
-            }
-        };
-
-        private static final CssMetaData<Pagination,Boolean> TOOLTIP_VISIBLE =
-            new CssMetaData<Pagination,Boolean>("-fx-tooltip-visible",
-                BooleanConverter.getInstance(), DEFAULT_TOOLTIP_VISIBLE) {
-
-            @Override
-            public boolean isSettable(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return skin.tooltipVisible == null || !skin.tooltipVisible.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Boolean> getStyleableProperty(Pagination n) {
-                final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.tooltipVisibleProperty();
-            }
-        };
-        private static final CssMetaData<Pagination,Number> ARROW_BUTTON_GAP =
-            new CssMetaData<Pagination,Number>("-fx-arrow-button-gap", SizeConverter.getInstance(), 4) {
-                @Override public boolean isSettable(Pagination n) {
-                    final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                    return skin.arrowButtonGap == null ||
-                            !skin.arrowButtonGap.isBound();
-                }
-                @Override public StyleableProperty<Number> getStyleableProperty(Pagination n) {
-                    final PaginationSkin skin = (PaginationSkin) n.getSkin();
-                    return (StyleableProperty<Number>)(WritableValue<Number>)skin.arrowButtonGapProperty();
-                }
-            };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-            styleables.add(ARROWS_VISIBLE);
-            styleables.add(PAGE_INFORMATION_VISIBLE);
-            styleables.add(PAGE_INFORMATION_ALIGNMENT);
-            styleables.add(TOOLTIP_VISIBLE);
-            styleables.add(ARROW_BUTTON_GAP);
-            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-03 15:20:42.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/PaginationSkin.java	2015-09-03 15:20:40.119925400 -0700
@@ -0,0 +1,1489 @@
+/*
+ * Copyright (c) 2012, 2015, 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 com.sun.javafx.scene.control.skin.Utils;
+import javafx.beans.property.DoubleProperty;
+import javafx.css.StyleableBooleanProperty;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.CssMetaData;
+
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.behavior.PaginationBehavior;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.animation.*;
+import javafx.application.Platform;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.WritableValue;
+import javafx.collections.ListChangeListener;
+import javafx.css.Styleable;
+import javafx.css.StyleableProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.TouchEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+
+import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
+
+/**
+ * Default skin implementation for the {@link Pagination} control.
+ *
+ * @see Pagination
+ * @since 9
+ */
+public class PaginationSkin extends SkinBase<Pagination> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final Duration DURATION = new Duration(125.0);
+    private static final double SWIPE_THRESHOLD = 0.30;
+    private static final double TOUCH_THRESHOLD = 15;
+    private static final Interpolator interpolator = Interpolator.SPLINE(0.4829, 0.5709, 0.6803, 0.9928);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private Pagination pagination;
+    private StackPane currentStackPane;
+    private StackPane nextStackPane;
+    private Timeline timeline;
+    private Rectangle clipRect;
+
+    private NavigationControl navigation;
+    private int fromIndex;
+    private int previousIndex;
+    private int currentIndex;
+    private int toIndex;
+    private int pageCount;
+    private int maxPageIndicatorCount;
+
+    private double startTouchPos;
+    private double lastTouchPos;
+    private long startTouchTime;
+    private long lastTouchTime;
+    private double touchVelocity;
+    private boolean touchThresholdBroken;
+    private int touchEventId = -1;
+    private boolean nextPageReached = false;
+    private boolean setInitialDirection = false;
+    private int direction;
+
+    private int currentAnimatedIndex;
+    private boolean hasPendingAnimation = false;
+
+    private boolean animate = true;
+
+    private final PaginationBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private EventHandler<ActionEvent> swipeAnimationEndEventHandler = new EventHandler<ActionEvent>() {
+        @Override public void handle(ActionEvent t) {
+            swapPanes();
+            timeline = null;
+
+            if (hasPendingAnimation) {
+                animateSwitchPage();
+                hasPendingAnimation = false;
+            }
+        }
+    };
+
+    private EventHandler<ActionEvent> clampAnimationEndEventHandler = new EventHandler<ActionEvent>() {
+        @Override public void handle(ActionEvent t) {
+            currentStackPane.setTranslateX(0);
+            nextStackPane.setTranslateX(0);
+            nextStackPane.setVisible(false);
+            timeline = null;
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new PaginationSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public PaginationSkin(final Pagination control) {
+        super(control);
+
+        // install default input map for the Pagination control
+        behavior = new PaginationBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+//        setManaged(false);
+        clipRect = new Rectangle();
+        getSkinnable().setClip(clipRect);
+
+        this.pagination = control;
+
+        this.currentStackPane = new StackPane();
+        currentStackPane.getStyleClass().add("page");
+
+        this.nextStackPane = new StackPane();
+        nextStackPane.getStyleClass().add("page");
+        nextStackPane.setVisible(false);
+
+        resetIndexes(true);
+
+        this.navigation = new NavigationControl();
+
+        getChildren().addAll(currentStackPane, nextStackPane, navigation);
+
+        control.maxPageIndicatorCountProperty().addListener(o -> {
+            resetIndiciesAndNav();
+        });
+
+        registerChangeListener(control.widthProperty(), e -> clipRect.setWidth(getSkinnable().getWidth()));
+        registerChangeListener(control.heightProperty(), e -> clipRect.setHeight(getSkinnable().getHeight()));
+        registerChangeListener(control.pageCountProperty(), e -> resetIndiciesAndNav());
+        registerChangeListener(control.pageFactoryProperty(), e -> {
+            if (animate && timeline != null) {
+                // If we are in the middle of a page animation.
+                // Speedup and finish the animation then update the page factory.
+                timeline.setRate(8);
+                timeline.setOnFinished(arg0 -> {
+                    resetIndiciesAndNav();
+                });
+                return;
+            }
+            resetIndiciesAndNav();
+        });
+
+        initializeSwipeAndTouchHandlers();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** The size of the gap between number buttons and arrow buttons */
+    private final DoubleProperty arrowButtonGap = new StyleableDoubleProperty(60.0) {
+        @Override public Object getBean() {
+            return PaginationSkin.this;
+        }
+        @Override public String getName() {
+            return "arrowButtonGap";
+        }
+        @Override public CssMetaData<Pagination,Number> getCssMetaData() {
+            return StyleableProperties.ARROW_BUTTON_GAP;
+        }
+    };
+    private final DoubleProperty arrowButtonGapProperty() {
+        return arrowButtonGap;
+    }
+    private final double getArrowButtonGap() {
+        return arrowButtonGap.get();
+    }
+    private final void setArrowButtonGap(double value) {
+        arrowButtonGap.set(value);
+    }
+
+    private BooleanProperty arrowsVisible;
+    private final void setArrowsVisible(boolean value) { arrowsVisibleProperty().set(value); }
+    private final boolean isArrowsVisible() { return arrowsVisible == null ? DEFAULT_ARROW_VISIBLE : arrowsVisible.get(); }
+    private final BooleanProperty arrowsVisibleProperty() {
+        if (arrowsVisible == null) {
+            arrowsVisible = new StyleableBooleanProperty(DEFAULT_ARROW_VISIBLE) {
+                @Override
+                protected void invalidated() {
+                    getSkinnable().requestLayout();
+                }
+
+                @Override
+                public CssMetaData<Pagination,Boolean> getCssMetaData() {
+                    return StyleableProperties.ARROWS_VISIBLE;
+                }
+
+                @Override
+                public Object getBean() {
+                    return PaginationSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "arrowVisible";
+                }
+            };
+        }
+        return arrowsVisible;
+    }
+
+    private BooleanProperty pageInformationVisible;
+    private final void setPageInformationVisible(boolean value) { pageInformationVisibleProperty().set(value); }
+    private final boolean isPageInformationVisible() { return pageInformationVisible == null ? DEFAULT_PAGE_INFORMATION_VISIBLE : pageInformationVisible.get(); }
+    private final BooleanProperty pageInformationVisibleProperty() {
+        if (pageInformationVisible == null) {
+            pageInformationVisible = new StyleableBooleanProperty(DEFAULT_PAGE_INFORMATION_VISIBLE) {
+                @Override
+                protected void invalidated() {
+                    getSkinnable().requestLayout();
+                }
+
+                @Override
+                public CssMetaData<Pagination,Boolean> getCssMetaData() {
+                    return StyleableProperties.PAGE_INFORMATION_VISIBLE;
+                }
+
+                @Override
+                public Object getBean() {
+                    return PaginationSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "pageInformationVisible";
+                }
+            };
+        }
+        return pageInformationVisible;
+    }
+
+    private ObjectProperty<Side> pageInformationAlignment;
+    private final void setPageInformationAlignment(Side value) { pageInformationAlignmentProperty().set(value); }
+    private final Side getPageInformationAlignment() { return pageInformationAlignment == null ? DEFAULT_PAGE_INFORMATION_ALIGNMENT : pageInformationAlignment.get(); }
+    private final ObjectProperty<Side> pageInformationAlignmentProperty() {
+        if (pageInformationAlignment == null) {
+            pageInformationAlignment = new StyleableObjectProperty<Side>(Side.BOTTOM) {
+                @Override
+                protected void invalidated() {
+                    getSkinnable().requestLayout();
+                }
+
+                @Override
+                public CssMetaData<Pagination,Side> getCssMetaData() {
+                    return StyleableProperties.PAGE_INFORMATION_ALIGNMENT;
+                }
+
+                @Override
+                public Object getBean() {
+                    return PaginationSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "pageInformationAlignment";
+                }
+            };
+        }
+        return pageInformationAlignment;
+    }
+
+    private BooleanProperty tooltipVisible;
+    private final void setTooltipVisible(boolean value) { tooltipVisibleProperty().set(value); }
+    private final boolean isTooltipVisible() { return tooltipVisible == null ? DEFAULT_TOOLTIP_VISIBLE : tooltipVisible.get(); }
+    private final BooleanProperty tooltipVisibleProperty() {
+        if (tooltipVisible == null) {
+            tooltipVisible = new StyleableBooleanProperty(DEFAULT_TOOLTIP_VISIBLE) {
+                @Override
+                protected void invalidated() {
+                    getSkinnable().requestLayout();
+                }
+
+                @Override
+                public CssMetaData<Pagination,Boolean> getCssMetaData() {
+                    return StyleableProperties.TOOLTIP_VISIBLE;
+                }
+
+                @Override
+                public Object getBean() {
+                    return PaginationSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "tooltipVisible";
+                }
+            };
+        }
+        return tooltipVisible;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double navigationWidth = navigation.isVisible() ? snapSize(navigation.minWidth(height)) : 0;
+        return leftInset + Math.max(currentStackPane.minWidth(height), navigationWidth) + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double navigationHeight = navigation.isVisible() ? snapSize(navigation.minHeight(width)) : 0;
+        return topInset + currentStackPane.minHeight(width) + navigationHeight + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double navigationWidth = navigation.isVisible() ? snapSize(navigation.prefWidth(height)) : 0;
+        return leftInset + Math.max(currentStackPane.prefWidth(height), navigationWidth) + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double navigationHeight = navigation.isVisible() ? snapSize(navigation.prefHeight(width)) : 0;
+        return topInset + currentStackPane.prefHeight(width) + navigationHeight + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        double navigationHeight = navigation.isVisible() ? snapSize(navigation.prefHeight(-1)) : 0;
+        double stackPaneHeight = snapSize(h - navigationHeight);
+
+        layoutInArea(currentStackPane, x, y, w, stackPaneHeight, 0, HPos.CENTER, VPos.CENTER);
+        layoutInArea(nextStackPane, x, y, w, stackPaneHeight, 0, HPos.CENTER, VPos.CENTER);
+        layoutInArea(navigation, x, stackPaneHeight, w, navigationHeight, 0, HPos.CENTER, VPos.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: return navigation.indicatorButtons.getSelectedToggle();
+            case ITEM_COUNT: return navigation.indicatorButtons.getToggles().size();
+            case ITEM_AT_INDEX: {
+                Integer index = (Integer)parameters[0];
+                if (index == null) return null;
+                return navigation.indicatorButtons.getToggles().get(index);
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void selectNext() {
+        if (getCurrentPageIndex() < getPageCount() - 1) {
+            pagination.setCurrentPageIndex(getCurrentPageIndex() + 1);
+        }
+    }
+
+    private void selectPrevious() {
+        if (getCurrentPageIndex() > 0) {
+            pagination.setCurrentPageIndex(getCurrentPageIndex() - 1);
+        }
+    }
+
+    private void resetIndiciesAndNav() {
+        resetIndexes(false);
+        navigation.initializePageIndicators();
+        navigation.updatePageIndicators();
+    }
+
+    private void initializeSwipeAndTouchHandlers() {
+        final Pagination control = getSkinnable();
+
+        getSkinnable().addEventHandler(TouchEvent.TOUCH_PRESSED, e -> {
+            if (touchEventId == -1) {
+                touchEventId = e.getTouchPoint().getId();
+            }
+            if (touchEventId != e.getTouchPoint().getId()) {
+                return;
+            }
+            lastTouchPos = startTouchPos = e.getTouchPoint().getX();
+            lastTouchTime = startTouchTime = System.currentTimeMillis();
+            touchThresholdBroken = false;
+            e.consume();
+        });
+
+        getSkinnable().addEventHandler(TouchEvent.TOUCH_MOVED, e -> {
+            if (touchEventId != e.getTouchPoint().getId()) {
+                return;
+            }
+
+            double drag = e.getTouchPoint().getX() - lastTouchPos;
+            long time = System.currentTimeMillis() - lastTouchTime;
+            touchVelocity = drag/time;
+            lastTouchPos = e.getTouchPoint().getX();
+            lastTouchTime = System.currentTimeMillis();
+            double delta = e.getTouchPoint().getX() - startTouchPos;
+
+            if (!touchThresholdBroken && Math.abs(delta) > TOUCH_THRESHOLD) {
+                touchThresholdBroken = true;
+            }
+
+            if (touchThresholdBroken) {
+                double width = control.getWidth() - (snappedLeftInset() + snappedRightInset());
+                double currentPaneX;
+                double nextPaneX;
+
+                if (!setInitialDirection) {
+                    // Remember the direction travelled so we can
+                    // load the next or previous page if the touch is not released.
+                    setInitialDirection = true;
+                    direction = delta < 0 ? 1 : -1;
+                }
+                if (delta < 0) {
+                    if (direction == -1) {
+                        nextStackPane.getChildren().clear();
+                        direction = 1;
+                    }
+                    // right to left
+                    if (Math.abs(delta) <= width) {
+                        currentPaneX = delta;
+                        nextPaneX = width + delta;
+                        nextPageReached = false;
+                    } else {
+                        currentPaneX = -width;
+                        nextPaneX = 0;
+                        nextPageReached = true;
+                    }
+                    currentStackPane.setTranslateX(currentPaneX);
+                    if (getCurrentPageIndex() < getPageCount() - 1) {
+                        createPage(nextStackPane, currentIndex + 1);
+                        nextStackPane.setVisible(true);
+                        nextStackPane.setTranslateX(nextPaneX);
+                    } else {
+                        currentStackPane.setTranslateX(0);
+                    }
+                } else {
+                    // left to right
+                    if (direction == 1) {
+                        nextStackPane.getChildren().clear();
+                        direction = -1;
+                    }
+                    if (Math.abs(delta) <= width) {
+                        currentPaneX = delta;
+                        nextPaneX = -width + delta;
+                        nextPageReached = false;
+                    } else {
+                        currentPaneX = width;
+                        nextPaneX = 0;
+                        nextPageReached = true;
+                    }
+                    currentStackPane.setTranslateX(currentPaneX);
+                    if (getCurrentPageIndex() != 0) {
+                        createPage(nextStackPane, currentIndex - 1);
+                        nextStackPane.setVisible(true);
+                        nextStackPane.setTranslateX(nextPaneX);
+                    } else {
+                        currentStackPane.setTranslateX(0);
+                    }
+                }
+            }
+            e.consume();
+        });
+
+        getSkinnable().addEventHandler(TouchEvent.TOUCH_RELEASED, e -> {
+            if (touchEventId != e.getTouchPoint().getId()) {
+                return;
+            } else {
+                touchEventId = -1;
+                setInitialDirection = false;
+            }
+
+            if (touchThresholdBroken) {
+                // determin if click or swipe
+                final double drag = e.getTouchPoint().getX() - startTouchPos;
+                // calculate complete time from start to end of drag
+                final long time = System.currentTimeMillis() - startTouchTime;
+                // if time is less than 300ms then considered a quick swipe and whole time is used
+                final boolean quick = time < 300;
+                // calculate velocity
+                final double velocity = quick ? (double)drag / time : touchVelocity; // pixels/ms
+                // calculate distance we would travel at this speed for 500ms of travel
+                final double distance = (velocity * 500);
+                final double width = control.getWidth() - (snappedLeftInset() + snappedRightInset());
+
+                // The swipe distance travelled.
+                final double threshold = Math.abs(distance/width);
+                // The touch and dragged distance travelled.
+                final double delta = Math.abs(drag/width);
+                if (threshold > SWIPE_THRESHOLD || delta > SWIPE_THRESHOLD) {
+                    if (startTouchPos > e.getTouchPoint().getX()) {
+                        selectNext();
+                    } else {
+                        selectPrevious();
+                    }
+                } else {
+                    animateClamping(startTouchPos > e.getTouchPoint().getSceneX());
+                }
+            }
+            e.consume();
+        });
+    }
+
+    private void resetIndexes(boolean usePageIndex) {
+        maxPageIndicatorCount = getMaxPageIndicatorCount();
+        // Used to indicate that we can change a set of pages.
+        pageCount = getPageCount();
+        if (pageCount > maxPageIndicatorCount) {
+            pageCount = maxPageIndicatorCount;
+        }
+
+        fromIndex = 0;
+        previousIndex = 0;
+        currentIndex = usePageIndex ? getCurrentPageIndex() : 0;
+        toIndex = pageCount - 1;
+
+        if (pageCount == Pagination.INDETERMINATE && maxPageIndicatorCount == Pagination.INDETERMINATE) {
+            // We do not know how many indicators  can fit.  Let the layout pass compute it.
+            toIndex = 0;
+        }
+
+        boolean isAnimate = animate;
+        if (isAnimate) {
+            animate = false;
+        }
+
+        // Remove the children in the pane before we create a new page.
+        currentStackPane.getChildren().clear();
+        nextStackPane.getChildren().clear();
+
+        pagination.setCurrentPageIndex(currentIndex);
+        createPage(currentStackPane, currentIndex);
+
+        if (isAnimate) {
+            animate = true;
+        }
+    }
+
+    private boolean createPage(StackPane pane, int index) {
+        if (pagination.getPageFactory() != null && pane.getChildren().isEmpty()) {
+            Node content = pagination.getPageFactory().call(index);
+            // If the content is null we don't want to switch pages.
+            if (content != null) {
+                pane.getChildren().setAll(content);
+                return true;
+            } else {
+                // Disable animation if the new page does not exist.  It is strange to
+                // see the same page animated out then in.
+                boolean isAnimate = animate;
+                if (isAnimate) {
+                    animate = false;
+                }
+
+                if (pagination.getPageFactory().call(previousIndex) != null) {
+                    pagination.setCurrentPageIndex(previousIndex);
+                } else {
+                    // Set the page index to 0 because both the current,
+                    // and the previous pages have no content.
+                    pagination.setCurrentPageIndex(0);
+                }
+
+                if (isAnimate) {
+                    animate = true;
+                }
+                return false;
+            }
+        }
+        return false;
+    }
+
+    private int getPageCount() {
+        if (getSkinnable().getPageCount() < 1) {
+            return 1;
+        }
+        return getSkinnable().getPageCount();
+    }
+
+    private int getMaxPageIndicatorCount() {
+        return getSkinnable().getMaxPageIndicatorCount();
+    }
+
+    private int getCurrentPageIndex() {
+        return getSkinnable().getCurrentPageIndex();
+    }
+
+    private void animateSwitchPage() {
+        if (timeline != null) {
+            timeline.setRate(8);
+            hasPendingAnimation = true;
+            return;
+        }
+
+        // We are handling a touch event if nextPane's page has already been
+        // created and visible == true.
+        if (!nextStackPane.isVisible()) {
+            if (!createPage(nextStackPane, currentAnimatedIndex)) {
+                // The next page does not exist just return without starting
+                // any animation.
+                return;
+            }
+        }
+        if (nextPageReached) {
+            // No animation is needed when the next page is already showing
+            // and in the correct position.  Just swap the panes and return
+            swapPanes();
+            nextPageReached = false;
+            return;
+        }
+
+        nextStackPane.setCache(true);
+        currentStackPane.setCache(true);
+
+        // wait one pulse then animate
+        Platform.runLater(() -> {
+            // We are handling a touch event if nextPane's translateX is not 0
+            boolean useTranslateX = nextStackPane.getTranslateX() != 0;
+            if (currentAnimatedIndex > previousIndex) {  // animate right to left
+                if (!useTranslateX) {
+                    nextStackPane.setTranslateX(currentStackPane.getWidth());
+                }
+                nextStackPane.setVisible(true);
+                timeline = new Timeline();
+                KeyFrame k1 =  new KeyFrame(Duration.millis(0),
+                    new KeyValue(currentStackPane.translateXProperty(),
+                        useTranslateX ? currentStackPane.getTranslateX() : 0,
+                        interpolator),
+                    new KeyValue(nextStackPane.translateXProperty(),
+                        useTranslateX ?
+                            nextStackPane.getTranslateX() : currentStackPane.getWidth(), interpolator));
+                KeyFrame k2 = new KeyFrame(DURATION,
+                    swipeAnimationEndEventHandler,
+                    new KeyValue(currentStackPane.translateXProperty(), -currentStackPane.getWidth(), interpolator),
+                    new KeyValue(nextStackPane.translateXProperty(), 0, interpolator));
+                timeline.getKeyFrames().setAll(k1, k2);
+                timeline.play();
+            } else { // animate left to right
+                if (!useTranslateX) {
+                    nextStackPane.setTranslateX(-currentStackPane.getWidth());
+                }
+                nextStackPane.setVisible(true);
+                timeline = new Timeline();
+                KeyFrame k1 = new KeyFrame(Duration.millis(0),
+                    new KeyValue(currentStackPane.translateXProperty(),
+                        useTranslateX ? currentStackPane.getTranslateX() : 0,
+                        interpolator),
+                    new KeyValue(nextStackPane.translateXProperty(),
+                        useTranslateX ? nextStackPane.getTranslateX() : -currentStackPane.getWidth(),
+                        interpolator));
+                KeyFrame k2 = new KeyFrame(DURATION,
+                    swipeAnimationEndEventHandler,
+                    new KeyValue(currentStackPane.translateXProperty(), currentStackPane.getWidth(), interpolator),
+                    new KeyValue(nextStackPane.translateXProperty(), 0, interpolator));
+                timeline.getKeyFrames().setAll(k1, k2);
+                timeline.play();
+            }
+        });
+    }
+
+    private void swapPanes() {
+        StackPane temp = currentStackPane;
+        currentStackPane = nextStackPane;
+        nextStackPane = temp;
+
+        currentStackPane.setTranslateX(0);
+        currentStackPane.setCache(false);
+
+        nextStackPane.setTranslateX(0);
+        nextStackPane.setCache(false);
+        nextStackPane.setVisible(false);
+        nextStackPane.getChildren().clear();
+    }
+
+    // If the swipe hasn't reached the THRESHOLD we want to animate the clamping.
+    private void animateClamping(boolean rightToLeft) {
+        if (rightToLeft) {  // animate right to left
+            timeline = new Timeline();
+            KeyFrame k1 = new KeyFrame(Duration.millis(0),
+                new KeyValue(currentStackPane.translateXProperty(), currentStackPane.getTranslateX(), interpolator),
+                new KeyValue(nextStackPane.translateXProperty(), nextStackPane.getTranslateX(), interpolator));
+            KeyFrame k2 = new KeyFrame(DURATION,
+                clampAnimationEndEventHandler,
+                new KeyValue(currentStackPane.translateXProperty(), 0, interpolator),
+                new KeyValue(nextStackPane.translateXProperty(), currentStackPane.getWidth(), interpolator));
+            timeline.getKeyFrames().setAll(k1, k2);
+            timeline.play();
+        } else { // animate left to right
+            timeline = new Timeline();
+            KeyFrame k1 = new KeyFrame(Duration.millis(0),
+                new KeyValue(currentStackPane.translateXProperty(), currentStackPane.getTranslateX(), interpolator),
+                new KeyValue(nextStackPane.translateXProperty(), nextStackPane.getTranslateX(), interpolator));
+            KeyFrame k2 = new KeyFrame(DURATION,
+                clampAnimationEndEventHandler,
+                new KeyValue(currentStackPane.translateXProperty(), 0, interpolator),
+                new KeyValue(nextStackPane.translateXProperty(), -currentStackPane.getWidth(), interpolator));
+            timeline.getKeyFrames().setAll(k1, k2);
+            timeline.play();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    class NavigationControl extends StackPane {
+
+        private HBox controlBox;
+        private Button leftArrowButton;
+        private StackPane leftArrow;
+        private Button rightArrowButton;
+        private StackPane rightArrow;
+        private ToggleGroup indicatorButtons;
+        private Label pageInformation;
+        private double previousWidth = -1;
+        private double minButtonSize = -1;
+
+        public NavigationControl() {
+            getStyleClass().setAll("pagination-control");
+
+            // redirect mouse events to behavior
+            addEventHandler(MouseEvent.MOUSE_PRESSED, behavior::mousePressed);
+
+            controlBox = new HBox();
+            controlBox.getStyleClass().add("control-box");
+
+            leftArrowButton = new Button();
+            leftArrowButton.setAccessibleText(getString("Accessibility.title.Pagination.PreviousButton"));
+            minButtonSize = leftArrowButton.getFont().getSize() * 2;
+            leftArrowButton.fontProperty().addListener((arg0, arg1, newFont) -> {
+                minButtonSize = newFont.getSize() * 2;
+                for(Node child: controlBox.getChildren()) {
+                    ((Control)child).setMinSize(minButtonSize, minButtonSize);
+                }
+                // We want to relayout the indicator buttons because the size has changed.
+                requestLayout();
+            });
+            leftArrowButton.setMinSize(minButtonSize, minButtonSize);
+            leftArrowButton.prefWidthProperty().bind(leftArrowButton.minWidthProperty());
+            leftArrowButton.prefHeightProperty().bind(leftArrowButton.minHeightProperty());
+            leftArrowButton.getStyleClass().add("left-arrow-button");
+            leftArrowButton.setFocusTraversable(false);
+            HBox.setMargin(leftArrowButton, new Insets(0, snapSize(arrowButtonGap.get()), 0, 0));
+            leftArrow = new StackPane();
+            leftArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
+            leftArrowButton.setGraphic(leftArrow);
+            leftArrow.getStyleClass().add("left-arrow");
+
+            rightArrowButton = new Button();
+            rightArrowButton.setAccessibleText(getString("Accessibility.title.Pagination.NextButton"));
+            rightArrowButton.setMinSize(minButtonSize, minButtonSize);
+            rightArrowButton.prefWidthProperty().bind(rightArrowButton.minWidthProperty());
+            rightArrowButton.prefHeightProperty().bind(rightArrowButton.minHeightProperty());
+            rightArrowButton.getStyleClass().add("right-arrow-button");
+            rightArrowButton.setFocusTraversable(false);
+            HBox.setMargin(rightArrowButton, new Insets(0, 0, 0, snapSize(arrowButtonGap.get())));
+            rightArrow = new StackPane();
+            rightArrow.setMaxSize(USE_PREF_SIZE, USE_PREF_SIZE);
+            rightArrowButton.setGraphic(rightArrow);
+            rightArrow.getStyleClass().add("right-arrow");
+
+            indicatorButtons = new ToggleGroup();
+
+            pageInformation = new Label();
+            pageInformation.getStyleClass().add("page-information");
+
+            getChildren().addAll(controlBox, pageInformation);
+            initializeNavigationHandlers();
+            initializePageIndicators();
+            updatePageIndex();
+
+            // listen to changes to arrowButtonGap and update margins
+            arrowButtonGap.addListener((observable, oldValue, newValue) -> {
+                if (newValue.doubleValue() == 0) {
+                    HBox.setMargin(leftArrowButton, null);
+                    HBox.setMargin(rightArrowButton, null);
+
+                } else {
+                    HBox.setMargin(leftArrowButton, new Insets(0, snapSize(newValue.doubleValue()), 0, 0));
+                    HBox.setMargin(rightArrowButton, new Insets(0, 0, 0, snapSize(newValue.doubleValue())));
+                }
+            });
+        }
+
+        private void initializeNavigationHandlers() {
+            leftArrowButton.setOnAction(arg0 -> {
+                selectPrevious();
+                requestLayout();
+            });
+
+            rightArrowButton.setOnAction(arg0 -> {
+                selectNext();
+                requestLayout();
+            });
+
+            pagination.currentPageIndexProperty().addListener((arg0, arg1, arg2) -> {
+                previousIndex = arg1.intValue();
+                currentIndex = arg2.intValue();
+                updatePageIndex();
+                if (animate) {
+                    currentAnimatedIndex = currentIndex;
+                    animateSwitchPage();
+                } else {
+                    createPage(currentStackPane, currentIndex);
+                }
+            });
+        }
+
+        // Create the indicators using fromIndex and toIndex.
+        private void initializePageIndicators() {
+            previousIndicatorCount = 0;
+            controlBox.getChildren().clear();
+            clearIndicatorButtons();
+
+            controlBox.getChildren().add(leftArrowButton);
+            for (int i = fromIndex; i <= toIndex; i++) {
+                IndicatorButton ib = new IndicatorButton(i);
+                ib.setMinSize(minButtonSize, minButtonSize);
+                ib.setToggleGroup(indicatorButtons);
+                controlBox.getChildren().add(ib);
+            }
+            controlBox.getChildren().add(rightArrowButton);
+        }
+
+        private void clearIndicatorButtons() {
+            for (Toggle toggle : indicatorButtons.getToggles()) {
+                if (toggle instanceof IndicatorButton) {
+                    IndicatorButton indicatorButton = (IndicatorButton) toggle;
+                    indicatorButton.release();
+                }
+            }
+            indicatorButtons.getToggles().clear();
+        }
+
+        // Finds and selects the IndicatorButton using the currentIndex.
+         private void updatePageIndicators() {
+            for (int i = 0; i < indicatorButtons.getToggles().size(); i++) {
+                IndicatorButton ib = (IndicatorButton)indicatorButtons.getToggles().get(i);
+                if (ib.getPageNumber() == currentIndex) {
+                    ib.setSelected(true);
+                    updatePageInformation();
+                    break;
+                }
+            }
+            getSkinnable().notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUS_ITEM);
+        }
+
+        // Update the page index using the currentIndex and updates the page set
+        // if necessary.
+        private void updatePageIndex() {
+            //System.out.println("SELECT PROPERTY FROM " + fromIndex + " TO " + toIndex + " PREVIOUS " + previousIndex + " CURRENT "+ currentIndex + " PAGE COUNT " + pageCount + " MAX PAGE INDICATOR COUNT " + maxPageIndicatorCount);
+            if (pageCount == maxPageIndicatorCount) {
+                if (changePageSet()) {
+                    initializePageIndicators();
+                }
+            }
+            updatePageIndicators();
+            requestLayout();
+        }
+
+        private void updatePageInformation() {
+            String currentPageNumber = Integer.toString(currentIndex + 1);
+            String lastPageNumber = getPageCount() == Pagination.INDETERMINATE ? "..." : Integer.toString(getPageCount());
+            pageInformation.setText(currentPageNumber + "/" + lastPageNumber);
+        }
+
+        private int previousIndicatorCount = 0;
+        // Layout the maximum number of page indicators we can fit within the width.
+        // And always show the selected indicator.
+        private void layoutPageIndicators() {
+            final double left = snappedLeftInset();
+            final double right = snappedRightInset();
+            final double width = snapSize(getWidth()) - (left + right);
+            final double controlBoxleft = controlBox.snappedLeftInset();
+            final double controlBoxRight = controlBox.snappedRightInset();
+            final double leftArrowWidth = snapSize(Utils.boundedSize(leftArrowButton.prefWidth(-1), leftArrowButton.minWidth(-1), leftArrowButton.maxWidth(-1)));
+            final double rightArrowWidth = snapSize(Utils.boundedSize(rightArrowButton.prefWidth(-1), rightArrowButton.minWidth(-1), rightArrowButton.maxWidth(-1)));
+            final double spacing = snapSize(controlBox.getSpacing());
+            double w = width - (controlBoxleft + leftArrowWidth + 2* arrowButtonGap.get() + spacing + rightArrowWidth + controlBoxRight);
+
+            if (isPageInformationVisible() &&
+                    (Side.LEFT.equals(getPageInformationAlignment()) ||
+                    Side.RIGHT.equals(getPageInformationAlignment()))) {
+                w -= snapSize(pageInformation.prefWidth(-1));
+            }
+
+            double x = 0;
+            int indicatorCount = 0;
+            for (int i = 0; i < getMaxPageIndicatorCount(); i++) {
+                int index = i < indicatorButtons.getToggles().size() ? i : indicatorButtons.getToggles().size() - 1;
+                double iw = minButtonSize;
+                if (index != -1) {
+                    IndicatorButton ib = (IndicatorButton)indicatorButtons.getToggles().get(index);
+                    iw = snapSize(Utils.boundedSize(ib.prefWidth(-1), ib.minWidth(-1), ib.maxWidth(-1)));
+                }
+
+                x += (iw + spacing);
+                if (x > w) {
+                    break;
+                }
+                indicatorCount++;
+            }
+            if (indicatorCount == 0) {
+               indicatorCount = 1; // The parent didn't respect the minSize of this Pagination.
+                                   // We will show at least one indicator nonetheless.
+            }
+
+            if (indicatorCount != previousIndicatorCount) {
+                if (indicatorCount < getMaxPageIndicatorCount()) {
+                    maxPageIndicatorCount = indicatorCount;
+                } else {
+                    maxPageIndicatorCount = getMaxPageIndicatorCount();
+                }
+
+                int lastIndicatorButtonIndex;
+                if (pageCount > maxPageIndicatorCount) {
+                    pageCount = maxPageIndicatorCount;
+                    lastIndicatorButtonIndex = maxPageIndicatorCount - 1;
+                 } else {
+                    if (indicatorCount > getPageCount()) {
+                        pageCount = getPageCount();
+                        lastIndicatorButtonIndex = getPageCount() - 1;
+                    } else {
+                        pageCount = indicatorCount;
+                        lastIndicatorButtonIndex = indicatorCount - 1;
+                    }
+                }
+
+                if (currentIndex >= toIndex) {
+                    // The current index has fallen off the right
+                    toIndex = currentIndex;
+                    fromIndex = toIndex - lastIndicatorButtonIndex;
+                } else if (currentIndex <= fromIndex) {
+                    // The current index has fallen off the left
+                    fromIndex = currentIndex;
+                    toIndex = fromIndex + lastIndicatorButtonIndex;
+                } else {
+                    toIndex = fromIndex + lastIndicatorButtonIndex;
+                }
+
+                if (toIndex > getPageCount() - 1) {
+                    toIndex = getPageCount() - 1;
+                    //fromIndex = toIndex - lastIndicatorButtonIndex;
+                }
+
+                if (fromIndex < 0) {
+                    fromIndex = 0;
+                    toIndex = fromIndex + lastIndicatorButtonIndex;
+                }
+
+                initializePageIndicators();
+                updatePageIndicators();
+                previousIndicatorCount = indicatorCount;
+            }
+        }
+
+        // Only change to the next set when the current index is at the start or the end of the set.
+        // Return true only if we have scrolled to the next/previous set.
+        private boolean changePageSet() {
+            int index = indexToIndicatorButtonsIndex(currentIndex);
+            int lastIndicatorButtonIndex = maxPageIndicatorCount - 1;
+            if (previousIndex < currentIndex &&
+                    index == 0 &&
+                    lastIndicatorButtonIndex != 0 &&
+                    index % lastIndicatorButtonIndex == 0) {
+                // Get the right page set
+                fromIndex = currentIndex;
+                toIndex = fromIndex + lastIndicatorButtonIndex;
+            } else if (currentIndex < previousIndex &&
+                    index == lastIndicatorButtonIndex &&
+                    lastIndicatorButtonIndex != 0 &&
+                    index % lastIndicatorButtonIndex == 0) {
+                // Get the left page set
+                toIndex = currentIndex;
+                fromIndex = toIndex - lastIndicatorButtonIndex;
+            } else {
+                // We need to get the new page set if the currentIndex is out of range.
+                // This can happen if setPageIndex() is called programatically.
+                if (currentIndex < fromIndex || currentIndex > toIndex) {
+                    fromIndex = currentIndex - index;
+                    toIndex = fromIndex + lastIndicatorButtonIndex;
+                } else {
+                    return false;
+                }
+            }
+
+            // We have gone past the total number of pages
+            if (toIndex > getPageCount() - 1) {
+                if (fromIndex > getPageCount() - 1) {
+                    return false;
+                } else {
+                  toIndex = getPageCount() - 1;
+                  //fromIndex = toIndex - lastIndicatorButtonIndex;
+                }
+            }
+
+            // We have gone past the starting page
+            if (fromIndex < 0) {
+                fromIndex = 0;
+                toIndex = fromIndex + lastIndicatorButtonIndex;
+            }
+            return true;
+        }
+
+        private int indexToIndicatorButtonsIndex(int index) {
+            // This should be in the indicator buttons toggle list.
+            if (index >= fromIndex && index <= toIndex) {
+                return index - fromIndex;
+            }
+            // The requested index is not in indicator buttons list we have to predict
+            // where the index will be.
+            int i = 0;
+            int from = fromIndex;
+            int to = toIndex;
+            if (currentIndex > previousIndex) {
+                while(from < getPageCount() && to < getPageCount()) {
+                    from += i;
+                    to += i;
+                    if (index >= from && index <= to) {
+                        if (index == from) {
+                            return 0;
+                        } else if (index == to) {
+                            return maxPageIndicatorCount - 1;
+                        }
+                        return index - from;
+                    }
+                    i += maxPageIndicatorCount;
+                }
+            } else {
+                while (from > 0 && to > 0) {
+                    from -= i;
+                    to -= i;
+                    if (index >= from && index <= to) {
+                        if (index == from) {
+                            return 0;
+                        } else if (index == to) {
+                            return maxPageIndicatorCount - 1;
+                        }
+                        return index - from;
+                    }
+                    i += maxPageIndicatorCount;
+                }
+            }
+            // We are on the last page set going back to the previous page set
+            return maxPageIndicatorCount - 1;
+        }
+
+        private Pos sideToPos(Side s) {
+            if (Side.TOP.equals(s)) {
+                return Pos.TOP_CENTER;
+            } else if (Side.RIGHT.equals(s)) {
+                return Pos.CENTER_RIGHT;
+            } else if (Side.BOTTOM.equals(s)) {
+                return Pos.BOTTOM_CENTER;
+            }
+            return Pos.CENTER_LEFT;
+        }
+
+        @Override protected double computeMinWidth(double height) {
+            double left = snappedLeftInset();
+            double right = snappedRightInset();
+            double leftArrowWidth = snapSize(Utils.boundedSize(leftArrowButton.prefWidth(-1), leftArrowButton.minWidth(-1), leftArrowButton.maxWidth(-1)));
+            double rightArrowWidth = snapSize(Utils.boundedSize(rightArrowButton.prefWidth(-1), rightArrowButton.minWidth(-1), rightArrowButton.maxWidth(-1)));
+            double spacing = snapSize(controlBox.getSpacing());
+            double pageInformationWidth = 0;
+            Side side = getPageInformationAlignment();
+            if (Side.LEFT.equals(side) || Side.RIGHT.equals(side)) {
+                pageInformationWidth = snapSize(pageInformation.prefWidth(-1));
+            }
+            double arrowGap = arrowButtonGap.get();
+
+            return left + leftArrowWidth + 2 *arrowGap + minButtonSize /*at least one button*/ 
+                    + 2 * spacing + rightArrowWidth + right + pageInformationWidth;
+        }
+
+        @Override protected double computeMinHeight(double width) {
+            return computePrefHeight(width);
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            final double left = snappedLeftInset();
+            final double right = snappedRightInset();
+            final double controlBoxWidth = snapSize(controlBox.prefWidth(height));
+            double pageInformationWidth = 0;
+            Side side = getPageInformationAlignment();
+            if (Side.LEFT.equals(side) || Side.RIGHT.equals(side)) {
+                pageInformationWidth = snapSize(pageInformation.prefWidth(-1));
+            }
+
+            return left + controlBoxWidth + right + pageInformationWidth;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            final double top = snappedTopInset();
+            final double bottom = snappedBottomInset();
+            final double boxHeight = snapSize(controlBox.prefHeight(width));
+            double pageInformationHeight = 0;
+            Side side = getPageInformationAlignment();
+            if (Side.TOP.equals(side) || Side.BOTTOM.equals(side)) {
+                pageInformationHeight = snapSize(pageInformation.prefHeight(-1));
+            }
+
+            return top + boxHeight + pageInformationHeight + bottom;
+        }
+
+        @Override protected void layoutChildren() {
+            final double top = snappedTopInset();
+            final double bottom = snappedBottomInset();
+            final double left = snappedLeftInset();
+            final double right = snappedRightInset();
+            final double width = snapSize(getWidth()) - (left + right);
+            final double height = snapSize(getHeight()) - (top + bottom);
+            final double controlBoxWidth = snapSize(controlBox.prefWidth(-1));
+            final double controlBoxHeight = snapSize(controlBox.prefHeight(-1));
+            final double pageInformationWidth = snapSize(pageInformation.prefWidth(-1));
+            final double pageInformationHeight = snapSize(pageInformation.prefHeight(-1));
+
+            leftArrowButton.setDisable(false);
+            rightArrowButton.setDisable(false);
+
+            if (currentIndex == 0) {
+                // Grey out the left arrow if we are at the beginning.
+                leftArrowButton.setDisable(true);
+            }
+            if (currentIndex == (getPageCount() - 1)) {
+                // Grey out the right arrow if we have reached the end.
+                rightArrowButton.setDisable(true);
+            }
+            // Reapply CSS so the left and right arrow button's disable state is updated
+            // immediately.
+            applyCss();
+
+            leftArrowButton.setVisible(isArrowsVisible());
+            rightArrowButton.setVisible(isArrowsVisible());
+            pageInformation.setVisible(isPageInformationVisible());
+
+            // Determine the number of indicators we can fit within the pagination width.
+//            if (snapSize(getWidth()) != previousWidth) {
+                layoutPageIndicators();
+//            }
+            previousWidth = getWidth();
+
+            HPos controlBoxHPos = controlBox.getAlignment().getHpos();
+            VPos controlBoxVPos = controlBox.getAlignment().getVpos();
+            double controlBoxX = left + Utils.computeXOffset(width, controlBoxWidth, controlBoxHPos);
+            double controlBoxY = top + Utils.computeYOffset(height, controlBoxHeight, controlBoxVPos);
+
+            if (isPageInformationVisible()) {
+                Pos p = sideToPos(getPageInformationAlignment());
+                HPos pageInformationHPos = p.getHpos();
+                VPos pageInformationVPos = p.getVpos();
+                double pageInformationX = left + Utils.computeXOffset(width, pageInformationWidth, pageInformationHPos);
+                double pageInformationY = top + Utils.computeYOffset(height, pageInformationHeight, pageInformationVPos);
+
+                if (Side.TOP.equals(getPageInformationAlignment())) {
+                    pageInformationY = top;
+                    controlBoxY = top + pageInformationHeight;
+                } else if (Side.RIGHT.equals(getPageInformationAlignment())) {
+                    pageInformationX = width - right - pageInformationWidth;
+                } else if (Side.BOTTOM.equals(getPageInformationAlignment())) {
+                    controlBoxY = top;
+                    pageInformationY = top + controlBoxHeight;
+                } else if (Side.LEFT.equals(getPageInformationAlignment())) {
+                    pageInformationX = left;
+                }
+                layoutInArea(pageInformation, pageInformationX, pageInformationY, pageInformationWidth, pageInformationHeight, 0, pageInformationHPos, pageInformationVPos);
+            }
+
+            layoutInArea(controlBox, controlBoxX, controlBoxY, controlBoxWidth, controlBoxHeight, 0, controlBoxHPos, controlBoxVPos);
+        }
+    }
+
+    class IndicatorButton extends ToggleButton {
+        private final ListChangeListener<String> updateSkinIndicatorType =
+                                                    c -> setIndicatorType();
+
+        private final ChangeListener<Boolean> updateTooltipVisibility =
+                       (ob, oldValue, newValue) -> setTooltipVisible(newValue);
+
+        private int pageNumber;
+
+        public IndicatorButton(int pageNumber) {
+            this.pageNumber = pageNumber;
+            setFocusTraversable(false);
+            setIndicatorType();
+            setTooltipVisible(isTooltipVisible());
+
+            getSkinnable().getStyleClass().addListener(updateSkinIndicatorType);
+
+            setOnAction(new EventHandler<ActionEvent>() {
+                @Override public void handle(ActionEvent arg0) {
+                    int selected = getCurrentPageIndex();
+                    // We do not need to update the selection if it has not changed.
+                    if (selected != IndicatorButton.this.pageNumber) {
+                        pagination.setCurrentPageIndex(IndicatorButton.this.pageNumber);
+                        requestLayout();
+                    }
+                }
+            });
+
+            tooltipVisibleProperty().addListener(updateTooltipVisibility);
+
+            prefHeightProperty().bind(minHeightProperty());
+            setAccessibleRole(AccessibleRole.PAGE_ITEM);
+        }
+
+        private void setIndicatorType() {
+            if (getSkinnable().getStyleClass().contains(Pagination.STYLE_CLASS_BULLET)) {
+                getStyleClass().remove("number-button");
+                getStyleClass().add("bullet-button");
+                setText(null);
+
+                // Bind the width in addition to the height to ensure the region is square
+                prefWidthProperty().bind(minWidthProperty());
+            } else {
+                getStyleClass().remove("bullet-button");
+                getStyleClass().add("number-button");
+                setText(Integer.toString(this.pageNumber + 1));
+
+                // Free the width to conform to the text content
+                prefWidthProperty().unbind();
+            }
+        }
+
+        private void setTooltipVisible(boolean b) {
+            if (b) {
+                setTooltip(new Tooltip(Integer.toString(IndicatorButton.this.pageNumber + 1)));
+            } else {
+                setTooltip(null);
+            }
+        }
+
+        public int getPageNumber() {
+            return this.pageNumber;
+        }
+
+        @Override public void fire() {
+            // we don't toggle from selected to not selected if part of a group
+            if (getToggleGroup() == null || !isSelected()) {
+                super.fire();
+            }
+        }
+
+        public void release() {
+            getSkinnable().getStyleClass().removeListener(updateSkinIndicatorType);
+            tooltipVisibleProperty().removeListener(updateTooltipVisibility);
+        }
+
+        @Override
+        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+            switch (attribute) {
+                case TEXT: return getText();
+                case SELECTED: return isSelected();
+                default: return super.queryAccessibleAttribute(attribute, parameters);
+            }
+        }
+
+        @Override
+        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+            switch (action) {
+                case REQUEST_FOCUS:
+                    getSkinnable().setCurrentPageIndex(pageNumber);
+                    break;
+                default: super.executeAccessibleAction(action);
+            }
+        }
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     *                         Stylesheet Handling                             *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final Boolean DEFAULT_ARROW_VISIBLE = Boolean.FALSE;
+    private static final Boolean DEFAULT_PAGE_INFORMATION_VISIBLE = Boolean.FALSE;
+    private static final Side DEFAULT_PAGE_INFORMATION_ALIGNMENT = Side.BOTTOM;
+    private static final Boolean DEFAULT_TOOLTIP_VISIBLE = Boolean.FALSE;
+
+    private static class StyleableProperties {
+        private static final CssMetaData<Pagination,Boolean> ARROWS_VISIBLE =
+            new CssMetaData<Pagination,Boolean>("-fx-arrows-visible",
+                BooleanConverter.getInstance(), DEFAULT_ARROW_VISIBLE) {
+
+            @Override
+            public boolean isSettable(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return skin.arrowsVisible == null || !skin.arrowsVisible.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Boolean> getStyleableProperty(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.arrowsVisibleProperty();
+            }
+        };
+
+        private static final CssMetaData<Pagination,Boolean> PAGE_INFORMATION_VISIBLE =
+            new CssMetaData<Pagination,Boolean>("-fx-page-information-visible",
+                BooleanConverter.getInstance(), DEFAULT_PAGE_INFORMATION_VISIBLE) {
+
+            @Override
+            public boolean isSettable(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return skin.pageInformationVisible == null || !skin.pageInformationVisible.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Boolean> getStyleableProperty(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.pageInformationVisibleProperty();
+            }
+        };
+
+        private static final CssMetaData<Pagination,Side> PAGE_INFORMATION_ALIGNMENT =
+            new CssMetaData<Pagination,Side>("-fx-page-information-alignment",
+                new EnumConverter<Side>(Side.class), DEFAULT_PAGE_INFORMATION_ALIGNMENT) {
+
+            @Override
+            public boolean isSettable(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return skin.pageInformationAlignment == null || !skin.pageInformationAlignment.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Side> getStyleableProperty(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return (StyleableProperty<Side>)(WritableValue<Side>)skin.pageInformationAlignmentProperty();
+            }
+        };
+
+        private static final CssMetaData<Pagination,Boolean> TOOLTIP_VISIBLE =
+            new CssMetaData<Pagination,Boolean>("-fx-tooltip-visible",
+                BooleanConverter.getInstance(), DEFAULT_TOOLTIP_VISIBLE) {
+
+            @Override
+            public boolean isSettable(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return skin.tooltipVisible == null || !skin.tooltipVisible.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Boolean> getStyleableProperty(Pagination n) {
+                final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.tooltipVisibleProperty();
+            }
+        };
+        private static final CssMetaData<Pagination,Number> ARROW_BUTTON_GAP =
+            new CssMetaData<Pagination,Number>("-fx-arrow-button-gap", SizeConverter.getInstance(), 4) {
+                @Override public boolean isSettable(Pagination n) {
+                    final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                    return skin.arrowButtonGap == null ||
+                            !skin.arrowButtonGap.isBound();
+                }
+                @Override public StyleableProperty<Number> getStyleableProperty(Pagination n) {
+                    final PaginationSkin skin = (PaginationSkin) n.getSkin();
+                    return (StyleableProperty<Number>)(WritableValue<Number>)skin.arrowButtonGapProperty();
+                }
+            };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+            styleables.add(ARROWS_VISIBLE);
+            styleables.add(PAGE_INFORMATION_VISIBLE);
+            styleables.add(PAGE_INFORMATION_ALIGNMENT);
+            styleables.add(TOOLTIP_VISIBLE);
+            styleables.add(ARROW_BUTTON_GAP);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ProgressBarSkin.java	2015-09-03 15:20:48.589409800 -0700
+++ /dev/null	2015-09-03 15:20:49.000000000 -0700
@@ -1,519 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.animation.Transition;
-import javafx.beans.InvalidationListener;
-import javafx.beans.binding.When;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.value.WritableValue;
-import javafx.css.CssMetaData;
-import javafx.css.StyleableBooleanProperty;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableProperty;
-import javafx.scene.Node;
-import javafx.scene.control.ProgressBar;
-import javafx.scene.control.ProgressIndicator;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
-import javafx.util.Duration;
-
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-
-import javafx.css.Styleable;
-
-
-public class ProgressBarSkin extends ProgressIndicatorSkin {
-
-    /***************************************************************************
-     *                                                                         *
-     * CSS properties                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * The length of the bouncing progress bar in indeterminate state
-     */
-    private DoubleProperty indeterminateBarLength = null;
-    private DoubleProperty indeterminateBarLengthProperty() {
-        if (indeterminateBarLength == null) {
-            indeterminateBarLength = new StyleableDoubleProperty(60.0) {
-
-                @Override
-                public Object getBean() {
-                    return ProgressBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "indeterminateBarLength";
-                }
-
-                @Override
-                public CssMetaData<ProgressBar,Number> getCssMetaData() {
-                    return StyleableProperties.INDETERMINATE_BAR_LENGTH;
-                }
-
-            };
-        }
-        return indeterminateBarLength;
-    }
-
-    private Double getIndeterminateBarLength() {
-        return indeterminateBarLength == null ? 60.0 : indeterminateBarLength.get();
-    }
-
-    /**
-     * If the progress bar should escape the ends of the progress bar region in indeterminate state
-     */
-    private BooleanProperty indeterminateBarEscape = null;
-    private BooleanProperty indeterminateBarEscapeProperty() {
-        if (indeterminateBarEscape == null) {
-            indeterminateBarEscape = new StyleableBooleanProperty(true) {
-
-                @Override
-                public Object getBean() {
-                    return ProgressBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "indeterminateBarEscape";
-                }
-
-                @Override
-                public CssMetaData<ProgressBar,Boolean> getCssMetaData() {
-                    return StyleableProperties.INDETERMINATE_BAR_ESCAPE;
-                }
-
-
-            };
-        }
-        return indeterminateBarEscape;
-    }
-
-    private Boolean getIndeterminateBarEscape() {
-        return indeterminateBarEscape == null ? true : indeterminateBarEscape.get();
-    }
-
-    /**
-     * If the progress bar should flip when it gets to the ends in indeterminate state
-     */
-    private BooleanProperty indeterminateBarFlip = null;
-    private BooleanProperty indeterminateBarFlipProperty() {
-        if (indeterminateBarFlip == null) {
-            indeterminateBarFlip = new StyleableBooleanProperty(true) {
-
-                @Override
-                public Object getBean() {
-                    return ProgressBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "indeterminateBarFlip";
-                }
-
-                @Override
-                public CssMetaData<ProgressBar,Boolean> getCssMetaData() {
-                    return StyleableProperties.INDETERMINATE_BAR_FLIP;
-                }
-
-            };
-        }
-        return indeterminateBarFlip;
-    }
-
-    private Boolean getIndeterminateBarFlip() {
-        return indeterminateBarFlip == null ? true : indeterminateBarFlip.get();
-    }
-
-    /**
-     * How many seconds it should take for the indeterminate bar to go from
-     * one edge to the other
-     */
-    private DoubleProperty indeterminateBarAnimationTime = null;
-
-    private DoubleProperty indeterminateBarAnimationTimeProperty() {
-        if (indeterminateBarAnimationTime == null) {
-            indeterminateBarAnimationTime = new StyleableDoubleProperty(2.0) {
-
-                @Override
-                public Object getBean() {
-                    return ProgressBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "indeterminateBarAnimationTime";
-                }
-
-                @Override
-                public CssMetaData<ProgressBar,Number> getCssMetaData() {
-                    return StyleableProperties.INDETERMINATE_BAR_ANIMATION_TIME;
-                }
-
-
-            };
-        }
-        return indeterminateBarAnimationTime;
-    }
-
-    private double getIndeterminateBarAnimationTime() {
-        return indeterminateBarAnimationTime == null ? 2.0 : indeterminateBarAnimationTime.get();
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    private StackPane bar;
-    private StackPane track;
-    private Region clipRegion;
-
-    // clean up progress so we never go out of bounds or update graphics more than twice per pixel
-    private double barWidth;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-    public ProgressBarSkin(ProgressBar control) {
-        super(control);
-
-        barWidth = ((int) (control.getWidth() - snappedLeftInset() - snappedRightInset()) * 2 * Math.min(1, Math.max(0, control.getProgress()))) / 2.0F;
-
-        InvalidationListener listener = valueModel -> {
-            updateProgress();
-        };
-        control.widthProperty().addListener(listener);
-
-        initialize();
-        getSkinnable().requestLayout();
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Implementation                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void initialize() {
-        track = new StackPane();
-        track.getStyleClass().setAll("track");
-
-        bar = new StackPane();
-        bar.getStyleClass().setAll("bar");
-
-        getChildren().setAll(track, bar);
-
-        // create a region to use as the clip for skin for animated indeterminate state
-        clipRegion = new Region();
-
-        // listen to the backgrounds on the bar and apply them to the clip but making them solid black for 100%
-        // solid anywhere the bar draws
-        bar.backgroundProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue != null && !newValue.getFills().isEmpty()) {
-                final BackgroundFill[] fills = new BackgroundFill[newValue.getFills().size()];
-                for (int i = 0; i < newValue.getFills().size(); i++) {
-                    BackgroundFill bf = newValue.getFills().get(i);
-                    fills[i] = new BackgroundFill(Color.BLACK,bf.getRadii(),bf.getInsets());
-                }
-                clipRegion.setBackground(new Background(fills));
-            }
-        });
-    }
-
-    @Override
-    protected void createIndeterminateTimeline() {
-        if (indeterminateTransition != null) indeterminateTransition.stop();
-
-        ProgressIndicator control = getSkinnable();
-        final double w = control.getWidth() - (snappedLeftInset() + snappedRightInset());
-        final double startX = getIndeterminateBarEscape() ? -getIndeterminateBarLength() : 0;
-        final double endX = getIndeterminateBarEscape() ? w : w - getIndeterminateBarLength();
-
-        // Set up the timeline.  We do not want to reverse if we are not flipping.
-        indeterminateTransition = new IndeterminateTransition(startX, endX, this);
-        indeterminateTransition.setCycleCount(Timeline.INDEFINITE);
-
-        clipRegion.translateXProperty().bind(new When(bar.scaleXProperty().isEqualTo(-1.0, 1e-100)).
-                then(bar.translateXProperty().subtract(w).add(indeterminateBarLengthProperty())).
-                otherwise(bar.translateXProperty().negate()));
-    }
-
-    boolean wasIndeterminate = false;
-
-    @Override
-    protected void updateProgress() {
-        ProgressIndicator control = getSkinnable();
-        // RT-33789: if the ProgressBar was indeterminate and still is indeterminate, don't update the bar width
-        final boolean isIndeterminate = control.isIndeterminate();
-        if (!(isIndeterminate && wasIndeterminate)) {
-            barWidth = ((int) (control.getWidth() - snappedLeftInset() - snappedRightInset()) * 2 * Math.min(1, Math.max(0, control.getProgress()))) / 2.0F;
-            getSkinnable().requestLayout();
-        }
-        wasIndeterminate = isIndeterminate;
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override
-    public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Node.BASELINE_OFFSET_SAME_AS_HEIGHT;
-    }
-
-    @Override
-    protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Math.max(100, leftInset + bar.prefWidth(getSkinnable().getWidth()) + rightInset);
-    }
-
-    @Override
-    protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return topInset + bar.prefHeight(width) + bottomInset;
-    }
-
-    @Override
-    protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefWidth(height);
-    }
-
-    @Override
-    protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-
-    @Override
-    protected void layoutChildren(final double x, final double y,
-                                  final double w, final double h) {
-
-        final ProgressIndicator control = getSkinnable();
-        boolean isIndeterminate = control.isIndeterminate();
-
-        // resize clip
-        clipRegion.resizeRelocate(0, 0, w, h);
-
-        track.resizeRelocate(x, y, w, h);
-        bar.resizeRelocate(x, y, isIndeterminate ? getIndeterminateBarLength() : barWidth, h);
-
-        // things should be invisible only when well below minimum length
-        track.setVisible(true);
-
-        // width might have changed so recreate our animation if needed
-        if (isIndeterminate) {
-            createIndeterminateTimeline();
-            if (getSkinnable().impl_isTreeVisible()) {
-                indeterminateTransition.play();
-            }
-
-            // apply clip
-            bar.setClip(clipRegion);
-        } else if (indeterminateTransition != null) {
-            indeterminateTransition.stop();
-            indeterminateTransition = null;
-
-            // remove clip
-            bar.setClip(null);
-            bar.setScaleX(1);
-            bar.setTranslateX(0);
-            clipRegion.translateXProperty().unbind();
-        }
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Super-lazy instantiation pattern from Bill Pugh.
-     *
-     * @treatAsPrivate implementation detail
-     */
-    private static class StyleableProperties {
-        private static final CssMetaData<ProgressBar, Number> INDETERMINATE_BAR_LENGTH =
-                new CssMetaData<ProgressBar, Number>("-fx-indeterminate-bar-length",
-                        SizeConverter.getInstance(), 60.0) {
-
-                    @Override
-                    public boolean isSettable(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return skin.indeterminateBarLength == null ||
-                                !skin.indeterminateBarLength.isBound();
-                    }
-
-                    @Override
-                    public StyleableProperty<Number> getStyleableProperty(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return (StyleableProperty<Number>) (WritableValue<Number>) skin.indeterminateBarLengthProperty();
-                    }
-                };
-
-        private static final CssMetaData<ProgressBar, Boolean> INDETERMINATE_BAR_ESCAPE =
-                new CssMetaData<ProgressBar, Boolean>("-fx-indeterminate-bar-escape",
-                        BooleanConverter.getInstance(), Boolean.TRUE) {
-
-                    @Override
-                    public boolean isSettable(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return skin.indeterminateBarEscape == null ||
-                                !skin.indeterminateBarEscape.isBound();
-                    }
-
-                    @Override
-                    public StyleableProperty<Boolean> getStyleableProperty(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return (StyleableProperty<Boolean>) (WritableValue<Boolean>) skin.indeterminateBarEscapeProperty();
-                    }
-                };
-
-        private static final CssMetaData<ProgressBar, Boolean> INDETERMINATE_BAR_FLIP =
-                new CssMetaData<ProgressBar, Boolean>("-fx-indeterminate-bar-flip",
-                        BooleanConverter.getInstance(), Boolean.TRUE) {
-
-                    @Override
-                    public boolean isSettable(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return skin.indeterminateBarFlip == null ||
-                                !skin.indeterminateBarFlip.isBound();
-                    }
-
-                    @Override
-                    public StyleableProperty<Boolean> getStyleableProperty(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return (StyleableProperty<Boolean>) (WritableValue<Boolean>) skin.indeterminateBarFlipProperty();
-                    }
-                };
-
-        private static final CssMetaData<ProgressBar, Number> INDETERMINATE_BAR_ANIMATION_TIME =
-                new CssMetaData<ProgressBar, Number>("-fx-indeterminate-bar-animation-time",
-                        SizeConverter.getInstance(), 2.0) {
-
-                    @Override
-                    public boolean isSettable(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return skin.indeterminateBarAnimationTime == null ||
-                                !skin.indeterminateBarAnimationTime.isBound();
-                    }
-
-                    @Override
-                    public StyleableProperty<Number> getStyleableProperty(ProgressBar n) {
-                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
-                        return (StyleableProperty<Number>) (WritableValue<Number>) skin.indeterminateBarAnimationTimeProperty();
-                    }
-                };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-
-        static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                    new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-            styleables.add(INDETERMINATE_BAR_LENGTH);
-            styleables.add(INDETERMINATE_BAR_ESCAPE);
-            styleables.add(INDETERMINATE_BAR_FLIP);
-            styleables.add(INDETERMINATE_BAR_ANIMATION_TIME);
-            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();
-    }
-
-
-    private static class IndeterminateTransition extends Transition {
-        private final WeakReference<ProgressBarSkin> skin;
-        private final double startX;
-        private final double endX;
-        private final boolean flip;
-
-        public IndeterminateTransition(double startX, double endX, ProgressBarSkin progressBarSkin) {
-            this.startX = startX;
-            this.endX = endX;
-            this.skin = new WeakReference<>(progressBarSkin);
-            this.flip = progressBarSkin.getIndeterminateBarFlip();
-            progressBarSkin.getIndeterminateBarEscape();
-            setCycleDuration(Duration.seconds(progressBarSkin.getIndeterminateBarAnimationTime() * (flip ? 2 : 1)));
-        }
-
-        @Override
-        protected void interpolate(double frac) {
-            ProgressBarSkin s = skin.get();
-            if (s == null) {
-                stop();
-            } else {
-                if (frac <= 0.5 || !flip) {
-                    s.bar.setScaleX(-1);
-                    s.bar.setTranslateX(startX + (flip ? 2 : 1) * frac * (endX - startX));
-                } else {
-                    s.bar.setScaleX(1);
-                    s.bar.setTranslateX(startX + 2 * (1 - frac) * (endX - startX));
-                }
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:20:49.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ProgressBarSkin.java	2015-09-03 15:20:47.895370100 -0700
@@ -0,0 +1,538 @@
+/*
+ * Copyright (c) 2010, 2015, 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 java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.animation.Timeline;
+import javafx.animation.Transition;
+import javafx.beans.binding.When;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.value.WritableValue;
+import javafx.css.CssMetaData;
+import javafx.css.StyleableBooleanProperty;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.ProgressBar;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.util.Duration;
+
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.SizeConverter;
+
+import javafx.css.Styleable;
+
+/**
+ * Default skin implementation for the {@link ProgressBar} control.
+ *
+ * @see ProgressBar
+ * @since 9
+ */
+public class ProgressBarSkin extends ProgressIndicatorSkin {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private StackPane bar;
+    private StackPane track;
+    private Region clipRegion;
+
+    // clean up progress so we never go out of bounds or update graphics more than twice per pixel
+    private double barWidth;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ProgressBarSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ProgressBarSkin(ProgressBar control) {
+        super(control);
+
+        barWidth = ((int) (control.getWidth() - snappedLeftInset() - snappedRightInset()) * 2 * Math.min(1, Math.max(0, control.getProgress()))) / 2.0F;
+
+        control.widthProperty().addListener(observable -> updateProgress());
+
+        initialize();
+        getSkinnable().requestLayout();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The length of the bouncing progress bar in indeterminate state
+     */
+    private DoubleProperty indeterminateBarLength = null;
+    private DoubleProperty indeterminateBarLengthProperty() {
+        if (indeterminateBarLength == null) {
+            indeterminateBarLength = new StyleableDoubleProperty(60.0) {
+
+                @Override
+                public Object getBean() {
+                    return ProgressBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "indeterminateBarLength";
+                }
+
+                @Override
+                public CssMetaData<ProgressBar,Number> getCssMetaData() {
+                    return StyleableProperties.INDETERMINATE_BAR_LENGTH;
+                }
+
+            };
+        }
+        return indeterminateBarLength;
+    }
+
+    private Double getIndeterminateBarLength() {
+        return indeterminateBarLength == null ? 60.0 : indeterminateBarLength.get();
+    }
+
+    /**
+     * If the progress bar should escape the ends of the progress bar region in indeterminate state
+     */
+    private BooleanProperty indeterminateBarEscape = null;
+    private BooleanProperty indeterminateBarEscapeProperty() {
+        if (indeterminateBarEscape == null) {
+            indeterminateBarEscape = new StyleableBooleanProperty(true) {
+
+                @Override
+                public Object getBean() {
+                    return ProgressBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "indeterminateBarEscape";
+                }
+
+                @Override
+                public CssMetaData<ProgressBar,Boolean> getCssMetaData() {
+                    return StyleableProperties.INDETERMINATE_BAR_ESCAPE;
+                }
+
+
+            };
+        }
+        return indeterminateBarEscape;
+    }
+
+    private Boolean getIndeterminateBarEscape() {
+        return indeterminateBarEscape == null ? true : indeterminateBarEscape.get();
+    }
+
+    /**
+     * If the progress bar should flip when it gets to the ends in indeterminate state
+     */
+    private BooleanProperty indeterminateBarFlip = null;
+    private BooleanProperty indeterminateBarFlipProperty() {
+        if (indeterminateBarFlip == null) {
+            indeterminateBarFlip = new StyleableBooleanProperty(true) {
+
+                @Override
+                public Object getBean() {
+                    return ProgressBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "indeterminateBarFlip";
+                }
+
+                @Override
+                public CssMetaData<ProgressBar,Boolean> getCssMetaData() {
+                    return StyleableProperties.INDETERMINATE_BAR_FLIP;
+                }
+
+            };
+        }
+        return indeterminateBarFlip;
+    }
+
+    private Boolean getIndeterminateBarFlip() {
+        return indeterminateBarFlip == null ? true : indeterminateBarFlip.get();
+    }
+
+    /**
+     * How many seconds it should take for the indeterminate bar to go from
+     * one edge to the other
+     */
+    private DoubleProperty indeterminateBarAnimationTime = null;
+
+    private DoubleProperty indeterminateBarAnimationTimeProperty() {
+        if (indeterminateBarAnimationTime == null) {
+            indeterminateBarAnimationTime = new StyleableDoubleProperty(2.0) {
+
+                @Override
+                public Object getBean() {
+                    return ProgressBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "indeterminateBarAnimationTime";
+                }
+
+                @Override
+                public CssMetaData<ProgressBar,Number> getCssMetaData() {
+                    return StyleableProperties.INDETERMINATE_BAR_ANIMATION_TIME;
+                }
+
+
+            };
+        }
+        return indeterminateBarAnimationTime;
+    }
+
+    private double getIndeterminateBarAnimationTime() {
+        return indeterminateBarAnimationTime == null ? 2.0 : indeterminateBarAnimationTime.get();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Node.BASELINE_OFFSET_SAME_AS_HEIGHT;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Math.max(100, leftInset + bar.prefWidth(getSkinnable().getWidth()) + rightInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return topInset + bar.prefHeight(width) + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+
+        final ProgressIndicator control = getSkinnable();
+        boolean isIndeterminate = control.isIndeterminate();
+
+        // resize clip
+        clipRegion.resizeRelocate(0, 0, w, h);
+
+        track.resizeRelocate(x, y, w, h);
+        bar.resizeRelocate(x, y, isIndeterminate ? getIndeterminateBarLength() : barWidth, h);
+
+        // things should be invisible only when well below minimum length
+        track.setVisible(true);
+
+        // width might have changed so recreate our animation if needed
+        if (isIndeterminate) {
+            createIndeterminateTimeline();
+            if (getSkinnable().impl_isTreeVisible()) {
+                indeterminateTransition.play();
+            }
+
+            // apply clip
+            bar.setClip(clipRegion);
+        } else if (indeterminateTransition != null) {
+            indeterminateTransition.stop();
+            indeterminateTransition = null;
+
+            // remove clip
+            bar.setClip(null);
+            bar.setScaleX(1);
+            bar.setTranslateX(0);
+            clipRegion.translateXProperty().unbind();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override void initialize() {
+        track = new StackPane();
+        track.getStyleClass().setAll("track");
+
+        bar = new StackPane();
+        bar.getStyleClass().setAll("bar");
+
+        getChildren().setAll(track, bar);
+
+        // create a region to use as the clip for skin for animated indeterminate state
+        clipRegion = new Region();
+
+        // listen to the backgrounds on the bar and apply them to the clip but making them solid black for 100%
+        // solid anywhere the bar draws
+        bar.backgroundProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue != null && !newValue.getFills().isEmpty()) {
+                final BackgroundFill[] fills = new BackgroundFill[newValue.getFills().size()];
+                for (int i = 0; i < newValue.getFills().size(); i++) {
+                    BackgroundFill bf = newValue.getFills().get(i);
+                    fills[i] = new BackgroundFill(Color.BLACK,bf.getRadii(),bf.getInsets());
+                }
+                clipRegion.setBackground(new Background(fills));
+            }
+        });
+    }
+
+    /** {@inheritDoc} */
+    @Override void createIndeterminateTimeline() {
+        if (indeterminateTransition != null) indeterminateTransition.stop();
+
+        ProgressIndicator control = getSkinnable();
+        final double w = control.getWidth() - (snappedLeftInset() + snappedRightInset());
+        final double startX = getIndeterminateBarEscape() ? -getIndeterminateBarLength() : 0;
+        final double endX = getIndeterminateBarEscape() ? w : w - getIndeterminateBarLength();
+
+        // Set up the timeline.  We do not want to reverse if we are not flipping.
+        indeterminateTransition = new IndeterminateTransition(startX, endX, this);
+        indeterminateTransition.setCycleCount(Timeline.INDEFINITE);
+
+        clipRegion.translateXProperty().bind(new When(bar.scaleXProperty().isEqualTo(-1.0, 1e-100)).
+                then(bar.translateXProperty().subtract(w).add(indeterminateBarLengthProperty())).
+                otherwise(bar.translateXProperty().negate()));
+    }
+
+    boolean wasIndeterminate = false;
+
+    /** {@inheritDoc} */
+    @Override void updateProgress() {
+        ProgressIndicator control = getSkinnable();
+        // RT-33789: if the ProgressBar was indeterminate and still is indeterminate, don't update the bar width
+        final boolean isIndeterminate = control.isIndeterminate();
+        if (!(isIndeterminate && wasIndeterminate)) {
+            barWidth = ((int) (control.getWidth() - snappedLeftInset() - snappedRightInset()) * 2 * Math.min(1, Math.max(0, control.getProgress()))) / 2.0F;
+            getSkinnable().requestLayout();
+        }
+        wasIndeterminate = isIndeterminate;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Super-lazy instantiation pattern from Bill Pugh.
+     *
+     * @treatAsPrivate implementation detail
+     */
+    private static class StyleableProperties {
+        private static final CssMetaData<ProgressBar, Number> INDETERMINATE_BAR_LENGTH =
+                new CssMetaData<ProgressBar, Number>("-fx-indeterminate-bar-length",
+                        SizeConverter.getInstance(), 60.0) {
+
+                    @Override
+                    public boolean isSettable(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return skin.indeterminateBarLength == null ||
+                                !skin.indeterminateBarLength.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Number> getStyleableProperty(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return (StyleableProperty<Number>) (WritableValue<Number>) skin.indeterminateBarLengthProperty();
+                    }
+                };
+
+        private static final CssMetaData<ProgressBar, Boolean> INDETERMINATE_BAR_ESCAPE =
+                new CssMetaData<ProgressBar, Boolean>("-fx-indeterminate-bar-escape",
+                        BooleanConverter.getInstance(), Boolean.TRUE) {
+
+                    @Override
+                    public boolean isSettable(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return skin.indeterminateBarEscape == null ||
+                                !skin.indeterminateBarEscape.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Boolean> getStyleableProperty(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return (StyleableProperty<Boolean>) (WritableValue<Boolean>) skin.indeterminateBarEscapeProperty();
+                    }
+                };
+
+        private static final CssMetaData<ProgressBar, Boolean> INDETERMINATE_BAR_FLIP =
+                new CssMetaData<ProgressBar, Boolean>("-fx-indeterminate-bar-flip",
+                        BooleanConverter.getInstance(), Boolean.TRUE) {
+
+                    @Override
+                    public boolean isSettable(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return skin.indeterminateBarFlip == null ||
+                                !skin.indeterminateBarFlip.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Boolean> getStyleableProperty(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return (StyleableProperty<Boolean>) (WritableValue<Boolean>) skin.indeterminateBarFlipProperty();
+                    }
+                };
+
+        private static final CssMetaData<ProgressBar, Number> INDETERMINATE_BAR_ANIMATION_TIME =
+                new CssMetaData<ProgressBar, Number>("-fx-indeterminate-bar-animation-time",
+                        SizeConverter.getInstance(), 2.0) {
+
+                    @Override
+                    public boolean isSettable(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return skin.indeterminateBarAnimationTime == null ||
+                                !skin.indeterminateBarAnimationTime.isBound();
+                    }
+
+                    @Override
+                    public StyleableProperty<Number> getStyleableProperty(ProgressBar n) {
+                        final ProgressBarSkin skin = (ProgressBarSkin) n.getSkin();
+                        return (StyleableProperty<Number>) (WritableValue<Number>) skin.indeterminateBarAnimationTimeProperty();
+                    }
+                };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                    new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+            styleables.add(INDETERMINATE_BAR_LENGTH);
+            styleables.add(INDETERMINATE_BAR_ESCAPE);
+            styleables.add(INDETERMINATE_BAR_FLIP);
+            styleables.add(INDETERMINATE_BAR_ANIMATION_TIME);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    private static class IndeterminateTransition extends Transition {
+        private final WeakReference<ProgressBarSkin> skin;
+        private final double startX;
+        private final double endX;
+        private final boolean flip;
+
+        public IndeterminateTransition(double startX, double endX, ProgressBarSkin progressBarSkin) {
+            this.startX = startX;
+            this.endX = endX;
+            this.skin = new WeakReference<>(progressBarSkin);
+            this.flip = progressBarSkin.getIndeterminateBarFlip();
+            progressBarSkin.getIndeterminateBarEscape();
+            setCycleDuration(Duration.seconds(progressBarSkin.getIndeterminateBarAnimationTime() * (flip ? 2 : 1)));
+        }
+
+        @Override
+        protected void interpolate(double frac) {
+            ProgressBarSkin s = skin.get();
+            if (s == null) {
+                stop();
+            } else {
+                if (frac <= 0.5 || !flip) {
+                    s.bar.setScaleX(-1);
+                    s.bar.setTranslateX(startX + (flip ? 2 : 1) * frac * (endX - startX));
+                } else {
+                    s.bar.setScaleX(1);
+                    s.bar.setTranslateX(startX + 2 * (1 - frac) * (endX - startX));
+                }
+            }
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ProgressIndicatorSkin.java	2015-09-03 15:20:56.007834100 -0700
+++ /dev/null	2015-09-03 15:20:57.000000000 -0700
@@ -1,786 +0,0 @@
-/*
- * Copyright (c) 2010, 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import javafx.animation.Animation;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.InvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.WritableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.VPos;
-import javafx.scene.Node;
-import javafx.scene.control.ProgressIndicator;
-import javafx.scene.control.SkinBase;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Arc;
-import javafx.scene.shape.ArcType;
-import javafx.scene.shape.Circle;
-import javafx.scene.text.Text;
-import javafx.scene.transform.Scale;
-import javafx.util.Duration;
-import javafx.css.CssMetaData;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
-import javafx.css.StyleableBooleanProperty;
-import javafx.css.StyleableIntegerProperty;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
-import javafx.css.Styleable;
-
-public class ProgressIndicatorSkin extends BehaviorSkinBase<ProgressIndicator, BehaviorBase<ProgressIndicator>> {
-
-    /***************************************************************************
-     *                                                                         *
-     * CSS properties                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * The colour of the progress segment.
-     */
-    private ObjectProperty<Paint> progressColor = new StyleableObjectProperty<Paint>(null) {
-        @Override protected void invalidated() {
-            final Paint value = get();
-            if (value != null && !(value instanceof Color)) {
-                if (isBound()) {
-                    unbind();
-                }
-                set(null);
-                throw new IllegalArgumentException("Only Color objects are supported");
-            }
-            if (spinner!=null) spinner.setFillOverride(value);
-            if (determinateIndicator!=null) determinateIndicator.setFillOverride(value);
-        }
-
-        @Override public Object getBean() {
-            return ProgressIndicatorSkin.this;
-        }
-
-        @Override public String getName() {
-            return "progressColorProperty";
-        }
-
-        @Override public CssMetaData<ProgressIndicator,Paint> getCssMetaData() {
-            return PROGRESS_COLOR;
-        }
-    };
-
-    Paint getProgressColor() {
-        return progressColor.get();
-    }
-
-    /**
-     * The number of segments in the spinner.
-     */
-    private IntegerProperty indeterminateSegmentCount = new StyleableIntegerProperty(8) {
-        @Override protected void invalidated() {
-            if (spinner!=null) spinner.rebuild();
-        }
-
-        @Override public Object getBean() {
-            return ProgressIndicatorSkin.this;
-        }
-
-        @Override public String getName() {
-            return "indeterminateSegmentCount";
-        }
-
-        @Override public CssMetaData<ProgressIndicator,Number> getCssMetaData() {
-            return INDETERMINATE_SEGMENT_COUNT;
-        }
-    };
-
-    /**
-     * True if the progress indicator should rotate as well as animate opacity.
-     */
-    private final BooleanProperty spinEnabled = new StyleableBooleanProperty(false) {
-        @Override protected void invalidated() {
-            if (spinner!=null) spinner.setSpinEnabled(get());
-        }
-
-        @Override public CssMetaData<ProgressIndicator,Boolean> getCssMetaData() {
-            return SPIN_ENABLED;
-        }
-
-        @Override public Object getBean() {
-            return ProgressIndicatorSkin.this;
-        }
-
-        @Override public String getName() {
-            return "spinEnabled";
-        }
-    };
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final String DONE = ControlResources.getString("ProgressIndicator.doneString");
-
-    /** doneText is just used to know the size of done as that is the biggest text we need to allow for */
-    private static final Text doneText = new Text(DONE);
-    static {
-        doneText.getStyleClass().add("text");
-    }
-
-    private IndeterminateSpinner spinner;
-    private DeterminateIndicator determinateIndicator;
-    private ProgressIndicator control;
-
-    protected Animation indeterminateTransition;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public ProgressIndicatorSkin(ProgressIndicator control) {
-        super(control, new BehaviorBase<ProgressIndicator>(control, Collections.emptyList()));
-
-        this.control = control;
-
-        // register listeners
-        registerChangeListener(control.indeterminateProperty(), "INDETERMINATE");
-        registerChangeListener(control.progressProperty(), "PROGRESS");
-        registerChangeListener(control.visibleProperty(), "VISIBLE");
-        registerChangeListener(control.parentProperty(), "PARENT");
-        registerChangeListener(control.sceneProperty(), "SCENE");
-
-        initialize();
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * API (for ProgressBarSkin)                                               *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("INDETERMINATE".equals(p)) {
-            initialize();
-        } else if ("PROGRESS".equals(p)) {
-            updateProgress();
-        } else if ("VISIBLE".equals(p)) {
-            updateAnimation();
-        } else if ("PARENT".equals(p)) {
-            updateAnimation();
-        } else if ("SCENE".equals(p)) {
-            updateAnimation();
-        }
-    }
-
-    protected void initialize() {
-        boolean isIndeterminate = control.isIndeterminate();
-        if (isIndeterminate) {
-            // clean up determinateIndicator
-            determinateIndicator = null;
-
-            // create spinner
-            spinner = new IndeterminateSpinner(spinEnabled.get(), progressColor.get());
-            getChildren().setAll(spinner);
-            if (control.impl_isTreeVisible()) {
-                if (indeterminateTransition != null) {
-                    indeterminateTransition.play();
-                }
-            }
-        } else {
-            // clean up after spinner
-            if (spinner != null) {
-                if (indeterminateTransition != null) {
-                    indeterminateTransition.stop();
-                }
-                spinner = null;
-            }
-
-            // create determinateIndicator
-            determinateIndicator = new DeterminateIndicator(control, this, progressColor.get());
-            getChildren().setAll(determinateIndicator);
-        }
-    }
-
-    @Override public void dispose() {
-        super.dispose();
-
-        if (indeterminateTransition != null) {
-            indeterminateTransition.stop();
-            indeterminateTransition = null;
-        }
-
-        if (spinner != null) {
-            spinner = null;
-        }
-
-        control = null;
-    }
-
-    protected void updateProgress() {
-        if (determinateIndicator != null) {
-            determinateIndicator.updateProgress(control.getProgress());
-        }
-    }
-
-    protected void createIndeterminateTimeline() {
-        if (spinner != null) {
-            spinner.rebuildTimeline();
-        }
-    }
-
-    protected void pauseTimeline(boolean pause) {
-        if (getSkinnable().isIndeterminate()) {
-            if (indeterminateTransition == null) {
-                createIndeterminateTimeline();
-            }
-            if (pause) {
-                indeterminateTransition.pause();
-            } else {
-                indeterminateTransition.play();
-            }
-        }
-    }
-
-    protected void updateAnimation() {
-        ProgressIndicator control = getSkinnable();
-        final boolean isTreeVisible = control.isVisible() &&
-                                      control.getParent() != null &&
-                                      control.getScene() != null;
-        if (indeterminateTransition != null) {
-            pauseTimeline(! isTreeVisible);
-        } else if (isTreeVisible) {
-            createIndeterminateTimeline();
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void layoutChildren(final double x, final double y,
-                                            final double w, final double h) {
-        if (spinner != null && control.isIndeterminate()) {
-            spinner.layoutChildren();
-            spinner.resizeRelocate(0, 0, w, h);
-        } else if (determinateIndicator != null) {
-            determinateIndicator.layoutChildren();
-            determinateIndicator.resizeRelocate(0, 0, w, h);
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * DeterminateIndicator                                                    *
-     *                                                                         *
-     **************************************************************************/
-
-    private class DeterminateIndicator extends Region {
-        private double textGap = 2.0F;
-
-        // only update progress text on whole percentages
-        private int intProgress;
-
-        // only update pie arc to nearest degree
-        private int degProgress;
-        private Text text;
-        private StackPane indicator;
-        private StackPane progress;
-        private StackPane tick;
-        private Arc arcShape;
-        private Circle indicatorCircle;
-
-        public DeterminateIndicator(ProgressIndicator control, ProgressIndicatorSkin s, Paint fillOverride) {
-
-            getStyleClass().add("determinate-indicator");
-
-            intProgress = (int) Math.round(control.getProgress() * 100.0) ;
-            degProgress = (int) (360 * control.getProgress());
-
-            getChildren().clear();
-
-            text = new Text((control.getProgress() >= 1) ? (DONE) : ("" + intProgress + "%"));
-            text.setTextOrigin(VPos.TOP);
-            text.getStyleClass().setAll("text", "percentage");
-
-            // The circular background for the progress pie piece
-            indicator = new StackPane();
-            indicator.setScaleShape(false);
-            indicator.setCenterShape(false);
-            indicator.getStyleClass().setAll("indicator");
-            indicatorCircle = new Circle();
-            indicator.setShape(indicatorCircle);
-
-            // The shape for our progress pie piece
-            arcShape = new Arc();
-            arcShape.setType(ArcType.ROUND);
-            arcShape.setStartAngle(90.0F);
-
-            // Our progress pie piece
-            progress = new StackPane();
-            progress.getStyleClass().setAll("progress");
-            progress.setScaleShape(false);
-            progress.setCenterShape(false);
-            progress.setShape(arcShape);
-            progress.getChildren().clear();
-            setFillOverride(fillOverride);
-
-            // The check mark that's drawn at 100%
-            tick = new StackPane();
-            tick.getStyleClass().setAll("tick");
-
-            getChildren().setAll(indicator, progress, text, tick);
-            updateProgress(control.getProgress());
-        }
-
-        private void setFillOverride(Paint fillOverride) {
-            if (fillOverride instanceof Color) {
-                Color c = (Color)fillOverride;
-                progress.setStyle("-fx-background-color: rgba("+((int)(255*c.getRed()))+","+((int)(255*c.getGreen()))+","+((int)(255*c.getBlue()))+","+c.getOpacity()+");");
-            } else {
-                progress.setStyle(null);
-            }
-        }
-
-        @Override public boolean usesMirroring() {
-            // This is used instead of setting NodeOrientation,
-            // allowing the Text node to inherit the current
-            // orientation.
-            return false;
-        }
-
-        private void updateProgress(double progress) {
-            intProgress = (int) Math.round(progress * 100.0) ;
-            text.setText((progress >= 1) ? (DONE) : ("" + intProgress + "%"));
-
-            degProgress = (int) (360 * progress);
-            arcShape.setLength(-degProgress);
-            requestLayout();
-        }
-
-        @Override protected void layoutChildren() {
-            // Position and size the circular background
-            double doneTextHeight = doneText.getLayoutBounds().getHeight();
-            final double left = control.snappedLeftInset();
-            final double right = control.snappedRightInset();
-            final double top = control.snappedTopInset();
-            final double bottom = control.snappedBottomInset();
-
-            /*
-            ** use the min of width, or height, keep it a circle
-            */
-            final double areaW = control.getWidth() - left - right;
-            final double areaH = control.getHeight() - top - bottom - textGap - doneTextHeight;
-            final double radiusW = areaW / 2;
-            final double radiusH = areaH / 2;
-            final double radius = Math.floor(Math.min(radiusW, radiusH));
-            final double centerX = snapPosition(left + radiusW);
-            final double centerY = snapPosition(top + radius);
-
-            // find radius that fits inside radius - insetsPadding
-            final double iLeft = indicator.snappedLeftInset();
-            final double iRight = indicator.snappedRightInset();
-            final double iTop = indicator.snappedTopInset();
-            final double iBottom = indicator.snappedBottomInset();
-            final double progressRadius = snapSize(Math.min(
-                    Math.min(radius - iLeft, radius - iRight),
-                    Math.min(radius - iTop, radius - iBottom)));
-
-            indicatorCircle.setRadius(radius);
-            indicator.setLayoutX(centerX);
-            indicator.setLayoutY(centerY);
-
-            arcShape.setRadiusX(progressRadius);
-            arcShape.setRadiusY(progressRadius);
-            progress.setLayoutX(centerX);
-            progress.setLayoutY(centerY);
-
-            // find radius that fits inside progressRadius - progressInsets
-            final double pLeft = progress.snappedLeftInset();
-            final double pRight = progress.snappedRightInset();
-            final double pTop = progress.snappedTopInset();
-            final double pBottom = progress.snappedBottomInset();
-            final double indicatorRadius = snapSize(Math.min(
-                    Math.min(progressRadius - pLeft, progressRadius - pRight),
-                    Math.min(progressRadius - pTop, progressRadius - pBottom)));
-
-            // find size of spare box that fits inside indicator radius
-            double squareBoxHalfWidth = Math.ceil(Math.sqrt((indicatorRadius * indicatorRadius) / 2));
-            double squareBoxHalfWidth2 = indicatorRadius * (Math.sqrt(2)/2);
-
-            tick.setLayoutX(centerX - squareBoxHalfWidth);
-            tick.setLayoutY(centerY - squareBoxHalfWidth);
-            tick.resize(squareBoxHalfWidth + squareBoxHalfWidth, squareBoxHalfWidth + squareBoxHalfWidth);
-            tick.setVisible(control.getProgress() >= 1);
-
-            // if the % text can't fit anywhere in the bounds then don't display it
-            double textWidth = text.getLayoutBounds().getWidth();
-            double textHeight = text.getLayoutBounds().getHeight();
-            if (control.getWidth() >= textWidth && control.getHeight() >= textHeight) {
-                if (!text.isVisible()) text.setVisible(true);
-                text.setLayoutY(snapPosition(centerY + radius + textGap));
-                text.setLayoutX(snapPosition(centerX - (textWidth/2)));
-            } else {
-                if (text.isVisible()) text.setVisible(false);
-            }
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            final double left = control.snappedLeftInset();
-            final double right = control.snappedRightInset();
-            final double iLeft = indicator.snappedLeftInset();
-            final double iRight = indicator.snappedRightInset();
-            final double iTop = indicator.snappedTopInset();
-            final double iBottom = indicator.snappedBottomInset();
-            final double indicatorMax = snapSize(Math.max(Math.max(iLeft, iRight), Math.max(iTop, iBottom)));
-            final double pLeft = progress.snappedLeftInset();
-            final double pRight = progress.snappedRightInset();
-            final double pTop = progress.snappedTopInset();
-            final double pBottom = progress.snappedBottomInset();
-            final double progressMax = snapSize(Math.max(Math.max(pLeft, pRight), Math.max(pTop, pBottom)));
-            final double tLeft = tick.snappedLeftInset();
-            final double tRight = tick.snappedRightInset();
-            final double indicatorWidth = indicatorMax + progressMax + tLeft + tRight + progressMax + indicatorMax;
-            return left + Math.max(indicatorWidth, doneText.getLayoutBounds().getWidth()) + right;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            final double top = control.snappedTopInset();
-            final double bottom = control.snappedBottomInset();
-            final double iLeft = indicator.snappedLeftInset();
-            final double iRight = indicator.snappedRightInset();
-            final double iTop = indicator.snappedTopInset();
-            final double iBottom = indicator.snappedBottomInset();
-            final double indicatorMax = snapSize(Math.max(Math.max(iLeft, iRight), Math.max(iTop, iBottom)));
-            final double pLeft = progress.snappedLeftInset();
-            final double pRight = progress.snappedRightInset();
-            final double pTop = progress.snappedTopInset();
-            final double pBottom = progress.snappedBottomInset();
-            final double progressMax = snapSize(Math.max(Math.max(pLeft, pRight), Math.max(pTop, pBottom)));
-            final double tTop = tick.snappedTopInset();
-            final double tBottom = tick.snappedBottomInset();
-            final double indicatorHeight = indicatorMax + progressMax + tTop + tBottom + progressMax + indicatorMax;
-            return top + indicatorHeight + textGap + doneText.getLayoutBounds().getHeight() + bottom;
-        }
-
-        @Override protected double computeMaxWidth(double height) {
-            return computePrefWidth(height);
-        }
-
-        @Override protected double computeMaxHeight(double width) {
-            return computePrefHeight(width);
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * IndeterminateSpinner                                                    *
-     *                                                                         *
-     **************************************************************************/
-
-    protected final Duration CLIPPED_DELAY = new Duration(300);
-    protected final Duration UNCLIPPED_DELAY = new Duration(0);
-
-    private final class IndeterminateSpinner extends Region {
-        private IndicatorPaths pathsG;
-        private final List<Double> opacities = new ArrayList<>();
-        private boolean spinEnabled = false;
-        private Paint fillOverride = null;
-
-        private IndeterminateSpinner(boolean spinEnabled, Paint fillOverride) {
-            this.spinEnabled = spinEnabled;
-            this.fillOverride = fillOverride;
-
-            setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
-            getStyleClass().setAll("spinner");
-
-            pathsG = new IndicatorPaths();
-            getChildren().add(pathsG);
-            rebuild();
-
-            rebuildTimeline();
-
-        }
-
-        public void setFillOverride(Paint fillOverride) {
-            this.fillOverride = fillOverride;
-            rebuild();
-        }
-
-        public void setSpinEnabled(boolean spinEnabled) {
-            this.spinEnabled = spinEnabled;
-            rebuildTimeline();
-        }
-
-        private void rebuildTimeline() {
-            if (spinEnabled) {
-                if (indeterminateTransition == null) {
-                    indeterminateTransition = new Timeline();
-                    indeterminateTransition.setCycleCount(Timeline.INDEFINITE);
-                    indeterminateTransition.setDelay(UNCLIPPED_DELAY);
-                } else {
-                    indeterminateTransition.stop();
-                    ((Timeline)indeterminateTransition).getKeyFrames().clear();
-                }
-                final ObservableList<KeyFrame> keyFrames = FXCollections.<KeyFrame>observableArrayList();
-
-                keyFrames.add(new KeyFrame(Duration.millis(1), new KeyValue(pathsG.rotateProperty(), 360)));
-                keyFrames.add(new KeyFrame(Duration.millis(3900), new KeyValue(pathsG.rotateProperty(), 0)));
-
-                for (int i = 100; i <= 3900; i += 100) {
-                    keyFrames.add(new KeyFrame(Duration.millis(i), event -> shiftColors()));
-                }
-
-                ((Timeline)indeterminateTransition).getKeyFrames().setAll(keyFrames);
-                indeterminateTransition.playFromStart();
-            } else {
-                if (indeterminateTransition != null) {
-                    indeterminateTransition.stop();
-                    ((Timeline)indeterminateTransition).getKeyFrames().clear();
-                    indeterminateTransition = null;
-                }
-            }
-        }
-
-        private class IndicatorPaths extends Pane {
-            @Override protected double computePrefWidth(double height) {
-                double w = 0;
-                for(Node child: getChildren()) {
-                    if (child instanceof Region) {
-                        Region region = (Region)child;
-                        if (region.getShape() != null) {
-                            w = Math.max(w,region.getShape().getLayoutBounds().getMaxX());
-                        } else {
-                            w = Math.max(w,region.prefWidth(height));
-                        }
-                    }
-                }
-                return w;
-            }
-
-            @Override protected double computePrefHeight(double width) {
-                double h = 0;
-                for(Node child: getChildren()) {
-                    if (child instanceof Region) {
-                        Region region = (Region)child;
-                        if (region.getShape() != null) {
-                            h = Math.max(h,region.getShape().getLayoutBounds().getMaxY());
-                        } else {
-                            h = Math.max(h,region.prefHeight(width));
-                        }
-                    }
-                }
-                return h;
-            }
-
-            @Override protected void layoutChildren() {
-                // calculate scale
-                double scale = getWidth() / computePrefWidth(-1);
-                for(Node child: getChildren()) {
-                    if (child instanceof Region) {
-                        Region region = (Region)child;
-                        if (region.getShape() != null) {
-                            region.resize(
-                                    region.getShape().getLayoutBounds().getMaxX(),
-                                    region.getShape().getLayoutBounds().getMaxY()
-                            );
-                            region.getTransforms().setAll(new Scale(scale,scale,0,0));
-                        } else {
-                            region.autosize();
-                        }
-                    }
-                }
-            }
-        }
-
-        @Override protected void layoutChildren() {
-            final double w = control.getWidth() - control.snappedLeftInset() - control.snappedRightInset();
-            final double h = control.getHeight() - control.snappedTopInset() - control.snappedBottomInset();
-            final double prefW = pathsG.prefWidth(-1);
-            final double prefH = pathsG.prefHeight(-1);
-            double scaleX = w / prefW;
-            double scale = scaleX;
-            if ((scaleX * prefH) > h) {
-                scale = h / prefH;
-            }
-            double indicatorW = prefW * scale;
-            double indicatorH = prefH * scale;
-            pathsG.resizeRelocate((w - indicatorW) / 2, (h - indicatorH) / 2, indicatorW, indicatorH);
-        }
-
-        private void rebuild() {
-            // update indeterminate indicator
-            final int segments = indeterminateSegmentCount.get();
-            opacities.clear();
-            pathsG.getChildren().clear();
-            final double step = 0.8/(segments-1);
-            for (int i = 0; i < segments; i++) {
-                Region region = new Region();
-                region.setScaleShape(false);
-                region.setCenterShape(false);
-                region.getStyleClass().addAll("segment", "segment" + i);
-                if (fillOverride instanceof Color) {
-                    Color c = (Color)fillOverride;
-                    region.setStyle("-fx-background-color: rgba("+((int)(255*c.getRed()))+","+((int)(255*c.getGreen()))+","+((int)(255*c.getBlue()))+","+c.getOpacity()+");");
-                } else {
-                    region.setStyle(null);
-                }
-                pathsG.getChildren().add(region);
-                opacities.add(Math.max(0.1, (1.0 - (step*i))));
-            }
-        }
-
-        private void shiftColors() {
-            if (opacities.size() <= 0) return;
-            final int segments = indeterminateSegmentCount.get();
-            Collections.rotate(opacities, -1);
-            for (int i = 0; i < segments; i++) {
-                pathsG.getChildren().get(i).setOpacity(opacities.get(i));
-            }
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final CssMetaData<ProgressIndicator,Paint> PROGRESS_COLOR =
-            new CssMetaData<ProgressIndicator,Paint>("-fx-progress-color",
-                    PaintConverter.getInstance(), null) {
-
-                @Override
-                public boolean isSettable(ProgressIndicator n) {
-                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
-                    return skin.progressColor == null ||
-                            !skin.progressColor.isBound();
-                }
-
-                @Override
-                public StyleableProperty<Paint> getStyleableProperty(ProgressIndicator n) {
-                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
-                    return (StyleableProperty<Paint>)(WritableValue<Paint>)skin.progressColor;
-                }
-            };
-    private static final CssMetaData<ProgressIndicator,Number> INDETERMINATE_SEGMENT_COUNT =
-            new CssMetaData<ProgressIndicator,Number>("-fx-indeterminate-segment-count",
-                    SizeConverter.getInstance(), 8) {
-
-                @Override public boolean isSettable(ProgressIndicator n) {
-                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
-                    return skin.indeterminateSegmentCount == null ||
-                            !skin.indeterminateSegmentCount.isBound();
-                }
-
-                @Override public StyleableProperty<Number> getStyleableProperty(ProgressIndicator n) {
-                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
-                    return (StyleableProperty<Number>)(WritableValue<Number>)skin.indeterminateSegmentCount;
-                }
-            };
-    private static final CssMetaData<ProgressIndicator,Boolean> SPIN_ENABLED =
-            new CssMetaData<ProgressIndicator,Boolean>("-fx-spin-enabled", BooleanConverter.getInstance(), Boolean.FALSE) {
-
-                @Override public boolean isSettable(ProgressIndicator node) {
-                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) node.getSkin();
-                    return skin.spinEnabled == null || !skin.spinEnabled.isBound();
-                }
-
-                @Override public StyleableProperty<Boolean> getStyleableProperty(ProgressIndicator node) {
-                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) node.getSkin();
-                    return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.spinEnabled;
-                }
-            };
-
-    public static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-    static {
-        final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-        styleables.add(PROGRESS_COLOR);
-        styleables.add(INDETERMINATE_SEGMENT_COUNT);
-        styleables.add(SPIN_ENABLED);
-        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 STYLEABLES;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
-        return getClassCssMetaData();
-    }
-}
--- /dev/null	2015-09-03 15:20:57.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ProgressIndicatorSkin.java	2015-09-03 15:20:55.293793300 -0700
@@ -0,0 +1,778 @@
+/*
+ * Copyright (c) 2010, 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.WritableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.VPos;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Arc;
+import javafx.scene.shape.ArcType;
+import javafx.scene.shape.Circle;
+import javafx.scene.text.Text;
+import javafx.scene.transform.Scale;
+import javafx.util.Duration;
+import javafx.css.CssMetaData;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.css.StyleableBooleanProperty;
+import javafx.css.StyleableIntegerProperty;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.skin.resources.ControlResources;
+import javafx.css.Styleable;
+
+/**
+ * Default skin implementation for the {@link ProgressIndicator} control.
+ *
+ * @see ProgressIndicator
+ * @since 9
+ */
+public class ProgressIndicatorSkin extends SkinBase<ProgressIndicator> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final String DONE = ControlResources.getString("ProgressIndicator.doneString");
+
+    /** doneText is just used to know the size of done as that is the biggest text we need to allow for */
+    private static final Text doneText = new Text(DONE);
+    static {
+        doneText.getStyleClass().add("text");
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    final Duration CLIPPED_DELAY = new Duration(300);
+    final Duration UNCLIPPED_DELAY = new Duration(0);
+
+    private IndeterminateSpinner spinner;
+    private DeterminateIndicator determinateIndicator;
+    private ProgressIndicator control;
+
+    Animation indeterminateTransition;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ProgressIndicatorSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ProgressIndicatorSkin(ProgressIndicator control) {
+        super(control);
+
+        this.control = control;
+
+        // register listeners
+        registerChangeListener(control.indeterminateProperty(), e -> initialize());
+        registerChangeListener(control.progressProperty(), e -> updateProgress());
+        registerChangeListener(control.visibleProperty(), e -> updateAnimation());
+        registerChangeListener(control.parentProperty(), e -> updateAnimation());
+        registerChangeListener(control.sceneProperty(), e -> updateAnimation());
+
+        initialize();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The colour of the progress segment.
+     */
+    private ObjectProperty<Paint> progressColor = new StyleableObjectProperty<Paint>(null) {
+        @Override protected void invalidated() {
+            final Paint value = get();
+            if (value != null && !(value instanceof Color)) {
+                if (isBound()) {
+                    unbind();
+                }
+                set(null);
+                throw new IllegalArgumentException("Only Color objects are supported");
+            }
+            if (spinner!=null) spinner.setFillOverride(value);
+            if (determinateIndicator!=null) determinateIndicator.setFillOverride(value);
+        }
+
+        @Override public Object getBean() {
+            return ProgressIndicatorSkin.this;
+        }
+
+        @Override public String getName() {
+            return "progressColorProperty";
+        }
+
+        @Override public CssMetaData<ProgressIndicator,Paint> getCssMetaData() {
+            return PROGRESS_COLOR;
+        }
+    };
+
+    Paint getProgressColor() {
+        return progressColor.get();
+    }
+
+    /**
+     * The number of segments in the spinner.
+     */
+    private IntegerProperty indeterminateSegmentCount = new StyleableIntegerProperty(8) {
+        @Override protected void invalidated() {
+            if (spinner!=null) spinner.rebuild();
+        }
+
+        @Override public Object getBean() {
+            return ProgressIndicatorSkin.this;
+        }
+
+        @Override public String getName() {
+            return "indeterminateSegmentCount";
+        }
+
+        @Override public CssMetaData<ProgressIndicator,Number> getCssMetaData() {
+            return INDETERMINATE_SEGMENT_COUNT;
+        }
+    };
+
+    /**
+     * True if the progress indicator should rotate as well as animate opacity.
+     */
+    private final BooleanProperty spinEnabled = new StyleableBooleanProperty(false) {
+        @Override protected void invalidated() {
+            if (spinner!=null) spinner.setSpinEnabled(get());
+        }
+
+        @Override public CssMetaData<ProgressIndicator,Boolean> getCssMetaData() {
+            return SPIN_ENABLED;
+        }
+
+        @Override public Object getBean() {
+            return ProgressIndicatorSkin.this;
+        }
+
+        @Override public String getName() {
+            return "spinEnabled";
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (indeterminateTransition != null) {
+            indeterminateTransition.stop();
+            indeterminateTransition = null;
+        }
+
+        if (spinner != null) {
+            spinner = null;
+        }
+
+        control = null;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        if (spinner != null && control.isIndeterminate()) {
+            spinner.layoutChildren();
+            spinner.resizeRelocate(0, 0, w, h);
+        } else if (determinateIndicator != null) {
+            determinateIndicator.layoutChildren();
+            determinateIndicator.resizeRelocate(0, 0, w, h);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    void initialize() {
+        boolean isIndeterminate = control.isIndeterminate();
+        if (isIndeterminate) {
+            // clean up determinateIndicator
+            determinateIndicator = null;
+
+            // create spinner
+            spinner = new IndeterminateSpinner(spinEnabled.get(), progressColor.get());
+            getChildren().setAll(spinner);
+            if (control.impl_isTreeVisible()) {
+                if (indeterminateTransition != null) {
+                    indeterminateTransition.play();
+                }
+            }
+        } else {
+            // clean up after spinner
+            if (spinner != null) {
+                if (indeterminateTransition != null) {
+                    indeterminateTransition.stop();
+                }
+                spinner = null;
+            }
+
+            // create determinateIndicator
+            determinateIndicator = new DeterminateIndicator(control, this, progressColor.get());
+            getChildren().setAll(determinateIndicator);
+        }
+    }
+
+    void updateProgress() {
+        if (determinateIndicator != null) {
+            determinateIndicator.updateProgress(control.getProgress());
+        }
+    }
+
+    void createIndeterminateTimeline() {
+        if (spinner != null) {
+            spinner.rebuildTimeline();
+        }
+    }
+
+    void pauseTimeline(boolean pause) {
+        if (getSkinnable().isIndeterminate()) {
+            if (indeterminateTransition == null) {
+                createIndeterminateTimeline();
+            }
+            if (pause) {
+                indeterminateTransition.pause();
+            } else {
+                indeterminateTransition.play();
+            }
+        }
+    }
+
+    void updateAnimation() {
+        ProgressIndicator control = getSkinnable();
+        final boolean isTreeVisible = control.isVisible() &&
+                control.getParent() != null &&
+                control.getScene() != null;
+        if (indeterminateTransition != null) {
+            pauseTimeline(!isTreeVisible);
+        } else if (isTreeVisible) {
+            createIndeterminateTimeline();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final CssMetaData<ProgressIndicator,Paint> PROGRESS_COLOR =
+            new CssMetaData<ProgressIndicator,Paint>("-fx-progress-color",
+                    PaintConverter.getInstance(), null) {
+
+                @Override
+                public boolean isSettable(ProgressIndicator n) {
+                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
+                    return skin.progressColor == null ||
+                            !skin.progressColor.isBound();
+                }
+
+                @Override
+                public StyleableProperty<Paint> getStyleableProperty(ProgressIndicator n) {
+                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
+                    return (StyleableProperty<Paint>)(WritableValue<Paint>)skin.progressColor;
+                }
+            };
+    private static final CssMetaData<ProgressIndicator,Number> INDETERMINATE_SEGMENT_COUNT =
+            new CssMetaData<ProgressIndicator,Number>("-fx-indeterminate-segment-count",
+                    SizeConverter.getInstance(), 8) {
+
+                @Override public boolean isSettable(ProgressIndicator n) {
+                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
+                    return skin.indeterminateSegmentCount == null ||
+                            !skin.indeterminateSegmentCount.isBound();
+                }
+
+                @Override public StyleableProperty<Number> getStyleableProperty(ProgressIndicator n) {
+                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) n.getSkin();
+                    return (StyleableProperty<Number>)(WritableValue<Number>)skin.indeterminateSegmentCount;
+                }
+            };
+    private static final CssMetaData<ProgressIndicator,Boolean> SPIN_ENABLED =
+            new CssMetaData<ProgressIndicator,Boolean>("-fx-spin-enabled", BooleanConverter.getInstance(), Boolean.FALSE) {
+
+                @Override public boolean isSettable(ProgressIndicator node) {
+                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) node.getSkin();
+                    return skin.spinEnabled == null || !skin.spinEnabled.isBound();
+                }
+
+                @Override public StyleableProperty<Boolean> getStyleableProperty(ProgressIndicator node) {
+                    final ProgressIndicatorSkin skin = (ProgressIndicatorSkin) node.getSkin();
+                    return (StyleableProperty<Boolean>)(WritableValue<Boolean>)skin.spinEnabled;
+                }
+            };
+
+    private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+    static {
+        final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+        styleables.add(PROGRESS_COLOR);
+        styleables.add(INDETERMINATE_SEGMENT_COUNT);
+        styleables.add(SPIN_ENABLED);
+        STYLEABLES = Collections.unmodifiableList(styleables);
+    }
+
+    /**
+     * Returns the CssMetaData associated with this class, which may include the
+     * CssMetaData of its super classes.
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return STYLEABLES;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    private final class DeterminateIndicator extends Region {
+        private double textGap = 2.0F;
+
+        // only update progress text on whole percentages
+        private int intProgress;
+
+        // only update pie arc to nearest degree
+        private int degProgress;
+        private Text text;
+        private StackPane indicator;
+        private StackPane progress;
+        private StackPane tick;
+        private Arc arcShape;
+        private Circle indicatorCircle;
+
+        public DeterminateIndicator(ProgressIndicator control, ProgressIndicatorSkin s, Paint fillOverride) {
+
+            getStyleClass().add("determinate-indicator");
+
+            intProgress = (int) Math.round(control.getProgress() * 100.0) ;
+            degProgress = (int) (360 * control.getProgress());
+
+            getChildren().clear();
+
+            text = new Text((control.getProgress() >= 1) ? (DONE) : ("" + intProgress + "%"));
+            text.setTextOrigin(VPos.TOP);
+            text.getStyleClass().setAll("text", "percentage");
+
+            // The circular background for the progress pie piece
+            indicator = new StackPane();
+            indicator.setScaleShape(false);
+            indicator.setCenterShape(false);
+            indicator.getStyleClass().setAll("indicator");
+            indicatorCircle = new Circle();
+            indicator.setShape(indicatorCircle);
+
+            // The shape for our progress pie piece
+            arcShape = new Arc();
+            arcShape.setType(ArcType.ROUND);
+            arcShape.setStartAngle(90.0F);
+
+            // Our progress pie piece
+            progress = new StackPane();
+            progress.getStyleClass().setAll("progress");
+            progress.setScaleShape(false);
+            progress.setCenterShape(false);
+            progress.setShape(arcShape);
+            progress.getChildren().clear();
+            setFillOverride(fillOverride);
+
+            // The check mark that's drawn at 100%
+            tick = new StackPane();
+            tick.getStyleClass().setAll("tick");
+
+            getChildren().setAll(indicator, progress, text, tick);
+            updateProgress(control.getProgress());
+        }
+
+        private void setFillOverride(Paint fillOverride) {
+            if (fillOverride instanceof Color) {
+                Color c = (Color)fillOverride;
+                progress.setStyle("-fx-background-color: rgba("+((int)(255*c.getRed()))+","+((int)(255*c.getGreen()))+","+((int)(255*c.getBlue()))+","+c.getOpacity()+");");
+            } else {
+                progress.setStyle(null);
+            }
+        }
+
+        @Override public boolean usesMirroring() {
+            // This is used instead of setting NodeOrientation,
+            // allowing the Text node to inherit the current
+            // orientation.
+            return false;
+        }
+
+        private void updateProgress(double progress) {
+            intProgress = (int) Math.round(progress * 100.0) ;
+            text.setText((progress >= 1) ? (DONE) : ("" + intProgress + "%"));
+
+            degProgress = (int) (360 * progress);
+            arcShape.setLength(-degProgress);
+            requestLayout();
+        }
+
+        @Override protected void layoutChildren() {
+            // Position and size the circular background
+            double doneTextHeight = doneText.getLayoutBounds().getHeight();
+            final double left = control.snappedLeftInset();
+            final double right = control.snappedRightInset();
+            final double top = control.snappedTopInset();
+            final double bottom = control.snappedBottomInset();
+
+            /*
+            ** use the min of width, or height, keep it a circle
+            */
+            final double areaW = control.getWidth() - left - right;
+            final double areaH = control.getHeight() - top - bottom - textGap - doneTextHeight;
+            final double radiusW = areaW / 2;
+            final double radiusH = areaH / 2;
+            final double radius = Math.floor(Math.min(radiusW, radiusH));
+            final double centerX = snapPosition(left + radiusW);
+            final double centerY = snapPosition(top + radius);
+
+            // find radius that fits inside radius - insetsPadding
+            final double iLeft = indicator.snappedLeftInset();
+            final double iRight = indicator.snappedRightInset();
+            final double iTop = indicator.snappedTopInset();
+            final double iBottom = indicator.snappedBottomInset();
+            final double progressRadius = snapSize(Math.min(
+                    Math.min(radius - iLeft, radius - iRight),
+                    Math.min(radius - iTop, radius - iBottom)));
+
+            indicatorCircle.setRadius(radius);
+            indicator.setLayoutX(centerX);
+            indicator.setLayoutY(centerY);
+
+            arcShape.setRadiusX(progressRadius);
+            arcShape.setRadiusY(progressRadius);
+            progress.setLayoutX(centerX);
+            progress.setLayoutY(centerY);
+
+            // find radius that fits inside progressRadius - progressInsets
+            final double pLeft = progress.snappedLeftInset();
+            final double pRight = progress.snappedRightInset();
+            final double pTop = progress.snappedTopInset();
+            final double pBottom = progress.snappedBottomInset();
+            final double indicatorRadius = snapSize(Math.min(
+                    Math.min(progressRadius - pLeft, progressRadius - pRight),
+                    Math.min(progressRadius - pTop, progressRadius - pBottom)));
+
+            // find size of spare box that fits inside indicator radius
+            double squareBoxHalfWidth = Math.ceil(Math.sqrt((indicatorRadius * indicatorRadius) / 2));
+            double squareBoxHalfWidth2 = indicatorRadius * (Math.sqrt(2)/2);
+
+            tick.setLayoutX(centerX - squareBoxHalfWidth);
+            tick.setLayoutY(centerY - squareBoxHalfWidth);
+            tick.resize(squareBoxHalfWidth + squareBoxHalfWidth, squareBoxHalfWidth + squareBoxHalfWidth);
+            tick.setVisible(control.getProgress() >= 1);
+
+            // if the % text can't fit anywhere in the bounds then don't display it
+            double textWidth = text.getLayoutBounds().getWidth();
+            double textHeight = text.getLayoutBounds().getHeight();
+            if (control.getWidth() >= textWidth && control.getHeight() >= textHeight) {
+                if (!text.isVisible()) text.setVisible(true);
+                text.setLayoutY(snapPosition(centerY + radius + textGap));
+                text.setLayoutX(snapPosition(centerX - (textWidth/2)));
+            } else {
+                if (text.isVisible()) text.setVisible(false);
+            }
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            final double left = control.snappedLeftInset();
+            final double right = control.snappedRightInset();
+            final double iLeft = indicator.snappedLeftInset();
+            final double iRight = indicator.snappedRightInset();
+            final double iTop = indicator.snappedTopInset();
+            final double iBottom = indicator.snappedBottomInset();
+            final double indicatorMax = snapSize(Math.max(Math.max(iLeft, iRight), Math.max(iTop, iBottom)));
+            final double pLeft = progress.snappedLeftInset();
+            final double pRight = progress.snappedRightInset();
+            final double pTop = progress.snappedTopInset();
+            final double pBottom = progress.snappedBottomInset();
+            final double progressMax = snapSize(Math.max(Math.max(pLeft, pRight), Math.max(pTop, pBottom)));
+            final double tLeft = tick.snappedLeftInset();
+            final double tRight = tick.snappedRightInset();
+            final double indicatorWidth = indicatorMax + progressMax + tLeft + tRight + progressMax + indicatorMax;
+            return left + Math.max(indicatorWidth, doneText.getLayoutBounds().getWidth()) + right;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            final double top = control.snappedTopInset();
+            final double bottom = control.snappedBottomInset();
+            final double iLeft = indicator.snappedLeftInset();
+            final double iRight = indicator.snappedRightInset();
+            final double iTop = indicator.snappedTopInset();
+            final double iBottom = indicator.snappedBottomInset();
+            final double indicatorMax = snapSize(Math.max(Math.max(iLeft, iRight), Math.max(iTop, iBottom)));
+            final double pLeft = progress.snappedLeftInset();
+            final double pRight = progress.snappedRightInset();
+            final double pTop = progress.snappedTopInset();
+            final double pBottom = progress.snappedBottomInset();
+            final double progressMax = snapSize(Math.max(Math.max(pLeft, pRight), Math.max(pTop, pBottom)));
+            final double tTop = tick.snappedTopInset();
+            final double tBottom = tick.snappedBottomInset();
+            final double indicatorHeight = indicatorMax + progressMax + tTop + tBottom + progressMax + indicatorMax;
+            return top + indicatorHeight + textGap + doneText.getLayoutBounds().getHeight() + bottom;
+        }
+
+        @Override protected double computeMaxWidth(double height) {
+            return computePrefWidth(height);
+        }
+
+        @Override protected double computeMaxHeight(double width) {
+            return computePrefHeight(width);
+        }
+    }
+
+
+    private final class IndeterminateSpinner extends Region {
+        private IndicatorPaths pathsG;
+        private final List<Double> opacities = new ArrayList<>();
+        private boolean spinEnabled = false;
+        private Paint fillOverride = null;
+
+        private IndeterminateSpinner(boolean spinEnabled, Paint fillOverride) {
+            this.spinEnabled = spinEnabled;
+            this.fillOverride = fillOverride;
+
+            setNodeOrientation(NodeOrientation.LEFT_TO_RIGHT);
+            getStyleClass().setAll("spinner");
+
+            pathsG = new IndicatorPaths();
+            getChildren().add(pathsG);
+            rebuild();
+
+            rebuildTimeline();
+
+        }
+
+        public void setFillOverride(Paint fillOverride) {
+            this.fillOverride = fillOverride;
+            rebuild();
+        }
+
+        public void setSpinEnabled(boolean spinEnabled) {
+            this.spinEnabled = spinEnabled;
+            rebuildTimeline();
+        }
+
+        private void rebuildTimeline() {
+            if (spinEnabled) {
+                if (indeterminateTransition == null) {
+                    indeterminateTransition = new Timeline();
+                    indeterminateTransition.setCycleCount(Timeline.INDEFINITE);
+                    indeterminateTransition.setDelay(UNCLIPPED_DELAY);
+                } else {
+                    indeterminateTransition.stop();
+                    ((Timeline)indeterminateTransition).getKeyFrames().clear();
+                }
+                final ObservableList<KeyFrame> keyFrames = FXCollections.<KeyFrame>observableArrayList();
+
+                keyFrames.add(new KeyFrame(Duration.millis(1), new KeyValue(pathsG.rotateProperty(), 360)));
+                keyFrames.add(new KeyFrame(Duration.millis(3900), new KeyValue(pathsG.rotateProperty(), 0)));
+
+                for (int i = 100; i <= 3900; i += 100) {
+                    keyFrames.add(new KeyFrame(Duration.millis(i), event -> shiftColors()));
+                }
+
+                ((Timeline)indeterminateTransition).getKeyFrames().setAll(keyFrames);
+                indeterminateTransition.playFromStart();
+            } else {
+                if (indeterminateTransition != null) {
+                    indeterminateTransition.stop();
+                    ((Timeline)indeterminateTransition).getKeyFrames().clear();
+                    indeterminateTransition = null;
+                }
+            }
+        }
+
+        private class IndicatorPaths extends Pane {
+            @Override protected double computePrefWidth(double height) {
+                double w = 0;
+                for(Node child: getChildren()) {
+                    if (child instanceof Region) {
+                        Region region = (Region)child;
+                        if (region.getShape() != null) {
+                            w = Math.max(w,region.getShape().getLayoutBounds().getMaxX());
+                        } else {
+                            w = Math.max(w,region.prefWidth(height));
+                        }
+                    }
+                }
+                return w;
+            }
+
+            @Override protected double computePrefHeight(double width) {
+                double h = 0;
+                for(Node child: getChildren()) {
+                    if (child instanceof Region) {
+                        Region region = (Region)child;
+                        if (region.getShape() != null) {
+                            h = Math.max(h,region.getShape().getLayoutBounds().getMaxY());
+                        } else {
+                            h = Math.max(h,region.prefHeight(width));
+                        }
+                    }
+                }
+                return h;
+            }
+
+            @Override protected void layoutChildren() {
+                // calculate scale
+                double scale = getWidth() / computePrefWidth(-1);
+                for(Node child: getChildren()) {
+                    if (child instanceof Region) {
+                        Region region = (Region)child;
+                        if (region.getShape() != null) {
+                            region.resize(
+                                    region.getShape().getLayoutBounds().getMaxX(),
+                                    region.getShape().getLayoutBounds().getMaxY()
+                            );
+                            region.getTransforms().setAll(new Scale(scale,scale,0,0));
+                        } else {
+                            region.autosize();
+                        }
+                    }
+                }
+            }
+        }
+
+        @Override protected void layoutChildren() {
+            final double w = control.getWidth() - control.snappedLeftInset() - control.snappedRightInset();
+            final double h = control.getHeight() - control.snappedTopInset() - control.snappedBottomInset();
+            final double prefW = pathsG.prefWidth(-1);
+            final double prefH = pathsG.prefHeight(-1);
+            double scaleX = w / prefW;
+            double scale = scaleX;
+            if ((scaleX * prefH) > h) {
+                scale = h / prefH;
+            }
+            double indicatorW = prefW * scale;
+            double indicatorH = prefH * scale;
+            pathsG.resizeRelocate((w - indicatorW) / 2, (h - indicatorH) / 2, indicatorW, indicatorH);
+        }
+
+        private void rebuild() {
+            // update indeterminate indicator
+            final int segments = indeterminateSegmentCount.get();
+            opacities.clear();
+            pathsG.getChildren().clear();
+            final double step = 0.8/(segments-1);
+            for (int i = 0; i < segments; i++) {
+                Region region = new Region();
+                region.setScaleShape(false);
+                region.setCenterShape(false);
+                region.getStyleClass().addAll("segment", "segment" + i);
+                if (fillOverride instanceof Color) {
+                    Color c = (Color)fillOverride;
+                    region.setStyle("-fx-background-color: rgba("+((int)(255*c.getRed()))+","+((int)(255*c.getGreen()))+","+((int)(255*c.getBlue()))+","+c.getOpacity()+");");
+                } else {
+                    region.setStyle(null);
+                }
+                pathsG.getChildren().add(region);
+                opacities.add(Math.max(0.1, (1.0 - (step*i))));
+            }
+        }
+
+        private void shiftColors() {
+            if (opacities.size() <= 0) return;
+            final int segments = indeterminateSegmentCount.get();
+            Collections.rotate(opacities, -1);
+            for (int i = 0; i < segments; i++) {
+                pathsG.getChildren().get(i).setOpacity(opacities.get(i));
+            }
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/RadioButtonSkin.java	2015-09-03 15:21:04.373312600 -0700
+++ /dev/null	2015-09-03 15:21:05.000000000 -0700
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.ToggleButtonBehavior;
-import javafx.scene.control.RadioButton;
-import javafx.scene.layout.StackPane;
-
-public class RadioButtonSkin extends LabeledSkinBase<RadioButton, ToggleButtonBehavior<RadioButton>> {
-
-    /** The radio contains the "dot", which is usually a circle */
-    private StackPane radio;
-
-    /**
-     * Used for laying out the label + radio together as a group
-     *
-     * NOTE: This extra node should be eliminated in the future.
-     * Instead, position inner nodes directly with the utility
-     * functions in Pane (computeXOffset()/computeYOffset()).
-     */
-    public RadioButtonSkin(RadioButton radioButton) {
-        super(radioButton, new ToggleButtonBehavior<>(radioButton));
-
-        radio = createRadio();        
-        updateChildren();
-    }
-
-    @Override protected void updateChildren() {
-        super.updateChildren();
-        if (radio != null) {
-            getChildren().add(radio);
-        }
-    }
-
-    private static StackPane createRadio() {
-        StackPane radio = new StackPane();
-        radio.getStyleClass().setAll("radio");
-        radio.setSnapToPixel(false);
-        StackPane region = new StackPane();
-        region.getStyleClass().setAll("dot");
-        radio.getChildren().clear();
-        radio.getChildren().addAll(region);
-        return radio;
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-    
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return super.computeMinWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(radio.minWidth(-1));
-    }
-    
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Math.max(snapSize(super.computeMinHeight(width - radio.minWidth(-1), topInset, rightInset, bottomInset, leftInset)),
-                topInset + radio.minHeight(-1) + bottomInset);
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(radio.prefWidth(-1));
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Math.max(snapSize(super.computePrefHeight(width - radio.prefWidth(-1), topInset, rightInset, bottomInset, leftInset)),
-                        topInset + radio.prefHeight(-1) + bottomInset);
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        final RadioButton radioButton = getSkinnable();
-        final double radioWidth = radio.prefWidth(-1);
-        final double radioHeight = radio.prefHeight(-1);
-        final double computeWidth = Math.max(radioButton.prefWidth(-1),radioButton.minWidth(-1));
-        final double labelWidth = Math.min(computeWidth - radioWidth, w - snapSize(radioWidth));
-        final double labelHeight = Math.min(radioButton.prefHeight(labelWidth), h);
-        final double maxHeight = Math.max(radioHeight, labelHeight);
-        final double xOffset = Utils.computeXOffset(w, labelWidth + radioWidth, radioButton.getAlignment().getHpos()) + x;
-        final double yOffset = Utils.computeYOffset(h, maxHeight, radioButton.getAlignment().getVpos()) + y;
-
-        layoutLabelInArea(xOffset + radioWidth, yOffset, labelWidth, maxHeight,  radioButton.getAlignment());
-        radio.resize(snapSize(radioWidth), snapSize(radioHeight));
-        positionInArea(radio, xOffset, yOffset, radioWidth, maxHeight, 0, radioButton.getAlignment().getHpos(), radioButton.getAlignment().getVpos());
-    }
-}
--- /dev/null	2015-09-03 15:21:05.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/RadioButtonSkin.java	2015-09-03 15:21:03.458260300 -0700
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.ToggleButtonBehavior;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.RadioButton;
+import javafx.scene.layout.StackPane;
+
+/**
+ * Default skin implementation for the {@link RadioButton} control.
+ *
+ * @see RadioButton
+ * @since 9
+ */
+public class RadioButtonSkin extends LabeledSkinBase<RadioButton> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /** The radio contains the "dot", which is usually a circle */
+    private StackPane radio;
+    private final BehaviorBase<RadioButton> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new RadioButtonSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public RadioButtonSkin(RadioButton control) {
+        super(control);
+
+        // install default input map for the RadioButton control
+        behavior = new ToggleButtonBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        radio = createRadio();        
+        updateChildren();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void updateChildren() {
+        super.updateChildren();
+        if (radio != null) {
+            getChildren().add(radio);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return super.computeMinWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(radio.minWidth(-1));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Math.max(snapSize(super.computeMinHeight(width - radio.minWidth(-1), topInset, rightInset, bottomInset, leftInset)),
+                topInset + radio.minHeight(-1) + bottomInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset) + snapSize(radio.prefWidth(-1));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Math.max(snapSize(super.computePrefHeight(width - radio.prefWidth(-1), topInset, rightInset, bottomInset, leftInset)),
+                topInset + radio.prefHeight(-1) + bottomInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        final RadioButton radioButton = getSkinnable();
+        final double radioWidth = radio.prefWidth(-1);
+        final double radioHeight = radio.prefHeight(-1);
+        final double computeWidth = Math.max(radioButton.prefWidth(-1),radioButton.minWidth(-1));
+        final double labelWidth = Math.min(computeWidth - radioWidth, w - snapSize(radioWidth));
+        final double labelHeight = Math.min(radioButton.prefHeight(labelWidth), h);
+        final double maxHeight = Math.max(radioHeight, labelHeight);
+        final double xOffset = Utils.computeXOffset(w, labelWidth + radioWidth, radioButton.getAlignment().getHpos()) + x;
+        final double yOffset = Utils.computeYOffset(h, maxHeight, radioButton.getAlignment().getVpos()) + y;
+
+        layoutLabelInArea(xOffset + radioWidth, yOffset, labelWidth, maxHeight,  radioButton.getAlignment());
+        radio.resize(snapSize(radioWidth), snapSize(radioHeight));
+        positionInArea(radio, xOffset, yOffset, radioWidth, maxHeight, 0, radioButton.getAlignment().getHpos(), radioButton.getAlignment().getVpos());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private static StackPane createRadio() {
+        StackPane radio = new StackPane();
+        radio.getStyleClass().setAll("radio");
+        radio.setSnapToPixel(false);
+        StackPane region = new StackPane();
+        region.getStyleClass().setAll("dot");
+        radio.getChildren().clear();
+        radio.getChildren().addAll(region);
+        return radio;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ScrollBarSkin.java	2015-09-03 15:21:12.131756400 -0700
+++ /dev/null	2015-09-03 15:21:13.000000000 -0700
@@ -1,641 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.geometry.Orientation;
-import javafx.geometry.Point2D;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.control.ScrollBar;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.Node;
-import com.sun.javafx.util.Utils;
-import com.sun.javafx.scene.control.behavior.ScrollBarBehavior;
-
-public class ScrollBarSkin extends BehaviorSkinBase<ScrollBar, ScrollBarBehavior> {
-
-    /***************************************************************************
-     *                                                                         *
-     * UI Subcomponents                                                        *
-     *                                                                         *
-     **************************************************************************/
-
-    public final static int DEFAULT_LENGTH = 100;
-    public final static int DEFAULT_WIDTH = 20;
-
-    private StackPane thumb;
-    private StackPane trackBackground;
-    private StackPane track;
-    private EndButton incButton;
-    private EndButton decButton;
-
-    private double trackLength;
-    private double thumbLength;
-
-    private double preDragThumbPos;
-    private Point2D dragStart; // in the track's coord system
-
-    private double trackPos;
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public ScrollBarSkin(ScrollBar scrollbar) {
-        super(scrollbar, new ScrollBarBehavior(scrollbar));
-        initialize();
-        getSkinnable().requestLayout();
-        // Register listeners
-        registerChangeListener(scrollbar.minProperty(), "MIN");
-        registerChangeListener(scrollbar.maxProperty(), "MAX");
-        registerChangeListener(scrollbar.valueProperty(), "VALUE");
-        registerChangeListener(scrollbar.orientationProperty(), "ORIENTATION");
-        registerChangeListener(scrollbar.visibleAmountProperty(), "VISIBLE_AMOUNT");
-    }
-
-    /**
-     * Initializes the ScrollBarSkin. Creates the scene and sets up all the
-     * bindings for the group.
-     */
-    private void initialize() {
-
-        track = new StackPane();
-        track.getStyleClass().setAll("track");
-
-        trackBackground = new StackPane();
-        trackBackground.getStyleClass().setAll("track-background");
-
-        thumb = new StackPane() {
-            @Override
-            public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-                switch (attribute) {
-                    case VALUE: return getSkinnable().getValue();
-                    default: return super.queryAccessibleAttribute(attribute, parameters);
-                }
-            }
-        };
-        thumb.getStyleClass().setAll("thumb");
-        thumb.setAccessibleRole(AccessibleRole.THUMB);
-
-
-        if (!IS_TOUCH_SUPPORTED) {
-            
-            incButton = new EndButton("increment-button", "increment-arrow") {
-                @Override
-                public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-                    switch (action) {
-                        case FIRE: 
-                            getSkinnable().increment();
-                            break;
-                        default: super.executeAccessibleAction(action, parameters);
-                    }
-                }
-            };
-            incButton.setAccessibleRole(AccessibleRole.INCREMENT_BUTTON);
-            incButton.setOnMousePressed(me -> {
-                /*
-                ** if the tracklenght isn't greater than do nothing....
-                */
-                if (!thumb.isVisible() || trackLength > thumbLength) {
-                    getBehavior().incButtonPressed();
-                }
-                me.consume();
-            });
-            incButton.setOnMouseReleased(me -> {
-                /*
-                ** if the tracklenght isn't greater than do nothing....
-                */
-                if (!thumb.isVisible() || trackLength > thumbLength) {
-                    getBehavior().incButtonReleased();
-                }
-                me.consume();
-            });
-
-            decButton = new EndButton("decrement-button", "decrement-arrow") {
-                @Override
-                public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-                    switch (action) {
-                        case FIRE:
-                            getSkinnable().decrement();
-                            break;
-                        default: super.executeAccessibleAction(action, parameters);
-                    }
-                }
-            };
-            decButton.setAccessibleRole(AccessibleRole.DECREMENT_BUTTON);
-            decButton.setOnMousePressed(me -> {
-                /*
-                ** if the tracklenght isn't greater than do nothing....
-                */
-                if (!thumb.isVisible() || trackLength > thumbLength) {
-                    getBehavior().decButtonPressed();
-                }
-                me.consume();
-            });
-            decButton.setOnMouseReleased(me -> {
-                /*
-                ** if the tracklenght isn't greater than do nothing....
-                */
-                if (!thumb.isVisible() || trackLength > thumbLength) {
-                    getBehavior().decButtonReleased();
-                }
-                me.consume();
-            });
-        }
-
-
-        track.setOnMousePressed(me -> {
-            if (!thumb.isPressed() && me.getButton() == MouseButton.PRIMARY) {
-                if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                    if (trackLength != 0) {
-                        getBehavior().trackPress(me.getY() / trackLength);
-                        me.consume();
-                    }
-                } else {
-                    if (trackLength != 0) {
-                        getBehavior().trackPress(me.getX() / trackLength);
-                        me.consume();
-                    }
-                }
-            }
-        });
-
-        track.setOnMouseReleased(me -> {
-            getBehavior().trackRelease();
-            me.consume();
-        });
-
-        thumb.setOnMousePressed(me -> {
-            if (me.isSynthesized()) {
-                // touch-screen events handled by Scroll handler
-                me.consume();
-                return;
-            }
-            /*
-            ** if max isn't greater than min then there is nothing to do here
-            */
-            if (getSkinnable().getMax() > getSkinnable().getMin()) {
-                dragStart = thumb.localToParent(me.getX(), me.getY());
-                double clampedValue = Utils.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
-                preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
-                me.consume();
-            }
-        });
-
-
-        thumb.setOnMouseDragged(me -> {
-            if (me.isSynthesized()) {
-                // touch-screen events handled by Scroll handler
-                me.consume();
-                return;
-            }
-            /*
-            ** if max isn't greater than min then there is nothing to do here
-            */
-            if (getSkinnable().getMax() > getSkinnable().getMin()) {
-                /*
-                ** if the tracklength isn't greater then do nothing....
-                */
-                if (trackLength > thumbLength) {
-                    Point2D cur = thumb.localToParent(me.getX(), me.getY());
-                    if (dragStart == null) {
-                        // we're getting dragged without getting a mouse press
-                        dragStart = thumb.localToParent(me.getX(), me.getY());
-                    }
-                    double dragPos = getSkinnable().getOrientation() == Orientation.VERTICAL ? cur.getY() - dragStart.getY(): cur.getX() - dragStart.getX();
-                    getBehavior().thumbDragged(preDragThumbPos + dragPos / (trackLength - thumbLength));
-                }
-
-                me.consume();
-            }
-        });
-
-        thumb.setOnScrollStarted(se -> {
-            if (se.isDirect()) {
-                /*
-                ** if max isn't greater than min then there is nothing to do here
-                */
-                if (getSkinnable().getMax() > getSkinnable().getMin()) {
-                    dragStart = thumb.localToParent(se.getX(), se.getY());
-                    double clampedValue = Utils.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
-                    preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
-                    se.consume();
-                }
-            }
-        });
-
-        thumb.setOnScroll(event -> {
-            if (event.isDirect()) {
-                /*
-                ** if max isn't greater than min then there is nothing to do here
-                */
-                if (getSkinnable().getMax() > getSkinnable().getMin()) {
-                    /*
-                    ** if the tracklength isn't greater then do nothing....
-                    */
-                    if (trackLength > thumbLength) {
-                        Point2D cur = thumb.localToParent(event.getX(), event.getY());
-                        if (dragStart == null) {
-                            // we're getting dragged without getting a mouse press
-                            dragStart = thumb.localToParent(event.getX(), event.getY());
-                        }
-                        double dragPos = getSkinnable().getOrientation() == Orientation.VERTICAL ? cur.getY() - dragStart.getY(): cur.getX() - dragStart.getX();
-                        getBehavior().thumbDragged(/*todo*/ preDragThumbPos + dragPos / (trackLength - thumbLength));
-                    }
-
-                    event.consume();
-                    return;
-                }
-            }
-        });
-
-
-        getSkinnable().addEventHandler(ScrollEvent.SCROLL, event -> {
-            /*
-            ** if the tracklength isn't greater then do nothing....
-            */
-            if (trackLength > thumbLength) {
-
-                double dx = event.getDeltaX();
-                double dy = event.getDeltaY();
-
-                /*
-                ** in 2.0 a horizontal scrollbar would scroll on a vertical
-                ** drag on a tracker-pad. We need to keep this behavior.
-                */
-                dx = (Math.abs(dx) < Math.abs(dy) ? dy : dx);
-
-                /*
-                ** we only consume an event that we've used.
-                */
-                ScrollBar sb = (ScrollBar) getSkinnable();
-
-                double delta = (getSkinnable().getOrientation() == Orientation.VERTICAL ? dy : dx);
-
-                /*
-                ** RT-22941 - If this is either a touch or inertia scroll
-                ** then we move to the position of the touch point.
-                *
-                * TODO: this fix causes RT-23406 ([ScrollBar, touch] Dragging scrollbar from the
-                * track on touchscreen causes flickering)
-                */
-                if (event.isDirect()) {
-                    if (trackLength > thumbLength) {
-                        getBehavior().thumbDragged((getSkinnable().getOrientation() == Orientation.VERTICAL ? event.getY(): event.getX()) / trackLength);
-                        event.consume();
-                    }
-                }
-                else {
-                    if (delta > 0.0 && sb.getValue() > sb.getMin()) {
-                        sb.decrement();
-                        event.consume();
-                    } else if (delta < 0.0 && sb.getValue() < sb.getMax()) {
-                        sb.increment();
-                        event.consume();
-                    }
-                }
-            }
-        });
-
-        getChildren().clear();
-        if (!IS_TOUCH_SUPPORTED) {
-            getChildren().addAll(trackBackground, incButton, decButton, track, thumb);
-        }
-        else {
-            getChildren().addAll(track, thumb);
-        }
-    }
-
-
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("ORIENTATION".equals(p)) {
-            getSkinnable().requestLayout();
-        } else if ("MIN".equals(p) || "MAX".equals(p) || "VISIBLE_AMOUNT".equals(p)) {
-            positionThumb();
-            getSkinnable().requestLayout();
-        } else if ("VALUE".equals(p)) {
-            positionThumb();
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final double DEFAULT_EMBEDDED_SB_BREADTH = 8.0;
-
-    /*
-     * Gets the breadth of the scrollbar. The "breadth" is the distance
-     * across the scrollbar, i.e. if vertical the width, otherwise the height.
-     * On desktop this is determined by the greater of the breadths of the end-buttons.
-     * Embedded doesn't have end-buttons, so currently we use a default breadth.
-     * We should change this when we get width/height css properties.
-     */
-    double getBreadth() {
-        if (!IS_TOUCH_SUPPORTED) {
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                return Math.max(decButton.prefWidth(-1), incButton.prefWidth(-1)) +snappedLeftInset()+snappedRightInset();
-            } else {
-                return Math.max(decButton.prefHeight(-1), incButton.prefHeight(-1)) +snappedTopInset()+snappedBottomInset();
-            }
-        }
-        else {
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                return Math.max(DEFAULT_EMBEDDED_SB_BREADTH, DEFAULT_EMBEDDED_SB_BREADTH)+snappedLeftInset()+snappedRightInset();
-            } else {
-                return Math.max(DEFAULT_EMBEDDED_SB_BREADTH, DEFAULT_EMBEDDED_SB_BREADTH)+snappedTopInset()+snappedBottomInset();
-            }
-        }
-    }
-
-    double minThumbLength() {
-        return 1.5f * getBreadth();
-    }
-
-    double minTrackLength() {
-        return 2.0f * getBreadth();
-    }
-
-    /*
-     * Minimum length is the length of the end buttons plus twice the
-     * minimum thumb length, which should be enough for a reasonably-sized
-     * track. Minimum breadth is determined by the breadths of the
-     * end buttons.
-     */
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-            return getBreadth();
-        } else {
-            if (!IS_TOUCH_SUPPORTED) {
-                return decButton.minWidth(-1) + incButton.minWidth(-1) + minTrackLength()+leftInset+rightInset;
-            } else {
-                return minTrackLength()+leftInset+rightInset;
-            }
-        }
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-            if (!IS_TOUCH_SUPPORTED) {
-                return decButton.minHeight(-1) + incButton.minHeight(-1) + minTrackLength()+topInset+bottomInset;
-            } else {
-                return minTrackLength()+topInset+bottomInset;
-            }
-        } else {
-            return getBreadth();
-        }
-    }
-
-    /*
-     * Preferred size. The breadth is determined by the breadth of
-     * the end buttons. The length is a constant default length.
-     * Usually applications or other components will either set a
-     * specific length using LayoutInfo or will stretch the length
-     * of the scrollbar to fit a container.
-     */
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollBar s = getSkinnable();
-        return s.getOrientation() == Orientation.VERTICAL ? getBreadth() : DEFAULT_LENGTH+leftInset+rightInset;
-    }
-
-    @Override protected double computePrefHeight(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollBar s = getSkinnable();
-        return s.getOrientation() == Orientation.VERTICAL ? DEFAULT_LENGTH+topInset+bottomInset : getBreadth();
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollBar s = getSkinnable();
-        return s.getOrientation() == Orientation.VERTICAL ? s.prefWidth(-1) : Double.MAX_VALUE;
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollBar s = getSkinnable();
-        return s.getOrientation() == Orientation.VERTICAL ? Double.MAX_VALUE : s.prefHeight(-1);
-    }
-
-    /**
-     * Called when ever either min, max or value changes, so thumb's layoutX, Y is recomputed.
-     */
-    void positionThumb() {
-        ScrollBar s = getSkinnable();
-        double clampedValue = Utils.clamp(s.getMin(), s.getValue(), s.getMax());
-        trackPos = (s.getMax() - s.getMin() > 0) ? ((trackLength - thumbLength) * (clampedValue - s.getMin()) / (s.getMax() - s.getMin())) : (0.0F);
-        
-        if (!IS_TOUCH_SUPPORTED) {
-            if (s.getOrientation() == Orientation.VERTICAL) {
-                trackPos += decButton.prefHeight(-1);
-            } else {
-                trackPos += decButton.prefWidth(-1);
-            }
-        }
-        
-        thumb.setTranslateX( snapPosition(s.getOrientation() == Orientation.VERTICAL ? snappedLeftInset() : trackPos + snappedLeftInset()));
-        thumb.setTranslateY( snapPosition(s.getOrientation() == Orientation.VERTICAL ? trackPos + snappedTopInset() : snappedTopInset()));
-    }
-    
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        
-        final ScrollBar s = getSkinnable();
-        
-        /**
-         * Compute the percentage length of thumb as (visibleAmount/range)
-         * if max isn't greater than min then there is nothing to do here
-         */
-        double visiblePortion;
-        if (s.getMax() > s.getMin()) {
-            visiblePortion = s.getVisibleAmount()/(s.getMax() - s.getMin());
-        }
-        else {
-            visiblePortion = 1.0;
-        }
-
-        if (s.getOrientation() == Orientation.VERTICAL) {
-            if (!IS_TOUCH_SUPPORTED) {
-                double decHeight = snapSize(decButton.prefHeight(-1));
-                double incHeight = snapSize(incButton.prefHeight(-1));
-
-                decButton.resize(w, decHeight);
-                incButton.resize(w, incHeight);
-
-                trackLength = snapSize(h - (decHeight + incHeight));
-                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
-
-                trackBackground.resizeRelocate(snapPosition(x), snapPosition(y), w, trackLength+decHeight+incHeight);
-                decButton.relocate(snapPosition(x), snapPosition(y));
-                incButton.relocate(snapPosition(x), snapPosition(y + h - incHeight));
-                track.resizeRelocate(snapPosition(x), snapPosition(y + decHeight), w, trackLength);
-                thumb.resize(snapSize(x >= 0 ? w : w + x), thumbLength); // Account for negative padding (see also RT-10719)
-                positionThumb();
-            }
-            else {
-                trackLength = snapSize(h);
-                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
-
-                track.resizeRelocate(snapPosition(x), snapPosition(y), w, trackLength);
-                thumb.resize(snapSize(x >= 0 ? w : w + x), thumbLength); // Account for negative padding (see also RT-10719)
-                positionThumb();
-            }
-        } else {
-            if (!IS_TOUCH_SUPPORTED) {
-                double decWidth = snapSize(decButton.prefWidth(-1));
-                double incWidth = snapSize(incButton.prefWidth(-1));
-
-                decButton.resize(decWidth, h);
-                incButton.resize(incWidth, h);
-
-                trackLength = snapSize(w - (decWidth + incWidth));
-                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
-
-                trackBackground.resizeRelocate(snapPosition(x), snapPosition(y), trackLength+decWidth+incWidth, h);
-                decButton.relocate(snapPosition(x), snapPosition(y));
-                incButton.relocate(snapPosition(x + w - incWidth), snapPosition(y));
-                track.resizeRelocate(snapPosition(x + decWidth), snapPosition(y), trackLength, h);
-                thumb.resize(thumbLength, snapSize(y >= 0 ? h : h + y)); // Account for negative padding (see also RT-10719)
-                positionThumb();
-            }
-            else {
-                trackLength = snapSize(w);
-                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
-
-                track.resizeRelocate(snapPosition(x), snapPosition(y), trackLength, h);
-                thumb.resize(thumbLength, snapSize(y >= 0 ? h : h + y)); // Account for negative padding (see also RT-10719)
-                positionThumb();
-            }
-
-            s.resize(snapSize(s.getWidth()), snapSize(s.getHeight()));
-        }
-        
-        // things should be invisible only when well below minimum length
-        if (s.getOrientation() == Orientation.VERTICAL && h >= (computeMinHeight(-1, (int)y , snappedRightInset(), snappedBottomInset(), (int)x) - (y+snappedBottomInset())) ||
-            s.getOrientation() == Orientation.HORIZONTAL && w >= (computeMinWidth(-1, (int)y , snappedRightInset(), snappedBottomInset(), (int)x) - (x+snappedRightInset()))) {
-            trackBackground.setVisible(true);
-            track.setVisible(true);
-            thumb.setVisible(true);
-            if (!IS_TOUCH_SUPPORTED) {
-                incButton.setVisible(true);
-                decButton.setVisible(true);
-            }
-        }
-        else {
-            trackBackground.setVisible(false);
-            track.setVisible(false);
-            thumb.setVisible(false);
-
-            if (!IS_TOUCH_SUPPORTED) {
-                /*
-                ** once the space is big enough for one button we 
-                ** can look at drawing
-                */
-                if (h >= decButton.computeMinWidth(-1)) {
-                    decButton.setVisible(true);
-                }
-                else {
-                    decButton.setVisible(false);
-                }
-                if (h >= incButton.computeMinWidth(-1)) {
-                    incButton.setVisible(true);
-                }
-                else {
-                    incButton.setVisible(false);
-                }
-            }
-        }
-    }
-
-    
-    public Node getThumb() {
-        return thumb;
-    }
-    
-    public Node getTrack() {
-        return track;
-    }
-    
-    public Node getIncButton() {
-        return incButton;
-    }
-    
-    public Node getDecButton() {
-        return decButton;
-    }
-    
-    private static class EndButton extends Region {
-        private Region arrow;
-
-        private EndButton(String styleClass, String arrowStyleClass) {
-            getStyleClass().setAll(styleClass);
-            arrow = new Region();
-            arrow.getStyleClass().setAll(arrowStyleClass);
-            getChildren().setAll(arrow);
-            requestLayout();
-        }
-
-        @Override protected void layoutChildren() {
-            final double top = snappedTopInset();
-            final double left = snappedLeftInset();
-            final double bottom = snappedBottomInset();
-            final double right = snappedRightInset();
-            final double aw = snapSize(arrow.prefWidth(-1));
-            final double ah = snapSize(arrow.prefHeight(-1));
-            final double yPos = snapPosition((getHeight() - (top + bottom + ah)) / 2.0);
-            final double xPos = snapPosition((getWidth() - (left + right + aw)) / 2.0);
-            arrow.resizeRelocate(xPos + left, yPos + top, aw, ah);
-        }
-
-        @Override protected double computeMinHeight(double width) {
-            return prefHeight(-1);
-        }
-
-        @Override protected double computeMinWidth(double height) {
-            return prefWidth(-1);
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            final double left = snappedLeftInset();
-            final double right = snappedRightInset();
-            final double aw = snapSize(arrow.prefWidth(-1));
-            return left + aw + right;
-        }
-        
-        @Override protected double computePrefHeight(double width) {
-            final double top = snappedTopInset();
-            final double bottom = snappedBottomInset();
-            final double ah = snapSize(arrow.prefHeight(-1));
-            return top + ah + bottom;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:21:13.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ScrollBarSkin.java	2015-09-03 15:21:11.362712400 -0700
@@ -0,0 +1,692 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Orientation;
+import javafx.geometry.Point2D;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.control.SkinBase;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.Node;
+import com.sun.javafx.util.Utils;
+import com.sun.javafx.scene.control.behavior.ScrollBarBehavior;
+
+import java.util.function.Consumer;
+
+/**
+ * Default skin implementation for the {@link ScrollBar} control.
+ *
+ * @see ScrollBar
+ * @since 9
+ */
+public class ScrollBarSkin extends SkinBase<ScrollBar> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final ScrollBarBehavior behavior;
+
+    private StackPane thumb;
+    private StackPane trackBackground;
+    private StackPane track;
+    private EndButton incButton;
+    private EndButton decButton;
+
+    private double trackLength;
+    private double thumbLength;
+
+    private double preDragThumbPos;
+    private Point2D dragStart; // in the track's coord system
+
+    private double trackPos;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ScrollBarSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ScrollBarSkin(ScrollBar control) {
+        super(control);
+
+        // install default input map for the ScrollBar control
+        this.behavior = new ScrollBarBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        initialize();
+        getSkinnable().requestLayout();
+
+        // Register listeners
+        final Consumer<ObservableValue<?>> consumer = e -> {
+            positionThumb();
+            getSkinnable().requestLayout();
+        };
+        registerChangeListener(control.minProperty(), consumer);
+        registerChangeListener(control.maxProperty(), consumer);
+        registerChangeListener(control.visibleAmountProperty(), consumer);
+        registerChangeListener(control.valueProperty(), e -> positionThumb());
+        registerChangeListener(control.orientationProperty(), e -> getSkinnable().requestLayout());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+
+        final ScrollBar s = getSkinnable();
+
+        /**
+         * Compute the percentage length of thumb as (visibleAmount/range)
+         * if max isn't greater than min then there is nothing to do here
+         */
+        double visiblePortion;
+        if (s.getMax() > s.getMin()) {
+            visiblePortion = s.getVisibleAmount()/(s.getMax() - s.getMin());
+        }
+        else {
+            visiblePortion = 1.0;
+        }
+
+        if (s.getOrientation() == Orientation.VERTICAL) {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                double decHeight = snapSize(decButton.prefHeight(-1));
+                double incHeight = snapSize(incButton.prefHeight(-1));
+
+                decButton.resize(w, decHeight);
+                incButton.resize(w, incHeight);
+
+                trackLength = snapSize(h - (decHeight + incHeight));
+                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
+
+                trackBackground.resizeRelocate(snapPosition(x), snapPosition(y), w, trackLength+decHeight+incHeight);
+                decButton.relocate(snapPosition(x), snapPosition(y));
+                incButton.relocate(snapPosition(x), snapPosition(y + h - incHeight));
+                track.resizeRelocate(snapPosition(x), snapPosition(y + decHeight), w, trackLength);
+                thumb.resize(snapSize(x >= 0 ? w : w + x), thumbLength); // Account for negative padding (see also RT-10719)
+                positionThumb();
+            }
+            else {
+                trackLength = snapSize(h);
+                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
+
+                track.resizeRelocate(snapPosition(x), snapPosition(y), w, trackLength);
+                thumb.resize(snapSize(x >= 0 ? w : w + x), thumbLength); // Account for negative padding (see also RT-10719)
+                positionThumb();
+            }
+        } else {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                double decWidth = snapSize(decButton.prefWidth(-1));
+                double incWidth = snapSize(incButton.prefWidth(-1));
+
+                decButton.resize(decWidth, h);
+                incButton.resize(incWidth, h);
+
+                trackLength = snapSize(w - (decWidth + incWidth));
+                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
+
+                trackBackground.resizeRelocate(snapPosition(x), snapPosition(y), trackLength+decWidth+incWidth, h);
+                decButton.relocate(snapPosition(x), snapPosition(y));
+                incButton.relocate(snapPosition(x + w - incWidth), snapPosition(y));
+                track.resizeRelocate(snapPosition(x + decWidth), snapPosition(y), trackLength, h);
+                thumb.resize(thumbLength, snapSize(y >= 0 ? h : h + y)); // Account for negative padding (see also RT-10719)
+                positionThumb();
+            }
+            else {
+                trackLength = snapSize(w);
+                thumbLength = snapSize(Utils.clamp(minThumbLength(), (trackLength * visiblePortion), trackLength));
+
+                track.resizeRelocate(snapPosition(x), snapPosition(y), trackLength, h);
+                thumb.resize(thumbLength, snapSize(y >= 0 ? h : h + y)); // Account for negative padding (see also RT-10719)
+                positionThumb();
+            }
+
+            s.resize(snapSize(s.getWidth()), snapSize(s.getHeight()));
+        }
+
+        // things should be invisible only when well below minimum length
+        if (s.getOrientation() == Orientation.VERTICAL && h >= (computeMinHeight(-1, (int)y , snappedRightInset(), snappedBottomInset(), (int)x) - (y+snappedBottomInset())) ||
+                s.getOrientation() == Orientation.HORIZONTAL && w >= (computeMinWidth(-1, (int)y , snappedRightInset(), snappedBottomInset(), (int)x) - (x+snappedRightInset()))) {
+            trackBackground.setVisible(true);
+            track.setVisible(true);
+            thumb.setVisible(true);
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                incButton.setVisible(true);
+                decButton.setVisible(true);
+            }
+        }
+        else {
+            trackBackground.setVisible(false);
+            track.setVisible(false);
+            thumb.setVisible(false);
+
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                /*
+                ** once the space is big enough for one button we
+                ** can look at drawing
+                */
+                if (h >= decButton.computeMinWidth(-1)) {
+                    decButton.setVisible(true);
+                }
+                else {
+                    decButton.setVisible(false);
+                }
+                if (h >= incButton.computeMinWidth(-1)) {
+                    incButton.setVisible(true);
+                }
+                else {
+                    incButton.setVisible(false);
+                }
+            }
+        }
+    }
+
+    /*
+     * Minimum length is the length of the end buttons plus twice the
+     * minimum thumb length, which should be enough for a reasonably-sized
+     * track. Minimum breadth is determined by the breadths of the
+     * end buttons.
+     */
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+            return getBreadth();
+        } else {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                return decButton.minWidth(-1) + incButton.minWidth(-1) + minTrackLength()+leftInset+rightInset;
+            } else {
+                return minTrackLength()+leftInset+rightInset;
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                return decButton.minHeight(-1) + incButton.minHeight(-1) + minTrackLength()+topInset+bottomInset;
+            } else {
+                return minTrackLength()+topInset+bottomInset;
+            }
+        } else {
+            return getBreadth();
+        }
+    }
+
+    /*
+     * Preferred size. The breadth is determined by the breadth of
+     * the end buttons. The length is a constant default length.
+     * Usually applications or other components will either set a
+     * specific length using LayoutInfo or will stretch the length
+     * of the scrollbar to fit a container.
+     */
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollBar s = getSkinnable();
+        return s.getOrientation() == Orientation.VERTICAL ? getBreadth() : Properties.DEFAULT_LENGTH+leftInset+rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollBar s = getSkinnable();
+        return s.getOrientation() == Orientation.VERTICAL ? Properties.DEFAULT_LENGTH+topInset+bottomInset : getBreadth();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollBar s = getSkinnable();
+        return s.getOrientation() == Orientation.VERTICAL ? s.prefWidth(-1) : Double.MAX_VALUE;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollBar s = getSkinnable();
+        return s.getOrientation() == Orientation.VERTICAL ? Double.MAX_VALUE : s.prefHeight(-1);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Initializes the ScrollBarSkin. Creates the scene and sets up all the
+     * bindings for the group.
+     */
+    private void initialize() {
+
+        track = new StackPane();
+        track.getStyleClass().setAll("track");
+
+        trackBackground = new StackPane();
+        trackBackground.getStyleClass().setAll("track-background");
+
+        thumb = new StackPane() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+                switch (attribute) {
+                    case VALUE: return getSkinnable().getValue();
+                    default: return super.queryAccessibleAttribute(attribute, parameters);
+                }
+            }
+        };
+        thumb.getStyleClass().setAll("thumb");
+        thumb.setAccessibleRole(AccessibleRole.THUMB);
+
+
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            
+            incButton = new EndButton("increment-button", "increment-arrow") {
+                @Override
+                public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+                    switch (action) {
+                        case FIRE: 
+                            getSkinnable().increment();
+                            break;
+                        default: super.executeAccessibleAction(action, parameters);
+                    }
+                }
+            };
+            incButton.setAccessibleRole(AccessibleRole.INCREMENT_BUTTON);
+            incButton.setOnMousePressed(me -> {
+                /*
+                ** if the tracklenght isn't greater than do nothing....
+                */
+                if (!thumb.isVisible() || trackLength > thumbLength) {
+                    behavior.incButtonPressed();
+                }
+                me.consume();
+            });
+            incButton.setOnMouseReleased(me -> {
+                /*
+                ** if the tracklenght isn't greater than do nothing....
+                */
+                if (!thumb.isVisible() || trackLength > thumbLength) {
+                    behavior.incButtonReleased();
+                }
+                me.consume();
+            });
+
+            decButton = new EndButton("decrement-button", "decrement-arrow") {
+                @Override
+                public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+                    switch (action) {
+                        case FIRE:
+                            getSkinnable().decrement();
+                            break;
+                        default: super.executeAccessibleAction(action, parameters);
+                    }
+                }
+            };
+            decButton.setAccessibleRole(AccessibleRole.DECREMENT_BUTTON);
+            decButton.setOnMousePressed(me -> {
+                /*
+                ** if the tracklenght isn't greater than do nothing....
+                */
+                if (!thumb.isVisible() || trackLength > thumbLength) {
+                    behavior.decButtonPressed();
+                }
+                me.consume();
+            });
+            decButton.setOnMouseReleased(me -> {
+                /*
+                ** if the tracklenght isn't greater than do nothing....
+                */
+                if (!thumb.isVisible() || trackLength > thumbLength) {
+                    behavior.decButtonReleased();
+                }
+                me.consume();
+            });
+        }
+
+
+        track.setOnMousePressed(me -> {
+            if (!thumb.isPressed() && me.getButton() == MouseButton.PRIMARY) {
+                if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                    if (trackLength != 0) {
+                        behavior.trackPress(me.getY() / trackLength);
+                        me.consume();
+                    }
+                } else {
+                    if (trackLength != 0) {
+                        behavior.trackPress(me.getX() / trackLength);
+                        me.consume();
+                    }
+                }
+            }
+        });
+
+        track.setOnMouseReleased(me -> {
+            behavior.trackRelease();
+            me.consume();
+        });
+
+        thumb.setOnMousePressed(me -> {
+            if (me.isSynthesized()) {
+                // touch-screen events handled by Scroll handler
+                me.consume();
+                return;
+            }
+            /*
+            ** if max isn't greater than min then there is nothing to do here
+            */
+            if (getSkinnable().getMax() > getSkinnable().getMin()) {
+                dragStart = thumb.localToParent(me.getX(), me.getY());
+                double clampedValue = Utils.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
+                preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
+                me.consume();
+            }
+        });
+
+
+        thumb.setOnMouseDragged(me -> {
+            if (me.isSynthesized()) {
+                // touch-screen events handled by Scroll handler
+                me.consume();
+                return;
+            }
+            /*
+            ** if max isn't greater than min then there is nothing to do here
+            */
+            if (getSkinnable().getMax() > getSkinnable().getMin()) {
+                /*
+                ** if the tracklength isn't greater then do nothing....
+                */
+                if (trackLength > thumbLength) {
+                    Point2D cur = thumb.localToParent(me.getX(), me.getY());
+                    if (dragStart == null) {
+                        // we're getting dragged without getting a mouse press
+                        dragStart = thumb.localToParent(me.getX(), me.getY());
+                    }
+                    double dragPos = getSkinnable().getOrientation() == Orientation.VERTICAL ? cur.getY() - dragStart.getY(): cur.getX() - dragStart.getX();
+                    behavior.thumbDragged(preDragThumbPos + dragPos / (trackLength - thumbLength));
+                }
+
+                me.consume();
+            }
+        });
+
+        thumb.setOnScrollStarted(se -> {
+            if (se.isDirect()) {
+                /*
+                ** if max isn't greater than min then there is nothing to do here
+                */
+                if (getSkinnable().getMax() > getSkinnable().getMin()) {
+                    dragStart = thumb.localToParent(se.getX(), se.getY());
+                    double clampedValue = Utils.clamp(getSkinnable().getMin(), getSkinnable().getValue(), getSkinnable().getMax());
+                    preDragThumbPos = (clampedValue - getSkinnable().getMin()) / (getSkinnable().getMax() - getSkinnable().getMin());
+                    se.consume();
+                }
+            }
+        });
+
+        thumb.setOnScroll(event -> {
+            if (event.isDirect()) {
+                /*
+                ** if max isn't greater than min then there is nothing to do here
+                */
+                if (getSkinnable().getMax() > getSkinnable().getMin()) {
+                    /*
+                    ** if the tracklength isn't greater then do nothing....
+                    */
+                    if (trackLength > thumbLength) {
+                        Point2D cur = thumb.localToParent(event.getX(), event.getY());
+                        if (dragStart == null) {
+                            // we're getting dragged without getting a mouse press
+                            dragStart = thumb.localToParent(event.getX(), event.getY());
+                        }
+                        double dragPos = getSkinnable().getOrientation() == Orientation.VERTICAL ? cur.getY() - dragStart.getY(): cur.getX() - dragStart.getX();
+                        behavior.thumbDragged(/*todo*/ preDragThumbPos + dragPos / (trackLength - thumbLength));
+                    }
+
+                    event.consume();
+                    return;
+                }
+            }
+        });
+
+
+        getSkinnable().addEventHandler(ScrollEvent.SCROLL, event -> {
+            /*
+            ** if the tracklength isn't greater then do nothing....
+            */
+            if (trackLength > thumbLength) {
+
+                double dx = event.getDeltaX();
+                double dy = event.getDeltaY();
+
+                /*
+                ** in 2.0 a horizontal scrollbar would scroll on a vertical
+                ** drag on a tracker-pad. We need to keep this behavior.
+                */
+                dx = (Math.abs(dx) < Math.abs(dy) ? dy : dx);
+
+                /*
+                ** we only consume an event that we've used.
+                */
+                ScrollBar sb = (ScrollBar) getSkinnable();
+
+                double delta = (getSkinnable().getOrientation() == Orientation.VERTICAL ? dy : dx);
+
+                /*
+                ** RT-22941 - If this is either a touch or inertia scroll
+                ** then we move to the position of the touch point.
+                *
+                * TODO: this fix causes RT-23406 ([ScrollBar, touch] Dragging scrollbar from the
+                * track on touchscreen causes flickering)
+                */
+                if (event.isDirect()) {
+                    if (trackLength > thumbLength) {
+                        behavior.thumbDragged((getSkinnable().getOrientation() == Orientation.VERTICAL ? event.getY() : event.getX()) / trackLength);
+                        event.consume();
+                    }
+                }
+                else {
+                    if (delta > 0.0 && sb.getValue() > sb.getMin()) {
+                        sb.decrement();
+                        event.consume();
+                    } else if (delta < 0.0 && sb.getValue() < sb.getMax()) {
+                        sb.increment();
+                        event.consume();
+                    }
+                }
+            }
+        });
+
+        getChildren().clear();
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            getChildren().addAll(trackBackground, incButton, decButton, track, thumb);
+        }
+        else {
+            getChildren().addAll(track, thumb);
+        }
+    }
+
+
+    /*
+     * Gets the breadth of the scrollbar. The "breadth" is the distance
+     * across the scrollbar, i.e. if vertical the width, otherwise the height.
+     * On desktop this is determined by the greater of the breadths of the end-buttons.
+     * Embedded doesn't have end-buttons, so currently we use a default breadth.
+     * We should change this when we get width/height css properties.
+     */
+    double getBreadth() {
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                return Math.max(decButton.prefWidth(-1), incButton.prefWidth(-1)) +snappedLeftInset()+snappedRightInset();
+            } else {
+                return Math.max(decButton.prefHeight(-1), incButton.prefHeight(-1)) +snappedTopInset()+snappedBottomInset();
+            }
+        }
+        else {
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                return Math.max(Properties.DEFAULT_EMBEDDED_SB_BREADTH, Properties.DEFAULT_EMBEDDED_SB_BREADTH)+snappedLeftInset()+snappedRightInset();
+            } else {
+                return Math.max(Properties.DEFAULT_EMBEDDED_SB_BREADTH, Properties.DEFAULT_EMBEDDED_SB_BREADTH)+snappedTopInset()+snappedBottomInset();
+            }
+        }
+    }
+
+    double minThumbLength() {
+        return 1.5f * getBreadth();
+    }
+
+    double minTrackLength() {
+        return 2.0f * getBreadth();
+    }
+
+    /**
+     * Called when ever either min, max or value changes, so thumb's layoutX, Y is recomputed.
+     */
+    void positionThumb() {
+        ScrollBar s = getSkinnable();
+        double clampedValue = Utils.clamp(s.getMin(), s.getValue(), s.getMax());
+        trackPos = (s.getMax() - s.getMin() > 0) ? ((trackLength - thumbLength) * (clampedValue - s.getMin()) / (s.getMax() - s.getMin())) : (0.0F);
+        
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            if (s.getOrientation() == Orientation.VERTICAL) {
+                trackPos += decButton.prefHeight(-1);
+            } else {
+                trackPos += decButton.prefWidth(-1);
+            }
+        }
+        
+        thumb.setTranslateX( snapPosition(s.getOrientation() == Orientation.VERTICAL ? snappedLeftInset() : trackPos + snappedLeftInset()));
+        thumb.setTranslateY( snapPosition(s.getOrientation() == Orientation.VERTICAL ? trackPos + snappedTopInset() : snappedTopInset()));
+    }
+    
+    private Node getThumb() {
+        return thumb;
+    }
+
+    private Node getTrack() {
+        return track;
+    }
+
+    private Node getIncrementButton() {
+        return incButton;
+    }
+
+    private Node getDecrementButton() {
+        return decButton;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    private static class EndButton extends Region {
+        private Region arrow;
+
+        private EndButton(String styleClass, String arrowStyleClass) {
+            getStyleClass().setAll(styleClass);
+            arrow = new Region();
+            arrow.getStyleClass().setAll(arrowStyleClass);
+            getChildren().setAll(arrow);
+            requestLayout();
+        }
+
+        @Override protected void layoutChildren() {
+            final double top = snappedTopInset();
+            final double left = snappedLeftInset();
+            final double bottom = snappedBottomInset();
+            final double right = snappedRightInset();
+            final double aw = snapSize(arrow.prefWidth(-1));
+            final double ah = snapSize(arrow.prefHeight(-1));
+            final double yPos = snapPosition((getHeight() - (top + bottom + ah)) / 2.0);
+            final double xPos = snapPosition((getWidth() - (left + right + aw)) / 2.0);
+            arrow.resizeRelocate(xPos + left, yPos + top, aw, ah);
+        }
+
+        @Override protected double computeMinHeight(double width) {
+            return prefHeight(-1);
+        }
+
+        @Override protected double computeMinWidth(double height) {
+            return prefWidth(-1);
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            final double left = snappedLeftInset();
+            final double right = snappedRightInset();
+            final double aw = snapSize(arrow.prefWidth(-1));
+            return left + aw + right;
+        }
+        
+        @Override protected double computePrefHeight(double width) {
+            final double top = snappedTopInset();
+            final double bottom = snappedBottomInset();
+            final double ah = snapSize(arrow.prefHeight(-1));
+            return top + ah + bottom;
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ScrollPaneSkin.java	2015-09-03 15:21:20.512235700 -0700
+++ /dev/null	2015-09-03 15:21:21.000000000 -0700
@@ -1,1236 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import javafx.animation.Animation.Status;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.DoublePropertyBase;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.event.EventDispatcher;
-import javafx.event.EventHandler;
-import javafx.geometry.BoundingBox;
-import javafx.geometry.Bounds;
-import javafx.geometry.Orientation;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.ScrollBar;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.ScrollPane.ScrollBarPolicy;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.input.TouchEvent;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Duration;
-import com.sun.javafx.util.Utils;
-import com.sun.javafx.scene.control.behavior.ScrollPaneBehavior;
-import com.sun.javafx.scene.traversal.TraverseListener;
-import static com.sun.javafx.scene.control.skin.Utils.*;
-import javafx.geometry.Insets;
-
-public class ScrollPaneSkin extends BehaviorSkinBase<ScrollPane, ScrollPaneBehavior> implements TraverseListener {
-    /***************************************************************************
-     *                                                                         *
-     * UI Subcomponents                                                        *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final double DEFAULT_PREF_SIZE = 100.0;
-
-    private static final double DEFAULT_MIN_SIZE = 36.0;
-
-    private static final double DEFAULT_SB_BREADTH = 12.0;
-    private static final double DEFAULT_EMBEDDED_SB_BREADTH = 8.0;
-
-    private static final double PAN_THRESHOLD = 0.5;
-
-    // state from the control
-
-    private Node scrollNode;
-
-    private double nodeWidth;
-    private double nodeHeight;
-    private boolean nodeSizeInvalid = true;
-
-    private double posX;
-    private double posY;
-
-    // working state
-
-    private boolean hsbvis;
-    private boolean vsbvis;
-    private double hsbHeight;
-    private double vsbWidth;
-
-    // substructure
-
-    private StackPane viewRect;
-    private StackPane viewContent;
-    private double contentWidth;
-    private double contentHeight;
-    private StackPane corner;
-    protected ScrollBar hsb;
-    protected ScrollBar vsb;
-
-    double pressX;
-    double pressY;
-    double ohvalue;
-    double ovvalue;
-    private Cursor saveCursor =  null;
-    private boolean dragDetected = false;
-    private boolean touchDetected = false;
-    private boolean mouseDown = false;
-
-    Rectangle clipRect;
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public ScrollPaneSkin(final ScrollPane scrollpane) {
-        super(scrollpane, new ScrollPaneBehavior(scrollpane));
-        initialize();
-        // Register listeners
-        registerChangeListener(scrollpane.contentProperty(), "NODE");
-        registerChangeListener(scrollpane.fitToWidthProperty(), "FIT_TO_WIDTH");
-        registerChangeListener(scrollpane.fitToHeightProperty(), "FIT_TO_HEIGHT");
-        registerChangeListener(scrollpane.hbarPolicyProperty(), "HBAR_POLICY");
-        registerChangeListener(scrollpane.vbarPolicyProperty(), "VBAR_POLICY");
-        registerChangeListener(scrollpane.hvalueProperty(), "HVALUE");
-        registerChangeListener(scrollpane.hmaxProperty(), "HMAX");
-        registerChangeListener(scrollpane.hminProperty(), "HMIN");
-        registerChangeListener(scrollpane.vvalueProperty(), "VVALUE");
-        registerChangeListener(scrollpane.vmaxProperty(), "VMAX");
-        registerChangeListener(scrollpane.vminProperty(), "VMIN");
-        registerChangeListener(scrollpane.prefViewportWidthProperty(), "VIEWPORT_SIZE_HINT");
-        registerChangeListener(scrollpane.prefViewportHeightProperty(), "VIEWPORT_SIZE_HINT");
-        registerChangeListener(scrollpane.minViewportWidthProperty(), "VIEWPORT_SIZE_HINT");
-        registerChangeListener(scrollpane.minViewportHeightProperty(), "VIEWPORT_SIZE_HINT");
-    }
-
-    private final InvalidationListener nodeListener = new InvalidationListener() {
-        @Override public void invalidated(Observable valueModel) {
-            if (!nodeSizeInvalid) {
-                final Bounds scrollNodeBounds = scrollNode.getLayoutBounds();
-                final double scrollNodeWidth = scrollNodeBounds.getWidth();
-                final double scrollNodeHeight = scrollNodeBounds.getHeight();
-
-                /*
-                ** if the new size causes scrollbar visibility to change, then need to relayout
-                ** we also need to correct the thumb size when the scrollnode's size changes 
-                */
-                if (vsbvis != determineVerticalSBVisible() || hsbvis != determineHorizontalSBVisible() ||
-                    (scrollNodeWidth != 0.0  && nodeWidth != scrollNodeWidth) ||
-                    (scrollNodeHeight != 0.0 && nodeHeight != scrollNodeHeight)) {
-                    getSkinnable().requestLayout();
-                } else {
-                    /**
-                     * we just need to update scrollbars based on new scrollNode size,
-                     * but we don't do this while dragging, there's no need,
-                     * and it jumps, as dragging updates the scrollbar too.
-                     */
-                    if (!dragDetected) {
-                        updateVerticalSB();
-                        updateHorizontalSB();
-                    }
-                }
-            }
-        }
-    };
-
-
-    /*
-    ** The content of the ScrollPane has just changed bounds, check scrollBar positions.
-    */ 
-   private final ChangeListener<Bounds> boundsChangeListener = new ChangeListener<Bounds>() {
-        @Override public void changed(ObservableValue<? extends Bounds> observable, Bounds oldBounds, Bounds newBounds) {
-            
-            /*
-            ** For a height change then we want to reduce
-            ** viewport vertical jumping as much as possible. 
-            ** We set a new vsb value to try to keep the same
-            ** content position at the top of the viewport
-            */
-            double oldHeight = oldBounds.getHeight();
-            double newHeight = newBounds.getHeight();
-            if (oldHeight > 0 && oldHeight != newHeight) {
-                double oldPositionY = (snapPosition(snappedTopInset() - posY / (vsb.getMax() - vsb.getMin()) * (oldHeight - contentHeight)));
-                double newPositionY = (snapPosition(snappedTopInset() - posY / (vsb.getMax() - vsb.getMin()) * (newHeight - contentHeight)));
-                
-                double newValueY = (oldPositionY/newPositionY)*vsb.getValue();
-                if (newValueY < 0.0) {
-                    vsb.setValue(0.0);
-                }
-                else if (newValueY < 1.0) {
-                    vsb.setValue(newValueY);
-                }
-                else if (newValueY > 1.0) {
-                    vsb.setValue(1.0);
-                }
-            }
-
-            /*
-            ** For a width change then we want to reduce
-            ** viewport horizontal jumping as much as possible. 
-            ** We set a new hsb value to try to keep the same
-            ** content position to the left of the viewport
-            */
-            double oldWidth = oldBounds.getWidth();
-            double newWidth = newBounds.getWidth();
-            if (oldWidth > 0 && oldWidth != newWidth) {
-                double oldPositionX = (snapPosition(snappedLeftInset() - posX / (hsb.getMax() - hsb.getMin()) * (oldWidth - contentWidth)));
-                double newPositionX = (snapPosition(snappedLeftInset() - posX / (hsb.getMax() - hsb.getMin()) * (newWidth - contentWidth)));
-
-                double newValueX = (oldPositionX/newPositionX)*hsb.getValue();
-                if (newValueX < 0.0) {
-                    hsb.setValue(0.0);
-                }
-                else if (newValueX < 1.0) {
-                    hsb.setValue(newValueX);
-                }
-                else if (newValueX > 1.0) {
-                    hsb.setValue(1.0);
-                }
-            }
-        }
-   };
-
-    private void initialize() {
-        // requestLayout calls below should not trigger requestLayout above ScrollPane
-//        setManaged(false);
-
-        ScrollPane control = getSkinnable();
-        scrollNode = control.getContent();
-
-        ParentTraversalEngine traversalEngine = new ParentTraversalEngine(getSkinnable());
-        traversalEngine.addTraverseListener(this);
-        getSkinnable().setImpl_traversalEngine(traversalEngine);
-
-        if (scrollNode != null) {
-            scrollNode.layoutBoundsProperty().addListener(nodeListener);
-            scrollNode.layoutBoundsProperty().addListener(boundsChangeListener);
-        }
-
-        viewRect = new StackPane() {
-
-            @Override
-            protected void layoutChildren() {
-                viewContent.resize(getWidth(), getHeight());
-            }
-
-        };
-        // prevent requestLayout requests from within scrollNode from percolating up
-        viewRect.setManaged(false);
-        viewRect.setCache(true);
-        viewRect.getStyleClass().add("viewport");
-
-        clipRect = new Rectangle();
-        viewRect.setClip(clipRect);
-
-        hsb = new ScrollBar();
-
-        vsb = new ScrollBar();
-        vsb.setOrientation(Orientation.VERTICAL);
-
-        EventHandler<MouseEvent> barHandler = ev -> {
-            getSkinnable().requestFocus();
-        };
-
-        hsb.addEventFilter(MouseEvent.MOUSE_PRESSED, barHandler);
-        vsb.addEventFilter(MouseEvent.MOUSE_PRESSED, barHandler);
-
-        corner = new StackPane();
-        corner.getStyleClass().setAll("corner");
-
-        viewContent = new StackPane() {
-            @Override public void requestLayout() {
-                // if scrollNode requested layout, will want to recompute
-                nodeSizeInvalid = true;
-
-                super.requestLayout(); // add as layout root for next layout pass
-
-                // Need to layout the ScrollPane as well in case scrollbars
-                // appeared or disappeared.
-                ScrollPaneSkin.this.getSkinnable().requestLayout();
-            }
-            @Override protected void layoutChildren() {
-                if (nodeSizeInvalid) {
-                    computeScrollNodeSize(getWidth(),getHeight());
-                }
-                if (scrollNode != null && scrollNode.isResizable()) {
-                    scrollNode.resize(snapSize(nodeWidth), snapSize(nodeHeight));
-                    if (vsbvis != determineVerticalSBVisible() || hsbvis != determineHorizontalSBVisible()) {
-                        getSkinnable().requestLayout();
-                    }
-                }
-                if (scrollNode != null) {
-                    scrollNode.relocate(0,0);
-                }
-            }
-        };
-        viewRect.getChildren().add(viewContent);
-
-        if (scrollNode != null) {
-            viewContent.getChildren().add(scrollNode);
-            viewRect.nodeOrientationProperty().bind(scrollNode.nodeOrientationProperty());
-        }
-
-        getChildren().clear();
-        getChildren().addAll(viewRect, vsb, hsb, corner);
-
-        /*
-        ** listeners, and assorted housekeeping
-        */
-        InvalidationListener vsbListener = valueModel -> {
-            if (!IS_TOUCH_SUPPORTED) {
-                posY = Utils.clamp(getSkinnable().getVmin(), vsb.getValue(), getSkinnable().getVmax());
-            }
-            else {
-                posY = vsb.getValue();
-            }
-            updatePosY();
-        };
-        vsb.valueProperty().addListener(vsbListener);
-
-        InvalidationListener hsbListener = valueModel -> {
-            if (!IS_TOUCH_SUPPORTED) {
-                posX = Utils.clamp(getSkinnable().getHmin(), hsb.getValue(), getSkinnable().getHmax());
-            }
-            else {
-                posX = hsb.getValue();
-            }
-            updatePosX();
-        };
-        hsb.valueProperty().addListener(hsbListener);
-
-        viewRect.setOnMousePressed(e -> {
-            mouseDown = true;
-            if (IS_TOUCH_SUPPORTED) {
-                startSBReleasedAnimation();
-            }
-            pressX = e.getX();
-            pressY = e.getY();
-            ohvalue = hsb.getValue();
-            ovvalue = vsb.getValue();
-        });
-
-
-        viewRect.setOnDragDetected(e -> {
-             if (IS_TOUCH_SUPPORTED) {
-                 startSBReleasedAnimation();
-             }
-            if (getSkinnable().isPannable()) {
-              dragDetected = true;
-              if (saveCursor == null) {
-                  saveCursor = getSkinnable().getCursor();
-                  if (saveCursor == null) {
-                      saveCursor = Cursor.DEFAULT;
-                  }
-                  getSkinnable().setCursor(Cursor.MOVE);
-                  getSkinnable().requestLayout();
-              }
-            }
-        });
-
-        viewRect.addEventFilter(MouseEvent.MOUSE_RELEASED, e -> {
-             mouseDown = false;
-             if (dragDetected == true) {
-                 if (saveCursor != null) {
-                     getSkinnable().setCursor(saveCursor);
-                     saveCursor = null;
-                     getSkinnable().requestLayout();
-                 }
-                 dragDetected = false;
-             }
-
-             /*
-             ** if the contents need repositioning, and there's is no
-             ** touch event in progress, then start the repositioning.
-             */
-             if ((posY > getSkinnable().getVmax() || posY < getSkinnable().getVmin() ||
-                 posX > getSkinnable().getHmax() || posX < getSkinnable().getHmin()) && !touchDetected) {
-                 startContentsToViewport();
-             }
-        });
-        viewRect.setOnMouseDragged(e -> {
-             if (IS_TOUCH_SUPPORTED) {
-                 startSBReleasedAnimation();
-             }
-            /*
-            ** for mobile-touch we allow drag, even if not pannagle
-            */
-            if (getSkinnable().isPannable() || IS_TOUCH_SUPPORTED) {
-                double deltaX = pressX - e.getX();
-                double deltaY = pressY - e.getY();
-                /*
-                ** we only drag if not all of the content is visible.
-                */
-                if (hsb.getVisibleAmount() > 0.0 && hsb.getVisibleAmount() < hsb.getMax()) {
-                    if (Math.abs(deltaX) > PAN_THRESHOLD) {
-                        if (isReverseNodeOrientation()) {
-                            deltaX = -deltaX;
-                        }
-                        double newHVal = (ohvalue + deltaX / (nodeWidth - viewRect.getWidth()) * (hsb.getMax() - hsb.getMin()));
-                        if (!IS_TOUCH_SUPPORTED) {
-                            if (newHVal > hsb.getMax()) {
-                                newHVal = hsb.getMax();
-                            }
-                            else if (newHVal < hsb.getMin()) {
-                                newHVal = hsb.getMin();
-                            }
-                            hsb.setValue(newHVal);
-                        }
-                        else {
-                            hsb.setValue(newHVal);
-                        }
-                    }
-                }
-                /*
-                ** we only drag if not all of the content is visible.
-                */
-                if (vsb.getVisibleAmount() > 0.0 && vsb.getVisibleAmount() < vsb.getMax()) {
-                    if (Math.abs(deltaY) > PAN_THRESHOLD) {
-                        double newVVal = (ovvalue + deltaY / (nodeHeight - viewRect.getHeight()) * (vsb.getMax() - vsb.getMin()));
-                        if (!IS_TOUCH_SUPPORTED) {
-                            if (newVVal > vsb.getMax()) {
-                                newVVal = vsb.getMax();
-                            }
-                            else if (newVVal < vsb.getMin()) {
-                                newVVal = vsb.getMin();
-                            }
-                            vsb.setValue(newVVal);
-                        }
-                        else {
-                            vsb.setValue(newVVal);
-                        }
-                    }
-                }
-            }
-            /*
-            ** we need to consume drag events, as we don't want
-            ** the scrollpane itself to be dragged on every mouse click
-            */
-            e.consume();
-        });
-
-
-        /*
-        ** don't allow the ScrollBar to handle the ScrollEvent,
-        ** In a ScrollPane a vertical scroll should scroll on the vertical only,
-        ** whereas in a horizontal ScrollBar it can scroll horizontally.
-        */ 
-        // block the event from being passed down to children
-        final EventDispatcher blockEventDispatcher = (event, tail) -> event;
-        // block ScrollEvent from being passed down to scrollbar's skin
-        final EventDispatcher oldHsbEventDispatcher = hsb.getEventDispatcher();
-        hsb.setEventDispatcher((event, tail) -> {
-            if (event.getEventType() == ScrollEvent.SCROLL &&
-                    !((ScrollEvent)event).isDirect()) {
-                tail = tail.prepend(blockEventDispatcher);
-                tail = tail.prepend(oldHsbEventDispatcher);
-                return tail.dispatchEvent(event);
-            }
-            return oldHsbEventDispatcher.dispatchEvent(event, tail);
-        });
-        // block ScrollEvent from being passed down to scrollbar's skin
-        final EventDispatcher oldVsbEventDispatcher = vsb.getEventDispatcher();
-        vsb.setEventDispatcher((event, tail) -> {
-            if (event.getEventType() == ScrollEvent.SCROLL &&
-                    !((ScrollEvent)event).isDirect()) {
-                tail = tail.prepend(blockEventDispatcher);
-                tail = tail.prepend(oldVsbEventDispatcher);
-                return tail.dispatchEvent(event);
-            }
-            return oldVsbEventDispatcher.dispatchEvent(event, tail);
-        });
-
-        /*
-         * listen for ScrollEvents over the whole of the ScrollPane
-         * area, the above dispatcher having removed the ScrollBars
-         * scroll event handling.
-         *
-         * Note that we use viewRect here, rather than setting the eventHandler
-         * on the ScrollPane itself. This is for RT-31582, and effectively
-         * allows for us to prioritise handling (and consuming) the event
-         * internally, before it is made available to users listening to events
-         * on the control. This is consistent with the VirtualFlow-based controls.
-         */
-        viewRect.addEventHandler(ScrollEvent.SCROLL, event -> {
-            if (IS_TOUCH_SUPPORTED) {
-                startSBReleasedAnimation();
-            }
-            /*
-            ** if we're completely visible then do nothing....
-            ** we only consume an event that we've used.
-            */
-            if (vsb.getVisibleAmount() < vsb.getMax()) {
-                double vRange = getSkinnable().getVmax()-getSkinnable().getVmin();
-                double vPixelValue;
-                if (nodeHeight > 0.0) {
-                    vPixelValue = vRange / nodeHeight;
-                }
-                else {
-                    vPixelValue = 0.0;
-                }
-                double newValue = vsb.getValue()+(-event.getDeltaY())*vPixelValue;
-                if (!IS_TOUCH_SUPPORTED) {
-                    if ((event.getDeltaY() > 0.0 && vsb.getValue() > vsb.getMin()) ||
-                        (event.getDeltaY() < 0.0 && vsb.getValue() < vsb.getMax())) {
-                        vsb.setValue(newValue);
-                        event.consume();
-                    }
-                }
-                else {
-                    /*
-                    ** if there is a repositioning in progress then we only
-                    ** set the value for 'real' events
-                    */
-                    if (!(((ScrollEvent)event).isInertia()) || (((ScrollEvent)event).isInertia()) && (contentsToViewTimeline == null || contentsToViewTimeline.getStatus() == Status.STOPPED)) {
-                        vsb.setValue(newValue);
-                        if ((newValue > vsb.getMax() || newValue < vsb.getMin()) && (!mouseDown && !touchDetected)) {
-                            startContentsToViewport();
-                        }
-                        event.consume();
-                    }
-                }
-            }
-
-            if (hsb.getVisibleAmount() < hsb.getMax()) {
-                double hRange = getSkinnable().getHmax()-getSkinnable().getHmin();
-                double hPixelValue;
-                if (nodeWidth > 0.0) {
-                    hPixelValue = hRange / nodeWidth;
-                }
-                else {
-                    hPixelValue = 0.0;
-                }
-
-                double newValue = hsb.getValue()+(-event.getDeltaX())*hPixelValue;
-                if (!IS_TOUCH_SUPPORTED) {
-                    if ((event.getDeltaX() > 0.0 && hsb.getValue() > hsb.getMin()) ||
-                        (event.getDeltaX() < 0.0 && hsb.getValue() < hsb.getMax())) {
-                        hsb.setValue(newValue);
-                        event.consume();
-                    }
-                }
-                else {
-                    /*
-                    ** if there is a repositioning in progress then we only
-                    ** set the value for 'real' events
-                    */
-                    if (!(((ScrollEvent)event).isInertia()) || (((ScrollEvent)event).isInertia()) && (contentsToViewTimeline == null || contentsToViewTimeline.getStatus() == Status.STOPPED)) {
-                        hsb.setValue(newValue);
-
-                        if ((newValue > hsb.getMax() || newValue < hsb.getMin()) && (!mouseDown && !touchDetected)) {
-                            startContentsToViewport();
-                        }
-                        event.consume();
-                    }
-                }
-            }
-        });
-
-        /*
-        ** there are certain animations that need to know if the touch is
-        ** happening.....
-        */
-        getSkinnable().addEventHandler(TouchEvent.TOUCH_PRESSED, e -> {
-            touchDetected = true;
-            startSBReleasedAnimation();
-            e.consume();
-        });
-
-        getSkinnable().addEventHandler(TouchEvent.TOUCH_RELEASED, e -> {
-            touchDetected = false;
-            e.consume();
-        });
-
-        // ScrollPanes do not block all MouseEvents by default, unlike most other UI Controls.
-        consumeMouseEvents(false);
-
-        // update skin initial state to match control (see RT-35554)
-        hsb.setValue(control.getHvalue());
-        vsb.setValue(control.getVvalue());
-    }
-
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("NODE".equals(p)) {
-            if (scrollNode != getSkinnable().getContent()) {
-                if (scrollNode != null) {
-                    scrollNode.layoutBoundsProperty().removeListener(nodeListener);
-                    scrollNode.layoutBoundsProperty().removeListener(boundsChangeListener);
-                    viewContent.getChildren().remove(scrollNode);
-                }
-                scrollNode = getSkinnable().getContent();
-                if (scrollNode != null) {
-                    nodeWidth = snapSize(scrollNode.getLayoutBounds().getWidth());
-                    nodeHeight = snapSize(scrollNode.getLayoutBounds().getHeight());
-                    viewContent.getChildren().setAll(scrollNode);
-                    scrollNode.layoutBoundsProperty().addListener(nodeListener);
-                    scrollNode.layoutBoundsProperty().addListener(boundsChangeListener);
-                }
-            }
-            getSkinnable().requestLayout();
-        } else if ("FIT_TO_WIDTH".equals(p) || "FIT_TO_HEIGHT".equals(p)) {
-            getSkinnable().requestLayout();
-            viewRect.requestLayout();
-        } else if ("HBAR_POLICY".equals(p) || "VBAR_POLICY".equals(p)) {
-            // change might affect pref size, so requestLayout on control
-            getSkinnable().requestLayout();
-        } else if ("HVALUE".equals(p)) {
-            hsb.setValue(getSkinnable().getHvalue());
-        } else if ("HMAX".equals(p)) {
-            hsb.setMax(getSkinnable().getHmax());
-        } else if ("HMIN".equals(p)) {
-            hsb.setMin(getSkinnable().getHmin());
-        } else if ("VVALUE".equals(p)) {
-            vsb.setValue(getSkinnable().getVvalue());
-        } else if ("VMAX".equals(p)) {
-            vsb.setMax(getSkinnable().getVmax());
-        } else if ("VMIN".equals(p)) {
-            vsb.setMin(getSkinnable().getVmin());
-        } else if ("VIEWPORT_SIZE_HINT".equals(p)) {
-            // change affects pref size, so requestLayout on control
-            getSkinnable().requestLayout();
-        }
-    }
-    
-    void scrollBoundsIntoView(Bounds b) {
-        double dx = 0.0;
-        double dy = 0.0;
-        if (b.getMaxX() > contentWidth) {
-            dx = b.getMinX() - snappedLeftInset();
-        }
-        if (b.getMinX() < snappedLeftInset()) {
-            dx = b.getMaxX() - contentWidth - snappedLeftInset();
-        }
-        if (b.getMaxY() > snappedTopInset() + contentHeight) {
-            dy = b.getMinY() - snappedTopInset();
-        }
-        if (b.getMinY() < snappedTopInset()) {
-            dy = b.getMaxY() - contentHeight - snappedTopInset();
-        }
-        // We want to move contentPanel's layoutX,Y by (dx,dy).
-        // But to do this we have to set the scrollbars' values appropriately.
-
-        if (dx != 0) {
-            double sdx = dx * (hsb.getMax() - hsb.getMin()) / (nodeWidth - contentWidth);
-            // Adjust back for some amount so that the Node border is not too close to view border
-            sdx += -1 * Math.signum(sdx) * hsb.getUnitIncrement() / 5; // This accounts to 2% of view width
-            hsb.setValue(hsb.getValue() + sdx);
-            getSkinnable().requestLayout();
-        }
-        if (dy != 0) {
-            double sdy = dy * (vsb.getMax() - vsb.getMin()) / (nodeHeight - contentHeight);
-            // Adjust back for some amount so that the Node border is not too close to view border
-            sdy += -1 * Math.signum(sdy) * vsb.getUnitIncrement() / 5; // This accounts to 2% of view height
-            vsb.setValue(vsb.getValue() + sdy);
-            getSkinnable().requestLayout();
-        }
-
-    }
-
-    /*
-    ** auto-scroll so node is within (0,0),(contentWidth,contentHeight)
-    */
-    @Override public void onTraverse(Node n, Bounds b) {
-        scrollBoundsIntoView(b);
-    }
-
-    public void hsbIncrement() {
-        if (hsb != null) hsb.increment();
-    }
-    public void hsbDecrement() {
-        if (hsb != null) hsb.decrement();
-    }
-
-    // TODO: add page increment and decrement
-    public void hsbPageIncrement() {
-        if (hsb != null) hsb.increment();
-    }
-    // TODO: add page increment and decrement
-    public void hsbPageDecrement() {
-        if (hsb != null) hsb.decrement();
-    }
-
-    public void vsbIncrement() {
-        if (vsb != null) vsb.increment();
-    }
-    public void vsbDecrement() {
-        if (vsb != null) vsb.decrement();
-    }
-
-    // TODO: add page increment and decrement
-    public void vsbPageIncrement() {
-        if (vsb != null) vsb.increment();
-    }
-    // TODO: add page increment and decrement
-    public void vsbPageDecrement() {
-        if (vsb != null) vsb.decrement();
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollPane sp = getSkinnable();
-
-        double vsbWidth = computeVsbSizeHint(sp);
-        double minWidth = vsbWidth + snappedLeftInset() + snappedRightInset();
-
-        if (sp.getPrefViewportWidth() > 0) {
-            return (sp.getPrefViewportWidth() + minWidth);
-        }
-        else if (sp.getContent() != null) {
-            return (sp.getContent().prefWidth(height) + minWidth);
-        }
-        else {
-            return Math.max(minWidth, DEFAULT_PREF_SIZE);
-        }
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollPane sp = getSkinnable();
-
-        double hsbHeight = computeHsbSizeHint(sp);
-        double minHeight = hsbHeight + snappedTopInset() + snappedBottomInset();
-
-        if (sp.getPrefViewportHeight() > 0) {
-            return (sp.getPrefViewportHeight() + minHeight);
-        }
-        else if (sp.getContent() != null) {
-            return (sp.getContent().prefHeight(width) + minHeight);
-        }
-        else {
-            return Math.max(minHeight, DEFAULT_PREF_SIZE);
-        }
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollPane sp = getSkinnable();
-
-        double vsbWidth = computeVsbSizeHint(sp);
-        double minWidth = vsbWidth + snappedLeftInset() + snappedRightInset();
-
-        if (sp.getMinViewportWidth() > 0) {
-            return (sp.getMinViewportWidth() + minWidth);
-        } else {
-            double w = corner.minWidth(-1);
-            return (w > 0) ? (3 * w) : (DEFAULT_MIN_SIZE);
-        }
-
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ScrollPane sp = getSkinnable();
-
-        double hsbHeight = computeHsbSizeHint(sp);
-        double minHeight = hsbHeight + snappedTopInset() + snappedBottomInset();
-
-        if (sp.getMinViewportHeight() > 0) {
-            return (sp.getMinViewportHeight() + minHeight);
-        } else {
-            double h = corner.minHeight(-1);
-            return (h > 0) ? (3 * h) : (DEFAULT_MIN_SIZE);
-        }
-    }
-
-    /**
-     * Computes the size that should be reserved for horizontal scrollbar in size hints (min/pref height)
-     */
-    private double computeHsbSizeHint(ScrollPane sp) {
-        return ((sp.getHbarPolicy() == ScrollBarPolicy.ALWAYS) ||
-                (sp.getHbarPolicy() == ScrollBarPolicy.AS_NEEDED && (sp.getPrefViewportHeight() > 0 || sp.getMinViewportHeight() > 0)))
-                ? hsb.prefHeight(ScrollBar.USE_COMPUTED_SIZE)
-                : 0;
-    }
-
-    /**
-     * Computes the size that should be reserved for vertical scrollbar in size hints (min/pref width)
-     */
-    private double computeVsbSizeHint(ScrollPane sp) {
-        return ((sp.getVbarPolicy() == ScrollBarPolicy.ALWAYS) ||
-                (sp.getVbarPolicy() == ScrollBarPolicy.AS_NEEDED && (sp.getPrefViewportWidth() > 0
-                        || sp.getMinViewportWidth() > 0)))
-                ? vsb.prefWidth(ScrollBar.USE_COMPUTED_SIZE)
-                : 0;
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        final ScrollPane control = getSkinnable();
-        final Insets padding = control.getPadding();
-        final double rightPadding = snapSize(padding.getRight());
-        final double leftPadding = snapSize(padding.getLeft());
-        final double topPadding = snapSize(padding.getTop());
-        final double bottomPadding = snapSize(padding.getBottom());
-
-        vsb.setMin(control.getVmin());
-        vsb.setMax(control.getVmax());
-
-        //should only do this on css setup
-        hsb.setMin(control.getHmin());
-        hsb.setMax(control.getHmax());
-
-        contentWidth = w;
-        contentHeight = h;
-
-        /*
-        ** we want the scrollbars to go right to the border
-        */
-        double hsbWidth = 0;
-        double vsbHeight = 0;
-
-        computeScrollNodeSize(contentWidth, contentHeight);
-        computeScrollBarSize();
-
-        for (int i = 0; i < 2; ++i) {
-            vsbvis = determineVerticalSBVisible();
-            hsbvis = determineHorizontalSBVisible();
-
-            if (vsbvis && !IS_TOUCH_SUPPORTED) {
-                contentWidth = w - vsbWidth;
-            }
-            hsbWidth = w + leftPadding + rightPadding - (vsbvis ? vsbWidth : 0);
-            if (hsbvis && !IS_TOUCH_SUPPORTED) {
-                contentHeight = h - hsbHeight;
-            }
-            vsbHeight = h + topPadding + bottomPadding - (hsbvis ? hsbHeight : 0);
-        }
-
-
-        if (scrollNode != null && scrollNode.isResizable()) {
-            // maybe adjust size now that scrollbars may take up space
-            if (vsbvis && hsbvis) {
-                // adjust just once to accommodate
-                computeScrollNodeSize(contentWidth, contentHeight);
-
-            } else if (hsbvis && !vsbvis) {
-                computeScrollNodeSize(contentWidth, contentHeight);
-                vsbvis = determineVerticalSBVisible();
-                if (vsbvis) {
-                    // now both are visible
-                    contentWidth -= vsbWidth;
-                    hsbWidth -= vsbWidth;
-                    computeScrollNodeSize(contentWidth, contentHeight);
-                }
-            } else if (vsbvis && !hsbvis) {
-                computeScrollNodeSize(contentWidth, contentHeight);
-                hsbvis = determineHorizontalSBVisible();
-                if (hsbvis) {
-                    // now both are visible
-                    contentHeight -= hsbHeight;
-                    vsbHeight -= hsbHeight;
-                    computeScrollNodeSize(contentWidth, contentHeight);
-                }
-            }
-        }
-
-        // figure out the content area that is to be filled
-        double cx = snappedLeftInset() - leftPadding;
-        double cy = snappedTopInset() - topPadding;
-
-        vsb.setVisible(vsbvis);
-        if (vsbvis) {
-            /*
-            ** round up position of ScrollBar, round down it's size.
-            **
-            ** Positioning the ScrollBar
-            **  The Padding should go between the content and the edge,
-            **  otherwise changes in padding move the ScrollBar, and could
-            **  in extreme cases size the ScrollBar to become unusable.
-            **  The -1, +1 plus one bit :
-            **   If padding in => 1 then we allow one pixel to appear as the
-            **   outside border of the Scrollbar, and the rest on the inside.
-            **   If padding is < 1 then we just stick to the edge.
-            */
-            vsb.resizeRelocate(snappedLeftInset() + w - vsbWidth + (rightPadding < 1 ? 0 : rightPadding - 1) ,
-                    cy, vsbWidth, vsbHeight);
-        }
-        updateVerticalSB();
-
-        hsb.setVisible(hsbvis);
-        if (hsbvis) {
-            /*
-            ** round up position of ScrollBar, round down it's size.
-            **
-            ** Positioning the ScrollBar
-            **  The Padding should go between the content and the edge,
-            **  otherwise changes in padding move the ScrollBar, and could
-            **  in extreme cases size the ScrollBar to become unusable.
-            **  The -1, +1 plus one bit : 
-            **   If padding in => 1 then we allow one pixel to appear as the
-            **   outside border of the Scrollbar, and the rest on the inside.
-            **   If padding is < 1 then we just stick to the edge.
-            */
-            hsb.resizeRelocate(cx, snappedTopInset() + h - hsbHeight + (bottomPadding < 1 ? 0 : bottomPadding - 1),
-                    hsbWidth, hsbHeight);
-        }
-        updateHorizontalSB();
-
-        viewRect.resizeRelocate(snappedLeftInset(), snappedTopInset(), snapSize(contentWidth), snapSize(contentHeight));
-        resetClip();
-
-        if (vsbvis && hsbvis) {
-            corner.setVisible(true);
-            double cornerWidth = vsbWidth;
-            double cornerHeight = hsbHeight;
-            corner.resizeRelocate(snapPosition(vsb.getLayoutX()), snapPosition(hsb.getLayoutY()), snapSize(cornerWidth), snapSize(cornerHeight));
-        } else {
-            corner.setVisible(false);
-        }
-        control.setViewportBounds(new BoundingBox(snapPosition(viewContent.getLayoutX()), snapPosition(viewContent.getLayoutY()), snapSize(contentWidth), snapSize(contentHeight)));
-    }
-    
-    private void computeScrollNodeSize(double contentWidth, double contentHeight) {
-        if (scrollNode != null) {
-            if (scrollNode.isResizable()) {
-                ScrollPane control = getSkinnable();
-                Orientation bias = scrollNode.getContentBias();
-                if (bias == null) {
-                    nodeWidth = snapSize(boundedSize(control.isFitToWidth()? contentWidth : scrollNode.prefWidth(-1),
-                                                         scrollNode.minWidth(-1),scrollNode.maxWidth(-1)));
-                    nodeHeight = snapSize(boundedSize(control.isFitToHeight()? contentHeight : scrollNode.prefHeight(-1),
-                                                          scrollNode.minHeight(-1), scrollNode.maxHeight(-1)));
-
-                } else if (bias == Orientation.HORIZONTAL) {
-                    nodeWidth = snapSize(boundedSize(control.isFitToWidth()? contentWidth : scrollNode.prefWidth(-1),
-                                                         scrollNode.minWidth(-1),scrollNode.maxWidth(-1)));
-                    nodeHeight = snapSize(boundedSize(control.isFitToHeight()? contentHeight : scrollNode.prefHeight(nodeWidth),
-                                                          scrollNode.minHeight(nodeWidth),scrollNode.maxHeight(nodeWidth)));
-
-                } else { // bias == VERTICAL
-                    nodeHeight = snapSize(boundedSize(control.isFitToHeight()? contentHeight : scrollNode.prefHeight(-1),
-                                                          scrollNode.minHeight(-1), scrollNode.maxHeight(-1)));
-                    nodeWidth = snapSize(boundedSize(control.isFitToWidth()? contentWidth : scrollNode.prefWidth(nodeHeight),
-                                                         scrollNode.minWidth(nodeHeight),scrollNode.maxWidth(nodeHeight)));
-                }
-
-            } else {
-                nodeWidth = snapSize(scrollNode.getLayoutBounds().getWidth());
-                nodeHeight = snapSize(scrollNode.getLayoutBounds().getHeight());
-            }
-            nodeSizeInvalid = false;
-        }
-    }
-
-    private boolean isReverseNodeOrientation() {
-        return (scrollNode != null &&
-                getSkinnable().getEffectiveNodeOrientation() !=
-                            scrollNode.getEffectiveNodeOrientation());
-    }
-
-    private boolean determineHorizontalSBVisible() {
-        final ScrollPane sp = getSkinnable();
-
-        if (IS_TOUCH_SUPPORTED) {
-            return (tempVisibility && (nodeWidth > contentWidth));
-        }
-        else {
-            // RT-17395: ScrollBarPolicy might be null. If so, treat it as "AS_NEEDED", which is the default
-            ScrollBarPolicy hbarPolicy = sp.getHbarPolicy();
-            return (ScrollBarPolicy.NEVER == hbarPolicy) ? false :
-                   ((ScrollBarPolicy.ALWAYS == hbarPolicy) ? true :
-                   ((sp.isFitToWidth() && scrollNode != null ? scrollNode.isResizable() : false) ?
-                   (nodeWidth > contentWidth && scrollNode.minWidth(-1) > contentWidth) : (nodeWidth > contentWidth)));
-        }
-    }
-
-    private boolean determineVerticalSBVisible() {
-        final ScrollPane sp = getSkinnable();
-
-        if (IS_TOUCH_SUPPORTED) {
-            return (tempVisibility && (nodeHeight > contentHeight));
-        }
-        else {
-            // RT-17395: ScrollBarPolicy might be null. If so, treat it as "AS_NEEDED", which is the default
-            ScrollBarPolicy vbarPolicy = sp.getVbarPolicy();
-            return (ScrollBarPolicy.NEVER == vbarPolicy) ? false :
-                   ((ScrollBarPolicy.ALWAYS == vbarPolicy) ? true :
-                   ((sp.isFitToHeight() && scrollNode != null ? scrollNode.isResizable() : false) ?
-                   (nodeHeight > contentHeight && scrollNode.minHeight(-1) > contentHeight) : (nodeHeight > contentHeight)));
-        }
-    }
-
-    private void computeScrollBarSize() {
-        vsbWidth = snapSize(vsb.prefWidth(-1));
-        if (vsbWidth == 0) {
-            //            println("*** WARNING ScrollPaneSkin: can't get scroll bar width, using {DEFAULT_SB_BREADTH}");
-            if (IS_TOUCH_SUPPORTED) {
-                vsbWidth = DEFAULT_EMBEDDED_SB_BREADTH;
-            }
-            else {
-                vsbWidth = DEFAULT_SB_BREADTH;
-            }
-        }
-        hsbHeight = snapSize(hsb.prefHeight(-1));
-        if (hsbHeight == 0) {
-            //            println("*** WARNING ScrollPaneSkin: can't get scroll bar height, using {DEFAULT_SB_BREADTH}");
-            if (IS_TOUCH_SUPPORTED) {
-                hsbHeight = DEFAULT_EMBEDDED_SB_BREADTH;
-            }
-            else {
-                hsbHeight = DEFAULT_SB_BREADTH;
-            }
-        }
-    }
-
-    private void updateHorizontalSB() {
-        double contentRatio = nodeWidth * (hsb.getMax() - hsb.getMin());
-        if (contentRatio > 0.0) {
-            hsb.setVisibleAmount(contentWidth / contentRatio);
-            hsb.setBlockIncrement(0.9 * hsb.getVisibleAmount());
-            hsb.setUnitIncrement(0.1 * hsb.getVisibleAmount());
-        }
-        else {
-            hsb.setVisibleAmount(0.0);
-            hsb.setBlockIncrement(0.0);
-            hsb.setUnitIncrement(0.0);
-        }
-
-        if (hsb.isVisible()) {
-            updatePosX();
-        } else {
-            if (nodeWidth > contentWidth) {
-                updatePosX();
-            } else {
-                viewContent.setLayoutX(0);
-            }
-        }
-    }
-    
-    private void updateVerticalSB() {
-        double contentRatio = nodeHeight * (vsb.getMax() - vsb.getMin());
-        if (contentRatio > 0.0) {
-            vsb.setVisibleAmount(contentHeight / contentRatio);
-            vsb.setBlockIncrement(0.9 * vsb.getVisibleAmount());
-            vsb.setUnitIncrement(0.1 * vsb.getVisibleAmount());
-        }
-        else {
-            vsb.setVisibleAmount(0.0);
-            vsb.setBlockIncrement(0.0);
-            vsb.setUnitIncrement(0.0);
-        }
-
-        if (vsb.isVisible()) {
-            updatePosY();
-        } else {
-            if (nodeHeight > contentHeight) {
-                updatePosY();
-            } else {
-                viewContent.setLayoutY(0);
-            }
-        }
-    }
-
-    private double updatePosX() {
-        final ScrollPane sp = getSkinnable();
-        double x = isReverseNodeOrientation() ? (hsb.getMax() - (posX - hsb.getMin())) : posX;
-        double minX = Math.min((- x / (hsb.getMax() - hsb.getMin()) * (nodeWidth - contentWidth)), 0);
-        viewContent.setLayoutX(snapPosition(minX));
-        if (!sp.hvalueProperty().isBound()) sp.setHvalue(Utils.clamp(sp.getHmin(), posX, sp.getHmax()));
-        return posX;
-    }
-
-    private double updatePosY() {
-        final ScrollPane sp = getSkinnable();
-        double minY = Math.min((- posY / (vsb.getMax() - vsb.getMin()) * (nodeHeight - contentHeight)), 0);
-        viewContent.setLayoutY(snapPosition(minY));
-        if (!sp.vvalueProperty().isBound()) sp.setVvalue(Utils.clamp(sp.getVmin(), posY, sp.getVmax()));
-        return posY;
-    }
-
-    private void resetClip() {
-        clipRect.setWidth(snapSize(contentWidth));
-        clipRect.setHeight(snapSize(contentHeight));
-    }
-
-    Timeline sbTouchTimeline;
-    KeyFrame sbTouchKF1;
-    KeyFrame sbTouchKF2;
-    Timeline contentsToViewTimeline;
-    KeyFrame contentsToViewKF1;
-    KeyFrame contentsToViewKF2;
-    KeyFrame contentsToViewKF3;
-
-    private boolean tempVisibility;
-
-
-    protected void startSBReleasedAnimation() {
-        if (sbTouchTimeline == null) {
-            /*
-            ** timeline to leave the scrollbars visible for a short
-            ** while after a scroll/drag
-            */
-            sbTouchTimeline = new Timeline();
-            sbTouchKF1 = new KeyFrame(Duration.millis(0), event -> {
-                tempVisibility = true;
-                if (touchDetected == true || mouseDown == true) {
-                    sbTouchTimeline.playFromStart();
-                }
-            });
-
-            sbTouchKF2 = new KeyFrame(Duration.millis(1000), event -> {
-                tempVisibility = false;
-                getSkinnable().requestLayout();
-            });
-            sbTouchTimeline.getKeyFrames().addAll(sbTouchKF1, sbTouchKF2);
-        }
-        sbTouchTimeline.playFromStart();
-    }
-
-
-
-    protected void startContentsToViewport() {
-        double newPosX = posX;
-        double newPosY = posY;
-
-        setContentPosX(posX);
-        setContentPosY(posY);
-
-        if (posY > getSkinnable().getVmax()) {
-            newPosY = getSkinnable().getVmax();
-        }
-        else if (posY < getSkinnable().getVmin()) {
-            newPosY = getSkinnable().getVmin();
-        }             
-        
-
-        if (posX > getSkinnable().getHmax()) {
-            newPosX = getSkinnable().getHmax();
-        }
-        else if (posX < getSkinnable().getHmin()) {
-            newPosX = getSkinnable().getHmin();
-        }
-
-        if (!IS_TOUCH_SUPPORTED) {
-            startSBReleasedAnimation();
-        }
-
-        /*
-        ** timeline to return the contents of the scrollpane to the viewport
-        */
-        if (contentsToViewTimeline != null) {
-            contentsToViewTimeline.stop();
-        }
-        contentsToViewTimeline = new Timeline();
-        /*
-        ** short pause before animation starts
-        */
-        contentsToViewKF1 = new KeyFrame(Duration.millis(50));
-        /*
-        ** reposition
-        */
-        contentsToViewKF2 = new KeyFrame(Duration.millis(150), event -> {
-            getSkinnable().requestLayout();
-        },
-            new KeyValue(contentPosX, newPosX),
-            new KeyValue(contentPosY, newPosY)
-            );
-        /*
-        ** block out 'aftershocks', but real events will
-        ** still reactivate
-        */
-        contentsToViewKF3 = new KeyFrame(Duration.millis(1500));
-        contentsToViewTimeline.getKeyFrames().addAll(contentsToViewKF1, contentsToViewKF2, contentsToViewKF3);
-        contentsToViewTimeline.playFromStart();
-    }
-
-
-    private DoubleProperty contentPosX;
-    private void setContentPosX(double value) { contentPosXProperty().set(value); }
-    private double getContentPosX() { return contentPosX == null ? 0.0 : contentPosX.get(); }
-    private DoubleProperty contentPosXProperty() {
-        if (contentPosX == null) {
-            contentPosX = new DoublePropertyBase() {
-                @Override protected void invalidated() {
-                    hsb.setValue(getContentPosX());
-                    getSkinnable().requestLayout();
-                }
-
-                @Override
-                public Object getBean() {
-                    return ScrollPaneSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "contentPosX";
-                }
-            };
-        }
-        return contentPosX;
-    }
-
-    private DoubleProperty contentPosY;
-    private void setContentPosY(double value) { contentPosYProperty().set(value); }
-    private double getContentPosY() { return contentPosY == null ? 0.0 : contentPosY.get(); }
-    private DoubleProperty contentPosYProperty() {
-        if (contentPosY == null) {
-            contentPosY = new DoublePropertyBase() {
-                @Override protected void invalidated() {
-                    vsb.setValue(getContentPosY());
-                    getSkinnable().requestLayout();
-                }
-
-                @Override
-                public Object getBean() {
-                    return ScrollPaneSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "contentPosY";
-                }
-            };
-        }
-        return contentPosY;
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case VERTICAL_SCROLLBAR: return vsb;
-            case HORIZONTAL_SCROLLBAR: return hsb;
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:21:21.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ScrollPaneSkin.java	2015-09-03 15:21:19.729190900 -0700
@@ -0,0 +1,1273 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import javafx.animation.Animation.Status;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.DoublePropertyBase;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.EventDispatcher;
+import javafx.event.EventHandler;
+import javafx.geometry.BoundingBox;
+import javafx.geometry.Bounds;
+import javafx.geometry.Orientation;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ScrollPane.ScrollBarPolicy;
+import javafx.scene.control.SkinBase;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.input.TouchEvent;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+import com.sun.javafx.util.Utils;
+import com.sun.javafx.scene.control.behavior.ScrollPaneBehavior;
+import static com.sun.javafx.scene.control.skin.Utils.*;
+import javafx.geometry.Insets;
+
+import java.util.function.Consumer;
+
+/**
+ * Default skin implementation for the {@link ScrollPane} control.
+ *
+ * @see ScrollPane
+ * @since 9
+ */
+public class ScrollPaneSkin extends SkinBase<ScrollPane> {
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final double DEFAULT_PREF_SIZE = 100.0;
+
+    private static final double DEFAULT_MIN_SIZE = 36.0;
+
+    private static final double DEFAULT_SB_BREADTH = 12.0;
+    private static final double DEFAULT_EMBEDDED_SB_BREADTH = 8.0;
+
+    private static final double PAN_THRESHOLD = 0.5;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    // state from the control
+
+    private Node scrollNode;
+    private final BehaviorBase<ScrollPane> behavior;
+
+    private double nodeWidth;
+    private double nodeHeight;
+    private boolean nodeSizeInvalid = true;
+
+    private double posX;
+    private double posY;
+
+    // working state
+
+    private boolean hsbvis;
+    private boolean vsbvis;
+    private double hsbHeight;
+    private double vsbWidth;
+
+    // substructure
+
+    private StackPane viewRect;
+    private StackPane viewContent;
+    private double contentWidth;
+    private double contentHeight;
+    private StackPane corner;
+    ScrollBar hsb;
+    ScrollBar vsb;
+
+    double pressX;
+    double pressY;
+    double ohvalue;
+    double ovvalue;
+    private Cursor saveCursor =  null;
+    private boolean dragDetected = false;
+    private boolean touchDetected = false;
+    private boolean mouseDown = false;
+
+    Rectangle clipRect;
+
+    Timeline sbTouchTimeline;
+    KeyFrame sbTouchKF1;
+    KeyFrame sbTouchKF2;
+    Timeline contentsToViewTimeline;
+    KeyFrame contentsToViewKF1;
+    KeyFrame contentsToViewKF2;
+    KeyFrame contentsToViewKF3;
+
+    private boolean tempVisibility;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private final InvalidationListener nodeListener = new InvalidationListener() {
+        @Override public void invalidated(Observable valueModel) {
+            if (!nodeSizeInvalid) {
+                final Bounds scrollNodeBounds = scrollNode.getLayoutBounds();
+                final double scrollNodeWidth = scrollNodeBounds.getWidth();
+                final double scrollNodeHeight = scrollNodeBounds.getHeight();
+
+                /*
+                ** if the new size causes scrollbar visibility to change, then need to relayout
+                ** we also need to correct the thumb size when the scrollnode's size changes
+                */
+                if (vsbvis != determineVerticalSBVisible() || hsbvis != determineHorizontalSBVisible() ||
+                        (scrollNodeWidth != 0.0  && nodeWidth != scrollNodeWidth) ||
+                        (scrollNodeHeight != 0.0 && nodeHeight != scrollNodeHeight)) {
+                    getSkinnable().requestLayout();
+                } else {
+                    /**
+                     * we just need to update scrollbars based on new scrollNode size,
+                     * but we don't do this while dragging, there's no need,
+                     * and it jumps, as dragging updates the scrollbar too.
+                     */
+                    if (!dragDetected) {
+                        updateVerticalSB();
+                        updateHorizontalSB();
+                    }
+                }
+            }
+        }
+    };
+
+
+    /*
+    ** The content of the ScrollPane has just changed bounds, check scrollBar positions.
+    */
+    private final ChangeListener<Bounds> boundsChangeListener = new ChangeListener<Bounds>() {
+        @Override public void changed(ObservableValue<? extends Bounds> observable, Bounds oldBounds, Bounds newBounds) {
+
+            /*
+            ** For a height change then we want to reduce
+            ** viewport vertical jumping as much as possible.
+            ** We set a new vsb value to try to keep the same
+            ** content position at the top of the viewport
+            */
+            double oldHeight = oldBounds.getHeight();
+            double newHeight = newBounds.getHeight();
+            if (oldHeight > 0 && oldHeight != newHeight) {
+                double oldPositionY = (snapPosition(snappedTopInset() - posY / (vsb.getMax() - vsb.getMin()) * (oldHeight - contentHeight)));
+                double newPositionY = (snapPosition(snappedTopInset() - posY / (vsb.getMax() - vsb.getMin()) * (newHeight - contentHeight)));
+
+                double newValueY = (oldPositionY/newPositionY)*vsb.getValue();
+                if (newValueY < 0.0) {
+                    vsb.setValue(0.0);
+                }
+                else if (newValueY < 1.0) {
+                    vsb.setValue(newValueY);
+                }
+                else if (newValueY > 1.0) {
+                    vsb.setValue(1.0);
+                }
+            }
+
+            /*
+            ** For a width change then we want to reduce
+            ** viewport horizontal jumping as much as possible.
+            ** We set a new hsb value to try to keep the same
+            ** content position to the left of the viewport
+            */
+            double oldWidth = oldBounds.getWidth();
+            double newWidth = newBounds.getWidth();
+            if (oldWidth > 0 && oldWidth != newWidth) {
+                double oldPositionX = (snapPosition(snappedLeftInset() - posX / (hsb.getMax() - hsb.getMin()) * (oldWidth - contentWidth)));
+                double newPositionX = (snapPosition(snappedLeftInset() - posX / (hsb.getMax() - hsb.getMin()) * (newWidth - contentWidth)));
+
+                double newValueX = (oldPositionX/newPositionX)*hsb.getValue();
+                if (newValueX < 0.0) {
+                    hsb.setValue(0.0);
+                }
+                else if (newValueX < 1.0) {
+                    hsb.setValue(newValueX);
+                }
+                else if (newValueX > 1.0) {
+                    hsb.setValue(1.0);
+                }
+            }
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ScrollPaneSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ScrollPaneSkin(final ScrollPane control) {
+        super(control);
+
+        // install default input map for the ScrollPane control
+        behavior = new ScrollPaneBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        initialize();
+
+        // Register listeners
+        Consumer<ObservableValue<?>> viewportSizeHintConsumer = e -> {
+            // change affects pref size, so requestLayout on control
+            getSkinnable().requestLayout();
+        };
+        registerChangeListener(control.contentProperty(), e -> {
+            if (scrollNode != getSkinnable().getContent()) {
+                if (scrollNode != null) {
+                    scrollNode.layoutBoundsProperty().removeListener(nodeListener);
+                    scrollNode.layoutBoundsProperty().removeListener(boundsChangeListener);
+                    viewContent.getChildren().remove(scrollNode);
+                }
+                scrollNode = getSkinnable().getContent();
+                if (scrollNode != null) {
+                    nodeWidth = snapSize(scrollNode.getLayoutBounds().getWidth());
+                    nodeHeight = snapSize(scrollNode.getLayoutBounds().getHeight());
+                    viewContent.getChildren().setAll(scrollNode);
+                    scrollNode.layoutBoundsProperty().addListener(nodeListener);
+                    scrollNode.layoutBoundsProperty().addListener(boundsChangeListener);
+                }
+            }
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.fitToWidthProperty(), e -> {
+            getSkinnable().requestLayout();
+            viewRect.requestLayout();
+        });
+        registerChangeListener(control.fitToHeightProperty(), e -> {
+            getSkinnable().requestLayout();
+            viewRect.requestLayout();
+        });
+        registerChangeListener(control.hbarPolicyProperty(), e -> {
+            // change might affect pref size, so requestLayout on control
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.vbarPolicyProperty(), e -> {
+            // change might affect pref size, so requestLayout on control
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.hvalueProperty(), e -> hsb.setValue(getSkinnable().getHvalue()));
+        registerChangeListener(control.hmaxProperty(), e -> hsb.setMax(getSkinnable().getHmax()));
+        registerChangeListener(control.hminProperty(), e -> hsb.setMin(getSkinnable().getHmin()));
+        registerChangeListener(control.vvalueProperty(), e -> vsb.setValue(getSkinnable().getVvalue()));
+        registerChangeListener(control.vmaxProperty(), e -> vsb.setMax(getSkinnable().getVmax()));
+        registerChangeListener(control.vminProperty(), e -> vsb.setMin(getSkinnable().getVmin()));
+        registerChangeListener(control.prefViewportWidthProperty(), viewportSizeHintConsumer);
+        registerChangeListener(control.prefViewportHeightProperty(), viewportSizeHintConsumer);
+        registerChangeListener(control.minViewportWidthProperty(), viewportSizeHintConsumer);
+        registerChangeListener(control.minViewportHeightProperty(), viewportSizeHintConsumer);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    private DoubleProperty contentPosX;
+    private final void setContentPosX(double value) { contentPosXProperty().set(value); }
+    private final double getContentPosX() { return contentPosX == null ? 0.0 : contentPosX.get(); }
+    private final DoubleProperty contentPosXProperty() {
+        if (contentPosX == null) {
+            contentPosX = new DoublePropertyBase() {
+                @Override protected void invalidated() {
+                    hsb.setValue(getContentPosX());
+                    getSkinnable().requestLayout();
+                }
+
+                @Override
+                public Object getBean() {
+                    return ScrollPaneSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "contentPosX";
+                }
+            };
+        }
+        return contentPosX;
+    }
+
+    private DoubleProperty contentPosY;
+    private final void setContentPosY(double value) { contentPosYProperty().set(value); }
+    private final double getContentPosY() { return contentPosY == null ? 0.0 : contentPosY.get(); }
+    private final DoubleProperty contentPosYProperty() {
+        if (contentPosY == null) {
+            contentPosY = new DoublePropertyBase() {
+                @Override protected void invalidated() {
+                    vsb.setValue(getContentPosY());
+                    getSkinnable().requestLayout();
+                }
+
+                @Override
+                public Object getBean() {
+                    return ScrollPaneSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "contentPosY";
+                }
+            };
+        }
+        return contentPosY;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /**
+     * Returns the horizontal {@link ScrollBar} used in this ScrollPaneSkin
+     * instance.
+     */
+    public final ScrollBar getHorizontalScrollBar() {
+        return hsb;
+    }
+
+    /**
+     * Returns the vertical {@link ScrollBar} used in this ScrollPaneSkin
+     * instance.
+     */
+    public final ScrollBar getVerticalScrollBar() {
+        return vsb;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollPane sp = getSkinnable();
+
+        double vsbWidth = computeVsbSizeHint(sp);
+        double minWidth = vsbWidth + snappedLeftInset() + snappedRightInset();
+
+        if (sp.getPrefViewportWidth() > 0) {
+            return (sp.getPrefViewportWidth() + minWidth);
+        }
+        else if (sp.getContent() != null) {
+            return (sp.getContent().prefWidth(height) + minWidth);
+        }
+        else {
+            return Math.max(minWidth, DEFAULT_PREF_SIZE);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollPane sp = getSkinnable();
+
+        double hsbHeight = computeHsbSizeHint(sp);
+        double minHeight = hsbHeight + snappedTopInset() + snappedBottomInset();
+
+        if (sp.getPrefViewportHeight() > 0) {
+            return (sp.getPrefViewportHeight() + minHeight);
+        }
+        else if (sp.getContent() != null) {
+            return (sp.getContent().prefHeight(width) + minHeight);
+        }
+        else {
+            return Math.max(minHeight, DEFAULT_PREF_SIZE);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollPane sp = getSkinnable();
+
+        double vsbWidth = computeVsbSizeHint(sp);
+        double minWidth = vsbWidth + snappedLeftInset() + snappedRightInset();
+
+        if (sp.getMinViewportWidth() > 0) {
+            return (sp.getMinViewportWidth() + minWidth);
+        } else {
+            double w = corner.minWidth(-1);
+            return (w > 0) ? (3 * w) : (DEFAULT_MIN_SIZE);
+        }
+
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ScrollPane sp = getSkinnable();
+
+        double hsbHeight = computeHsbSizeHint(sp);
+        double minHeight = hsbHeight + snappedTopInset() + snappedBottomInset();
+
+        if (sp.getMinViewportHeight() > 0) {
+            return (sp.getMinViewportHeight() + minHeight);
+        } else {
+            double h = corner.minHeight(-1);
+            return (h > 0) ? (3 * h) : (DEFAULT_MIN_SIZE);
+        }
+    }
+
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        final ScrollPane control = getSkinnable();
+        final Insets padding = control.getPadding();
+        final double rightPadding = snapSize(padding.getRight());
+        final double leftPadding = snapSize(padding.getLeft());
+        final double topPadding = snapSize(padding.getTop());
+        final double bottomPadding = snapSize(padding.getBottom());
+
+        vsb.setMin(control.getVmin());
+        vsb.setMax(control.getVmax());
+
+        //should only do this on css setup
+        hsb.setMin(control.getHmin());
+        hsb.setMax(control.getHmax());
+
+        contentWidth = w;
+        contentHeight = h;
+
+        /*
+        ** we want the scrollbars to go right to the border
+        */
+        double hsbWidth = 0;
+        double vsbHeight = 0;
+
+        computeScrollNodeSize(contentWidth, contentHeight);
+        computeScrollBarSize();
+
+        for (int i = 0; i < 2; ++i) {
+            vsbvis = determineVerticalSBVisible();
+            hsbvis = determineHorizontalSBVisible();
+
+            if (vsbvis && !Properties.IS_TOUCH_SUPPORTED) {
+                contentWidth = w - vsbWidth;
+            }
+            hsbWidth = w + leftPadding + rightPadding - (vsbvis ? vsbWidth : 0);
+            if (hsbvis && !Properties.IS_TOUCH_SUPPORTED) {
+                contentHeight = h - hsbHeight;
+            }
+            vsbHeight = h + topPadding + bottomPadding - (hsbvis ? hsbHeight : 0);
+        }
+
+
+        if (scrollNode != null && scrollNode.isResizable()) {
+            // maybe adjust size now that scrollbars may take up space
+            if (vsbvis && hsbvis) {
+                // adjust just once to accommodate
+                computeScrollNodeSize(contentWidth, contentHeight);
+
+            } else if (hsbvis && !vsbvis) {
+                computeScrollNodeSize(contentWidth, contentHeight);
+                vsbvis = determineVerticalSBVisible();
+                if (vsbvis) {
+                    // now both are visible
+                    contentWidth -= vsbWidth;
+                    hsbWidth -= vsbWidth;
+                    computeScrollNodeSize(contentWidth, contentHeight);
+                }
+            } else if (vsbvis && !hsbvis) {
+                computeScrollNodeSize(contentWidth, contentHeight);
+                hsbvis = determineHorizontalSBVisible();
+                if (hsbvis) {
+                    // now both are visible
+                    contentHeight -= hsbHeight;
+                    vsbHeight -= hsbHeight;
+                    computeScrollNodeSize(contentWidth, contentHeight);
+                }
+            }
+        }
+
+        // figure out the content area that is to be filled
+        double cx = snappedLeftInset() - leftPadding;
+        double cy = snappedTopInset() - topPadding;
+
+        vsb.setVisible(vsbvis);
+        if (vsbvis) {
+            /*
+            ** round up position of ScrollBar, round down it's size.
+            **
+            ** Positioning the ScrollBar
+            **  The Padding should go between the content and the edge,
+            **  otherwise changes in padding move the ScrollBar, and could
+            **  in extreme cases size the ScrollBar to become unusable.
+            **  The -1, +1 plus one bit :
+            **   If padding in => 1 then we allow one pixel to appear as the
+            **   outside border of the Scrollbar, and the rest on the inside.
+            **   If padding is < 1 then we just stick to the edge.
+            */
+            vsb.resizeRelocate(snappedLeftInset() + w - vsbWidth + (rightPadding < 1 ? 0 : rightPadding - 1) ,
+                    cy, vsbWidth, vsbHeight);
+        }
+        updateVerticalSB();
+
+        hsb.setVisible(hsbvis);
+        if (hsbvis) {
+            /*
+            ** round up position of ScrollBar, round down it's size.
+            **
+            ** Positioning the ScrollBar
+            **  The Padding should go between the content and the edge,
+            **  otherwise changes in padding move the ScrollBar, and could
+            **  in extreme cases size the ScrollBar to become unusable.
+            **  The -1, +1 plus one bit :
+            **   If padding in => 1 then we allow one pixel to appear as the
+            **   outside border of the Scrollbar, and the rest on the inside.
+            **   If padding is < 1 then we just stick to the edge.
+            */
+            hsb.resizeRelocate(cx, snappedTopInset() + h - hsbHeight + (bottomPadding < 1 ? 0 : bottomPadding - 1),
+                    hsbWidth, hsbHeight);
+        }
+        updateHorizontalSB();
+
+        viewRect.resizeRelocate(snappedLeftInset(), snappedTopInset(), snapSize(contentWidth), snapSize(contentHeight));
+        resetClip();
+
+        if (vsbvis && hsbvis) {
+            corner.setVisible(true);
+            double cornerWidth = vsbWidth;
+            double cornerHeight = hsbHeight;
+            corner.resizeRelocate(snapPosition(vsb.getLayoutX()), snapPosition(hsb.getLayoutY()), snapSize(cornerWidth), snapSize(cornerHeight));
+        } else {
+            corner.setVisible(false);
+        }
+        control.setViewportBounds(new BoundingBox(snapPosition(viewContent.getLayoutX()), snapPosition(viewContent.getLayoutY()), snapSize(contentWidth), snapSize(contentHeight)));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case VERTICAL_SCROLLBAR: return vsb;
+            case HORIZONTAL_SCROLLBAR: return hsb;
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void initialize() {
+        // requestLayout calls below should not trigger requestLayout above ScrollPane
+//        setManaged(false);
+
+        ScrollPane control = getSkinnable();
+        scrollNode = control.getContent();
+
+        ParentTraversalEngine traversalEngine = new ParentTraversalEngine(getSkinnable());
+        traversalEngine.addTraverseListener((node, bounds) -> {
+            // auto-scroll so node is within (0,0),(contentWidth,contentHeight)
+            scrollBoundsIntoView(bounds);
+        });
+        getSkinnable().setImpl_traversalEngine(traversalEngine);
+
+        if (scrollNode != null) {
+            scrollNode.layoutBoundsProperty().addListener(nodeListener);
+            scrollNode.layoutBoundsProperty().addListener(boundsChangeListener);
+        }
+
+        viewRect = new StackPane() {
+            @Override protected void layoutChildren() {
+                viewContent.resize(getWidth(), getHeight());
+            }
+        };
+        // prevent requestLayout requests from within scrollNode from percolating up
+        viewRect.setManaged(false);
+        viewRect.setCache(true);
+        viewRect.getStyleClass().add("viewport");
+
+        clipRect = new Rectangle();
+        viewRect.setClip(clipRect);
+
+        hsb = new ScrollBar();
+
+        vsb = new ScrollBar();
+        vsb.setOrientation(Orientation.VERTICAL);
+
+        EventHandler<MouseEvent> barHandler = ev -> {
+            getSkinnable().requestFocus();
+        };
+
+        hsb.addEventFilter(MouseEvent.MOUSE_PRESSED, barHandler);
+        vsb.addEventFilter(MouseEvent.MOUSE_PRESSED, barHandler);
+
+        corner = new StackPane();
+        corner.getStyleClass().setAll("corner");
+
+        viewContent = new StackPane() {
+            @Override public void requestLayout() {
+                // if scrollNode requested layout, will want to recompute
+                nodeSizeInvalid = true;
+
+                super.requestLayout(); // add as layout root for next layout pass
+
+                // Need to layout the ScrollPane as well in case scrollbars
+                // appeared or disappeared.
+                ScrollPaneSkin.this.getSkinnable().requestLayout();
+            }
+            @Override protected void layoutChildren() {
+                if (nodeSizeInvalid) {
+                    computeScrollNodeSize(getWidth(),getHeight());
+                }
+                if (scrollNode != null && scrollNode.isResizable()) {
+                    scrollNode.resize(snapSize(nodeWidth), snapSize(nodeHeight));
+                    if (vsbvis != determineVerticalSBVisible() || hsbvis != determineHorizontalSBVisible()) {
+                        getSkinnable().requestLayout();
+                    }
+                }
+                if (scrollNode != null) {
+                    scrollNode.relocate(0,0);
+                }
+            }
+        };
+        viewRect.getChildren().add(viewContent);
+
+        if (scrollNode != null) {
+            viewContent.getChildren().add(scrollNode);
+            viewRect.nodeOrientationProperty().bind(scrollNode.nodeOrientationProperty());
+        }
+
+        getChildren().clear();
+        getChildren().addAll(viewRect, vsb, hsb, corner);
+
+        /*
+        ** listeners, and assorted housekeeping
+        */
+        InvalidationListener vsbListener = valueModel -> {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                posY = Utils.clamp(getSkinnable().getVmin(), vsb.getValue(), getSkinnable().getVmax());
+            }
+            else {
+                posY = vsb.getValue();
+            }
+            updatePosY();
+        };
+        vsb.valueProperty().addListener(vsbListener);
+
+        InvalidationListener hsbListener = valueModel -> {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                posX = Utils.clamp(getSkinnable().getHmin(), hsb.getValue(), getSkinnable().getHmax());
+            }
+            else {
+                posX = hsb.getValue();
+            }
+            updatePosX();
+        };
+        hsb.valueProperty().addListener(hsbListener);
+
+        viewRect.setOnMousePressed(e -> {
+            mouseDown = true;
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                startSBReleasedAnimation();
+            }
+            pressX = e.getX();
+            pressY = e.getY();
+            ohvalue = hsb.getValue();
+            ovvalue = vsb.getValue();
+        });
+
+
+        viewRect.setOnDragDetected(e -> {
+             if (Properties.IS_TOUCH_SUPPORTED) {
+                 startSBReleasedAnimation();
+             }
+            if (getSkinnable().isPannable()) {
+              dragDetected = true;
+              if (saveCursor == null) {
+                  saveCursor = getSkinnable().getCursor();
+                  if (saveCursor == null) {
+                      saveCursor = Cursor.DEFAULT;
+                  }
+                  getSkinnable().setCursor(Cursor.MOVE);
+                  getSkinnable().requestLayout();
+              }
+            }
+        });
+
+        viewRect.addEventFilter(MouseEvent.MOUSE_RELEASED, e -> {
+             mouseDown = false;
+             if (dragDetected == true) {
+                 if (saveCursor != null) {
+                     getSkinnable().setCursor(saveCursor);
+                     saveCursor = null;
+                     getSkinnable().requestLayout();
+                 }
+                 dragDetected = false;
+             }
+
+             /*
+             ** if the contents need repositioning, and there's is no
+             ** touch event in progress, then start the repositioning.
+             */
+             if ((posY > getSkinnable().getVmax() || posY < getSkinnable().getVmin() ||
+                 posX > getSkinnable().getHmax() || posX < getSkinnable().getHmin()) && !touchDetected) {
+                 startContentsToViewport();
+             }
+        });
+        viewRect.setOnMouseDragged(e -> {
+             if (Properties.IS_TOUCH_SUPPORTED) {
+                 startSBReleasedAnimation();
+             }
+            /*
+            ** for mobile-touch we allow drag, even if not pannagle
+            */
+            if (getSkinnable().isPannable() || Properties.IS_TOUCH_SUPPORTED) {
+                double deltaX = pressX - e.getX();
+                double deltaY = pressY - e.getY();
+                /*
+                ** we only drag if not all of the content is visible.
+                */
+                if (hsb.getVisibleAmount() > 0.0 && hsb.getVisibleAmount() < hsb.getMax()) {
+                    if (Math.abs(deltaX) > PAN_THRESHOLD) {
+                        if (isReverseNodeOrientation()) {
+                            deltaX = -deltaX;
+                        }
+                        double newHVal = (ohvalue + deltaX / (nodeWidth - viewRect.getWidth()) * (hsb.getMax() - hsb.getMin()));
+                        if (!Properties.IS_TOUCH_SUPPORTED) {
+                            if (newHVal > hsb.getMax()) {
+                                newHVal = hsb.getMax();
+                            }
+                            else if (newHVal < hsb.getMin()) {
+                                newHVal = hsb.getMin();
+                            }
+                            hsb.setValue(newHVal);
+                        }
+                        else {
+                            hsb.setValue(newHVal);
+                        }
+                    }
+                }
+                /*
+                ** we only drag if not all of the content is visible.
+                */
+                if (vsb.getVisibleAmount() > 0.0 && vsb.getVisibleAmount() < vsb.getMax()) {
+                    if (Math.abs(deltaY) > PAN_THRESHOLD) {
+                        double newVVal = (ovvalue + deltaY / (nodeHeight - viewRect.getHeight()) * (vsb.getMax() - vsb.getMin()));
+                        if (!Properties.IS_TOUCH_SUPPORTED) {
+                            if (newVVal > vsb.getMax()) {
+                                newVVal = vsb.getMax();
+                            }
+                            else if (newVVal < vsb.getMin()) {
+                                newVVal = vsb.getMin();
+                            }
+                            vsb.setValue(newVVal);
+                        }
+                        else {
+                            vsb.setValue(newVVal);
+                        }
+                    }
+                }
+            }
+            /*
+            ** we need to consume drag events, as we don't want
+            ** the scrollpane itself to be dragged on every mouse click
+            */
+            e.consume();
+        });
+
+
+        /*
+        ** don't allow the ScrollBar to handle the ScrollEvent,
+        ** In a ScrollPane a vertical scroll should scroll on the vertical only,
+        ** whereas in a horizontal ScrollBar it can scroll horizontally.
+        */ 
+        // block the event from being passed down to children
+        final EventDispatcher blockEventDispatcher = (event, tail) -> event;
+        // block ScrollEvent from being passed down to scrollbar's skin
+        final EventDispatcher oldHsbEventDispatcher = hsb.getEventDispatcher();
+        hsb.setEventDispatcher((event, tail) -> {
+            if (event.getEventType() == ScrollEvent.SCROLL &&
+                    !((ScrollEvent)event).isDirect()) {
+                tail = tail.prepend(blockEventDispatcher);
+                tail = tail.prepend(oldHsbEventDispatcher);
+                return tail.dispatchEvent(event);
+            }
+            return oldHsbEventDispatcher.dispatchEvent(event, tail);
+        });
+        // block ScrollEvent from being passed down to scrollbar's skin
+        final EventDispatcher oldVsbEventDispatcher = vsb.getEventDispatcher();
+        vsb.setEventDispatcher((event, tail) -> {
+            if (event.getEventType() == ScrollEvent.SCROLL &&
+                    !((ScrollEvent)event).isDirect()) {
+                tail = tail.prepend(blockEventDispatcher);
+                tail = tail.prepend(oldVsbEventDispatcher);
+                return tail.dispatchEvent(event);
+            }
+            return oldVsbEventDispatcher.dispatchEvent(event, tail);
+        });
+
+        /*
+         * listen for ScrollEvents over the whole of the ScrollPane
+         * area, the above dispatcher having removed the ScrollBars
+         * scroll event handling.
+         *
+         * Note that we use viewRect here, rather than setting the eventHandler
+         * on the ScrollPane itself. This is for RT-31582, and effectively
+         * allows for us to prioritise handling (and consuming) the event
+         * internally, before it is made available to users listening to events
+         * on the control. This is consistent with the VirtualFlow-based controls.
+         */
+        viewRect.addEventHandler(ScrollEvent.SCROLL, event -> {
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                startSBReleasedAnimation();
+            }
+            /*
+            ** if we're completely visible then do nothing....
+            ** we only consume an event that we've used.
+            */
+            if (vsb.getVisibleAmount() < vsb.getMax()) {
+                double vRange = getSkinnable().getVmax()-getSkinnable().getVmin();
+                double vPixelValue;
+                if (nodeHeight > 0.0) {
+                    vPixelValue = vRange / nodeHeight;
+                }
+                else {
+                    vPixelValue = 0.0;
+                }
+                double newValue = vsb.getValue()+(-event.getDeltaY())*vPixelValue;
+                if (!Properties.IS_TOUCH_SUPPORTED) {
+                    if ((event.getDeltaY() > 0.0 && vsb.getValue() > vsb.getMin()) ||
+                        (event.getDeltaY() < 0.0 && vsb.getValue() < vsb.getMax())) {
+                        vsb.setValue(newValue);
+                        event.consume();
+                    }
+                }
+                else {
+                    /*
+                    ** if there is a repositioning in progress then we only
+                    ** set the value for 'real' events
+                    */
+                    if (!(((ScrollEvent)event).isInertia()) || (((ScrollEvent)event).isInertia()) && (contentsToViewTimeline == null || contentsToViewTimeline.getStatus() == Status.STOPPED)) {
+                        vsb.setValue(newValue);
+                        if ((newValue > vsb.getMax() || newValue < vsb.getMin()) && (!mouseDown && !touchDetected)) {
+                            startContentsToViewport();
+                        }
+                        event.consume();
+                    }
+                }
+            }
+
+            if (hsb.getVisibleAmount() < hsb.getMax()) {
+                double hRange = getSkinnable().getHmax()-getSkinnable().getHmin();
+                double hPixelValue;
+                if (nodeWidth > 0.0) {
+                    hPixelValue = hRange / nodeWidth;
+                }
+                else {
+                    hPixelValue = 0.0;
+                }
+
+                double newValue = hsb.getValue()+(-event.getDeltaX())*hPixelValue;
+                if (!Properties.IS_TOUCH_SUPPORTED) {
+                    if ((event.getDeltaX() > 0.0 && hsb.getValue() > hsb.getMin()) ||
+                        (event.getDeltaX() < 0.0 && hsb.getValue() < hsb.getMax())) {
+                        hsb.setValue(newValue);
+                        event.consume();
+                    }
+                }
+                else {
+                    /*
+                    ** if there is a repositioning in progress then we only
+                    ** set the value for 'real' events
+                    */
+                    if (!(((ScrollEvent)event).isInertia()) || (((ScrollEvent)event).isInertia()) && (contentsToViewTimeline == null || contentsToViewTimeline.getStatus() == Status.STOPPED)) {
+                        hsb.setValue(newValue);
+
+                        if ((newValue > hsb.getMax() || newValue < hsb.getMin()) && (!mouseDown && !touchDetected)) {
+                            startContentsToViewport();
+                        }
+                        event.consume();
+                    }
+                }
+            }
+        });
+
+        /*
+        ** there are certain animations that need to know if the touch is
+        ** happening.....
+        */
+        getSkinnable().addEventHandler(TouchEvent.TOUCH_PRESSED, e -> {
+            touchDetected = true;
+            startSBReleasedAnimation();
+            e.consume();
+        });
+
+        getSkinnable().addEventHandler(TouchEvent.TOUCH_RELEASED, e -> {
+            touchDetected = false;
+            e.consume();
+        });
+
+        // ScrollPanes do not block all MouseEvents by default, unlike most other UI Controls.
+        consumeMouseEvents(false);
+
+        // update skin initial state to match control (see RT-35554)
+        hsb.setValue(control.getHvalue());
+        vsb.setValue(control.getVvalue());
+    }
+
+    void scrollBoundsIntoView(Bounds b) {
+        double dx = 0.0;
+        double dy = 0.0;
+        if (b.getMaxX() > contentWidth) {
+            dx = b.getMinX() - snappedLeftInset();
+        }
+        if (b.getMinX() < snappedLeftInset()) {
+            dx = b.getMaxX() - contentWidth - snappedLeftInset();
+        }
+        if (b.getMaxY() > snappedTopInset() + contentHeight) {
+            dy = b.getMinY() - snappedTopInset();
+        }
+        if (b.getMinY() < snappedTopInset()) {
+            dy = b.getMaxY() - contentHeight - snappedTopInset();
+        }
+        // We want to move contentPanel's layoutX,Y by (dx,dy).
+        // But to do this we have to set the scrollbars' values appropriately.
+
+        if (dx != 0) {
+            double sdx = dx * (hsb.getMax() - hsb.getMin()) / (nodeWidth - contentWidth);
+            // Adjust back for some amount so that the Node border is not too close to view border
+            sdx += -1 * Math.signum(sdx) * hsb.getUnitIncrement() / 5; // This accounts to 2% of view width
+            hsb.setValue(hsb.getValue() + sdx);
+            getSkinnable().requestLayout();
+        }
+        if (dy != 0) {
+            double sdy = dy * (vsb.getMax() - vsb.getMin()) / (nodeHeight - contentHeight);
+            // Adjust back for some amount so that the Node border is not too close to view border
+            sdy += -1 * Math.signum(sdy) * vsb.getUnitIncrement() / 5; // This accounts to 2% of view height
+            vsb.setValue(vsb.getValue() + sdy);
+            getSkinnable().requestLayout();
+        }
+
+    }
+
+    /**
+     * Computes the size that should be reserved for horizontal scrollbar in size hints (min/pref height)
+     */
+    private double computeHsbSizeHint(ScrollPane sp) {
+        return ((sp.getHbarPolicy() == ScrollBarPolicy.ALWAYS) ||
+                (sp.getHbarPolicy() == ScrollBarPolicy.AS_NEEDED && (sp.getPrefViewportHeight() > 0 || sp.getMinViewportHeight() > 0)))
+                ? hsb.prefHeight(ScrollBar.USE_COMPUTED_SIZE)
+                : 0;
+    }
+
+    /**
+     * Computes the size that should be reserved for vertical scrollbar in size hints (min/pref width)
+     */
+    private double computeVsbSizeHint(ScrollPane sp) {
+        return ((sp.getVbarPolicy() == ScrollBarPolicy.ALWAYS) ||
+                (sp.getVbarPolicy() == ScrollBarPolicy.AS_NEEDED && (sp.getPrefViewportWidth() > 0
+                        || sp.getMinViewportWidth() > 0)))
+                ? vsb.prefWidth(ScrollBar.USE_COMPUTED_SIZE)
+                : 0;
+    }
+
+    private void computeScrollNodeSize(double contentWidth, double contentHeight) {
+        if (scrollNode != null) {
+            if (scrollNode.isResizable()) {
+                ScrollPane control = getSkinnable();
+                Orientation bias = scrollNode.getContentBias();
+                if (bias == null) {
+                    nodeWidth = snapSize(boundedSize(control.isFitToWidth()? contentWidth : scrollNode.prefWidth(-1),
+                                                         scrollNode.minWidth(-1),scrollNode.maxWidth(-1)));
+                    nodeHeight = snapSize(boundedSize(control.isFitToHeight()? contentHeight : scrollNode.prefHeight(-1),
+                                                          scrollNode.minHeight(-1), scrollNode.maxHeight(-1)));
+
+                } else if (bias == Orientation.HORIZONTAL) {
+                    nodeWidth = snapSize(boundedSize(control.isFitToWidth()? contentWidth : scrollNode.prefWidth(-1),
+                                                         scrollNode.minWidth(-1),scrollNode.maxWidth(-1)));
+                    nodeHeight = snapSize(boundedSize(control.isFitToHeight()? contentHeight : scrollNode.prefHeight(nodeWidth),
+                                                          scrollNode.minHeight(nodeWidth),scrollNode.maxHeight(nodeWidth)));
+
+                } else { // bias == VERTICAL
+                    nodeHeight = snapSize(boundedSize(control.isFitToHeight()? contentHeight : scrollNode.prefHeight(-1),
+                                                          scrollNode.minHeight(-1), scrollNode.maxHeight(-1)));
+                    nodeWidth = snapSize(boundedSize(control.isFitToWidth()? contentWidth : scrollNode.prefWidth(nodeHeight),
+                                                         scrollNode.minWidth(nodeHeight),scrollNode.maxWidth(nodeHeight)));
+                }
+
+            } else {
+                nodeWidth = snapSize(scrollNode.getLayoutBounds().getWidth());
+                nodeHeight = snapSize(scrollNode.getLayoutBounds().getHeight());
+            }
+            nodeSizeInvalid = false;
+        }
+    }
+
+    private boolean isReverseNodeOrientation() {
+        return (scrollNode != null &&
+                getSkinnable().getEffectiveNodeOrientation() !=
+                            scrollNode.getEffectiveNodeOrientation());
+    }
+
+    private boolean determineHorizontalSBVisible() {
+        final ScrollPane sp = getSkinnable();
+
+        if (Properties.IS_TOUCH_SUPPORTED) {
+            return (tempVisibility && (nodeWidth > contentWidth));
+        }
+        else {
+            // RT-17395: ScrollBarPolicy might be null. If so, treat it as "AS_NEEDED", which is the default
+            ScrollBarPolicy hbarPolicy = sp.getHbarPolicy();
+            return (ScrollBarPolicy.NEVER == hbarPolicy) ? false :
+                   ((ScrollBarPolicy.ALWAYS == hbarPolicy) ? true :
+                   ((sp.isFitToWidth() && scrollNode != null ? scrollNode.isResizable() : false) ?
+                   (nodeWidth > contentWidth && scrollNode.minWidth(-1) > contentWidth) : (nodeWidth > contentWidth)));
+        }
+    }
+
+    private boolean determineVerticalSBVisible() {
+        final ScrollPane sp = getSkinnable();
+
+        if (Properties.IS_TOUCH_SUPPORTED) {
+            return (tempVisibility && (nodeHeight > contentHeight));
+        }
+        else {
+            // RT-17395: ScrollBarPolicy might be null. If so, treat it as "AS_NEEDED", which is the default
+            ScrollBarPolicy vbarPolicy = sp.getVbarPolicy();
+            return (ScrollBarPolicy.NEVER == vbarPolicy) ? false :
+                   ((ScrollBarPolicy.ALWAYS == vbarPolicy) ? true :
+                   ((sp.isFitToHeight() && scrollNode != null ? scrollNode.isResizable() : false) ?
+                   (nodeHeight > contentHeight && scrollNode.minHeight(-1) > contentHeight) : (nodeHeight > contentHeight)));
+        }
+    }
+
+    private void computeScrollBarSize() {
+        vsbWidth = snapSize(vsb.prefWidth(-1));
+        if (vsbWidth == 0) {
+            //            println("*** WARNING ScrollPaneSkin: can't get scroll bar width, using {DEFAULT_SB_BREADTH}");
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                vsbWidth = DEFAULT_EMBEDDED_SB_BREADTH;
+            }
+            else {
+                vsbWidth = DEFAULT_SB_BREADTH;
+            }
+        }
+        hsbHeight = snapSize(hsb.prefHeight(-1));
+        if (hsbHeight == 0) {
+            //            println("*** WARNING ScrollPaneSkin: can't get scroll bar height, using {DEFAULT_SB_BREADTH}");
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                hsbHeight = DEFAULT_EMBEDDED_SB_BREADTH;
+            }
+            else {
+                hsbHeight = DEFAULT_SB_BREADTH;
+            }
+        }
+    }
+
+    private void updateHorizontalSB() {
+        double contentRatio = nodeWidth * (hsb.getMax() - hsb.getMin());
+        if (contentRatio > 0.0) {
+            hsb.setVisibleAmount(contentWidth / contentRatio);
+            hsb.setBlockIncrement(0.9 * hsb.getVisibleAmount());
+            hsb.setUnitIncrement(0.1 * hsb.getVisibleAmount());
+        }
+        else {
+            hsb.setVisibleAmount(0.0);
+            hsb.setBlockIncrement(0.0);
+            hsb.setUnitIncrement(0.0);
+        }
+
+        if (hsb.isVisible()) {
+            updatePosX();
+        } else {
+            if (nodeWidth > contentWidth) {
+                updatePosX();
+            } else {
+                viewContent.setLayoutX(0);
+            }
+        }
+    }
+    
+    private void updateVerticalSB() {
+        double contentRatio = nodeHeight * (vsb.getMax() - vsb.getMin());
+        if (contentRatio > 0.0) {
+            vsb.setVisibleAmount(contentHeight / contentRatio);
+            vsb.setBlockIncrement(0.9 * vsb.getVisibleAmount());
+            vsb.setUnitIncrement(0.1 * vsb.getVisibleAmount());
+        }
+        else {
+            vsb.setVisibleAmount(0.0);
+            vsb.setBlockIncrement(0.0);
+            vsb.setUnitIncrement(0.0);
+        }
+
+        if (vsb.isVisible()) {
+            updatePosY();
+        } else {
+            if (nodeHeight > contentHeight) {
+                updatePosY();
+            } else {
+                viewContent.setLayoutY(0);
+            }
+        }
+    }
+
+    private double updatePosX() {
+        final ScrollPane sp = getSkinnable();
+        double x = isReverseNodeOrientation() ? (hsb.getMax() - (posX - hsb.getMin())) : posX;
+        double minX = Math.min((- x / (hsb.getMax() - hsb.getMin()) * (nodeWidth - contentWidth)), 0);
+        viewContent.setLayoutX(snapPosition(minX));
+        if (!sp.hvalueProperty().isBound()) sp.setHvalue(Utils.clamp(sp.getHmin(), posX, sp.getHmax()));
+        return posX;
+    }
+
+    private double updatePosY() {
+        final ScrollPane sp = getSkinnable();
+        double minY = Math.min((- posY / (vsb.getMax() - vsb.getMin()) * (nodeHeight - contentHeight)), 0);
+        viewContent.setLayoutY(snapPosition(minY));
+        if (!sp.vvalueProperty().isBound()) sp.setVvalue(Utils.clamp(sp.getVmin(), posY, sp.getVmax()));
+        return posY;
+    }
+
+    private void resetClip() {
+        clipRect.setWidth(snapSize(contentWidth));
+        clipRect.setHeight(snapSize(contentHeight));
+    }
+
+    private void startSBReleasedAnimation() {
+        if (sbTouchTimeline == null) {
+            /*
+            ** timeline to leave the scrollbars visible for a short
+            ** while after a scroll/drag
+            */
+            sbTouchTimeline = new Timeline();
+            sbTouchKF1 = new KeyFrame(Duration.millis(0), event -> {
+                tempVisibility = true;
+                if (touchDetected == true || mouseDown == true) {
+                    sbTouchTimeline.playFromStart();
+                }
+            });
+
+            sbTouchKF2 = new KeyFrame(Duration.millis(1000), event -> {
+                tempVisibility = false;
+                getSkinnable().requestLayout();
+            });
+            sbTouchTimeline.getKeyFrames().addAll(sbTouchKF1, sbTouchKF2);
+        }
+        sbTouchTimeline.playFromStart();
+    }
+
+    private void startContentsToViewport() {
+        double newPosX = posX;
+        double newPosY = posY;
+
+        setContentPosX(posX);
+        setContentPosY(posY);
+
+        if (posY > getSkinnable().getVmax()) {
+            newPosY = getSkinnable().getVmax();
+        }
+        else if (posY < getSkinnable().getVmin()) {
+            newPosY = getSkinnable().getVmin();
+        }
+
+
+        if (posX > getSkinnable().getHmax()) {
+            newPosX = getSkinnable().getHmax();
+        }
+        else if (posX < getSkinnable().getHmin()) {
+            newPosX = getSkinnable().getHmin();
+        }
+
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            startSBReleasedAnimation();
+        }
+
+        /*
+        ** timeline to return the contents of the scrollpane to the viewport
+        */
+        if (contentsToViewTimeline != null) {
+            contentsToViewTimeline.stop();
+        }
+        contentsToViewTimeline = new Timeline();
+        /*
+        ** short pause before animation starts
+        */
+        contentsToViewKF1 = new KeyFrame(Duration.millis(50));
+        /*
+        ** reposition
+        */
+        contentsToViewKF2 = new KeyFrame(Duration.millis(150), event -> {
+            getSkinnable().requestLayout();
+        },
+                new KeyValue(contentPosX, newPosX),
+                new KeyValue(contentPosY, newPosY)
+        );
+        /*
+        ** block out 'aftershocks', but real events will
+        ** still reactivate
+        */
+        contentsToViewKF3 = new KeyFrame(Duration.millis(1500));
+        contentsToViewTimeline.getKeyFrames().addAll(contentsToViewKF1, contentsToViewKF2, contentsToViewKF3);
+        contentsToViewTimeline.playFromStart();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SeparatorSkin.java	2015-09-03 15:21:28.440689200 -0700
+++ /dev/null	2015-09-03 15:21:29.000000000 -0700
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2010, 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.geometry.Orientation;
-import javafx.scene.control.Separator;
-import javafx.scene.layout.Region;
-
-import java.util.Collections;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-/**
- *
- */
-public class SeparatorSkin extends BehaviorSkinBase<Separator, BehaviorBase<Separator>> {
-
-    /**
-     * Separator's have no intrinsic length, so we need to hard code some sort
-     * of default preferred size when a separator is not otherwise being resized.
-     * This is the default length to use (height when vertical, width when horizontal)
-     * for computing the preferred width/height.
-     */
-    private static final double DEFAULT_LENGTH = 10;
-
-    /**
-     * The region to use for rendering the line. The line is specified via
-     * CSS. By default we use a single stroke to render the line, but the
-     * programmer could use images or whatnot from CSS instead.
-     */
-    private final Region line;
-
-    /**
-     * Create a new SeparatorSkin. Just specify the separator, thanks very much.
-     * @param separator not null
-     */
-    public SeparatorSkin(Separator separator) {
-        // There is no behavior for the separator, so we just create a
-        // dummy behavior base instead, since SkinBase will complain
-        // about it being null.
-        super(separator, new BehaviorBase<>(separator, Collections.emptyList()));
-
-        line = new Region();
-        line.getStyleClass().setAll("line");
-
-        getChildren().add(line);
-        registerChangeListener(separator.orientationProperty(), "ORIENTATION");
-        registerChangeListener(separator.halignmentProperty(), "HALIGNMENT");
-        registerChangeListener(separator.valignmentProperty(), "VALIGNMENT");
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("ORIENTATION".equals(p) || "HALIGNMENT".equals(p) || "VALIGNMENT".equals(p)) {
-            getSkinnable().requestLayout();
-        }
-    }
-
-    /**
-     * We only need to deal with the single "line" child region. The important
-     * thing here is that we want a horizontal separator to have a line which is
-     * as wide as the separator (less the left/right padding), but as thin as
-     * it can be (based on its own pref height). The same idea for a vertical
-     * separator. It should be as tall as the separator (less the top and
-     * bottom padding) but as thin as can be (the pref width of the line).
-     * <p>
-     * Then position the line within the separator such that the alignment
-     * properties are honored.
-     */
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        final Separator sep = getSkinnable();
-
-        if (sep.getOrientation() == Orientation.HORIZONTAL) {
-            // Resize to the content width, and the pref height of the line.
-            line.resize(w, line.prefHeight(-1));
-        } else {
-            // Resize to the pref width of the line and the content height.
-            line.resize(line.prefWidth(-1), h);
-        }
-
-        // Now that the line has been sized, simply position it
-        positionInArea(line, x, y, w, h, 0, sep.getHalignment(), sep.getValignment());
-    }
-    
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-    }
-    
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computePrefWidth(double h, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Separator sep = getSkinnable();
-        double w = sep.getOrientation() == Orientation.VERTICAL ? line.prefWidth(-1) : DEFAULT_LENGTH;
-        return w + leftInset + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double w, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Separator sep = getSkinnable();
-        double h = sep.getOrientation() == Orientation.VERTICAL ? DEFAULT_LENGTH : line.prefHeight(-1);
-        return h + topInset + bottomInset;
-    }
-
-    @Override protected double computeMaxWidth(double h, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Separator sep = getSkinnable();
-        return sep.getOrientation() == Orientation.VERTICAL ? sep.prefWidth(h) : Double.MAX_VALUE;
-    }
-
-    @Override protected double computeMaxHeight(double w, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Separator sep = getSkinnable();
-        return sep.getOrientation() == Orientation.VERTICAL ? Double.MAX_VALUE : sep.prefHeight(w);
-    }
-}
--- /dev/null	2015-09-03 15:21:29.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/SeparatorSkin.java	2015-09-03 15:21:27.659644500 -0700
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2010, 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.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Control;
+import javafx.scene.control.Separator;
+import javafx.scene.control.SkinBase;
+import javafx.scene.layout.Region;
+
+import java.util.Collections;
+
+/**
+ * Default skin implementation for the {@link Separator} control.
+ *
+ * @see Separator
+ * @since 9
+ */
+public class SeparatorSkin extends SkinBase<Separator> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Separator's have no intrinsic length, so we need to hard code some sort
+     * of default preferred size when a separator is not otherwise being resized.
+     * This is the default length to use (height when vertical, width when horizontal)
+     * for computing the preferred width/height.
+     */
+    private static final double DEFAULT_LENGTH = 10;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The region to use for rendering the line. The line is specified via
+     * CSS. By default we use a single stroke to render the line, but the
+     * programmer could use images or whatnot from CSS instead.
+     */
+    private final Region line;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new SeparatorSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public SeparatorSkin(Separator control) {
+        // There is no behavior for the separator, so we just create a
+        // dummy behavior base instead, since SkinBase will complain
+        // about it being null.
+        super(control);
+
+        line = new Region();
+        line.getStyleClass().setAll("line");
+
+        getChildren().add(line);
+        registerChangeListener(control.orientationProperty(), e -> getSkinnable().requestLayout());
+        registerChangeListener(control.halignmentProperty(), e -> getSkinnable().requestLayout());
+        registerChangeListener(control.valignmentProperty(), e -> getSkinnable().requestLayout());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * We only need to deal with the single "line" child region. The important
+     * thing here is that we want a horizontal separator to have a line which is
+     * as wide as the separator (less the left/right padding), but as thin as
+     * it can be (based on its own pref height). The same idea for a vertical
+     * separator. It should be as tall as the separator (less the top and
+     * bottom padding) but as thin as can be (the pref width of the line).
+     * <p>
+     * Then position the line within the separator such that the alignment
+     * properties are honored.
+     */
+    @Override protected void layoutChildren(final double x, final double y,
+            final double w, final double h) {
+        final Separator sep = getSkinnable();
+
+        if (sep.getOrientation() == Orientation.HORIZONTAL) {
+            // Resize to the content width, and the pref height of the line.
+            line.resize(w, line.prefHeight(-1));
+        } else {
+            // Resize to the pref width of the line and the content height.
+            line.resize(line.prefWidth(-1), h);
+        }
+
+        // Now that the line has been sized, simply position it
+        positionInArea(line, x, y, w, h, 0, sep.getHalignment(), sep.getValignment());
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double h, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Separator sep = getSkinnable();
+        double w = sep.getOrientation() == Orientation.VERTICAL ? line.prefWidth(-1) : DEFAULT_LENGTH;
+        return w + leftInset + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double w, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Separator sep = getSkinnable();
+        double h = sep.getOrientation() == Orientation.VERTICAL ? DEFAULT_LENGTH : line.prefHeight(-1);
+        return h + topInset + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double h, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Separator sep = getSkinnable();
+        return sep.getOrientation() == Orientation.VERTICAL ? sep.prefWidth(h) : Double.MAX_VALUE;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double w, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Separator sep = getSkinnable();
+        return sep.getOrientation() == Orientation.VERTICAL ? Double.MAX_VALUE : sep.prefHeight(w);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SliderSkin.java	2015-09-03 15:21:37.366199700 -0700
+++ /dev/null	2015-09-03 15:21:38.000000000 -0700
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2010, 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.animation.Transition;
-import javafx.geometry.Orientation;
-import javafx.geometry.Point2D;
-import javafx.geometry.Side;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.chart.NumberAxis;
-import javafx.scene.control.Slider;
-import javafx.scene.layout.StackPane;
-import javafx.util.Duration;
-import javafx.util.StringConverter;
-
-import com.sun.javafx.scene.control.behavior.SliderBehavior;
-
-/**
- * Region/css based skin for Slider
-*/
-public class SliderSkin extends BehaviorSkinBase<Slider, SliderBehavior> {
-
-    /** Track if slider is vertical/horizontal and cause re layout */
-//    private boolean horizontal;
-    private NumberAxis tickLine = null;
-    private double trackToTickGap = 2;
-
-    private boolean showTickMarks;
-    private double thumbWidth;
-    private double thumbHeight;
-
-    private double trackStart;
-    private double trackLength;
-    private double thumbTop;
-    private double thumbLeft;
-    private double preDragThumbPos;
-    private Point2D dragStart; // in skin coordinates
-
-    private StackPane thumb;
-    private StackPane track;
-    private boolean trackClicked = false;
-//    private double visibleAmount = 16;
-
-    public SliderSkin(Slider slider) {
-        super(slider, new SliderBehavior(slider));
-
-        initialize();
-        slider.requestLayout();
-        registerChangeListener(slider.minProperty(), "MIN");
-        registerChangeListener(slider.maxProperty(), "MAX");
-        registerChangeListener(slider.valueProperty(), "VALUE");
-        registerChangeListener(slider.orientationProperty(), "ORIENTATION");
-        registerChangeListener(slider.showTickMarksProperty(), "SHOW_TICK_MARKS");
-        registerChangeListener(slider.showTickLabelsProperty(), "SHOW_TICK_LABELS");
-        registerChangeListener(slider.majorTickUnitProperty(), "MAJOR_TICK_UNIT");
-        registerChangeListener(slider.minorTickCountProperty(), "MINOR_TICK_COUNT");
-        registerChangeListener(slider.labelFormatterProperty(), "TICK_LABEL_FORMATTER");
-    }
-
-    private void initialize() {
-        thumb = new StackPane() {
-            @Override
-            public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-                switch (attribute) {
-                    case VALUE: return getSkinnable().getValue();
-                    default: return super.queryAccessibleAttribute(attribute, parameters);
-                }
-            }
-        };
-        thumb.getStyleClass().setAll("thumb");
-        thumb.setAccessibleRole(AccessibleRole.THUMB);
-        track = new StackPane();
-        track.getStyleClass().setAll("track");
-//        horizontal = getSkinnable().isVertical();
-
-        getChildren().clear();
-        getChildren().addAll(track, thumb);
-        setShowTickMarks(getSkinnable().isShowTickMarks(), getSkinnable().isShowTickLabels());
-        track.setOnMousePressed(me -> {
-            if (!thumb.isPressed()) {
-                trackClicked = true;
-                if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
-                    getBehavior().trackPress(me, (me.getX() / trackLength));
-                } else {
-                    getBehavior().trackPress(me, (me.getY() / trackLength));
-                }
-                trackClicked = false;
-            }
-        });
-        
-        track.setOnMouseDragged(me -> {
-            if (!thumb.isPressed()) {
-                if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
-                    getBehavior().trackPress(me, (me.getX() / trackLength));
-                } else {
-                    getBehavior().trackPress(me, (me.getY() / trackLength));
-                }
-            }
-        });
-
-        thumb.setOnMousePressed(me -> {
-            getBehavior().thumbPressed(me, 0.0f);
-            dragStart = thumb.localToParent(me.getX(), me.getY());
-            preDragThumbPos = (getSkinnable().getValue() - getSkinnable().getMin()) /
-                    (getSkinnable().getMax() - getSkinnable().getMin());
-        });
-
-        thumb.setOnMouseReleased(me -> {
-            getBehavior().thumbReleased(me);
-        });
-
-        thumb.setOnMouseDragged(me -> {
-            Point2D cur = thumb.localToParent(me.getX(), me.getY());
-            double dragPos = (getSkinnable().getOrientation() == Orientation.HORIZONTAL)?
-                cur.getX() - dragStart.getX() : -(cur.getY() - dragStart.getY());
-            getBehavior().thumbDragged(me, preDragThumbPos + dragPos / trackLength);
-        });
-    }
-
-    StringConverter<Number> stringConverterWrapper = new StringConverter<Number>() {
-        Slider slider = getSkinnable();
-        @Override public String toString(Number object) {
-            return(object != null) ? slider.getLabelFormatter().toString(object.doubleValue()) : "";
-        }
-        @Override public Number fromString(String string) {
-            return slider.getLabelFormatter().fromString(string);
-        }
-    };
-    
-     private void setShowTickMarks(boolean ticksVisible, boolean labelsVisible) {
-        showTickMarks = (ticksVisible || labelsVisible);
-        Slider slider = getSkinnable();
-        if (showTickMarks) {
-            if (tickLine == null) {
-                tickLine = new NumberAxis();
-                tickLine.setAutoRanging(false);
-                tickLine.setSide(slider.getOrientation() == Orientation.VERTICAL ? Side.RIGHT : (slider.getOrientation() == null) ? Side.RIGHT: Side.BOTTOM);
-                tickLine.setUpperBound(slider.getMax());
-                tickLine.setLowerBound(slider.getMin());
-                tickLine.setTickUnit(slider.getMajorTickUnit());
-                tickLine.setTickMarkVisible(ticksVisible);
-                tickLine.setTickLabelsVisible(labelsVisible);
-                tickLine.setMinorTickVisible(ticksVisible);
-                // add 1 to the slider minor tick count since the axis draws one
-                // less minor ticks than the number given.
-                tickLine.setMinorTickCount(Math.max(slider.getMinorTickCount(),0) + 1);
-                if (slider.getLabelFormatter() != null) {
-                    tickLine.setTickLabelFormatter(stringConverterWrapper);
-                }
-                getChildren().clear();
-                getChildren().addAll(tickLine, track, thumb);
-            } else {
-                tickLine.setTickLabelsVisible(labelsVisible);
-                tickLine.setTickMarkVisible(ticksVisible);
-                tickLine.setMinorTickVisible(ticksVisible);
-            }
-        } 
-        else  {
-            getChildren().clear();
-            getChildren().addAll(track, thumb);
-//            tickLine = null;
-        }
-
-        getSkinnable().requestLayout();
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        Slider slider = getSkinnable();
-        if ("ORIENTATION".equals(p)) {
-            if (showTickMarks && tickLine != null) {
-                tickLine.setSide(slider.getOrientation() == Orientation.VERTICAL ? Side.RIGHT : (slider.getOrientation() == null) ? Side.RIGHT: Side.BOTTOM);
-            }
-            getSkinnable().requestLayout();
-        } else if ("VALUE".equals(p)) {
-            // only animate thumb if the track was clicked - not if the thumb is dragged
-            positionThumb(trackClicked);
-        } else if ("MIN".equals(p) ) {
-            if (showTickMarks && tickLine != null) {
-                tickLine.setLowerBound(slider.getMin());
-            }
-            getSkinnable().requestLayout();
-        } else if ("MAX".equals(p)) {
-            if (showTickMarks && tickLine != null) {
-                tickLine.setUpperBound(slider.getMax());
-            }
-            getSkinnable().requestLayout();
-        } else if ("SHOW_TICK_MARKS".equals(p) || "SHOW_TICK_LABELS".equals(p)) {
-            setShowTickMarks(slider.isShowTickMarks(), slider.isShowTickLabels());
-        }  else if ("MAJOR_TICK_UNIT".equals(p)) {
-            if (tickLine != null) {
-                tickLine.setTickUnit(slider.getMajorTickUnit());
-                getSkinnable().requestLayout();
-            }
-        } else if ("MINOR_TICK_COUNT".equals(p)) {
-            if (tickLine != null) {
-                tickLine.setMinorTickCount(Math.max(slider.getMinorTickCount(),0) + 1);
-                getSkinnable().requestLayout();
-            }
-        } else if ("TICK_LABEL_FORMATTER".equals(p)) {
-            if (tickLine != null) {
-                if (slider.getLabelFormatter() == null) {
-                    tickLine.setTickLabelFormatter(null);
-                } else {
-                    tickLine.setTickLabelFormatter(stringConverterWrapper);
-                    tickLine.requestAxisLayout();
-                }
-            }
-        }
-    }
-
-    /**
-     * Called when ever either min, max or value changes, so thumb's layoutX, Y is recomputed.
-     */
-    void positionThumb(final boolean animate) {
-        Slider s = getSkinnable();
-        if (s.getValue() > s.getMax()) return;// this can happen if we are bound to something 
-        boolean horizontal = s.getOrientation() == Orientation.HORIZONTAL;
-        final double endX = (horizontal) ? trackStart + (((trackLength * ((s.getValue() - s.getMin()) /
-                (s.getMax() - s.getMin()))) - thumbWidth/2)) : thumbLeft;
-        final double endY = (horizontal) ? thumbTop :
-            snappedTopInset() + trackLength - (trackLength * ((s.getValue() - s.getMin()) /
-                (s.getMax() - s.getMin()))); //  - thumbHeight/2
-        
-        if (animate) {
-            // lets animate the thumb transition
-            final double startX = thumb.getLayoutX();
-            final double startY = thumb.getLayoutY();
-            Transition transition = new Transition() {
-                {
-                    setCycleDuration(Duration.millis(200));
-                }
-
-                @Override protected void interpolate(double frac) {
-                    if (!Double.isNaN(startX)) {
-                        thumb.setLayoutX(startX + frac * (endX - startX));
-                    }
-                    if (!Double.isNaN(startY)) {
-                        thumb.setLayoutY(startY + frac * (endY - startY));
-                    }
-                }
-            };
-            transition.play();
-        } else {
-            thumb.setLayoutX(endX);
-            thumb.setLayoutY(endY);
-        }
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-         // calculate the available space
-        // resize thumb to preferred size
-        thumbWidth = snapSize(thumb.prefWidth(-1));
-        thumbHeight = snapSize(thumb.prefHeight(-1));
-        thumb.resize(thumbWidth, thumbHeight);
-        // we are assuming the is common radius's for all corners on the track
-        double trackRadius = track.getBackground() == null ? 0 : track.getBackground().getFills().size() > 0 ?
-                track.getBackground().getFills().get(0).getRadii().getTopLeftHorizontalRadius() : 0;
-
-        if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
-            double tickLineHeight =  (showTickMarks) ? tickLine.prefHeight(-1) : 0;
-            double trackHeight = snapSize(track.prefHeight(-1));
-            double trackAreaHeight = Math.max(trackHeight,thumbHeight);
-            double totalHeightNeeded = trackAreaHeight  + ((showTickMarks) ? trackToTickGap+tickLineHeight : 0);
-            double startY = y + ((h - totalHeightNeeded)/2); // center slider in available height vertically
-            trackLength = snapSize(w - thumbWidth);
-            trackStart = snapPosition(x + (thumbWidth/2));
-            double trackTop = (int)(startY + ((trackAreaHeight-trackHeight)/2));
-            thumbTop = (int)(startY + ((trackAreaHeight-thumbHeight)/2));
-
-            positionThumb(false);
-            // layout track
-            track.resizeRelocate((int)(trackStart - trackRadius),
-                                 trackTop ,
-                                 (int)(trackLength + trackRadius + trackRadius),
-                                 trackHeight);
-            // layout tick line
-            if (showTickMarks) {
-                tickLine.setLayoutX(trackStart);
-                tickLine.setLayoutY(trackTop+trackHeight+trackToTickGap);
-                tickLine.resize(trackLength, tickLineHeight);
-                tickLine.requestAxisLayout();
-            } else {
-                if (tickLine != null) {
-                    tickLine.resize(0,0);
-                    tickLine.requestAxisLayout();
-                }
-                tickLine = null;
-            }
-        } else {
-            double tickLineWidth = (showTickMarks) ? tickLine.prefWidth(-1) : 0;
-            double trackWidth = snapSize(track.prefWidth(-1));
-            double trackAreaWidth = Math.max(trackWidth,thumbWidth);
-            double totalWidthNeeded = trackAreaWidth  + ((showTickMarks) ? trackToTickGap+tickLineWidth : 0) ;
-            double startX = x + ((w - totalWidthNeeded)/2); // center slider in available width horizontally
-            trackLength = snapSize(h - thumbHeight);
-            trackStart = snapPosition(y + (thumbHeight/2));
-            double trackLeft = (int)(startX + ((trackAreaWidth-trackWidth)/2));
-            thumbLeft = (int)(startX + ((trackAreaWidth-thumbWidth)/2));
-
-            positionThumb(false);
-            // layout track
-            track.resizeRelocate(trackLeft,
-                                 (int)(trackStart - trackRadius),
-                                 trackWidth,
-                                 (int)(trackLength + trackRadius + trackRadius));
-            // layout tick line
-            if (showTickMarks) {
-                tickLine.setLayoutX(trackLeft+trackWidth+trackToTickGap);
-                tickLine.setLayoutY(trackStart);
-                tickLine.resize(tickLineWidth, trackLength);
-                tickLine.requestAxisLayout();
-            } else {
-                if (tickLine != null) {
-                    tickLine.resize(0,0);
-                    tickLine.requestAxisLayout();
-                }
-                tickLine = null;
-            }
-        }
-    }
-
-    double minTrackLength() {
-        return 2*thumb.prefWidth(-1);
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Slider s = getSkinnable();
-        if (s.getOrientation() == Orientation.HORIZONTAL) {
-            return (leftInset + minTrackLength() + thumb.minWidth(-1) + rightInset);
-        } else {
-            return(leftInset + thumb.prefWidth(-1) + rightInset);
-        }
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Slider s = getSkinnable();
-        if (s.getOrientation() == Orientation.HORIZONTAL) {
-            double axisHeight = showTickMarks ? (tickLine.prefHeight(-1) + trackToTickGap) : 0;
-            return topInset + thumb.prefHeight(-1) + axisHeight + bottomInset;
-        } else {
-            return topInset + minTrackLength() + thumb.prefHeight(-1) + bottomInset;
-        }
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Slider s = getSkinnable();
-        if (s.getOrientation() == Orientation.HORIZONTAL) {
-            if(showTickMarks) {
-                return Math.max(140, tickLine.prefWidth(-1));
-            } else {
-                return 140;
-            }
-        } else {
-            double axisWidth = showTickMarks ? (tickLine.prefWidth(-1) + trackToTickGap) : 0;
-            return leftInset + Math.max(thumb.prefWidth(-1), track.prefWidth(-1)) + axisWidth + rightInset;
-        }
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final Slider s = getSkinnable();
-        if (s.getOrientation() == Orientation.HORIZONTAL) {
-            return topInset + Math.max(thumb.prefHeight(-1), track.prefHeight(-1)) +
-             ((showTickMarks) ? (trackToTickGap+tickLine.prefHeight(-1)) : 0)  + bottomInset;
-        } else {
-            if(showTickMarks) {
-                return Math.max(140, tickLine.prefHeight(-1));
-            } else {
-                return 140;
-            }
-        }
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
-            return Double.MAX_VALUE;
-        } else {
-            return getSkinnable().prefWidth(-1);
-        }
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
-            return getSkinnable().prefHeight(width);
-        } else {
-            return Double.MAX_VALUE;
-        }
-    }
-}
-
--- /dev/null	2015-09-03 15:21:38.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/SliderSkin.java	2015-09-03 15:21:36.599155800 -0700
@@ -0,0 +1,474 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.animation.Transition;
+import javafx.geometry.Orientation;
+import javafx.geometry.Point2D;
+import javafx.geometry.Side;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.Slider;
+import javafx.scene.layout.StackPane;
+import javafx.util.Duration;
+import javafx.util.StringConverter;
+
+import com.sun.javafx.scene.control.behavior.SliderBehavior;
+
+/**
+ * Default skin implementation for the {@link Slider} control.
+ *
+ * @see Slider
+ * @since 9
+ */
+public class SliderSkin extends SkinBase<Slider> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /** Track if slider is vertical/horizontal and cause re layout */
+//    private boolean horizontal;
+    private NumberAxis tickLine = null;
+    private double trackToTickGap = 2;
+
+    private boolean showTickMarks;
+    private double thumbWidth;
+    private double thumbHeight;
+
+    private double trackStart;
+    private double trackLength;
+    private double thumbTop;
+    private double thumbLeft;
+    private double preDragThumbPos;
+    private Point2D dragStart; // in skin coordinates
+
+    private StackPane thumb;
+    private StackPane track;
+    private boolean trackClicked = false;
+//    private double visibleAmount = 16;
+
+    private final SliderBehavior behavior;
+
+    StringConverter<Number> stringConverterWrapper = new StringConverter<Number>() {
+        Slider slider = getSkinnable();
+        @Override public String toString(Number object) {
+            return(object != null) ? slider.getLabelFormatter().toString(object.doubleValue()) : "";
+        }
+        @Override public Number fromString(String string) {
+            return slider.getLabelFormatter().fromString(string);
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new SliderSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public SliderSkin(Slider control) {
+        super(control);
+
+        behavior = new SliderBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        initialize();
+        control.requestLayout();
+        registerChangeListener(control.minProperty(), e -> {
+            if (showTickMarks && tickLine != null) {
+                tickLine.setLowerBound(control.getMin());
+            }
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.maxProperty(), e -> {
+            if (showTickMarks && tickLine != null) {
+                tickLine.setUpperBound(control.getMax());
+            }
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.valueProperty(), e -> {
+            // only animate thumb if the track was clicked - not if the thumb is dragged
+            positionThumb(trackClicked);
+        });
+        registerChangeListener(control.orientationProperty(), e -> {
+            if (showTickMarks && tickLine != null) {
+                tickLine.setSide(control.getOrientation() == Orientation.VERTICAL ? Side.RIGHT : (control.getOrientation() == null) ? Side.RIGHT: Side.BOTTOM);
+            }
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.showTickMarksProperty(), e -> setShowTickMarks(control.isShowTickMarks(), control.isShowTickLabels()));
+        registerChangeListener(control.showTickLabelsProperty(), e -> setShowTickMarks(control.isShowTickMarks(), control.isShowTickLabels()));
+        registerChangeListener(control.majorTickUnitProperty(), e -> {
+            if (tickLine != null) {
+                tickLine.setTickUnit(control.getMajorTickUnit());
+                getSkinnable().requestLayout();
+            }
+        });
+        registerChangeListener(control.minorTickCountProperty(), e -> {
+            if (tickLine != null) {
+                tickLine.setMinorTickCount(Math.max(control.getMinorTickCount(), 0) + 1);
+                getSkinnable().requestLayout();
+            }
+        });
+        registerChangeListener(control.labelFormatterProperty(), e -> {
+            if (tickLine != null) {
+                if (control.getLabelFormatter() == null) {
+                    tickLine.setTickLabelFormatter(null);
+                } else {
+                    tickLine.setTickLabelFormatter(stringConverterWrapper);
+                    tickLine.requestAxisLayout();
+                }
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        // calculate the available space
+        // resize thumb to preferred size
+        thumbWidth = snapSize(thumb.prefWidth(-1));
+        thumbHeight = snapSize(thumb.prefHeight(-1));
+        thumb.resize(thumbWidth, thumbHeight);
+        // we are assuming the is common radius's for all corners on the track
+        double trackRadius = track.getBackground() == null ? 0 : track.getBackground().getFills().size() > 0 ?
+                track.getBackground().getFills().get(0).getRadii().getTopLeftHorizontalRadius() : 0;
+
+        if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
+            double tickLineHeight =  (showTickMarks) ? tickLine.prefHeight(-1) : 0;
+            double trackHeight = snapSize(track.prefHeight(-1));
+            double trackAreaHeight = Math.max(trackHeight,thumbHeight);
+            double totalHeightNeeded = trackAreaHeight  + ((showTickMarks) ? trackToTickGap+tickLineHeight : 0);
+            double startY = y + ((h - totalHeightNeeded)/2); // center slider in available height vertically
+            trackLength = snapSize(w - thumbWidth);
+            trackStart = snapPosition(x + (thumbWidth/2));
+            double trackTop = (int)(startY + ((trackAreaHeight-trackHeight)/2));
+            thumbTop = (int)(startY + ((trackAreaHeight-thumbHeight)/2));
+
+            positionThumb(false);
+            // layout track
+            track.resizeRelocate((int)(trackStart - trackRadius),
+                    trackTop ,
+                    (int)(trackLength + trackRadius + trackRadius),
+                    trackHeight);
+            // layout tick line
+            if (showTickMarks) {
+                tickLine.setLayoutX(trackStart);
+                tickLine.setLayoutY(trackTop+trackHeight+trackToTickGap);
+                tickLine.resize(trackLength, tickLineHeight);
+                tickLine.requestAxisLayout();
+            } else {
+                if (tickLine != null) {
+                    tickLine.resize(0,0);
+                    tickLine.requestAxisLayout();
+                }
+                tickLine = null;
+            }
+        } else {
+            double tickLineWidth = (showTickMarks) ? tickLine.prefWidth(-1) : 0;
+            double trackWidth = snapSize(track.prefWidth(-1));
+            double trackAreaWidth = Math.max(trackWidth,thumbWidth);
+            double totalWidthNeeded = trackAreaWidth  + ((showTickMarks) ? trackToTickGap+tickLineWidth : 0) ;
+            double startX = x + ((w - totalWidthNeeded)/2); // center slider in available width horizontally
+            trackLength = snapSize(h - thumbHeight);
+            trackStart = snapPosition(y + (thumbHeight/2));
+            double trackLeft = (int)(startX + ((trackAreaWidth-trackWidth)/2));
+            thumbLeft = (int)(startX + ((trackAreaWidth-thumbWidth)/2));
+
+            positionThumb(false);
+            // layout track
+            track.resizeRelocate(trackLeft,
+                    (int)(trackStart - trackRadius),
+                    trackWidth,
+                    (int)(trackLength + trackRadius + trackRadius));
+            // layout tick line
+            if (showTickMarks) {
+                tickLine.setLayoutX(trackLeft+trackWidth+trackToTickGap);
+                tickLine.setLayoutY(trackStart);
+                tickLine.resize(tickLineWidth, trackLength);
+                tickLine.requestAxisLayout();
+            } else {
+                if (tickLine != null) {
+                    tickLine.resize(0,0);
+                    tickLine.requestAxisLayout();
+                }
+                tickLine = null;
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Slider s = getSkinnable();
+        if (s.getOrientation() == Orientation.HORIZONTAL) {
+            return (leftInset + minTrackLength() + thumb.minWidth(-1) + rightInset);
+        } else {
+            return(leftInset + thumb.prefWidth(-1) + rightInset);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Slider s = getSkinnable();
+        if (s.getOrientation() == Orientation.HORIZONTAL) {
+            double axisHeight = showTickMarks ? (tickLine.prefHeight(-1) + trackToTickGap) : 0;
+            return topInset + thumb.prefHeight(-1) + axisHeight + bottomInset;
+        } else {
+            return topInset + minTrackLength() + thumb.prefHeight(-1) + bottomInset;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Slider s = getSkinnable();
+        if (s.getOrientation() == Orientation.HORIZONTAL) {
+            if(showTickMarks) {
+                return Math.max(140, tickLine.prefWidth(-1));
+            } else {
+                return 140;
+            }
+        } else {
+            double axisWidth = showTickMarks ? (tickLine.prefWidth(-1) + trackToTickGap) : 0;
+            return leftInset + Math.max(thumb.prefWidth(-1), track.prefWidth(-1)) + axisWidth + rightInset;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final Slider s = getSkinnable();
+        if (s.getOrientation() == Orientation.HORIZONTAL) {
+            return topInset + Math.max(thumb.prefHeight(-1), track.prefHeight(-1)) +
+                    ((showTickMarks) ? (trackToTickGap+tickLine.prefHeight(-1)) : 0)  + bottomInset;
+        } else {
+            if(showTickMarks) {
+                return Math.max(140, tickLine.prefHeight(-1));
+            } else {
+                return 140;
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
+            return Double.MAX_VALUE;
+        } else {
+            return getSkinnable().prefWidth(-1);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
+            return getSkinnable().prefHeight(width);
+        } else {
+            return Double.MAX_VALUE;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void initialize() {
+        thumb = new StackPane() {
+            @Override
+            public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+                switch (attribute) {
+                    case VALUE: return getSkinnable().getValue();
+                    default: return super.queryAccessibleAttribute(attribute, parameters);
+                }
+            }
+        };
+        thumb.getStyleClass().setAll("thumb");
+        thumb.setAccessibleRole(AccessibleRole.THUMB);
+        track = new StackPane();
+        track.getStyleClass().setAll("track");
+//        horizontal = getSkinnable().isVertical();
+
+        getChildren().clear();
+        getChildren().addAll(track, thumb);
+        setShowTickMarks(getSkinnable().isShowTickMarks(), getSkinnable().isShowTickLabels());
+        track.setOnMousePressed(me -> {
+            if (!thumb.isPressed()) {
+                trackClicked = true;
+                if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
+                    behavior.trackPress(me, (me.getX() / trackLength));
+                } else {
+                    behavior.trackPress(me, (me.getY() / trackLength));
+                }
+                trackClicked = false;
+            }
+        });
+        
+        track.setOnMouseDragged(me -> {
+            if (!thumb.isPressed()) {
+                if (getSkinnable().getOrientation() == Orientation.HORIZONTAL) {
+                    behavior.trackPress(me, (me.getX() / trackLength));
+                } else {
+                    behavior.trackPress(me, (me.getY() / trackLength));
+                }
+            }
+        });
+
+        thumb.setOnMousePressed(me -> {
+            behavior.thumbPressed(me, 0.0f);
+            dragStart = thumb.localToParent(me.getX(), me.getY());
+            preDragThumbPos = (getSkinnable().getValue() - getSkinnable().getMin()) /
+                    (getSkinnable().getMax() - getSkinnable().getMin());
+        });
+
+        thumb.setOnMouseReleased(me -> {
+            behavior.thumbReleased(me);
+        });
+
+        thumb.setOnMouseDragged(me -> {
+            Point2D cur = thumb.localToParent(me.getX(), me.getY());
+            double dragPos = (getSkinnable().getOrientation() == Orientation.HORIZONTAL) ?
+                    cur.getX() - dragStart.getX() : -(cur.getY() - dragStart.getY());
+            behavior.thumbDragged(me, preDragThumbPos + dragPos / trackLength);
+        });
+    }
+
+    private void setShowTickMarks(boolean ticksVisible, boolean labelsVisible) {
+        showTickMarks = (ticksVisible || labelsVisible);
+        Slider slider = getSkinnable();
+        if (showTickMarks) {
+            if (tickLine == null) {
+                tickLine = new NumberAxis();
+                tickLine.setAutoRanging(false);
+                tickLine.setSide(slider.getOrientation() == Orientation.VERTICAL ? Side.RIGHT : (slider.getOrientation() == null) ? Side.RIGHT: Side.BOTTOM);
+                tickLine.setUpperBound(slider.getMax());
+                tickLine.setLowerBound(slider.getMin());
+                tickLine.setTickUnit(slider.getMajorTickUnit());
+                tickLine.setTickMarkVisible(ticksVisible);
+                tickLine.setTickLabelsVisible(labelsVisible);
+                tickLine.setMinorTickVisible(ticksVisible);
+                // add 1 to the slider minor tick count since the axis draws one
+                // less minor ticks than the number given.
+                tickLine.setMinorTickCount(Math.max(slider.getMinorTickCount(),0) + 1);
+                if (slider.getLabelFormatter() != null) {
+                    tickLine.setTickLabelFormatter(stringConverterWrapper);
+                }
+                getChildren().clear();
+                getChildren().addAll(tickLine, track, thumb);
+            } else {
+                tickLine.setTickLabelsVisible(labelsVisible);
+                tickLine.setTickMarkVisible(ticksVisible);
+                tickLine.setMinorTickVisible(ticksVisible);
+            }
+        } 
+        else  {
+            getChildren().clear();
+            getChildren().addAll(track, thumb);
+//            tickLine = null;
+        }
+
+        getSkinnable().requestLayout();
+    }
+
+    /**
+     * Called when ever either min, max or value changes, so thumb's layoutX, Y is recomputed.
+     */
+    void positionThumb(final boolean animate) {
+        Slider s = getSkinnable();
+        if (s.getValue() > s.getMax()) return;// this can happen if we are bound to something 
+        boolean horizontal = s.getOrientation() == Orientation.HORIZONTAL;
+        final double endX = (horizontal) ? trackStart + (((trackLength * ((s.getValue() - s.getMin()) /
+                (s.getMax() - s.getMin()))) - thumbWidth/2)) : thumbLeft;
+        final double endY = (horizontal) ? thumbTop :
+            snappedTopInset() + trackLength - (trackLength * ((s.getValue() - s.getMin()) /
+                (s.getMax() - s.getMin()))); //  - thumbHeight/2
+        
+        if (animate) {
+            // lets animate the thumb transition
+            final double startX = thumb.getLayoutX();
+            final double startY = thumb.getLayoutY();
+            Transition transition = new Transition() {
+                {
+                    setCycleDuration(Duration.millis(200));
+                }
+
+                @Override protected void interpolate(double frac) {
+                    if (!Double.isNaN(startX)) {
+                        thumb.setLayoutX(startX + frac * (endX - startX));
+                    }
+                    if (!Double.isNaN(startY)) {
+                        thumb.setLayoutY(startY + frac * (endY - startY));
+                    }
+                }
+            };
+            transition.play();
+        } else {
+            thumb.setLayoutX(endX);
+            thumb.setLayoutY(endY);
+        }
+    }
+
+    double minTrackLength() {
+        return 2*thumb.prefWidth(-1);
+    }
+}
+
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SpinnerSkin.java	2015-09-03 15:21:45.393658800 -0700
+++ /dev/null	2015-09-03 15:21:46.000000000 -0700
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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 com.sun.javafx.scene.control.behavior.SpinnerBehavior;
-import com.sun.javafx.scene.traversal.Algorithm;
-import com.sun.javafx.scene.traversal.Direction;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import com.sun.javafx.scene.traversal.TraversalContext;
-import javafx.collections.ListChangeListener;
-import javafx.css.PseudoClass;
-import javafx.geometry.HPos;
-import javafx.geometry.VPos;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.control.Spinner;
-import javafx.scene.control.TextField;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-
-import java.util.List;
-
-public class SpinnerSkin<T> extends BehaviorSkinBase<Spinner<T>, SpinnerBehavior<T>> {
-
-    private TextField textField;
-
-    private Region incrementArrow;
-    private StackPane incrementArrowButton;
-
-    private Region decrementArrow;
-    private StackPane decrementArrowButton;
-
-    // rather than create an private enum, lets just use an int, here's the important details:
-    private static final int ARROWS_ON_RIGHT_VERTICAL   = 0;
-    private static final int ARROWS_ON_LEFT_VERTICAL    = 1;
-    private static final int ARROWS_ON_RIGHT_HORIZONTAL = 2;
-    private static final int ARROWS_ON_LEFT_HORIZONTAL  = 3;
-    private static final int SPLIT_ARROWS_VERTICAL      = 4;
-    private static final int SPLIT_ARROWS_HORIZONTAL    = 5;
-
-    private int layoutMode = 0;
-
-    public SpinnerSkin(Spinner<T> spinner) {
-        super(spinner, new SpinnerBehavior<T>(spinner));
-
-        textField = spinner.getEditor();
-        getChildren().add(textField);
-
-        updateStyleClass();
-        spinner.getStyleClass().addListener((ListChangeListener<String>) c -> updateStyleClass());
-
-        // increment / decrement arrows
-        incrementArrow = new Region();
-        incrementArrow.setFocusTraversable(false);
-        incrementArrow.getStyleClass().setAll("increment-arrow");
-        incrementArrow.setMaxWidth(Region.USE_PREF_SIZE);
-        incrementArrow.setMaxHeight(Region.USE_PREF_SIZE);
-        incrementArrow.setMouseTransparent(true);
-
-        incrementArrowButton = new StackPane() {
-            public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-                switch (action) {
-                    case FIRE: getSkinnable().increment();
-                    default: super.executeAccessibleAction(action, parameters);
-                }
-            }
-        };
-        incrementArrowButton.setAccessibleRole(AccessibleRole.INCREMENT_BUTTON);
-        incrementArrowButton.setFocusTraversable(false);
-        incrementArrowButton.getStyleClass().setAll("increment-arrow-button");
-        incrementArrowButton.getChildren().add(incrementArrow);
-        incrementArrowButton.setOnMousePressed(e -> {
-            getSkinnable().requestFocus();
-            getBehavior().startSpinning(true);
-        });
-        incrementArrowButton.setOnMouseReleased(e -> getBehavior().stopSpinning());
-
-        decrementArrow = new Region();
-        decrementArrow.setFocusTraversable(false);
-        decrementArrow.getStyleClass().setAll("decrement-arrow");
-        decrementArrow.setMaxWidth(Region.USE_PREF_SIZE);
-        decrementArrow.setMaxHeight(Region.USE_PREF_SIZE);
-        decrementArrow.setMouseTransparent(true);
-
-        decrementArrowButton = new StackPane() {
-            public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-                switch (action) {
-                    case FIRE: getSkinnable().decrement();
-                    default: super.executeAccessibleAction(action, parameters);
-                }
-            }
-        };
-        decrementArrowButton.setAccessibleRole(AccessibleRole.DECREMENT_BUTTON);
-        decrementArrowButton.setFocusTraversable(false);
-        decrementArrowButton.getStyleClass().setAll("decrement-arrow-button");
-        decrementArrowButton.getChildren().add(decrementArrow);
-        decrementArrowButton.setOnMousePressed(e -> {
-            getSkinnable().requestFocus();
-            getBehavior().startSpinning(false);
-        });
-        decrementArrowButton.setOnMouseReleased(e -> getBehavior().stopSpinning());
-
-        getChildren().addAll(incrementArrowButton, decrementArrowButton);
-
-        // Fixes in the same vein as ComboBoxListViewSkin
-
-        // move fake focus in to the textfield if the spinner is editable
-        spinner.focusedProperty().addListener((ov, t, hasFocus) -> {
-            // Fix for the regression noted in a comment in RT-29885.
-            ((ComboBoxListViewSkin.FakeFocusTextField)textField).setFakeFocus(hasFocus);
-        });
-
-        spinner.addEventFilter(KeyEvent.ANY, ke -> {
-            if (spinner.isEditable()) {
-                // This prevents a stack overflow from our rebroadcasting of the
-                // event to the textfield that occurs in the final else statement
-                // of the conditions below.
-                if (ke.getTarget().equals(textField)) return;
-
-                // Fix for RT-38527 which led to a stack overflow
-                if (ke.getCode() == KeyCode.ESCAPE) return;
-
-                // Fix for the regression noted in a comment in RT-29885.
-                // This forwards the event down into the TextField when
-                // the key event is actually received by the Spinner.
-                textField.fireEvent(ke.copyFor(textField, textField));
-                ke.consume();
-            }
-        });
-
-        // This event filter is to enable keyboard events being delivered to the
-        // spinner when the user has mouse clicked into the TextField area of the
-        // Spinner control. Without this the up/down/left/right arrow keys don't
-        // work when you click inside the TextField area (but they do in the case
-        // of tabbing in).
-        textField.addEventFilter(KeyEvent.ANY, ke -> {
-            if (! spinner.isEditable()) {
-                spinner.fireEvent(ke.copyFor(spinner, spinner));
-                ke.consume();
-            }
-        });
-
-        textField.focusedProperty().addListener((ov, t, hasFocus) -> {
-            // Fix for RT-29885
-            spinner.getProperties().put("FOCUSED", hasFocus);
-            // --- end of RT-29885
-
-            // RT-21454 starts here
-            if (! hasFocus) {
-                pseudoClassStateChanged(CONTAINS_FOCUS_PSEUDOCLASS_STATE, false);
-            } else {
-                pseudoClassStateChanged(CONTAINS_FOCUS_PSEUDOCLASS_STATE, true);
-            }
-            // --- end of RT-21454
-        });
-
-        // end of comboBox-esque fixes
-
-        textField.focusTraversableProperty().bind(spinner.editableProperty());
-
-
-        // Following code borrowed from ComboBoxPopupControl, to resolve the
-        // issue initially identified in RT-36902, but specifically (for Spinner)
-        // identified in RT-40625
-        spinner.setImpl_traversalEngine(new ParentTraversalEngine(spinner, new Algorithm() {
-            @Override public Node select(Node owner, Direction dir, TraversalContext context) {
-                return null;
-            }
-
-            @Override public Node selectFirst(TraversalContext context) {
-                return null;
-            }
-
-            @Override public Node selectLast(TraversalContext context) {
-                return null;
-            }
-        }));
-    }
-
-    private void updateStyleClass() {
-        final List<String> styleClass = getSkinnable().getStyleClass();
-
-        if (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_LEFT_VERTICAL)) {
-            layoutMode = ARROWS_ON_LEFT_VERTICAL;
-        } else if (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_LEFT_HORIZONTAL)) {
-            layoutMode = ARROWS_ON_LEFT_HORIZONTAL;
-        } else if (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_RIGHT_HORIZONTAL)) {
-            layoutMode = ARROWS_ON_RIGHT_HORIZONTAL;
-        } else if (styleClass.contains(Spinner.STYLE_CLASS_SPLIT_ARROWS_VERTICAL)) {
-            layoutMode = SPLIT_ARROWS_VERTICAL;
-        } else if (styleClass.contains(Spinner.STYLE_CLASS_SPLIT_ARROWS_HORIZONTAL)) {
-            layoutMode = SPLIT_ARROWS_HORIZONTAL;
-        } else {
-            layoutMode = ARROWS_ON_RIGHT_VERTICAL;
-        }
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-                                            final double w, final double h) {
-
-        final double incrementArrowButtonWidth = incrementArrowButton.snappedLeftInset() +
-                snapSize(incrementArrow.prefWidth(-1)) + incrementArrowButton.snappedRightInset();
-
-        final double decrementArrowButtonWidth = decrementArrowButton.snappedLeftInset() +
-                snapSize(decrementArrow.prefWidth(-1)) + decrementArrowButton.snappedRightInset();
-
-        final double widestArrowButton = Math.max(incrementArrowButtonWidth, decrementArrowButtonWidth);
-
-        // we need to decide on our layout approach, and this depends on
-        // the presence of style classes in the Spinner styleClass list.
-        // To be a bit more efficient, we observe the list for changes, so
-        // here in layoutChildren we can just react to a few booleans.
-        if (layoutMode == ARROWS_ON_RIGHT_VERTICAL || layoutMode == ARROWS_ON_LEFT_VERTICAL) {
-            final double textFieldStartX = layoutMode == ARROWS_ON_RIGHT_VERTICAL ? x : x + widestArrowButton;
-            final double buttonStartX = layoutMode == ARROWS_ON_RIGHT_VERTICAL ? x + w - widestArrowButton : x;
-            final double halfHeight = Math.floor(h / 2.0);
-
-            textField.resizeRelocate(textFieldStartX, y, w - widestArrowButton, h);
-
-            incrementArrowButton.resize(widestArrowButton, halfHeight);
-            positionInArea(incrementArrowButton, buttonStartX, y,
-                    widestArrowButton, halfHeight, 0, HPos.CENTER, VPos.CENTER);
-
-            decrementArrowButton.resize(widestArrowButton, halfHeight);
-            positionInArea(decrementArrowButton, buttonStartX, y + halfHeight,
-                    widestArrowButton, h - halfHeight, 0, HPos.CENTER, VPos.BOTTOM);
-        } else if (layoutMode == ARROWS_ON_RIGHT_HORIZONTAL || layoutMode == ARROWS_ON_LEFT_HORIZONTAL) {
-            final double totalButtonWidth = incrementArrowButtonWidth + decrementArrowButtonWidth;
-            final double textFieldStartX = layoutMode == ARROWS_ON_RIGHT_HORIZONTAL ? x : x + totalButtonWidth;
-            final double buttonStartX = layoutMode == ARROWS_ON_RIGHT_HORIZONTAL ? x + w - totalButtonWidth : x;
-
-            textField.resizeRelocate(textFieldStartX, y, w - totalButtonWidth, h);
-
-            // decrement is always on the left
-            decrementArrowButton.resize(decrementArrowButtonWidth, h);
-            positionInArea(decrementArrowButton, buttonStartX, y,
-                    decrementArrowButtonWidth, h, 0, HPos.CENTER, VPos.CENTER);
-
-            // ... and increment is always on the right
-            incrementArrowButton.resize(incrementArrowButtonWidth, h);
-            positionInArea(incrementArrowButton, buttonStartX + decrementArrowButtonWidth, y,
-                    incrementArrowButtonWidth, h, 0, HPos.CENTER, VPos.CENTER);
-        } else if (layoutMode == SPLIT_ARROWS_VERTICAL) {
-            final double incrementArrowButtonHeight = incrementArrowButton.snappedTopInset() +
-                    snapSize(incrementArrow.prefHeight(-1)) + incrementArrowButton.snappedBottomInset();
-
-            final double decrementArrowButtonHeight = decrementArrowButton.snappedTopInset() +
-                    snapSize(decrementArrow.prefHeight(-1)) + decrementArrowButton.snappedBottomInset();
-
-            final double tallestArrowButton = Math.max(incrementArrowButtonHeight, decrementArrowButtonHeight);
-
-            // increment is at the top
-            incrementArrowButton.resize(w, tallestArrowButton);
-            positionInArea(incrementArrowButton, x, y,
-                    w, tallestArrowButton, 0, HPos.CENTER, VPos.CENTER);
-
-            // textfield in the middle
-            textField.resizeRelocate(x, y + tallestArrowButton, w, h - (2*tallestArrowButton));
-
-            // decrement is at the bottom
-            decrementArrowButton.resize(w, tallestArrowButton);
-            positionInArea(decrementArrowButton, x, h - tallestArrowButton,
-                    w, tallestArrowButton, 0, HPos.CENTER, VPos.CENTER);
-        } else if (layoutMode == SPLIT_ARROWS_HORIZONTAL) {
-            // decrement is on the left-hand side
-            decrementArrowButton.resize(widestArrowButton, h);
-            positionInArea(decrementArrowButton, x, y,
-                    widestArrowButton, h, 0, HPos.CENTER, VPos.CENTER);
-
-            // textfield in the middle
-            textField.resizeRelocate(x + widestArrowButton, y, w - (2*widestArrowButton), h);
-
-            // increment is on the right-hand side
-            incrementArrowButton.resize(widestArrowButton, h);
-            positionInArea(incrementArrowButton, w - widestArrowButton, y,
-                    widestArrowButton, h, 0, HPos.CENTER, VPos.CENTER);
-        }
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final double textfieldWidth = textField.prefWidth(height);
-        return leftInset + textfieldWidth + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double ph;
-        double textFieldHeight = textField.prefHeight(width);
-
-        if (layoutMode == SPLIT_ARROWS_VERTICAL) {
-            ph = topInset + incrementArrowButton.prefHeight(width) +
-                    textFieldHeight + decrementArrowButton.prefHeight(width) + bottomInset;
-        } else {
-            ph = topInset + textFieldHeight + bottomInset;
-        }
-
-        return ph;
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefWidth(height);
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-
-    // Overridden so that we use the textfield as the baseline, rather than the arrow.
-    // See RT-30754 for more information.
-    @Override protected double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        return textField.getLayoutBounds().getMinY() + textField.getLayoutY() + textField.getBaselineOffset();
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-
-    private static PseudoClass CONTAINS_FOCUS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("contains-focus");
-}
\ No newline at end of file
--- /dev/null	2015-09-03 15:21:46.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/SpinnerSkin.java	2015-09-03 15:21:44.548610500 -0700
@@ -0,0 +1,422 @@
+/*
+ * Copyright (c) 2014, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.traversal.Algorithm;
+import com.sun.javafx.scene.control.FakeFocusTextField;
+import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import com.sun.javafx.scene.control.behavior.SpinnerBehavior;
+import com.sun.javafx.scene.traversal.TraversalContext;
+import javafx.collections.ListChangeListener;
+import javafx.css.PseudoClass;
+import javafx.geometry.HPos;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.control.Spinner;
+import javafx.scene.control.TextField;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+
+import java.util.List;
+
+/**
+ * Default skin implementation for the {@link Spinner} control.
+ *
+ * @see Spinner
+ * @since 9
+ */
+public class SpinnerSkin<T> extends SkinBase<Spinner<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private TextField textField;
+
+    private Region incrementArrow;
+    private StackPane incrementArrowButton;
+
+    private Region decrementArrow;
+    private StackPane decrementArrowButton;
+
+    // rather than create an private enum, lets just use an int, here's the important details:
+    private static final int ARROWS_ON_RIGHT_VERTICAL   = 0;
+    private static final int ARROWS_ON_LEFT_VERTICAL    = 1;
+    private static final int ARROWS_ON_RIGHT_HORIZONTAL = 2;
+    private static final int ARROWS_ON_LEFT_HORIZONTAL  = 3;
+    private static final int SPLIT_ARROWS_VERTICAL      = 4;
+    private static final int SPLIT_ARROWS_HORIZONTAL    = 5;
+
+    private int layoutMode = 0;
+
+    private final SpinnerBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new SpinnerSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public SpinnerSkin(Spinner<T> control) {
+        super(control);
+
+        // install default input map for the Button control
+        behavior = new SpinnerBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        textField = control.getEditor();
+        getChildren().add(textField);
+
+        updateStyleClass();
+        control.getStyleClass().addListener((ListChangeListener<String>) c -> updateStyleClass());
+
+        // increment / decrement arrows
+        incrementArrow = new Region();
+        incrementArrow.setFocusTraversable(false);
+        incrementArrow.getStyleClass().setAll("increment-arrow");
+        incrementArrow.setMaxWidth(Region.USE_PREF_SIZE);
+        incrementArrow.setMaxHeight(Region.USE_PREF_SIZE);
+        incrementArrow.setMouseTransparent(true);
+
+        incrementArrowButton = new StackPane() {
+            public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+                switch (action) {
+                    case FIRE: getSkinnable().increment();
+                    default: super.executeAccessibleAction(action, parameters);
+                }
+            }
+        };
+        incrementArrowButton.setAccessibleRole(AccessibleRole.INCREMENT_BUTTON);
+        incrementArrowButton.setFocusTraversable(false);
+        incrementArrowButton.getStyleClass().setAll("increment-arrow-button");
+        incrementArrowButton.getChildren().add(incrementArrow);
+        incrementArrowButton.setOnMousePressed(e -> {
+            getSkinnable().requestFocus();
+            behavior.startSpinning(true);
+        });
+        incrementArrowButton.setOnMouseReleased(e -> behavior.stopSpinning());
+
+        decrementArrow = new Region();
+        decrementArrow.setFocusTraversable(false);
+        decrementArrow.getStyleClass().setAll("decrement-arrow");
+        decrementArrow.setMaxWidth(Region.USE_PREF_SIZE);
+        decrementArrow.setMaxHeight(Region.USE_PREF_SIZE);
+        decrementArrow.setMouseTransparent(true);
+
+        decrementArrowButton = new StackPane() {
+            public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+                switch (action) {
+                    case FIRE: getSkinnable().decrement();
+                    default: super.executeAccessibleAction(action, parameters);
+                }
+            }
+        };
+        decrementArrowButton.setAccessibleRole(AccessibleRole.DECREMENT_BUTTON);
+        decrementArrowButton.setFocusTraversable(false);
+        decrementArrowButton.getStyleClass().setAll("decrement-arrow-button");
+        decrementArrowButton.getChildren().add(decrementArrow);
+        decrementArrowButton.setOnMousePressed(e -> {
+            getSkinnable().requestFocus();
+            behavior.startSpinning(false);
+        });
+        decrementArrowButton.setOnMouseReleased(e -> behavior.stopSpinning());
+
+        getChildren().addAll(incrementArrowButton, decrementArrowButton);
+
+        // Fixes in the same vein as ComboBoxListViewSkin
+
+        // move fake focus in to the textfield if the spinner is editable
+        control.focusedProperty().addListener((ov, t, hasFocus) -> {
+            // Fix for the regression noted in a comment in RT-29885.
+            ((FakeFocusTextField)textField).setFakeFocus(hasFocus);
+        });
+
+        control.addEventFilter(KeyEvent.ANY, ke -> {
+            if (control.isEditable()) {
+                // This prevents a stack overflow from our rebroadcasting of the
+                // event to the textfield that occurs in the final else statement
+                // of the conditions below.
+                if (ke.getTarget().equals(textField)) return;
+
+                // Fix for RT-38527 which led to a stack overflow
+                if (ke.getCode() == KeyCode.ESCAPE) return;
+
+                // Fix for the regression noted in a comment in RT-29885.
+                // This forwards the event down into the TextField when
+                // the key event is actually received by the Spinner.
+                textField.fireEvent(ke.copyFor(textField, textField));
+                ke.consume();
+            }
+        });
+
+        // This event filter is to enable keyboard events being delivered to the
+        // spinner when the user has mouse clicked into the TextField area of the
+        // Spinner control. Without this the up/down/left/right arrow keys don't
+        // work when you click inside the TextField area (but they do in the case
+        // of tabbing in).
+        textField.addEventFilter(KeyEvent.ANY, ke -> {
+            if (! control.isEditable()) {
+                control.fireEvent(ke.copyFor(control, control));
+                ke.consume();
+            }
+        });
+
+        textField.focusedProperty().addListener((ov, t, hasFocus) -> {
+            // Fix for RT-29885
+            control.getProperties().put("FOCUSED", hasFocus);
+            // --- end of RT-29885
+
+            // RT-21454 starts here
+            if (! hasFocus) {
+                pseudoClassStateChanged(CONTAINS_FOCUS_PSEUDOCLASS_STATE, false);
+            } else {
+                pseudoClassStateChanged(CONTAINS_FOCUS_PSEUDOCLASS_STATE, true);
+            }
+            // --- end of RT-21454
+        });
+
+        // end of comboBox-esque fixes
+
+        textField.focusTraversableProperty().bind(control.editableProperty());
+
+
+        // Following code borrowed from ComboBoxPopupControl, to resolve the
+        // issue initially identified in RT-36902, but specifically (for Spinner)
+        // identified in RT-40625
+        control.setImpl_traversalEngine(new ParentTraversalEngine(control, new Algorithm() {
+            @Override public Node select(Node owner, Direction dir, TraversalContext context) {
+                return null;
+            }
+
+            @Override public Node selectFirst(TraversalContext context) {
+                return null;
+            }
+
+            @Override public Node selectLast(TraversalContext context) {
+                return null;
+            }
+        }));
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+
+        final double incrementArrowButtonWidth = incrementArrowButton.snappedLeftInset() +
+                snapSize(incrementArrow.prefWidth(-1)) + incrementArrowButton.snappedRightInset();
+
+        final double decrementArrowButtonWidth = decrementArrowButton.snappedLeftInset() +
+                snapSize(decrementArrow.prefWidth(-1)) + decrementArrowButton.snappedRightInset();
+
+        final double widestArrowButton = Math.max(incrementArrowButtonWidth, decrementArrowButtonWidth);
+
+        // we need to decide on our layout approach, and this depends on
+        // the presence of style classes in the Spinner styleClass list.
+        // To be a bit more efficient, we observe the list for changes, so
+        // here in layoutChildren we can just react to a few booleans.
+        if (layoutMode == ARROWS_ON_RIGHT_VERTICAL || layoutMode == ARROWS_ON_LEFT_VERTICAL) {
+            final double textFieldStartX = layoutMode == ARROWS_ON_RIGHT_VERTICAL ? x : x + widestArrowButton;
+            final double buttonStartX = layoutMode == ARROWS_ON_RIGHT_VERTICAL ? x + w - widestArrowButton : x;
+            final double halfHeight = Math.floor(h / 2.0);
+
+            textField.resizeRelocate(textFieldStartX, y, w - widestArrowButton, h);
+
+            incrementArrowButton.resize(widestArrowButton, halfHeight);
+            positionInArea(incrementArrowButton, buttonStartX, y,
+                    widestArrowButton, halfHeight, 0, HPos.CENTER, VPos.CENTER);
+
+            decrementArrowButton.resize(widestArrowButton, halfHeight);
+            positionInArea(decrementArrowButton, buttonStartX, y + halfHeight,
+                    widestArrowButton, h - halfHeight, 0, HPos.CENTER, VPos.BOTTOM);
+        } else if (layoutMode == ARROWS_ON_RIGHT_HORIZONTAL || layoutMode == ARROWS_ON_LEFT_HORIZONTAL) {
+            final double totalButtonWidth = incrementArrowButtonWidth + decrementArrowButtonWidth;
+            final double textFieldStartX = layoutMode == ARROWS_ON_RIGHT_HORIZONTAL ? x : x + totalButtonWidth;
+            final double buttonStartX = layoutMode == ARROWS_ON_RIGHT_HORIZONTAL ? x + w - totalButtonWidth : x;
+
+            textField.resizeRelocate(textFieldStartX, y, w - totalButtonWidth, h);
+
+            // decrement is always on the left
+            decrementArrowButton.resize(decrementArrowButtonWidth, h);
+            positionInArea(decrementArrowButton, buttonStartX, y,
+                    decrementArrowButtonWidth, h, 0, HPos.CENTER, VPos.CENTER);
+
+            // ... and increment is always on the right
+            incrementArrowButton.resize(incrementArrowButtonWidth, h);
+            positionInArea(incrementArrowButton, buttonStartX + decrementArrowButtonWidth, y,
+                    incrementArrowButtonWidth, h, 0, HPos.CENTER, VPos.CENTER);
+        } else if (layoutMode == SPLIT_ARROWS_VERTICAL) {
+            final double incrementArrowButtonHeight = incrementArrowButton.snappedTopInset() +
+                    snapSize(incrementArrow.prefHeight(-1)) + incrementArrowButton.snappedBottomInset();
+
+            final double decrementArrowButtonHeight = decrementArrowButton.snappedTopInset() +
+                    snapSize(decrementArrow.prefHeight(-1)) + decrementArrowButton.snappedBottomInset();
+
+            final double tallestArrowButton = Math.max(incrementArrowButtonHeight, decrementArrowButtonHeight);
+
+            // increment is at the top
+            incrementArrowButton.resize(w, tallestArrowButton);
+            positionInArea(incrementArrowButton, x, y,
+                    w, tallestArrowButton, 0, HPos.CENTER, VPos.CENTER);
+
+            // textfield in the middle
+            textField.resizeRelocate(x, y + tallestArrowButton, w, h - (2*tallestArrowButton));
+
+            // decrement is at the bottom
+            decrementArrowButton.resize(w, tallestArrowButton);
+            positionInArea(decrementArrowButton, x, h - tallestArrowButton,
+                    w, tallestArrowButton, 0, HPos.CENTER, VPos.CENTER);
+        } else if (layoutMode == SPLIT_ARROWS_HORIZONTAL) {
+            // decrement is on the left-hand side
+            decrementArrowButton.resize(widestArrowButton, h);
+            positionInArea(decrementArrowButton, x, y,
+                    widestArrowButton, h, 0, HPos.CENTER, VPos.CENTER);
+
+            // textfield in the middle
+            textField.resizeRelocate(x + widestArrowButton, y, w - (2*widestArrowButton), h);
+
+            // increment is on the right-hand side
+            incrementArrowButton.resize(widestArrowButton, h);
+            positionInArea(incrementArrowButton, w - widestArrowButton, y,
+                    widestArrowButton, h, 0, HPos.CENTER, VPos.CENTER);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final double textfieldWidth = textField.prefWidth(height);
+        return leftInset + textfieldWidth + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double ph;
+        double textFieldHeight = textField.prefHeight(width);
+
+        if (layoutMode == SPLIT_ARROWS_VERTICAL) {
+            ph = topInset + incrementArrowButton.prefHeight(width) +
+                    textFieldHeight + decrementArrowButton.prefHeight(width) + bottomInset;
+        } else {
+            ph = topInset + textFieldHeight + bottomInset;
+        }
+
+        return ph;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefWidth(height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    // Overridden so that we use the textfield as the baseline, rather than the arrow.
+    // See RT-30754 for more information.
+    /** {@inheritDoc} */
+    @Override protected double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        return textField.getLayoutBounds().getMinY() + textField.getLayoutY() + textField.getBaselineOffset();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void updateStyleClass() {
+        final List<String> styleClass = getSkinnable().getStyleClass();
+
+        if (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_LEFT_VERTICAL)) {
+            layoutMode = ARROWS_ON_LEFT_VERTICAL;
+        } else if (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_LEFT_HORIZONTAL)) {
+            layoutMode = ARROWS_ON_LEFT_HORIZONTAL;
+        } else if (styleClass.contains(Spinner.STYLE_CLASS_ARROWS_ON_RIGHT_HORIZONTAL)) {
+            layoutMode = ARROWS_ON_RIGHT_HORIZONTAL;
+        } else if (styleClass.contains(Spinner.STYLE_CLASS_SPLIT_ARROWS_VERTICAL)) {
+            layoutMode = SPLIT_ARROWS_VERTICAL;
+        } else if (styleClass.contains(Spinner.STYLE_CLASS_SPLIT_ARROWS_HORIZONTAL)) {
+            layoutMode = SPLIT_ARROWS_HORIZONTAL;
+        } else {
+            layoutMode = ARROWS_ON_RIGHT_VERTICAL;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+    private static PseudoClass CONTAINS_FOCUS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("contains-focus");
+}
\ No newline at end of file
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SplitMenuButtonSkin.java	2015-09-03 15:21:53.730135700 -0700
+++ /dev/null	2015-09-03 15:21:54.000000000 -0700
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2010, 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.SplitMenuButton;
-import javafx.scene.input.MouseEvent;
-
-import com.sun.javafx.scene.control.behavior.SplitMenuButtonBehavior;
-
-/**
- * Skin for SplitMenuButton Control.
- */
-public class SplitMenuButtonSkin extends MenuButtonSkinBase<SplitMenuButton, SplitMenuButtonBehavior> {
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-    
-    /**
-     * Creates a new SplitMenuButtonSkin for the given SplitMenu.
-     * 
-     * @param splitMenuButton the SplitMenuButton
-     */
-    public SplitMenuButtonSkin(final SplitMenuButton splitMenuButton) {
-        super(splitMenuButton, new SplitMenuButtonBehavior(splitMenuButton));
-
-        /*
-         * The arrow button is the only thing that acts like a MenuButton on
-         * this control.
-         */
-        behaveLikeButton = true;
-        // TODO: do we need to consume all mouse events?
-        // they only bubble to the skin which consumes them by default
-        arrowButton.addEventHandler(MouseEvent.ANY, event -> {
-            event.consume();
-        });
-        arrowButton.setOnMousePressed(e -> {
-            getBehavior().mousePressed(e, false);
-            e.consume();
-        });
-        arrowButton.setOnMouseReleased(e -> {
-            getBehavior().mouseReleased(e, false);
-            e.consume();
-        });
-
-        label.setLabelFor(splitMenuButton);
-    }
-}
--- /dev/null	2015-09-03 15:21:55.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/SplitMenuButtonSkin.java	2015-09-03 15:21:52.892087700 -0700
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.MenuButtonBehavior;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.SplitMenuButton;
+import javafx.scene.input.MouseEvent;
+
+import com.sun.javafx.scene.control.behavior.SplitMenuButtonBehavior;
+
+/**
+ * Default skin implementation for the {@link SplitMenuButton} control.
+ *
+ * @see SplitMenuButton
+ * @since 9
+ */
+public class SplitMenuButtonSkin extends MenuButtonSkinBase<SplitMenuButton> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final SplitMenuButtonBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new SplitMenuButtonSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public SplitMenuButtonSkin(final SplitMenuButton control) {
+        super(control);
+
+        // install default input map for the MenuButton-like controls
+        this.behavior = new SplitMenuButtonBehavior(control);
+//        setInputMap(control, behavior.getInputMap());
+
+        /*
+         * The arrow button is the only thing that acts like a MenuButton on
+         * this control.
+         */
+        behaveLikeButton = true;
+        // TODO: do we need to consume all mouse events?
+        // they only bubble to the skin which consumes them by default
+        arrowButton.addEventHandler(MouseEvent.ANY, event -> event.consume());
+        arrowButton.setOnMousePressed(e -> {
+            getBehavior().mousePressed(e, false);
+            e.consume();
+        });
+        arrowButton.setOnMouseReleased(e -> {
+            getBehavior().mouseReleased(e, false);
+            e.consume();
+        });
+
+        label.setLabelFor(control);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    @Override SplitMenuButtonBehavior getBehavior() {
+        return behavior;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SplitPaneSkin.java	2015-09-03 15:22:01.518581100 -0700
+++ /dev/null	2015-09-03 15:22:02.000000000 -0700
@@ -1,1173 +0,0 @@
-/*
- * Copyright (c) 2010, 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.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.geometry.HPos;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.Orientation;
-import javafx.geometry.VPos;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.SplitPane;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-public class SplitPaneSkin extends BehaviorSkinBase<SplitPane, BehaviorBase<SplitPane>>  {
-
-    private ObservableList<Content> contentRegions;
-    private ObservableList<ContentDivider> contentDividers;
-    private boolean horizontal;
-    
-    public SplitPaneSkin(final SplitPane splitPane) {
-        super(splitPane, new BehaviorBase<>(splitPane, Collections.emptyList()));
-//        splitPane.setManaged(false);
-        horizontal = getSkinnable().getOrientation() == Orientation.HORIZONTAL;
-        
-        contentRegions = FXCollections.<Content>observableArrayList();
-        contentDividers = FXCollections.<ContentDivider>observableArrayList();
-
-        int index = 0;
-        for (Node n: getSkinnable().getItems()) {
-            addContent(index++, n);
-        }
-        initializeContentListener();
-
-        for (SplitPane.Divider d: getSkinnable().getDividers()) {
-            addDivider(d);
-        }
-
-        registerChangeListener(splitPane.orientationProperty(), "ORIENTATION");
-        registerChangeListener(splitPane.widthProperty(), "WIDTH");
-        registerChangeListener(splitPane.heightProperty(), "HEIGHT");
-    }
-
-    private void addContent(int index, Node n) {
-        Content c = new Content(n);
-        contentRegions.add(index, c);
-        getChildren().add(index, c);
-    }
-
-    private void removeContent(Node n) {
-        for (Content c: contentRegions) {
-            if (c.getContent().equals(n)) {
-                getChildren().remove(c);
-                contentRegions.remove(c);
-                break;
-            }
-        }
-    }
-
-    private void initializeContentListener() {
-        getSkinnable().getItems().addListener((ListChangeListener<Node>) c -> {
-            while (c.next()) {
-                if (c.wasPermutated() || c.wasUpdated()) {
-                    /**
-                     * the contents were either moved, or updated.
-                     * rebuild the contents to re-sync
-                     */
-                    getChildren().clear();
-                    contentRegions.clear();
-                    int index = 0;
-                    for (Node n : c.getList()) {
-                        addContent(index++, n);
-                    }
-
-                } else {
-                    for (Node n : c.getRemoved()) {
-                        removeContent(n);
-                    }
-
-                    int index = c.getFrom();
-                    for (Node n : c.getAddedSubList()) {
-                        addContent(index++, n);
-                    }
-                }
-            }
-            // TODO there may be a more efficient way than rebuilding all the dividers
-            // everytime the list changes.
-            removeAllDividers();
-            for (SplitPane.Divider d: getSkinnable().getDividers()) {
-                addDivider(d);
-            }
-        });
-    }
-          
-    // This listener is to be removed from 'removed' dividers and added to 'added' dividers
-    class PosPropertyListener implements ChangeListener<Number> {
-        ContentDivider divider;
-        
-        public PosPropertyListener(ContentDivider divider) {
-            this.divider = divider;
-        }
-        
-        @Override public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {  
-            if (checkDividerPos) {
-                // When checking is enforced, we know that the position was set explicitly
-                divider.posExplicit = true;
-            }
-            getSkinnable().requestLayout();
-        }
-    }
-       
-    private void checkDividerPosition(ContentDivider divider, double newPos, double oldPos) {
-        double dividerWidth = divider.prefWidth(-1);
-        Content left = getLeft(divider);
-        Content right = getRight(divider);
-        double minLeft = left == null ? 0 : (horizontal) ? left.minWidth(-1) : left.minHeight(-1);
-        double minRight = right == null ? 0 : (horizontal) ? right.minWidth(-1) : right.minHeight(-1);
-        double maxLeft = left == null ? 0 :
-            left.getContent() != null ? (horizontal) ? left.getContent().maxWidth(-1) : left.getContent().maxHeight(-1) : 0;
-        double maxRight = right == null ? 0 :
-            right.getContent() != null ? (horizontal) ? right.getContent().maxWidth(-1) : right.getContent().maxHeight(-1) : 0;                        
-               
-        double previousDividerPos = 0;
-        double nextDividerPos = getSize();
-        int index = contentDividers.indexOf(divider);
-
-        if (index - 1 >= 0) {
-            previousDividerPos = contentDividers.get(index - 1).getDividerPos();
-            if (previousDividerPos == -1) {
-                // Get the divider position if it hasn't been initialized.
-                previousDividerPos = getAbsoluteDividerPos(contentDividers.get(index - 1));
-            }
-        }
-        if (index + 1 < contentDividers.size()) {
-            nextDividerPos = contentDividers.get(index + 1).getDividerPos();
-            if (nextDividerPos == -1) {
-                // Get the divider position if it hasn't been initialized.
-                nextDividerPos = getAbsoluteDividerPos(contentDividers.get(index + 1));
-            }
-        }
-        
-        // Set the divider into the correct position by looking at the max and min content sizes.
-        checkDividerPos = false;
-        if (newPos > oldPos) {
-            double max = previousDividerPos == 0 ? maxLeft : previousDividerPos + dividerWidth + maxLeft;
-            double min = nextDividerPos - minRight - dividerWidth;                
-            double stopPos = Math.min(max, min);
-            if (newPos >= stopPos) {                
-                setAbsoluteDividerPos(divider, stopPos);
-            } else {
-                double rightMax = nextDividerPos - maxRight - dividerWidth;                    
-                if (newPos <= rightMax) {
-                    setAbsoluteDividerPos(divider, rightMax);
-                } else {                    
-                    setAbsoluteDividerPos(divider, newPos);
-                }
-            }             
-        } else {
-            double max = nextDividerPos - maxRight - dividerWidth;
-            double min = previousDividerPos == 0 ? minLeft : previousDividerPos + minLeft + dividerWidth;
-            double stopPos = Math.max(max, min);
-            if (newPos <= stopPos) {
-                setAbsoluteDividerPos(divider, stopPos);
-            } else {
-                double leftMax = previousDividerPos + maxLeft + dividerWidth;
-                if (newPos >= leftMax) {
-                    setAbsoluteDividerPos(divider, leftMax);
-                } else {
-                    setAbsoluteDividerPos(divider, newPos);
-                }
-            }                
-        }                    
-        checkDividerPos = true;
-    }
-    
-    private void addDivider(SplitPane.Divider d) {
-        ContentDivider c = new ContentDivider(d);        
-        c.setInitialPos(d.getPosition());
-        c.setDividerPos(-1);
-        ChangeListener<Number> posPropertyListener = new PosPropertyListener(c);
-        c.setPosPropertyListener(posPropertyListener);
-        d.positionProperty().addListener(posPropertyListener);
-        initializeDivderEventHandlers(c);
-        contentDividers.add(c);
-        getChildren().add(c);
-    }
-
-    private void removeAllDividers() {
-        ListIterator<ContentDivider> dividers = contentDividers.listIterator();
-        while (dividers.hasNext()) {
-            ContentDivider c = dividers.next();
-            getChildren().remove(c);
-            c.getDivider().positionProperty().removeListener(c.getPosPropertyListener());
-            dividers.remove();
-        }
-        lastDividerUpdate = 0;
-    }
-
-    private void initializeDivderEventHandlers(final ContentDivider divider) {
-        // TODO: do we need to consume all mouse events?
-        // they only bubble to the skin which consumes them by default
-        divider.addEventHandler(MouseEvent.ANY, event -> {
-            event.consume();
-        });
-
-        divider.setOnMousePressed(e -> {
-            if (horizontal) {
-                divider.setInitialPos(divider.getDividerPos());
-                divider.setPressPos(e.getSceneX());
-                divider.setPressPos(getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT
-                        ? getSkinnable().getWidth() - e.getSceneX() : e.getSceneX());
-            } else {
-                divider.setInitialPos(divider.getDividerPos());
-                divider.setPressPos(e.getSceneY());
-            }
-            e.consume();
-        });
-
-        divider.setOnMouseDragged(e -> {
-            double delta = 0;
-            if (horizontal) {
-                delta = getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT
-                        ? getSkinnable().getWidth() - e.getSceneX() : e.getSceneX();
-            } else {
-                delta = e.getSceneY();
-            }
-            delta -= divider.getPressPos();
-            setAndCheckAbsoluteDividerPos(divider, Math.ceil(divider.getInitialPos() + delta));
-            e.consume();
-        });
-    }
-
-    private Content getLeft(ContentDivider d) {
-        int index = contentDividers.indexOf(d);
-        if (index != -1) {
-            return contentRegions.get(index);
-        }
-        return null;
-    }
-
-    private Content getRight(ContentDivider d) {
-        int index = contentDividers.indexOf(d);
-        if (index != -1) {
-            return contentRegions.get(index + 1);
-        }
-        return null;
-    }
-
-    @Override protected void handleControlPropertyChanged(String property) {
-        super.handleControlPropertyChanged(property);
-        if ("ORIENTATION".equals(property)) {
-            this.horizontal = getSkinnable().getOrientation() == Orientation.HORIZONTAL;
-            this.previousSize = -1;
-            for (ContentDivider c: contentDividers) {
-                c.setGrabberStyle(horizontal);
-            }
-            getSkinnable().requestLayout();
-        } else if ("WIDTH".equals(property) || "HEIGHT".equals(property)) {
-            getSkinnable().requestLayout();
-        }
-    }
-
-    // Value is the left edge of the divider
-    private void setAbsoluteDividerPos(ContentDivider divider, double value) {
-        if (getSkinnable().getWidth() > 0 && getSkinnable().getHeight() > 0 && divider != null) {
-            SplitPane.Divider paneDivider = divider.getDivider();
-            divider.setDividerPos(value);
-            double size = getSize();
-            if (size != 0) {
-                // Adjust the position to the center of the
-                // divider and convert its position to a percentage.
-                double pos = value + divider.prefWidth(-1)/2;
-                paneDivider.setPosition(pos / size);
-            } else {
-                paneDivider.setPosition(0);
-            }
-        }
-    }
-   
-    // Updates the divider with the SplitPane.Divider's position
-    // The value updated to SplitPane.Divider will be the center of the divider.
-    // The returned position will be the left edge of the divider
-    private double getAbsoluteDividerPos(ContentDivider divider) {
-        if (getSkinnable().getWidth() > 0 && getSkinnable().getHeight() > 0 && divider != null) {
-            SplitPane.Divider paneDivider = divider.getDivider();
-            double newPos = posToDividerPos(divider, paneDivider.getPosition());
-            divider.setDividerPos(newPos);
-            return newPos;
-        }
-        return 0;
-    }
-
-    // Returns the left edge of the divider at pos
-    // Pos is the percentage location from SplitPane.Divider.
-    private double posToDividerPos(ContentDivider divider, double pos) {
-        double newPos = getSize() * pos;
-        if (pos == 1) {                
-            newPos -= divider.prefWidth(-1);
-        } else {
-            newPos -= divider.prefWidth(-1)/2;
-        }       
-        return Math.round(newPos);                    
-    }
-    
-    private double totalMinSize() {
-        double dividerWidth = !contentDividers.isEmpty() ? contentDividers.size() * contentDividers.get(0).prefWidth(-1) : 0;
-        double minSize = 0;
-        for (Content c: contentRegions) {
-            if (horizontal) {
-                minSize += c.minWidth(-1);
-            } else {
-                minSize += c.minHeight(-1);
-            }
-        }
-        return minSize + dividerWidth;
-    }
-
-    private double getSize() {
-        final SplitPane s = getSkinnable();
-        double size = totalMinSize();
-        if (horizontal) {
-            if (s.getWidth() > size) {
-                size = s.getWidth() - snappedLeftInset() - snappedRightInset();
-            }
-        } else {
-            if (s.getHeight() > size) {
-                size = s.getHeight() - snappedTopInset() - snappedBottomInset();
-            }
-        }
-        return size;
-    }
-
-    // Evenly distribute the size to the available list.
-    // size is the amount to distribute.
-    private double distributeTo(List<Content> available, double size) {
-        if (available.isEmpty()) {
-            return size;
-        }
-                
-        size = snapSize(size);
-        int portion = (int)(size)/available.size();
-        int remainder;
-
-        while (size > 0 && !available.isEmpty()) {
-            Iterator<Content> i = available.iterator();
-            while (i.hasNext()) {
-                Content c = i.next();
-                double max = Math.min((horizontal ? c.maxWidth(-1) : c.maxHeight(-1)), Double.MAX_VALUE);
-                double min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
-
-                // We have too much space
-                if (c.getArea() >= max) {
-                    c.setAvailable(c.getArea() - min);
-                    i.remove();
-                    continue;
-                }
-                // Not enough space
-                if (portion >= (max - c.getArea())) {
-                    size -= (max - c.getArea());
-                    c.setArea(max);
-                    c.setAvailable(max - min);
-                    i.remove();
-                } else {
-                    // Enough space
-                    c.setArea(c.getArea() + portion);
-                    c.setAvailable(c.getArea() - min);
-                    size -= portion;
-                }
-                if ((int)size == 0) {
-                    return size;
-                }
-            }
-            if (available.isEmpty()) {
-                // We reached the max size for everything just return
-                return size;
-            }
-            portion = (int)(size)/available.size();
-            remainder = (int)(size)%available.size();
-            if (portion == 0 && remainder != 0) {
-                portion = remainder;
-                remainder = 0;
-            }
-        }
-        return size;
-    }
-
-    // Evenly distribute the size from the available list.
-    // size is the amount to distribute.
-    private double distributeFrom(double size, List<Content> available) {
-        if (available.isEmpty()) {
-            return size;
-        }
-        
-        size = snapSize(size);
-        int portion = (int)(size)/available.size();
-        int remainder;
-
-        while (size > 0 && !available.isEmpty()) {
-            Iterator<Content> i = available.iterator();
-            while (i.hasNext()) {
-                Content c = i.next();
-                //not enough space taking available and setting min
-                if (portion >= c.getAvailable()) {
-                    c.setArea(c.getArea() - c.getAvailable()); // Min size
-                    size -= c.getAvailable();
-                    c.setAvailable(0);
-                    i.remove();
-                } else {
-                    //enough space
-                    c.setArea(c.getArea() - portion);
-                    c.setAvailable(c.getAvailable() - portion);
-                    size -= portion;
-                }
-                if ((int)size == 0) {
-                    return size;
-                }
-            }
-            if (available.isEmpty()) {
-                // We reached the min size for everything just return
-                return size;
-            }
-            portion = (int)(size)/available.size();
-            remainder = (int)(size)%available.size();
-            if (portion == 0 && remainder != 0) {
-                portion = remainder;
-                remainder = 0;
-            }
-        }
-        return size;
-    }
-
-    private void setupContentAndDividerForLayout() {
-        // Set all the value to prepare for layout
-        double dividerWidth = contentDividers.isEmpty() ? 0 : contentDividers.get(0).prefWidth(-1);
-        double startX = 0;
-        double startY = 0;
-        for (Content c: contentRegions) {
-            if (resize && !c.isResizableWithParent()) {
-                c.setArea(c.getResizableWithParentArea());
-            }
-            
-            c.setX(startX);
-            c.setY(startY);
-            if (horizontal) {
-                startX += (c.getArea() + dividerWidth);
-            } else {
-                startY += (c.getArea() + dividerWidth);
-            }
-        }
-
-        startX = 0;
-        startY = 0;
-        // The dividers are already in the correct positions.  Disable
-        // checking the divider positions.
-        checkDividerPos = false;
-        for (int i = 0; i < contentDividers.size(); i++) {
-            ContentDivider d = contentDividers.get(i);
-            if (horizontal) {
-                startX += getLeft(d).getArea() + (i == 0 ? 0 : dividerWidth);
-            } else {
-                startY += getLeft(d).getArea() + (i == 0 ? 0 : dividerWidth);
-            }
-            d.setX(startX);
-            d.setY(startY);              
-            setAbsoluteDividerPos(d, (horizontal ? d.getX() : d.getY()));
-            d.posExplicit = false;
-        }
-        checkDividerPos = true;
-    }
-
-    private void layoutDividersAndContent(double width, double height) {
-        final double paddingX = snappedLeftInset();
-        final double paddingY = snappedTopInset();
-        final double dividerWidth = contentDividers.isEmpty() ? 0 : contentDividers.get(0).prefWidth(-1);
-
-        for (Content c: contentRegions) {
-//            System.out.println("LAYOUT " + c.getId() + " PANELS X " + c.getX() + " Y " + c.getY() + " W " + (horizontal ? c.getArea() : width) + " H " + (horizontal ? height : c.getArea()));
-            if (horizontal) {
-                c.setClipSize(c.getArea(), height);
-                layoutInArea(c, c.getX() + paddingX, c.getY() + paddingY, c.getArea(), height,
-                    0/*baseline*/,HPos.CENTER, VPos.CENTER);
-            } else {
-                c.setClipSize(width, c.getArea());
-                layoutInArea(c, c.getX() + paddingX, c.getY() + paddingY, width, c.getArea(),
-                    0/*baseline*/,HPos.CENTER, VPos.CENTER);
-            }
-        }
-        for (ContentDivider c: contentDividers) {
-//            System.out.println("LAYOUT DIVIDERS X " + c.getX() + " Y " + c.getY() + " W " + (horizontal ? dividerWidth : width) + " H " + (horizontal ? height : dividerWidth));
-            if (horizontal) {
-                c.resize(dividerWidth, height);
-                positionInArea(c, c.getX() + paddingX, c.getY() + paddingY, dividerWidth, height,
-                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-            } else {
-                c.resize(width, dividerWidth);                
-                positionInArea(c, c.getX() + paddingX, c.getY() + paddingY, width, dividerWidth,
-                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-            }
-        }
-    }
-
-    private double previousSize = -1;
-    private int lastDividerUpdate = 0;
-    private boolean resize = false;
-    private boolean checkDividerPos = true;
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        final SplitPane s = getSkinnable();
-        final double sw = s.getWidth();
-        final double sh = s.getHeight();
-        
-        if (!s.isVisible() || 
-            (horizontal ? sw == 0 : sh == 0) ||
-            contentRegions.isEmpty()) {
-            return;
-        }
-        
-        double dividerWidth = contentDividers.isEmpty() ? 0 : contentDividers.get(0).prefWidth(-1);
-
-        if (contentDividers.size() > 0 && previousSize != -1 && previousSize != (horizontal ? sw  : sh)) {
-            //This algorithm adds/subtracts a little to each panel on every resize
-            List<Content> resizeList = new ArrayList<Content>();
-            for (Content c: contentRegions) {
-                if (c.isResizableWithParent()) {
-                    resizeList.add(c);
-                }
-            }
-                        
-            double delta = (horizontal ? s.getWidth() : s.getHeight()) - previousSize;
-            boolean growing = delta > 0;
-            
-            delta = Math.abs(delta);            
-
-            if (delta != 0 && !resizeList.isEmpty()) {
-                int portion = (int)(delta)/resizeList.size();
-                int remainder = (int)delta%resizeList.size();
-                int size = 0;
-                if (portion == 0) {
-                    portion = remainder;
-                    size = remainder;
-                    remainder = 0;
-                } else {
-                    size = portion * resizeList.size();
-                }
-
-                while (size > 0 && !resizeList.isEmpty()) {
-                    if (growing) {
-                        lastDividerUpdate++;
-                    } else {
-                        lastDividerUpdate--;
-                        if (lastDividerUpdate < 0) {
-                            lastDividerUpdate = contentRegions.size() - 1;
-                        }
-                    }
-                    int id = lastDividerUpdate%contentRegions.size();
-                    Content content = contentRegions.get(id);
-                    if (content.isResizableWithParent() && resizeList.contains(content)) {
-                        double area = content.getArea();
-                        if (growing) {
-                            double max = horizontal ? content.maxWidth(-1) : content.maxHeight(-1);
-                            if ((area + portion) <= max) {
-                                area += portion;
-                            } else {
-                                resizeList.remove(content);
-                                continue;
-                            }
-                        } else {
-                            double min = horizontal ? content.minWidth(-1) : content.minHeight(-1);
-                            if ((area - portion) >= min) {
-                                area -= portion;
-                            } else {
-                                resizeList.remove(content);
-                                continue;
-                            }
-                        }
-                        content.setArea(area);
-                        size -= portion;
-                        if (size == 0 && remainder != 0) {
-                            portion = remainder;
-                            size = remainder;
-                            remainder = 0;
-                        } else if (size == 0) {
-                            break;
-                        }
-                    }
-                }
-
-                // If we are resizing the window save the current area into
-                // resizableWithParentArea.  We use this value during layout.
-                {
-                    for (Content c: contentRegions) {
-                        c.setResizableWithParentArea(c.getArea());
-                        c.setAvailable(0);
-                    }
-                }
-                resize = true;
-            }
-
-            previousSize = horizontal ? sw : sh;
-        } else {
-            previousSize = horizontal ? sw : sh;
-        }
-        
-        // If the window is less than the min size we want to resize
-        // proportionally
-        double minSize = totalMinSize();
-        if (minSize > (horizontal ? w : h)) {
-            double percentage = 0;
-            for (int i = 0; i < contentRegions.size(); i++) {
-                Content c = contentRegions.get(i);
-                double min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
-                percentage = min/minSize;
-                c.setArea(snapSpace(percentage * (horizontal ? w : h)));
-                c.setAvailable(0);
-            }
-            setupContentAndDividerForLayout();
-            layoutDividersAndContent(w, h);
-            resize = false;
-            return;
-        }
-
-        for(int trys = 0; trys < 10; trys++) {
-            // Compute the area in between each divider.            
-            ContentDivider previousDivider = null;
-            ContentDivider divider = null;            
-            for (int i = 0; i < contentRegions.size(); i++) {
-                double space = 0;
-                if (i < contentDividers.size()) {
-                    divider = contentDividers.get(i);
-                    if (divider.posExplicit) {
-                        checkDividerPosition(divider, posToDividerPos(divider, divider.d.getPosition()),
-                                divider.getDividerPos());
-                    }
-                    if (i == 0) {
-                        // First panel
-                        space = getAbsoluteDividerPos(divider);
-                    } else {
-                        double newPos = getAbsoluteDividerPos(previousDivider) + dividerWidth;
-                        // Middle panels
-                        if (getAbsoluteDividerPos(divider) <= getAbsoluteDividerPos(previousDivider)) {
-                            // The current divider and the previous divider share the same position
-                            // or the current divider position is less than the previous position.
-                            // We will set the divider next to the previous divider.
-                            setAndCheckAbsoluteDividerPos(divider, newPos);
-                        }
-                        space = getAbsoluteDividerPos(divider) - newPos;
-                    }
-                } else if (i == contentDividers.size()) {
-                    // Last panel
-                    space = (horizontal ? w : h) - (previousDivider != null ? getAbsoluteDividerPos(previousDivider) + dividerWidth : 0);
-                }
-                if (!resize || divider.posExplicit) {
-                    contentRegions.get(i).setArea(space);
-                }
-                previousDivider = divider;
-            }
-
-            // Compute the amount of space we have available.
-            // Available is amount of space we can take from a panel before we reach its min.
-            // If available is negative we don't have enough space and we will
-            // proportionally take the space from the other availables.  If we have extra space
-            // we will porportionally give it to the others
-            double spaceRequested = 0;
-            double extraSpace = 0;
-            for (Content c: contentRegions) {
-                double max = 0;
-                double min = 0;
-                if (c != null) {
-                    max = horizontal ? c.maxWidth(-1) : c.maxHeight(-1);
-                    min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
-                }
-
-                if (c.getArea() >= max) {
-                    // Add the space that needs to be distributed to the others
-                    extraSpace += (c.getArea() - max);
-                    c.setArea(max);
-                }
-                c.setAvailable(c.getArea() - min);
-                if (c.getAvailable() < 0) {
-                    spaceRequested += c.getAvailable();
-                }
-            }
-
-            spaceRequested = Math.abs(spaceRequested);
-
-            // Add the panels where we can take space from
-            List<Content> availableList = new ArrayList<Content>();
-            List<Content> storageList = new ArrayList<Content>();
-            List<Content> spaceRequestor = new ArrayList<Content>();
-            double available = 0;
-            for (Content c: contentRegions) {
-                if (c.getAvailable() >= 0) {
-                    available += c.getAvailable();
-                    availableList.add(c);
-                }
-
-                if (resize && !c.isResizableWithParent()) {
-                    // We are making the SplitPane bigger and will need to
-                    // distribute the extra space.
-                    if (c.getArea() >= c.getResizableWithParentArea()) {                        
-                        extraSpace += (c.getArea() - c.getResizableWithParentArea());
-                    } else {
-                        // We are making the SplitPane smaller and will need to
-                        // distribute the space requested.
-                        spaceRequested += (c.getResizableWithParentArea() - c.getArea());
-                    }
-                    c.setAvailable(0);
-                }
-                // Add the panels where we can add space to;
-                if (resize) {
-                    if (c.isResizableWithParent()) {
-                        storageList.add(c);
-                    }
-                } else {
-                    storageList.add(c);
-                }
-                // List of panels that need space.
-                if (c.getAvailable() < 0) {
-                    spaceRequestor.add(c);
-                }
-            }
-
-            if (extraSpace > 0) {
-                extraSpace = distributeTo(storageList, extraSpace);
-                // After distributing add any panels that may still need space to the
-                // spaceRequestor list.
-                spaceRequested = 0;
-                spaceRequestor.clear();
-                available = 0;
-                availableList.clear();
-                for (Content c: contentRegions) {
-                    if (c.getAvailable() < 0) {
-                        spaceRequested += c.getAvailable();
-                        spaceRequestor.add(c);
-                    } else {
-                        available += c.getAvailable();
-                        availableList.add(c);
-                    }
-                }
-                spaceRequested = Math.abs(spaceRequested);
-            }
-
-            if (available >= spaceRequested) {
-                for (Content requestor: spaceRequestor) {
-                    double min = horizontal ? requestor.minWidth(-1) : requestor.minHeight(-1);
-                    requestor.setArea(min);
-                    requestor.setAvailable(0);
-                }
-                // After setting all the space requestors to their min we have to
-                // redistribute the space requested to any panel that still
-                // has available space.
-                if (spaceRequested > 0 && !spaceRequestor.isEmpty()) {
-                    distributeFrom(spaceRequested, availableList);
-                }
-
-                // Only for resizing.  We should have all the panel areas
-                // available computed.  We can total them up and see
-                // how much space we have left or went over and redistribute.
-                if (resize) {
-                    double total = 0;
-                    for (Content c: contentRegions) {
-                        if (c.isResizableWithParent()) {
-                            total += c.getArea();
-                        } else {
-                            total += c.getResizableWithParentArea();
-                        }
-                    }
-                    total += (dividerWidth * contentDividers.size());
-                    if (total < (horizontal ? w : h)) {
-                        extraSpace += ((horizontal ? w : h) - total);
-                        distributeTo(storageList, extraSpace);
-                    } else {
-                        spaceRequested += (total - (horizontal ? w : h));
-                        distributeFrom(spaceRequested, storageList);
-                    }
-                }
-            }
-
-            setupContentAndDividerForLayout();
-
-            // Check the bounds of every panel
-            boolean passed = true;
-            for (Content c: contentRegions) {
-                double max = horizontal ? c.maxWidth(-1) : c.maxHeight(-1);
-                double min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
-                if (c.getArea() < min || c.getArea() > max) {
-                    passed = false;
-                    break;
-                }
-            }
-            if (passed) {
-                break;
-            }
-        }
-
-        layoutDividersAndContent(w, h);        
-        resize = false;        
-    }
-
-    private void setAndCheckAbsoluteDividerPos(ContentDivider divider, double value) {
-        double oldPos = divider.getDividerPos();
-        setAbsoluteDividerPos(divider, value);
-        checkDividerPosition(divider, value, oldPos);
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double minWidth = 0;
-        double maxMinWidth = 0;
-        for (Content c: contentRegions) {
-            minWidth += c.minWidth(-1);
-            maxMinWidth = Math.max(maxMinWidth, c.minWidth(-1));
-        }
-        for (ContentDivider d: contentDividers) {
-            minWidth += d.prefWidth(-1);
-        }
-        if (horizontal) {
-            return minWidth + leftInset + rightInset;
-        } else {
-            return maxMinWidth + leftInset + rightInset;
-        }
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double minHeight = 0;
-        double maxMinHeight = 0;
-        for (Content c: contentRegions) {
-            minHeight += c.minHeight(-1);
-            maxMinHeight = Math.max(maxMinHeight, c.minHeight(-1));
-        }
-        for (ContentDivider d: contentDividers) {
-            minHeight += d.prefWidth(-1);
-        }
-        if (horizontal) {
-            return maxMinHeight + topInset + bottomInset;
-        } else {
-            return minHeight + topInset + bottomInset;
-        }
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double prefWidth = 0;
-        double prefMaxWidth = 0;
-        for (Content c: contentRegions) {
-            prefWidth += c.prefWidth(-1);
-            prefMaxWidth = Math.max(prefMaxWidth, c.prefWidth(-1));
-        }
-        for (ContentDivider d: contentDividers) {
-            prefWidth += d.prefWidth(-1);
-        }
-        if (horizontal) {
-            return prefWidth + leftInset + rightInset;
-        } else {
-            return prefMaxWidth + leftInset + rightInset;
-        }
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double prefHeight = 0;
-        double maxPrefHeight = 0;
-        for (Content c: contentRegions) {
-            prefHeight += c.prefHeight(-1);
-            maxPrefHeight = Math.max(maxPrefHeight, c.prefHeight(-1));
-        }
-        for (ContentDivider d: contentDividers) {
-            prefHeight += d.prefWidth(-1);
-        }
-        if (horizontal) {
-            return maxPrefHeight + topInset + bottomInset;
-        } else {
-            return prefHeight + topInset + bottomInset;
-        }
-    }
-    
-
-//    private void printDividerPositions() {
-//        for (int i = 0; i < contentDividers.size(); i++) {
-//            System.out.print("DIVIDER[" + i + "] " + contentDividers.get(i).getDividerPos() + " ");
-//        } 
-//        System.out.println("");
-//    }
-//    
-//    private void printAreaAndAvailable() {
-//        for (int i = 0; i < contentRegions.size(); i++) {
-//            System.out.print("AREA[" + i + "] " + contentRegions.get(i).getArea() + " ");
-//        }
-//        System.out.println("");
-//        for (int i = 0; i < contentRegions.size(); i++) {
-//            System.out.print("AVAILABLE[" + i + "] " + contentRegions.get(i).getAvailable() + " ");
-//        }
-//        System.out.println("");
-//        for (int i = 0; i < contentRegions.size(); i++) {
-//            System.out.print("RESIZABLEWTIHPARENT[" + i + "] " + contentRegions.get(i).getResizableWithParentArea() + " ");
-//        }
-//        System.out.println("");
-//    }
-
-    class ContentDivider extends StackPane {
-        private double initialPos;
-        private double dividerPos;
-        private double pressPos;
-        private SplitPane.Divider d;
-        private StackPane grabber;
-        private double x;
-        private double y;
-        private boolean posExplicit;
-        private ChangeListener<Number> listener;
-
-        public ContentDivider(SplitPane.Divider d) {
-            getStyleClass().setAll("split-pane-divider");
-
-            this.d = d;
-            this.initialPos = 0;
-            this.dividerPos = 0;
-            this.pressPos = 0;
-
-            grabber = new StackPane() {
-                @Override protected double computeMinWidth(double height) {
-                    return 0;
-                }
-
-                @Override protected double computeMinHeight(double width) {
-                    return 0;
-                }
-
-                @Override protected double computePrefWidth(double height) {
-                    return snappedLeftInset() + snappedRightInset();
-                }
-
-                @Override protected double computePrefHeight(double width) {
-                    return snappedTopInset() + snappedBottomInset();
-                }
-
-                @Override protected double computeMaxWidth(double height) {
-                    return computePrefWidth(-1);
-                }
-
-                @Override protected double computeMaxHeight(double width) {
-                    return computePrefHeight(-1);
-                }
-            };
-            setGrabberStyle(horizontal);
-            getChildren().add(grabber);
-
-            // TODO register a listener for SplitPane.Divider position
-        }
-
-        public SplitPane.Divider getDivider() {
-            return this.d;
-        }
-
-        public final void setGrabberStyle(boolean horizontal) {
-            grabber.getStyleClass().clear();
-            grabber.getStyleClass().setAll("vertical-grabber");
-            setCursor(Cursor.V_RESIZE);
-            if (horizontal) {
-                grabber.getStyleClass().setAll("horizontal-grabber");
-                setCursor(Cursor.H_RESIZE);
-            }
-        }
-
-        public double getInitialPos() {
-            return initialPos;
-        }
-
-        public void setInitialPos(double initialPos) {
-            this.initialPos = initialPos;
-        }
-
-        public double getDividerPos() {
-            return dividerPos;
-        }
-
-        public void setDividerPos(double dividerPos) {
-            this.dividerPos = dividerPos;
-        }
-
-        public double getPressPos() {
-            return pressPos;
-        }
-
-        public void setPressPos(double pressPos) {
-            this.pressPos = pressPos;
-        }
-
-        // TODO remove x and y and replace with dividerpos.
-        public double getX() {
-            return x;
-        }
-
-        public void setX(double x) {
-            this.x = x;
-        }
-
-        public double getY() {
-            return y;
-        }
-
-        public void setY(double y) {
-            this.y = y;
-        }
-
-        public ChangeListener<Number> getPosPropertyListener() {
-            return listener;
-        }
-
-        public void setPosPropertyListener(ChangeListener<Number> listener) {
-            this.listener = listener;
-        }
-                
-        @Override protected double computeMinWidth(double height) {
-            return computePrefWidth(height);
-        }
-
-        @Override protected double computeMinHeight(double width) {
-            return computePrefHeight(width);
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            return snappedLeftInset() + snappedRightInset();
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            return snappedTopInset() + snappedBottomInset();
-        }
-
-        @Override protected double computeMaxWidth(double height) {
-            return computePrefWidth(height);
-        }
-
-        @Override protected double computeMaxHeight(double width) {
-            return computePrefHeight(width);
-        }
-
-        @Override protected void layoutChildren() {
-            double grabberWidth = grabber.prefWidth(-1);
-            double grabberHeight = grabber.prefHeight(-1);
-            double grabberX = (getWidth() - grabberWidth)/2;
-            double grabberY = (getHeight() - grabberHeight)/2;
-            grabber.resize(grabberWidth, grabberHeight);
-            positionInArea(grabber, grabberX, grabberY, grabberWidth, grabberHeight,
-                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-        }
-    }
-
-    static class Content extends StackPane {
-        private Node content;
-        private Rectangle clipRect;
-        private double x;
-        private double y;
-        private double area;
-        private double resizableWithParentArea;
-        private double available;
-
-        public Content(Node n) {
-            this.clipRect = new Rectangle();
-            setClip(clipRect);
-            this.content = n;
-            if (n != null) {
-                getChildren().add(n);
-            }
-            this.x = 0;
-            this.y = 0;
-        }
-
-        public Node getContent() {
-            return content;
-        }
-
-        public double getX() {
-            return x;
-        }
-
-        public void setX(double x) {
-            this.x = x;
-        }
-
-        public double getY() {
-            return y;
-        }
-
-        public void setY(double y) {
-            this.y = y;
-        }
-
-        // This is the area of the panel.  This will be used as the
-        // width/height during layout.
-        public double getArea() {
-            return area;
-        }
-
-        public void setArea(double area) {
-            this.area = area;
-        }
-
-        // This is the minimum available area for other panels to use
-        // if they need more space.
-        public double getAvailable() {
-            return available;
-        }
-
-        public void setAvailable(double available) {
-            this.available = available;
-        }
-
-        public boolean isResizableWithParent() {
-            return SplitPane.isResizableWithParent(content);
-        }
-
-        public double getResizableWithParentArea() {
-            return resizableWithParentArea;
-        }
-
-        // This is used to save the current area during resizing when
-        // isResizeableWithParent equals false.
-        public void setResizableWithParentArea(double resizableWithParentArea) {
-            if (!isResizableWithParent()) {
-                this.resizableWithParentArea = resizableWithParentArea;
-            } else {
-                this.resizableWithParentArea = 0;
-            }
-        }
-
-        protected void setClipSize(double w, double h) {
-            clipRect.setWidth(w);
-            clipRect.setHeight(h);
-        }
-
-        @Override protected double computeMaxWidth(double height) {
-            return snapSize(content.maxWidth(height));
-        }
-
-        @Override protected double computeMaxHeight(double width) {
-            return snapSize(content.maxHeight(width));
-        }
-    }
-}
-
--- /dev/null	2015-09-03 15:22:02.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/SplitPaneSkin.java	2015-09-03 15:22:00.774538600 -0700
@@ -0,0 +1,1202 @@
+/*
+ * Copyright (c) 2010, 2015, 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.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.HPos;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Orientation;
+import javafx.geometry.VPos;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Control;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.SplitPane;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * Default skin implementation for the {@link SplitPane} control.
+ *
+ * @see SplitPane
+ * @since 9
+ */
+public class SplitPaneSkin extends SkinBase<SplitPane> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private ObservableList<Content> contentRegions;
+    private ObservableList<ContentDivider> contentDividers;
+    private boolean horizontal;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new SplitPaneSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public SplitPaneSkin(final SplitPane control) {
+        super(control);
+//        control.setManaged(false);
+        horizontal = getSkinnable().getOrientation() == Orientation.HORIZONTAL;
+        
+        contentRegions = FXCollections.<Content>observableArrayList();
+        contentDividers = FXCollections.<ContentDivider>observableArrayList();
+
+        int index = 0;
+        for (Node n: getSkinnable().getItems()) {
+            addContent(index++, n);
+        }
+        initializeContentListener();
+
+        for (SplitPane.Divider d: getSkinnable().getDividers()) {
+            addDivider(d);
+        }
+
+        registerChangeListener(control.orientationProperty(), e -> {
+            this.horizontal = getSkinnable().getOrientation() == Orientation.HORIZONTAL;
+            this.previousSize = -1;
+            for (ContentDivider c: contentDividers) {
+                c.setGrabberStyle(horizontal);
+            }
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.widthProperty(), e -> getSkinnable().requestLayout());
+        registerChangeListener(control.heightProperty(), e -> getSkinnable().requestLayout());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        final SplitPane s = getSkinnable();
+        final double sw = s.getWidth();
+        final double sh = s.getHeight();
+
+        if (!s.isVisible() ||
+                (horizontal ? sw == 0 : sh == 0) ||
+                contentRegions.isEmpty()) {
+            return;
+        }
+
+        double dividerWidth = contentDividers.isEmpty() ? 0 : contentDividers.get(0).prefWidth(-1);
+
+        if (contentDividers.size() > 0 && previousSize != -1 && previousSize != (horizontal ? sw  : sh)) {
+            //This algorithm adds/subtracts a little to each panel on every resize
+            List<Content> resizeList = new ArrayList<Content>();
+            for (Content c: contentRegions) {
+                if (c.isResizableWithParent()) {
+                    resizeList.add(c);
+                }
+            }
+
+            double delta = (horizontal ? s.getWidth() : s.getHeight()) - previousSize;
+            boolean growing = delta > 0;
+
+            delta = Math.abs(delta);
+
+            if (delta != 0 && !resizeList.isEmpty()) {
+                int portion = (int)(delta)/resizeList.size();
+                int remainder = (int)delta%resizeList.size();
+                int size = 0;
+                if (portion == 0) {
+                    portion = remainder;
+                    size = remainder;
+                    remainder = 0;
+                } else {
+                    size = portion * resizeList.size();
+                }
+
+                while (size > 0 && !resizeList.isEmpty()) {
+                    if (growing) {
+                        lastDividerUpdate++;
+                    } else {
+                        lastDividerUpdate--;
+                        if (lastDividerUpdate < 0) {
+                            lastDividerUpdate = contentRegions.size() - 1;
+                        }
+                    }
+                    int id = lastDividerUpdate%contentRegions.size();
+                    Content content = contentRegions.get(id);
+                    if (content.isResizableWithParent() && resizeList.contains(content)) {
+                        double area = content.getArea();
+                        if (growing) {
+                            double max = horizontal ? content.maxWidth(-1) : content.maxHeight(-1);
+                            if ((area + portion) <= max) {
+                                area += portion;
+                            } else {
+                                resizeList.remove(content);
+                                continue;
+                            }
+                        } else {
+                            double min = horizontal ? content.minWidth(-1) : content.minHeight(-1);
+                            if ((area - portion) >= min) {
+                                area -= portion;
+                            } else {
+                                resizeList.remove(content);
+                                continue;
+                            }
+                        }
+                        content.setArea(area);
+                        size -= portion;
+                        if (size == 0 && remainder != 0) {
+                            portion = remainder;
+                            size = remainder;
+                            remainder = 0;
+                        } else if (size == 0) {
+                            break;
+                        }
+                    }
+                }
+
+                // If we are resizing the window save the current area into
+                // resizableWithParentArea.  We use this value during layout.
+                {
+                    for (Content c: contentRegions) {
+                        c.setResizableWithParentArea(c.getArea());
+                        c.setAvailable(0);
+                    }
+                }
+                resize = true;
+            }
+
+            previousSize = horizontal ? sw : sh;
+        } else {
+            previousSize = horizontal ? sw : sh;
+        }
+
+        // If the window is less than the min size we want to resize
+        // proportionally
+        double minSize = totalMinSize();
+        if (minSize > (horizontal ? w : h)) {
+            double percentage = 0;
+            for (int i = 0; i < contentRegions.size(); i++) {
+                Content c = contentRegions.get(i);
+                double min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
+                percentage = min/minSize;
+                c.setArea(snapSpace(percentage * (horizontal ? w : h)));
+                c.setAvailable(0);
+            }
+            setupContentAndDividerForLayout();
+            layoutDividersAndContent(w, h);
+            resize = false;
+            return;
+        }
+
+        for(int trys = 0; trys < 10; trys++) {
+            // Compute the area in between each divider.
+            ContentDivider previousDivider = null;
+            ContentDivider divider = null;
+            for (int i = 0; i < contentRegions.size(); i++) {
+                double space = 0;
+                if (i < contentDividers.size()) {
+                    divider = contentDividers.get(i);
+                    if (divider.posExplicit) {
+                        checkDividerPosition(divider, posToDividerPos(divider, divider.d.getPosition()),
+                                divider.getDividerPos());
+                    }
+                    if (i == 0) {
+                        // First panel
+                        space = getAbsoluteDividerPos(divider);
+                    } else {
+                        double newPos = getAbsoluteDividerPos(previousDivider) + dividerWidth;
+                        // Middle panels
+                        if (getAbsoluteDividerPos(divider) <= getAbsoluteDividerPos(previousDivider)) {
+                            // The current divider and the previous divider share the same position
+                            // or the current divider position is less than the previous position.
+                            // We will set the divider next to the previous divider.
+                            setAndCheckAbsoluteDividerPos(divider, newPos);
+                        }
+                        space = getAbsoluteDividerPos(divider) - newPos;
+                    }
+                } else if (i == contentDividers.size()) {
+                    // Last panel
+                    space = (horizontal ? w : h) - (previousDivider != null ? getAbsoluteDividerPos(previousDivider) + dividerWidth : 0);
+                }
+                if (!resize || divider.posExplicit) {
+                    contentRegions.get(i).setArea(space);
+                }
+                previousDivider = divider;
+            }
+
+            // Compute the amount of space we have available.
+            // Available is amount of space we can take from a panel before we reach its min.
+            // If available is negative we don't have enough space and we will
+            // proportionally take the space from the other availables.  If we have extra space
+            // we will porportionally give it to the others
+            double spaceRequested = 0;
+            double extraSpace = 0;
+            for (Content c: contentRegions) {
+                double max = 0;
+                double min = 0;
+                if (c != null) {
+                    max = horizontal ? c.maxWidth(-1) : c.maxHeight(-1);
+                    min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
+                }
+
+                if (c.getArea() >= max) {
+                    // Add the space that needs to be distributed to the others
+                    extraSpace += (c.getArea() - max);
+                    c.setArea(max);
+                }
+                c.setAvailable(c.getArea() - min);
+                if (c.getAvailable() < 0) {
+                    spaceRequested += c.getAvailable();
+                }
+            }
+
+            spaceRequested = Math.abs(spaceRequested);
+
+            // Add the panels where we can take space from
+            List<Content> availableList = new ArrayList<Content>();
+            List<Content> storageList = new ArrayList<Content>();
+            List<Content> spaceRequestor = new ArrayList<Content>();
+            double available = 0;
+            for (Content c: contentRegions) {
+                if (c.getAvailable() >= 0) {
+                    available += c.getAvailable();
+                    availableList.add(c);
+                }
+
+                if (resize && !c.isResizableWithParent()) {
+                    // We are making the SplitPane bigger and will need to
+                    // distribute the extra space.
+                    if (c.getArea() >= c.getResizableWithParentArea()) {
+                        extraSpace += (c.getArea() - c.getResizableWithParentArea());
+                    } else {
+                        // We are making the SplitPane smaller and will need to
+                        // distribute the space requested.
+                        spaceRequested += (c.getResizableWithParentArea() - c.getArea());
+                    }
+                    c.setAvailable(0);
+                }
+                // Add the panels where we can add space to;
+                if (resize) {
+                    if (c.isResizableWithParent()) {
+                        storageList.add(c);
+                    }
+                } else {
+                    storageList.add(c);
+                }
+                // List of panels that need space.
+                if (c.getAvailable() < 0) {
+                    spaceRequestor.add(c);
+                }
+            }
+
+            if (extraSpace > 0) {
+                extraSpace = distributeTo(storageList, extraSpace);
+                // After distributing add any panels that may still need space to the
+                // spaceRequestor list.
+                spaceRequested = 0;
+                spaceRequestor.clear();
+                available = 0;
+                availableList.clear();
+                for (Content c: contentRegions) {
+                    if (c.getAvailable() < 0) {
+                        spaceRequested += c.getAvailable();
+                        spaceRequestor.add(c);
+                    } else {
+                        available += c.getAvailable();
+                        availableList.add(c);
+                    }
+                }
+                spaceRequested = Math.abs(spaceRequested);
+            }
+
+            if (available >= spaceRequested) {
+                for (Content requestor: spaceRequestor) {
+                    double min = horizontal ? requestor.minWidth(-1) : requestor.minHeight(-1);
+                    requestor.setArea(min);
+                    requestor.setAvailable(0);
+                }
+                // After setting all the space requestors to their min we have to
+                // redistribute the space requested to any panel that still
+                // has available space.
+                if (spaceRequested > 0 && !spaceRequestor.isEmpty()) {
+                    distributeFrom(spaceRequested, availableList);
+                }
+
+                // Only for resizing.  We should have all the panel areas
+                // available computed.  We can total them up and see
+                // how much space we have left or went over and redistribute.
+                if (resize) {
+                    double total = 0;
+                    for (Content c: contentRegions) {
+                        if (c.isResizableWithParent()) {
+                            total += c.getArea();
+                        } else {
+                            total += c.getResizableWithParentArea();
+                        }
+                    }
+                    total += (dividerWidth * contentDividers.size());
+                    if (total < (horizontal ? w : h)) {
+                        extraSpace += ((horizontal ? w : h) - total);
+                        distributeTo(storageList, extraSpace);
+                    } else {
+                        spaceRequested += (total - (horizontal ? w : h));
+                        distributeFrom(spaceRequested, storageList);
+                    }
+                }
+            }
+
+            setupContentAndDividerForLayout();
+
+            // Check the bounds of every panel
+            boolean passed = true;
+            for (Content c: contentRegions) {
+                double max = horizontal ? c.maxWidth(-1) : c.maxHeight(-1);
+                double min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
+                if (c.getArea() < min || c.getArea() > max) {
+                    passed = false;
+                    break;
+                }
+            }
+            if (passed) {
+                break;
+            }
+        }
+
+        layoutDividersAndContent(w, h);
+        resize = false;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double minWidth = 0;
+        double maxMinWidth = 0;
+        for (Content c: contentRegions) {
+            minWidth += c.minWidth(-1);
+            maxMinWidth = Math.max(maxMinWidth, c.minWidth(-1));
+        }
+        for (ContentDivider d: contentDividers) {
+            minWidth += d.prefWidth(-1);
+        }
+        if (horizontal) {
+            return minWidth + leftInset + rightInset;
+        } else {
+            return maxMinWidth + leftInset + rightInset;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double minHeight = 0;
+        double maxMinHeight = 0;
+        for (Content c: contentRegions) {
+            minHeight += c.minHeight(-1);
+            maxMinHeight = Math.max(maxMinHeight, c.minHeight(-1));
+        }
+        for (ContentDivider d: contentDividers) {
+            minHeight += d.prefWidth(-1);
+        }
+        if (horizontal) {
+            return maxMinHeight + topInset + bottomInset;
+        } else {
+            return minHeight + topInset + bottomInset;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double prefWidth = 0;
+        double prefMaxWidth = 0;
+        for (Content c: contentRegions) {
+            prefWidth += c.prefWidth(-1);
+            prefMaxWidth = Math.max(prefMaxWidth, c.prefWidth(-1));
+        }
+        for (ContentDivider d: contentDividers) {
+            prefWidth += d.prefWidth(-1);
+        }
+        if (horizontal) {
+            return prefWidth + leftInset + rightInset;
+        } else {
+            return prefMaxWidth + leftInset + rightInset;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double prefHeight = 0;
+        double maxPrefHeight = 0;
+        for (Content c: contentRegions) {
+            prefHeight += c.prefHeight(-1);
+            maxPrefHeight = Math.max(maxPrefHeight, c.prefHeight(-1));
+        }
+        for (ContentDivider d: contentDividers) {
+            prefHeight += d.prefWidth(-1);
+        }
+        if (horizontal) {
+            return maxPrefHeight + topInset + bottomInset;
+        } else {
+            return prefHeight + topInset + bottomInset;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void addContent(int index, Node n) {
+        Content c = new Content(n);
+        contentRegions.add(index, c);
+        getChildren().add(index, c);
+    }
+
+    private void removeContent(Node n) {
+        for (Content c: contentRegions) {
+            if (c.getContent().equals(n)) {
+                getChildren().remove(c);
+                contentRegions.remove(c);
+                break;
+            }
+        }
+    }
+
+    private void initializeContentListener() {
+        getSkinnable().getItems().addListener((ListChangeListener<Node>) c -> {
+            while (c.next()) {
+                if (c.wasPermutated() || c.wasUpdated()) {
+                    /**
+                     * the contents were either moved, or updated.
+                     * rebuild the contents to re-sync
+                     */
+                    getChildren().clear();
+                    contentRegions.clear();
+                    int index = 0;
+                    for (Node n : c.getList()) {
+                        addContent(index++, n);
+                    }
+
+                } else {
+                    for (Node n : c.getRemoved()) {
+                        removeContent(n);
+                    }
+
+                    int index = c.getFrom();
+                    for (Node n : c.getAddedSubList()) {
+                        addContent(index++, n);
+                    }
+                }
+            }
+            // TODO there may be a more efficient way than rebuilding all the dividers
+            // everytime the list changes.
+            removeAllDividers();
+            for (SplitPane.Divider d: getSkinnable().getDividers()) {
+                addDivider(d);
+            }
+        });
+    }
+          
+    private void checkDividerPosition(ContentDivider divider, double newPos, double oldPos) {
+        double dividerWidth = divider.prefWidth(-1);
+        Content left = getLeft(divider);
+        Content right = getRight(divider);
+        double minLeft = left == null ? 0 : (horizontal) ? left.minWidth(-1) : left.minHeight(-1);
+        double minRight = right == null ? 0 : (horizontal) ? right.minWidth(-1) : right.minHeight(-1);
+        double maxLeft = left == null ? 0 :
+            left.getContent() != null ? (horizontal) ? left.getContent().maxWidth(-1) : left.getContent().maxHeight(-1) : 0;
+        double maxRight = right == null ? 0 :
+            right.getContent() != null ? (horizontal) ? right.getContent().maxWidth(-1) : right.getContent().maxHeight(-1) : 0;                        
+               
+        double previousDividerPos = 0;
+        double nextDividerPos = getSize();
+        int index = contentDividers.indexOf(divider);
+
+        if (index - 1 >= 0) {
+            previousDividerPos = contentDividers.get(index - 1).getDividerPos();
+            if (previousDividerPos == -1) {
+                // Get the divider position if it hasn't been initialized.
+                previousDividerPos = getAbsoluteDividerPos(contentDividers.get(index - 1));
+            }
+        }
+        if (index + 1 < contentDividers.size()) {
+            nextDividerPos = contentDividers.get(index + 1).getDividerPos();
+            if (nextDividerPos == -1) {
+                // Get the divider position if it hasn't been initialized.
+                nextDividerPos = getAbsoluteDividerPos(contentDividers.get(index + 1));
+            }
+        }
+        
+        // Set the divider into the correct position by looking at the max and min content sizes.
+        checkDividerPos = false;
+        if (newPos > oldPos) {
+            double max = previousDividerPos == 0 ? maxLeft : previousDividerPos + dividerWidth + maxLeft;
+            double min = nextDividerPos - minRight - dividerWidth;                
+            double stopPos = Math.min(max, min);
+            if (newPos >= stopPos) {                
+                setAbsoluteDividerPos(divider, stopPos);
+            } else {
+                double rightMax = nextDividerPos - maxRight - dividerWidth;                    
+                if (newPos <= rightMax) {
+                    setAbsoluteDividerPos(divider, rightMax);
+                } else {                    
+                    setAbsoluteDividerPos(divider, newPos);
+                }
+            }             
+        } else {
+            double max = nextDividerPos - maxRight - dividerWidth;
+            double min = previousDividerPos == 0 ? minLeft : previousDividerPos + minLeft + dividerWidth;
+            double stopPos = Math.max(max, min);
+            if (newPos <= stopPos) {
+                setAbsoluteDividerPos(divider, stopPos);
+            } else {
+                double leftMax = previousDividerPos + maxLeft + dividerWidth;
+                if (newPos >= leftMax) {
+                    setAbsoluteDividerPos(divider, leftMax);
+                } else {
+                    setAbsoluteDividerPos(divider, newPos);
+                }
+            }                
+        }                    
+        checkDividerPos = true;
+    }
+    
+    private void addDivider(SplitPane.Divider d) {
+        ContentDivider c = new ContentDivider(d);        
+        c.setInitialPos(d.getPosition());
+        c.setDividerPos(-1);
+        ChangeListener<Number> posPropertyListener = new PosPropertyListener(c);
+        c.setPosPropertyListener(posPropertyListener);
+        d.positionProperty().addListener(posPropertyListener);
+        initializeDivderEventHandlers(c);
+        contentDividers.add(c);
+        getChildren().add(c);
+    }
+
+    private void removeAllDividers() {
+        ListIterator<ContentDivider> dividers = contentDividers.listIterator();
+        while (dividers.hasNext()) {
+            ContentDivider c = dividers.next();
+            getChildren().remove(c);
+            c.getDivider().positionProperty().removeListener(c.getPosPropertyListener());
+            dividers.remove();
+        }
+        lastDividerUpdate = 0;
+    }
+
+    private void initializeDivderEventHandlers(final ContentDivider divider) {
+        // TODO: do we need to consume all mouse events?
+        // they only bubble to the skin which consumes them by default
+        divider.addEventHandler(MouseEvent.ANY, event -> {
+            event.consume();
+        });
+
+        divider.setOnMousePressed(e -> {
+            if (horizontal) {
+                divider.setInitialPos(divider.getDividerPos());
+                divider.setPressPos(e.getSceneX());
+                divider.setPressPos(getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT
+                        ? getSkinnable().getWidth() - e.getSceneX() : e.getSceneX());
+            } else {
+                divider.setInitialPos(divider.getDividerPos());
+                divider.setPressPos(e.getSceneY());
+            }
+            e.consume();
+        });
+
+        divider.setOnMouseDragged(e -> {
+            double delta = 0;
+            if (horizontal) {
+                delta = getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT
+                        ? getSkinnable().getWidth() - e.getSceneX() : e.getSceneX();
+            } else {
+                delta = e.getSceneY();
+            }
+            delta -= divider.getPressPos();
+            setAndCheckAbsoluteDividerPos(divider, Math.ceil(divider.getInitialPos() + delta));
+            e.consume();
+        });
+    }
+
+    private Content getLeft(ContentDivider d) {
+        int index = contentDividers.indexOf(d);
+        if (index != -1) {
+            return contentRegions.get(index);
+        }
+        return null;
+    }
+
+    private Content getRight(ContentDivider d) {
+        int index = contentDividers.indexOf(d);
+        if (index != -1) {
+            return contentRegions.get(index + 1);
+        }
+        return null;
+    }
+
+    // Value is the left edge of the divider
+    private void setAbsoluteDividerPos(ContentDivider divider, double value) {
+        if (getSkinnable().getWidth() > 0 && getSkinnable().getHeight() > 0 && divider != null) {
+            SplitPane.Divider paneDivider = divider.getDivider();
+            divider.setDividerPos(value);
+            double size = getSize();
+            if (size != 0) {
+                // Adjust the position to the center of the
+                // divider and convert its position to a percentage.
+                double pos = value + divider.prefWidth(-1)/2;
+                paneDivider.setPosition(pos / size);
+            } else {
+                paneDivider.setPosition(0);
+            }
+        }
+    }
+   
+    // Updates the divider with the SplitPane.Divider's position
+    // The value updated to SplitPane.Divider will be the center of the divider.
+    // The returned position will be the left edge of the divider
+    private double getAbsoluteDividerPos(ContentDivider divider) {
+        if (getSkinnable().getWidth() > 0 && getSkinnable().getHeight() > 0 && divider != null) {
+            SplitPane.Divider paneDivider = divider.getDivider();
+            double newPos = posToDividerPos(divider, paneDivider.getPosition());
+            divider.setDividerPos(newPos);
+            return newPos;
+        }
+        return 0;
+    }
+
+    // Returns the left edge of the divider at pos
+    // Pos is the percentage location from SplitPane.Divider.
+    private double posToDividerPos(ContentDivider divider, double pos) {
+        double newPos = getSize() * pos;
+        if (pos == 1) {                
+            newPos -= divider.prefWidth(-1);
+        } else {
+            newPos -= divider.prefWidth(-1)/2;
+        }       
+        return Math.round(newPos);                    
+    }
+    
+    private double totalMinSize() {
+        double dividerWidth = !contentDividers.isEmpty() ? contentDividers.size() * contentDividers.get(0).prefWidth(-1) : 0;
+        double minSize = 0;
+        for (Content c: contentRegions) {
+            if (horizontal) {
+                minSize += c.minWidth(-1);
+            } else {
+                minSize += c.minHeight(-1);
+            }
+        }
+        return minSize + dividerWidth;
+    }
+
+    private double getSize() {
+        final SplitPane s = getSkinnable();
+        double size = totalMinSize();
+        if (horizontal) {
+            if (s.getWidth() > size) {
+                size = s.getWidth() - snappedLeftInset() - snappedRightInset();
+            }
+        } else {
+            if (s.getHeight() > size) {
+                size = s.getHeight() - snappedTopInset() - snappedBottomInset();
+            }
+        }
+        return size;
+    }
+
+    // Evenly distribute the size to the available list.
+    // size is the amount to distribute.
+    private double distributeTo(List<Content> available, double size) {
+        if (available.isEmpty()) {
+            return size;
+        }
+                
+        size = snapSize(size);
+        int portion = (int)(size)/available.size();
+        int remainder;
+
+        while (size > 0 && !available.isEmpty()) {
+            Iterator<Content> i = available.iterator();
+            while (i.hasNext()) {
+                Content c = i.next();
+                double max = Math.min((horizontal ? c.maxWidth(-1) : c.maxHeight(-1)), Double.MAX_VALUE);
+                double min = horizontal ? c.minWidth(-1) : c.minHeight(-1);
+
+                // We have too much space
+                if (c.getArea() >= max) {
+                    c.setAvailable(c.getArea() - min);
+                    i.remove();
+                    continue;
+                }
+                // Not enough space
+                if (portion >= (max - c.getArea())) {
+                    size -= (max - c.getArea());
+                    c.setArea(max);
+                    c.setAvailable(max - min);
+                    i.remove();
+                } else {
+                    // Enough space
+                    c.setArea(c.getArea() + portion);
+                    c.setAvailable(c.getArea() - min);
+                    size -= portion;
+                }
+                if ((int)size == 0) {
+                    return size;
+                }
+            }
+            if (available.isEmpty()) {
+                // We reached the max size for everything just return
+                return size;
+            }
+            portion = (int)(size)/available.size();
+            remainder = (int)(size)%available.size();
+            if (portion == 0 && remainder != 0) {
+                portion = remainder;
+                remainder = 0;
+            }
+        }
+        return size;
+    }
+
+    // Evenly distribute the size from the available list.
+    // size is the amount to distribute.
+    private double distributeFrom(double size, List<Content> available) {
+        if (available.isEmpty()) {
+            return size;
+        }
+        
+        size = snapSize(size);
+        int portion = (int)(size)/available.size();
+        int remainder;
+
+        while (size > 0 && !available.isEmpty()) {
+            Iterator<Content> i = available.iterator();
+            while (i.hasNext()) {
+                Content c = i.next();
+                //not enough space taking available and setting min
+                if (portion >= c.getAvailable()) {
+                    c.setArea(c.getArea() - c.getAvailable()); // Min size
+                    size -= c.getAvailable();
+                    c.setAvailable(0);
+                    i.remove();
+                } else {
+                    //enough space
+                    c.setArea(c.getArea() - portion);
+                    c.setAvailable(c.getAvailable() - portion);
+                    size -= portion;
+                }
+                if ((int)size == 0) {
+                    return size;
+                }
+            }
+            if (available.isEmpty()) {
+                // We reached the min size for everything just return
+                return size;
+            }
+            portion = (int)(size)/available.size();
+            remainder = (int)(size)%available.size();
+            if (portion == 0 && remainder != 0) {
+                portion = remainder;
+                remainder = 0;
+            }
+        }
+        return size;
+    }
+
+    private void setupContentAndDividerForLayout() {
+        // Set all the value to prepare for layout
+        double dividerWidth = contentDividers.isEmpty() ? 0 : contentDividers.get(0).prefWidth(-1);
+        double startX = 0;
+        double startY = 0;
+        for (Content c: contentRegions) {
+            if (resize && !c.isResizableWithParent()) {
+                c.setArea(c.getResizableWithParentArea());
+            }
+            
+            c.setX(startX);
+            c.setY(startY);
+            if (horizontal) {
+                startX += (c.getArea() + dividerWidth);
+            } else {
+                startY += (c.getArea() + dividerWidth);
+            }
+        }
+
+        startX = 0;
+        startY = 0;
+        // The dividers are already in the correct positions.  Disable
+        // checking the divider positions.
+        checkDividerPos = false;
+        for (int i = 0; i < contentDividers.size(); i++) {
+            ContentDivider d = contentDividers.get(i);
+            if (horizontal) {
+                startX += getLeft(d).getArea() + (i == 0 ? 0 : dividerWidth);
+            } else {
+                startY += getLeft(d).getArea() + (i == 0 ? 0 : dividerWidth);
+            }
+            d.setX(startX);
+            d.setY(startY);              
+            setAbsoluteDividerPos(d, (horizontal ? d.getX() : d.getY()));
+            d.posExplicit = false;
+        }
+        checkDividerPos = true;
+    }
+
+    private void layoutDividersAndContent(double width, double height) {
+        final double paddingX = snappedLeftInset();
+        final double paddingY = snappedTopInset();
+        final double dividerWidth = contentDividers.isEmpty() ? 0 : contentDividers.get(0).prefWidth(-1);
+
+        for (Content c: contentRegions) {
+//            System.out.println("LAYOUT " + c.getId() + " PANELS X " + c.getX() + " Y " + c.getY() + " W " + (horizontal ? c.getArea() : width) + " H " + (horizontal ? height : c.getArea()));
+            if (horizontal) {
+                c.setClipSize(c.getArea(), height);
+                layoutInArea(c, c.getX() + paddingX, c.getY() + paddingY, c.getArea(), height,
+                    0/*baseline*/,HPos.CENTER, VPos.CENTER);
+            } else {
+                c.setClipSize(width, c.getArea());
+                layoutInArea(c, c.getX() + paddingX, c.getY() + paddingY, width, c.getArea(),
+                    0/*baseline*/,HPos.CENTER, VPos.CENTER);
+            }
+        }
+        for (ContentDivider c: contentDividers) {
+//            System.out.println("LAYOUT DIVIDERS X " + c.getX() + " Y " + c.getY() + " W " + (horizontal ? dividerWidth : width) + " H " + (horizontal ? height : dividerWidth));
+            if (horizontal) {
+                c.resize(dividerWidth, height);
+                positionInArea(c, c.getX() + paddingX, c.getY() + paddingY, dividerWidth, height,
+                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+            } else {
+                c.resize(width, dividerWidth);                
+                positionInArea(c, c.getX() + paddingX, c.getY() + paddingY, width, dividerWidth,
+                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+            }
+        }
+    }
+
+    private double previousSize = -1;
+    private int lastDividerUpdate = 0;
+    private boolean resize = false;
+    private boolean checkDividerPos = true;
+
+    private void setAndCheckAbsoluteDividerPos(ContentDivider divider, double value) {
+        double oldPos = divider.getDividerPos();
+        setAbsoluteDividerPos(divider, value);
+        checkDividerPosition(divider, value, oldPos);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    // This listener is to be removed from 'removed' dividers and added to 'added' dividers
+    class PosPropertyListener implements ChangeListener<Number> {
+        ContentDivider divider;
+
+        public PosPropertyListener(ContentDivider divider) {
+            this.divider = divider;
+        }
+
+        @Override public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
+            if (checkDividerPos) {
+                // When checking is enforced, we know that the position was set explicitly
+                divider.posExplicit = true;
+            }
+            getSkinnable().requestLayout();
+        }
+    }
+
+
+    class ContentDivider extends StackPane {
+        private double initialPos;
+        private double dividerPos;
+        private double pressPos;
+        private SplitPane.Divider d;
+        private StackPane grabber;
+        private double x;
+        private double y;
+        private boolean posExplicit;
+        private ChangeListener<Number> listener;
+
+        public ContentDivider(SplitPane.Divider d) {
+            getStyleClass().setAll("split-pane-divider");
+
+            this.d = d;
+            this.initialPos = 0;
+            this.dividerPos = 0;
+            this.pressPos = 0;
+
+            grabber = new StackPane() {
+                @Override protected double computeMinWidth(double height) {
+                    return 0;
+                }
+
+                @Override protected double computeMinHeight(double width) {
+                    return 0;
+                }
+
+                @Override protected double computePrefWidth(double height) {
+                    return snappedLeftInset() + snappedRightInset();
+                }
+
+                @Override protected double computePrefHeight(double width) {
+                    return snappedTopInset() + snappedBottomInset();
+                }
+
+                @Override protected double computeMaxWidth(double height) {
+                    return computePrefWidth(-1);
+                }
+
+                @Override protected double computeMaxHeight(double width) {
+                    return computePrefHeight(-1);
+                }
+            };
+            setGrabberStyle(horizontal);
+            getChildren().add(grabber);
+
+            // TODO register a listener for SplitPane.Divider position
+        }
+
+        public SplitPane.Divider getDivider() {
+            return this.d;
+        }
+
+        public final void setGrabberStyle(boolean horizontal) {
+            grabber.getStyleClass().clear();
+            grabber.getStyleClass().setAll("vertical-grabber");
+            setCursor(Cursor.V_RESIZE);
+            if (horizontal) {
+                grabber.getStyleClass().setAll("horizontal-grabber");
+                setCursor(Cursor.H_RESIZE);
+            }
+        }
+
+        public double getInitialPos() {
+            return initialPos;
+        }
+
+        public void setInitialPos(double initialPos) {
+            this.initialPos = initialPos;
+        }
+
+        public double getDividerPos() {
+            return dividerPos;
+        }
+
+        public void setDividerPos(double dividerPos) {
+            this.dividerPos = dividerPos;
+        }
+
+        public double getPressPos() {
+            return pressPos;
+        }
+
+        public void setPressPos(double pressPos) {
+            this.pressPos = pressPos;
+        }
+
+        // TODO remove x and y and replace with dividerpos.
+        public double getX() {
+            return x;
+        }
+
+        public void setX(double x) {
+            this.x = x;
+        }
+
+        public double getY() {
+            return y;
+        }
+
+        public void setY(double y) {
+            this.y = y;
+        }
+
+        public ChangeListener<Number> getPosPropertyListener() {
+            return listener;
+        }
+
+        public void setPosPropertyListener(ChangeListener<Number> listener) {
+            this.listener = listener;
+        }
+                
+        @Override protected double computeMinWidth(double height) {
+            return computePrefWidth(height);
+        }
+
+        @Override protected double computeMinHeight(double width) {
+            return computePrefHeight(width);
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            return snappedLeftInset() + snappedRightInset();
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            return snappedTopInset() + snappedBottomInset();
+        }
+
+        @Override protected double computeMaxWidth(double height) {
+            return computePrefWidth(height);
+        }
+
+        @Override protected double computeMaxHeight(double width) {
+            return computePrefHeight(width);
+        }
+
+        @Override protected void layoutChildren() {
+            double grabberWidth = grabber.prefWidth(-1);
+            double grabberHeight = grabber.prefHeight(-1);
+            double grabberX = (getWidth() - grabberWidth)/2;
+            double grabberY = (getHeight() - grabberHeight)/2;
+            grabber.resize(grabberWidth, grabberHeight);
+            positionInArea(grabber, grabberX, grabberY, grabberWidth, grabberHeight,
+                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+        }
+    }
+
+    static class Content extends StackPane {
+        private Node content;
+        private Rectangle clipRect;
+        private double x;
+        private double y;
+        private double area;
+        private double resizableWithParentArea;
+        private double available;
+
+        public Content(Node n) {
+            this.clipRect = new Rectangle();
+            setClip(clipRect);
+            this.content = n;
+            if (n != null) {
+                getChildren().add(n);
+            }
+            this.x = 0;
+            this.y = 0;
+        }
+
+        public Node getContent() {
+            return content;
+        }
+
+        public double getX() {
+            return x;
+        }
+
+        public void setX(double x) {
+            this.x = x;
+        }
+
+        public double getY() {
+            return y;
+        }
+
+        public void setY(double y) {
+            this.y = y;
+        }
+
+        // This is the area of the panel.  This will be used as the
+        // width/height during layout.
+        public double getArea() {
+            return area;
+        }
+
+        public void setArea(double area) {
+            this.area = area;
+        }
+
+        // This is the minimum available area for other panels to use
+        // if they need more space.
+        public double getAvailable() {
+            return available;
+        }
+
+        public void setAvailable(double available) {
+            this.available = available;
+        }
+
+        public boolean isResizableWithParent() {
+            return SplitPane.isResizableWithParent(content);
+        }
+
+        public double getResizableWithParentArea() {
+            return resizableWithParentArea;
+        }
+
+        // This is used to save the current area during resizing when
+        // isResizeableWithParent equals false.
+        public void setResizableWithParentArea(double resizableWithParentArea) {
+            if (!isResizableWithParent()) {
+                this.resizableWithParentArea = resizableWithParentArea;
+            } else {
+                this.resizableWithParentArea = 0;
+            }
+        }
+
+        protected void setClipSize(double w, double h) {
+            clipRect.setWidth(w);
+            clipRect.setHeight(h);
+        }
+
+        @Override protected double computeMaxWidth(double height) {
+            return snapSize(content.maxWidth(height));
+        }
+
+        @Override protected double computeMaxHeight(double width) {
+            return snapSize(content.maxHeight(width));
+        }
+    }
+}
+
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TabPaneSkin.java	2015-09-03 15:22:09.632045200 -0700
+++ /dev/null	2015-09-03 15:22:10.000000000 -0700
@@ -1,1832 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 com.sun.javafx.util.Utils;
-import javafx.animation.Animation;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.WeakInvalidationListener;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.value.WritableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.WeakListChangeListener;
-import javafx.css.CssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.HPos;
-import javafx.geometry.Pos;
-import javafx.geometry.Side;
-import javafx.geometry.VPos;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.RadioMenuItem;
-import javafx.scene.control.SkinBase;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TabPane;
-import javafx.scene.control.TabPane.TabClosingPolicy;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.control.Tooltip;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.ContextMenuEvent;
-import javafx.scene.input.MouseButton;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.input.SwipeEvent;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.transform.Rotate;
-import javafx.util.Duration;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.scene.control.MultiplePropertyChangeListenerHandler;
-import com.sun.javafx.scene.control.behavior.TabPaneBehavior;
-import com.sun.javafx.scene.traversal.Direction;
-import com.sun.javafx.scene.traversal.TraversalEngine;
-
-import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
-
-public class TabPaneSkin extends BehaviorSkinBase<TabPane, TabPaneBehavior> {
-    private static enum TabAnimation {
-        NONE,
-        GROW
-        // In future we could add FADE, ...
-    }
-
-    private enum TabAnimationState {
-        SHOWING, HIDING, NONE;
-    }
-    
-    private ObjectProperty<TabAnimation> openTabAnimation = new StyleableObjectProperty<TabAnimation>(TabAnimation.GROW) {
-        @Override public CssMetaData<TabPane,TabAnimation> getCssMetaData() {
-            return StyleableProperties.OPEN_TAB_ANIMATION;
-        }
-        
-        @Override public Object getBean() {
-            return TabPaneSkin.this;
-        }
-
-        @Override public String getName() {
-            return "openTabAnimation";
-        }
-    };
-    
-    private ObjectProperty<TabAnimation> closeTabAnimation = new StyleableObjectProperty<TabAnimation>(TabAnimation.GROW) {
-        @Override public CssMetaData<TabPane,TabAnimation> getCssMetaData() {
-            return StyleableProperties.CLOSE_TAB_ANIMATION;
-        }
-
-        @Override public Object getBean() {
-            return TabPaneSkin.this;
-        }
-
-        @Override public String getName() {
-            return "closeTabAnimation";
-        }
-    };
-    
-    private static int getRotation(Side pos) {
-        switch (pos) {
-            case TOP:
-                return 0;
-            case BOTTOM:
-                return 180;
-            case LEFT:
-                return -90;
-            case RIGHT:
-                return 90;
-            default:
-                return 0;
-        }
-    }
-
-    /**
-     * VERY HACKY - this lets us 'duplicate' Label and ImageView nodes to be used in a
-     * Tab and the tabs menu at the same time.
-     */
-    private static Node clone(Node n) {
-        if (n == null) {
-            return null;
-        }
-        if (n instanceof ImageView) {
-            ImageView iv = (ImageView) n;
-            ImageView imageview = new ImageView();
-            imageview.setImage(iv.getImage());
-            return imageview;
-        }
-        if (n instanceof Label) {            
-            Label l = (Label)n;
-            Label label = new Label(l.getText(), l.getGraphic());
-            return label;
-        }
-        return null;
-    }
-    private static final double ANIMATION_SPEED = 150;
-    private static final int SPACER = 10;
-
-    private TabHeaderArea tabHeaderArea;
-    private ObservableList<TabContentRegion> tabContentRegions;
-    private Rectangle clipRect;
-    private Rectangle tabHeaderAreaClipRect;
-    private Tab selectedTab;
-    private boolean isSelectingTab;
-
-    public TabPaneSkin(TabPane tabPane) {
-        super(tabPane, new TabPaneBehavior(tabPane));
-
-        clipRect = new Rectangle(tabPane.getWidth(), tabPane.getHeight());
-        getSkinnable().setClip(clipRect);
-
-        tabContentRegions = FXCollections.<TabContentRegion>observableArrayList();
-
-        for (Tab tab : getSkinnable().getTabs()) {
-            addTabContent(tab);
-        }
-
-        tabHeaderAreaClipRect = new Rectangle();
-        tabHeaderArea = new TabHeaderArea();
-        tabHeaderArea.setClip(tabHeaderAreaClipRect);
-        getChildren().add(tabHeaderArea);
-        if (getSkinnable().getTabs().size() == 0) {
-            tabHeaderArea.setVisible(false);
-        }
-
-        initializeTabListener();
-
-        registerChangeListener(tabPane.getSelectionModel().selectedItemProperty(), "SELECTED_TAB");
-        registerChangeListener(tabPane.sideProperty(), "SIDE");
-        registerChangeListener(tabPane.widthProperty(), "WIDTH");
-        registerChangeListener(tabPane.heightProperty(), "HEIGHT");
-
-        selectedTab = getSkinnable().getSelectionModel().getSelectedItem();
-        // Could not find the selected tab try and get the selected tab using the selected index
-        if (selectedTab == null && getSkinnable().getSelectionModel().getSelectedIndex() != -1) {
-            getSkinnable().getSelectionModel().select(getSkinnable().getSelectionModel().getSelectedIndex());
-            selectedTab = getSkinnable().getSelectionModel().getSelectedItem();        
-        } 
-        if (selectedTab == null) {
-            // getSelectedItem and getSelectedIndex failed select the first.
-            getSkinnable().getSelectionModel().selectFirst();
-        } 
-        selectedTab = getSkinnable().getSelectionModel().getSelectedItem();        
-        isSelectingTab = false;
-
-        initializeSwipeHandlers();
-    }
-
-    public StackPane getSelectedTabContentRegion() {
-        for (TabContentRegion contentRegion : tabContentRegions) {
-            if (contentRegion.getTab().equals(selectedTab)) {
-                return contentRegion;
-            }
-        }
-        return null;
-    }
-
-    @Override protected void handleControlPropertyChanged(String property) {
-        super.handleControlPropertyChanged(property);
-        if ("SELECTED_TAB".equals(property)) {            
-            isSelectingTab = true;
-            selectedTab = getSkinnable().getSelectionModel().getSelectedItem();
-            getSkinnable().requestLayout();
-        } else if ("SIDE".equals(property)) {
-            updateTabPosition();
-        } else if ("WIDTH".equals(property)) {
-            clipRect.setWidth(getSkinnable().getWidth());
-        } else if ("HEIGHT".equals(property)) {
-            clipRect.setHeight(getSkinnable().getHeight());
-        }
-    }
-    private void removeTabs(List<? extends Tab> removedList) {
-        for (final Tab tab : removedList) {
-            stopCurrentAnimation(tab);
-            // Animate the tab removal
-            final TabHeaderSkin tabRegion = tabHeaderArea.getTabHeaderSkin(tab);
-            if (tabRegion != null) {
-                tabRegion.isClosing = true;
-
-                tabRegion.removeListeners(tab);
-                removeTabContent(tab);
-
-                // remove the menu item from the popup menu
-                ContextMenu popupMenu = tabHeaderArea.controlButtons.popup;
-                TabMenuItem tabItem = null;
-                if (popupMenu != null) {
-                    for (MenuItem item : popupMenu.getItems()) {
-                        tabItem = (TabMenuItem) item;
-                        if (tab == tabItem.getTab()) {
-                            break;
-                        }
-                        tabItem = null;
-                    }
-                }
-                if (tabItem != null) {
-                    tabItem.dispose();
-                    popupMenu.getItems().remove(tabItem);
-                }
-                // end of removing menu item
-
-                EventHandler<ActionEvent> cleanup = ae -> {
-                    tabRegion.animationState = TabAnimationState.NONE;
-
-                    tabHeaderArea.removeTab(tab);
-                    tabHeaderArea.requestLayout();
-                    if (getSkinnable().getTabs().isEmpty()) {
-                        tabHeaderArea.setVisible(false);
-                    }
-                };
-
-                if (closeTabAnimation.get() == TabAnimation.GROW) {
-                    tabRegion.animationState = TabAnimationState.HIDING;
-                    Timeline closedTabTimeline = tabRegion.currentAnimation =
-                            createTimeline(tabRegion, Duration.millis(ANIMATION_SPEED), 0.0F, cleanup);
-                    closedTabTimeline.play();    
-                } else {
-                    cleanup.handle(null);
-                }
-            }
-        }
-    }
-
-    private void stopCurrentAnimation(Tab tab) {
-        final TabHeaderSkin tabRegion = tabHeaderArea.getTabHeaderSkin(tab);
-        if (tabRegion != null) {
-            // Execute the code immediately, don't wait for the animation to finish.
-            Timeline timeline = tabRegion.currentAnimation;
-            if (timeline != null && timeline.getStatus() == Animation.Status.RUNNING) {
-                timeline.getOnFinished().handle(null);
-                timeline.stop();
-                tabRegion.currentAnimation = null;
-            }
-        }
-    }
-
-    private void addTabs(List<? extends Tab> addedList, int from) {
-        int i = 0;
-
-        // RT-39984: check if any other tabs are animating - they must be completed first.
-        List<Node> headers = new ArrayList<>(tabHeaderArea.headersRegion.getChildren());
-        for (Node n : headers) {
-            TabHeaderSkin header = (TabHeaderSkin) n;
-            if (header.animationState == TabAnimationState.HIDING) {
-                stopCurrentAnimation(header.tab);
-            }
-        }
-        // end of fix for RT-39984
-
-        for (final Tab tab : addedList) {
-            stopCurrentAnimation(tab); // Note that this must happen before addTab() call below
-            // A new tab was added - animate it out
-            if (!tabHeaderArea.isVisible()) {
-                tabHeaderArea.setVisible(true);
-            }
-            int index = from + i++;
-            tabHeaderArea.addTab(tab, index);
-            addTabContent(tab);
-            final TabHeaderSkin tabRegion = tabHeaderArea.getTabHeaderSkin(tab);
-            if (tabRegion != null) {
-                if (openTabAnimation.get() == TabAnimation.GROW) {
-                    tabRegion.animationState = TabAnimationState.SHOWING;
-                    tabRegion.animationTransition.setValue(0.0);
-                    tabRegion.setVisible(true);
-                    tabRegion.currentAnimation = createTimeline(tabRegion, Duration.millis(ANIMATION_SPEED), 1.0, event -> {
-                        tabRegion.animationState = TabAnimationState.NONE;
-                        tabRegion.setVisible(true);
-                        tabRegion.inner.requestLayout();
-                    });
-                    tabRegion.currentAnimation.play();
-                } else {
-                    tabRegion.setVisible(true);
-                    tabRegion.inner.requestLayout();
-                }
-            }
-        }
-    }
-    
-    private void initializeTabListener() {
-        getSkinnable().getTabs().addListener((ListChangeListener<Tab>) c -> {
-            List<Tab> tabsToRemove = new ArrayList<>();
-            List<Tab> tabsToAdd = new ArrayList<>();
-            int insertPos = -1;
-
-            while (c.next()) {
-                if (c.wasPermutated()) {
-                    TabPane tabPane = getSkinnable();
-                    List<Tab> tabs = tabPane.getTabs();
-
-                    // tabs sorted : create list of permutated tabs.
-                    // clear selection, set tab animation to NONE
-                    // remove permutated tabs, add them back in correct order.
-                    // restore old selection, and old tab animation states.
-                    int size = c.getTo() - c.getFrom();
-                    Tab selTab = tabPane.getSelectionModel().getSelectedItem();
-                    List<Tab> permutatedTabs = new ArrayList<Tab>(size);
-                    getSkinnable().getSelectionModel().clearSelection();
-
-                    // save and set tab animation to none - as it is not a good idea
-                    // to animate on the same data for open and close.
-                    TabAnimation prevOpenAnimation = openTabAnimation.get();
-                    TabAnimation prevCloseAnimation = closeTabAnimation.get();
-                    openTabAnimation.set(TabAnimation.NONE);
-                    closeTabAnimation.set(TabAnimation.NONE);
-                    for (int i = c.getFrom(); i < c.getTo(); i++) {
-                        permutatedTabs.add(tabs.get(i));
-                    }
-
-                    removeTabs(permutatedTabs);
-                    addTabs(permutatedTabs, c.getFrom());
-                    openTabAnimation.set(prevOpenAnimation);
-                    closeTabAnimation.set(prevCloseAnimation);
-                    getSkinnable().getSelectionModel().select(selTab);
-                }
-
-                if (c.wasRemoved()) {
-                    tabsToRemove.addAll(c.getRemoved());
-                }
-
-                if (c.wasAdded()) {
-                    tabsToAdd.addAll(c.getAddedSubList());
-                    insertPos = c.getFrom();
-                }
-            }
-
-            // now only remove the tabs that are not in the tabsToAdd list
-            tabsToRemove.removeAll(tabsToAdd);
-            removeTabs(tabsToRemove);
-
-            // and add in any new tabs (that we don't already have showing)
-            if (! tabsToAdd.isEmpty()) {
-                for (TabContentRegion tabContentRegion : tabContentRegions) {
-                    Tab tab = tabContentRegion.getTab();
-                    TabHeaderSkin tabHeader = tabHeaderArea.getTabHeaderSkin(tab);
-                    if (!tabHeader.isClosing && tabsToAdd.contains(tabContentRegion.getTab())) {
-                        tabsToAdd.remove(tabContentRegion.getTab());
-                    }
-                }
-
-                addTabs(tabsToAdd, insertPos == -1 ? tabContentRegions.size() : insertPos);
-            }
-
-            // Fix for RT-34692
-            getSkinnable().requestLayout();
-        });
-    }
-
-    private void addTabContent(Tab tab) {
-        TabContentRegion tabContentRegion = new TabContentRegion(tab);
-        tabContentRegion.setClip(new Rectangle());
-        tabContentRegions.add(tabContentRegion);
-        // We want the tab content to always sit below the tab headers
-        getChildren().add(0, tabContentRegion);
-    }
-
-    private void removeTabContent(Tab tab) {
-        for (TabContentRegion contentRegion : tabContentRegions) {
-            if (contentRegion.getTab().equals(tab)) {
-                contentRegion.removeListeners(tab);
-                getChildren().remove(contentRegion);
-                tabContentRegions.remove(contentRegion);
-                break;
-            }
-        }
-    }
-
-    private void updateTabPosition() {
-        tabHeaderArea.setScrollOffset(0.0F);
-        getSkinnable().applyCss();
-        getSkinnable().requestLayout();
-    }
-
-    private Timeline createTimeline(final TabHeaderSkin tabRegion, final Duration duration, final double endValue, final EventHandler<ActionEvent> func) {
-        Timeline timeline = new Timeline();
-        timeline.setCycleCount(1);
-
-        KeyValue keyValue = new KeyValue(tabRegion.animationTransition, endValue, Interpolator.LINEAR);
-        timeline.getKeyFrames().clear();
-        timeline.getKeyFrames().add(new KeyFrame(duration, keyValue));
-
-        timeline.setOnFinished(func);
-        return timeline;
-    }
-
-    private boolean isHorizontal() {
-        Side tabPosition = getSkinnable().getSide();
-        return Side.TOP.equals(tabPosition) || Side.BOTTOM.equals(tabPosition);
-    }
-
-    private void initializeSwipeHandlers() {
-        if (IS_TOUCH_SUPPORTED) {
-            getSkinnable().addEventHandler(SwipeEvent.SWIPE_LEFT, t -> {
-                getBehavior().selectNextTab();
-            });
-
-            getSkinnable().addEventHandler(SwipeEvent.SWIPE_RIGHT, t -> {
-                getBehavior().selectPreviousTab();
-            });
-        }    
-    }
-    
-    //TODO need to cache this.
-    private boolean isFloatingStyleClass() {
-        return getSkinnable().getStyleClass().contains(TabPane.STYLE_CLASS_FLOATING);
-    }
-
-    private double maxw = 0.0d;
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        // The TabPane can only be as wide as it widest content width.
-        for (TabContentRegion contentRegion: tabContentRegions) {
-             maxw = Math.max(maxw, snapSize(contentRegion.prefWidth(-1)));
-        }
-
-        final boolean isHorizontal = isHorizontal();
-        final double tabHeaderAreaSize = snapSize(isHorizontal ?
-                tabHeaderArea.prefWidth(-1) : tabHeaderArea.prefHeight(-1));
-
-        double prefWidth = isHorizontal ?
-            Math.max(maxw, tabHeaderAreaSize) : maxw + tabHeaderAreaSize;
-        return snapSize(prefWidth) + rightInset + leftInset;
-    }
-
-    private double maxh = 0.0d;
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        // The TabPane can only be as high as it highest content height.
-        for (TabContentRegion contentRegion: tabContentRegions) {
-             maxh = Math.max(maxh, snapSize(contentRegion.prefHeight(-1)));
-        }
-
-        final boolean isHorizontal = isHorizontal();
-        final double tabHeaderAreaSize = snapSize(isHorizontal ?
-                tabHeaderArea.prefHeight(-1) : tabHeaderArea.prefWidth(-1));
-
-        double prefHeight = isHorizontal ?
-             maxh + snapSize(tabHeaderAreaSize) : Math.max(maxh, tabHeaderAreaSize);
-        return snapSize(prefHeight) + topInset + bottomInset;
-    }
-
-    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        Side tabPosition = getSkinnable().getSide();
-        if (tabPosition == Side.TOP) {
-            return tabHeaderArea.getBaselineOffset() + topInset;
-        }
-        return 0;
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        TabPane tabPane = getSkinnable();
-        Side tabPosition = tabPane.getSide();
-
-        double headerHeight = snapSize(tabHeaderArea.prefHeight(-1));
-        double tabsStartX = tabPosition.equals(Side.RIGHT)? x + w - headerHeight : x;
-        double tabsStartY = tabPosition.equals(Side.BOTTOM)? y + h - headerHeight : y;
-
-        if (tabPosition == Side.TOP) {
-            tabHeaderArea.resize(w, headerHeight);
-            tabHeaderArea.relocate(tabsStartX, tabsStartY);
-            tabHeaderArea.getTransforms().clear();
-            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.TOP)));
-        } else if (tabPosition == Side.BOTTOM) {
-            tabHeaderArea.resize(w, headerHeight);
-            tabHeaderArea.relocate(w, tabsStartY - headerHeight);
-            tabHeaderArea.getTransforms().clear();
-            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.BOTTOM), 0, headerHeight));
-        } else if (tabPosition == Side.LEFT) {
-            tabHeaderArea.resize(h, headerHeight);
-            tabHeaderArea.relocate(tabsStartX + headerHeight, h - headerHeight);
-            tabHeaderArea.getTransforms().clear();
-            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.LEFT), 0, headerHeight));
-        } else if (tabPosition == Side.RIGHT) {
-            tabHeaderArea.resize(h, headerHeight);
-            tabHeaderArea.relocate(tabsStartX, y - headerHeight);
-            tabHeaderArea.getTransforms().clear();
-            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.RIGHT), 0, headerHeight));
-        }
-
-        tabHeaderAreaClipRect.setX(0);
-        tabHeaderAreaClipRect.setY(0);
-        if (isHorizontal()) {
-            tabHeaderAreaClipRect.setWidth(w);
-        } else {
-            tabHeaderAreaClipRect.setWidth(h);
-        }
-        tabHeaderAreaClipRect.setHeight(headerHeight);
-
-        // ==================================
-        // position the tab content for the selected tab only
-        // ==================================
-        // if the tabs are on the left, the content needs to be indented
-        double contentStartX = 0;
-        double contentStartY = 0;
-
-        if (tabPosition == Side.TOP) {
-            contentStartX = x;
-            contentStartY = y + headerHeight;
-            if (isFloatingStyleClass()) {
-                // This is to hide the top border content
-                contentStartY -= 1;
-            }
-        } else if (tabPosition == Side.BOTTOM) {
-            contentStartX = x;
-            contentStartY = y;
-            if (isFloatingStyleClass()) {
-                // This is to hide the bottom border content
-                contentStartY = 1;
-            }
-        } else if (tabPosition == Side.LEFT) {
-            contentStartX = x + headerHeight;
-            contentStartY = y;
-            if (isFloatingStyleClass()) {
-                // This is to hide the left border content
-                contentStartX -= 1;
-            }
-        } else if (tabPosition == Side.RIGHT) {
-            contentStartX = x;
-            contentStartY = y;
-            if (isFloatingStyleClass()) {
-                // This is to hide the right border content
-                contentStartX = 1;
-            }
-        }
-
-        double contentWidth = w - (isHorizontal() ? 0 : headerHeight);
-        double contentHeight = h - (isHorizontal() ? headerHeight: 0);
-        
-        for (int i = 0, max = tabContentRegions.size(); i < max; i++) {
-            TabContentRegion tabContent = tabContentRegions.get(i);
-            
-            tabContent.setAlignment(Pos.TOP_LEFT);
-            if (tabContent.getClip() != null) {
-                ((Rectangle)tabContent.getClip()).setWidth(contentWidth);
-                ((Rectangle)tabContent.getClip()).setHeight(contentHeight);
-            }
-            
-            // we need to size all tabs, even if they aren't visible. For example,
-            // see RT-29167
-            tabContent.resize(contentWidth, contentHeight);
-            tabContent.relocate(contentStartX, contentStartY);
-        }
-    }
-    
-    
-   /**
-    * Super-lazy instantiation pattern from Bill Pugh.
-    * @treatAsPrivate implementation detail
-    */
-   private static class StyleableProperties {
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        
-        private final static CssMetaData<TabPane,TabAnimation> OPEN_TAB_ANIMATION = 
-                new CssMetaData<TabPane, TabPaneSkin.TabAnimation>("-fx-open-tab-animation", 
-                    new EnumConverter<TabAnimation>(TabAnimation.class), TabAnimation.GROW) {
-
-            @Override public boolean isSettable(TabPane node) {
-                return true;
-            }
-
-            @Override public StyleableProperty<TabAnimation> getStyleableProperty(TabPane node) {
-                TabPaneSkin skin = (TabPaneSkin) node.getSkin();
-                return (StyleableProperty<TabAnimation>)(WritableValue<TabAnimation>)skin.openTabAnimation;
-            }
-        };
-        
-        private final static CssMetaData<TabPane,TabAnimation> CLOSE_TAB_ANIMATION = 
-                new CssMetaData<TabPane, TabPaneSkin.TabAnimation>("-fx-close-tab-animation", 
-                    new EnumConverter<TabAnimation>(TabAnimation.class), TabAnimation.GROW) {
-
-            @Override public boolean isSettable(TabPane node) {
-                return true;
-            }
-
-            @Override public StyleableProperty<TabAnimation> getStyleableProperty(TabPane node) {
-                TabPaneSkin skin = (TabPaneSkin) node.getSkin();
-                return (StyleableProperty<TabAnimation>)(WritableValue<TabAnimation>)skin.closeTabAnimation;
-            }
-        };
-        
-        static {
-
-           final List<CssMetaData<? extends Styleable, ?>> styleables = 
-               new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-           styleables.add(OPEN_TAB_ANIMATION);
-           styleables.add(CLOSE_TAB_ANIMATION);
-           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();
-    }
-
-    /**************************************************************************
-     *
-     * TabHeaderArea: Area responsible for painting all tabs
-     *
-     **************************************************************************/
-    class TabHeaderArea extends StackPane {
-        private Rectangle headerClip;
-        private StackPane headersRegion;
-        private StackPane headerBackground;
-        private TabControlButtons controlButtons;
-
-        private boolean measureClosingTabs = false;
-
-        private double scrollOffset;
-
-        public TabHeaderArea() {
-            getStyleClass().setAll("tab-header-area");
-            setManaged(false);
-            final TabPane tabPane = getSkinnable();
-
-            headerClip = new Rectangle();
-            
-            headersRegion = new StackPane() {
-                @Override protected double computePrefWidth(double height) {
-                    double width = 0.0F;
-                    for (Node child : getChildren()) {
-                        TabHeaderSkin tabHeaderSkin = (TabHeaderSkin)child;
-                        if (tabHeaderSkin.isVisible() && (measureClosingTabs || ! tabHeaderSkin.isClosing)) {
-                            width += tabHeaderSkin.prefWidth(height);
-                        }
-                    }
-                    return snapSize(width) + snappedLeftInset() + snappedRightInset();
-                }
-
-                @Override protected double computePrefHeight(double width) {
-                    double height = 0.0F;
-                    for (Node child : getChildren()) {
-                        TabHeaderSkin tabHeaderSkin = (TabHeaderSkin)child;
-                        height = Math.max(height, tabHeaderSkin.prefHeight(width));
-                    }
-                    return snapSize(height) + snappedTopInset() + snappedBottomInset();
-                }
-
-                @Override protected void layoutChildren() {
-                    if (tabsFit()) {
-                        setScrollOffset(0.0);
-                    } else {
-                        if (!removeTab.isEmpty()) {                            
-                            double offset = 0;
-                            double w = tabHeaderArea.getWidth() - snapSize(controlButtons.prefWidth(-1)) - firstTabIndent() - SPACER;
-                            Iterator<Node> i = getChildren().iterator();
-                            while (i.hasNext()) {
-                                TabHeaderSkin tabHeader = (TabHeaderSkin)i.next();
-                                double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1));
-                                if (removeTab.contains(tabHeader)) {                                    
-                                    if (offset < w) {
-                                        isSelectingTab = true;
-                                    }
-                                    i.remove();
-                                    removeTab.remove(tabHeader);
-                                    if (removeTab.isEmpty()) {
-                                        break;
-                                    }
-                                }
-                                offset += tabHeaderPrefWidth;                                
-                            }
-//                        } else {
-//                            isSelectingTab = true;
-                        }
-                    }
-
-                    if (isSelectingTab) {
-                        ensureSelectedTabIsVisible();
-                        isSelectingTab = false;
-                    } else {
-                        validateScrollOffset();
-                    }
-
-                    Side tabPosition = getSkinnable().getSide();
-                    double tabBackgroundHeight = snapSize(prefHeight(-1));
-                    double tabX = (tabPosition.equals(Side.LEFT) || tabPosition.equals(Side.BOTTOM)) ?
-                        snapSize(getWidth()) - getScrollOffset() : getScrollOffset();
-
-                    updateHeaderClip();
-                    for (Node node : getChildren()) {
-                        TabHeaderSkin tabHeader = (TabHeaderSkin)node;
-
-                        // size and position the header relative to the other headers
-                        double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1) * tabHeader.animationTransition.get());
-                        double tabHeaderPrefHeight = snapSize(tabHeader.prefHeight(-1));
-                        tabHeader.resize(tabHeaderPrefWidth, tabHeaderPrefHeight);
-
-                        // This ensures that the tabs are located in the correct position
-                        // when there are tabs of differing heights.
-                        double startY = tabPosition.equals(Side.BOTTOM) ?
-                            0 : tabBackgroundHeight - tabHeaderPrefHeight - snappedBottomInset();
-                        if (tabPosition.equals(Side.LEFT) || tabPosition.equals(Side.BOTTOM)) {
-                            // build from the right
-                            tabX -= tabHeaderPrefWidth;
-                            tabHeader.relocate(tabX, startY);
-                        } else {
-                            // build from the left
-                            tabHeader.relocate(tabX, startY);
-                            tabX += tabHeaderPrefWidth;
-                        }
-                    }
-                }
-
-            };
-            headersRegion.getStyleClass().setAll("headers-region");
-            headersRegion.setClip(headerClip);
-
-            headerBackground = new StackPane();
-            headerBackground.getStyleClass().setAll("tab-header-background");
-
-            int i = 0;
-            for (Tab tab: tabPane.getTabs()) {
-                addTab(tab, i++);
-            }
-
-            controlButtons = new TabControlButtons();
-            controlButtons.setVisible(false);
-            if (controlButtons.isVisible()) {
-                controlButtons.setVisible(true);
-            }
-            getChildren().addAll(headerBackground, headersRegion, controlButtons);
-
-            // support for mouse scroll of header area (for when the tabs exceed
-            // the available space)
-            addEventHandler(ScrollEvent.SCROLL, (ScrollEvent e) -> {
-                Side side = getSkinnable().getSide();
-                side = side == null ? Side.TOP : side;
-                switch (side) {
-                    default:
-                    case TOP:
-                    case BOTTOM:
-                        setScrollOffset(scrollOffset - e.getDeltaY());
-                        break;
-                    case LEFT:
-                    case RIGHT:
-                        setScrollOffset(scrollOffset + e.getDeltaY());
-                        break;
-                }
-
-            });
-        }
-
-        private void updateHeaderClip() {
-            Side tabPosition = getSkinnable().getSide();
-
-            double x = 0;
-            double y = 0;
-            double clipWidth = 0;
-            double clipHeight = 0;
-            double maxWidth = 0;
-            double shadowRadius = 0;
-            double clipOffset = firstTabIndent();
-            double controlButtonPrefWidth = snapSize(controlButtons.prefWidth(-1));
-
-            measureClosingTabs = true;
-            double headersPrefWidth = snapSize(headersRegion.prefWidth(-1));
-            measureClosingTabs = false;
-
-            double headersPrefHeight = snapSize(headersRegion.prefHeight(-1));
-
-            // Add the spacer if isShowTabsMenu is true.
-            if (controlButtonPrefWidth > 0) {
-                controlButtonPrefWidth = controlButtonPrefWidth + SPACER;
-            }
-
-            if (headersRegion.getEffect() instanceof DropShadow) {
-                DropShadow shadow = (DropShadow)headersRegion.getEffect();
-                shadowRadius = shadow.getRadius();
-            }
-
-            maxWidth = snapSize(getWidth()) - controlButtonPrefWidth - clipOffset;
-            if (tabPosition.equals(Side.LEFT) || tabPosition.equals(Side.BOTTOM)) {
-                if (headersPrefWidth < maxWidth) {
-                    clipWidth = headersPrefWidth + shadowRadius;
-                } else {
-                    x = headersPrefWidth - maxWidth;
-                    clipWidth = maxWidth + shadowRadius;
-                }
-                clipHeight = headersPrefHeight;
-            } else {
-                // If x = 0 the header region's drop shadow is clipped.
-                x = -shadowRadius;
-                clipWidth = (headersPrefWidth < maxWidth ? headersPrefWidth : maxWidth) + shadowRadius;
-                clipHeight = headersPrefHeight;
-            }
-
-            headerClip.setX(x);
-            headerClip.setY(y);
-            headerClip.setWidth(clipWidth);
-            headerClip.setHeight(clipHeight);
-        }
-
-        private void addTab(Tab tab, int addToIndex) {
-            TabHeaderSkin tabHeaderSkin = new TabHeaderSkin(tab);
-            headersRegion.getChildren().add(addToIndex, tabHeaderSkin);
-        }
-
-        private List<TabHeaderSkin> removeTab = new ArrayList<>();
-        private void removeTab(Tab tab) {
-            TabHeaderSkin tabHeaderSkin = getTabHeaderSkin(tab);
-            if (tabHeaderSkin != null) {
-                if (tabsFit()) {
-                    headersRegion.getChildren().remove(tabHeaderSkin);
-                } else {
-                    // The tab will be removed during layout because
-                    // we need its width to compute the scroll offset.
-                    removeTab.add(tabHeaderSkin);
-                    tabHeaderSkin.removeListeners(tab);
-                }
-            }
-        }
-
-        private TabHeaderSkin getTabHeaderSkin(Tab tab) {
-            for (Node child: headersRegion.getChildren()) {
-                TabHeaderSkin tabHeaderSkin = (TabHeaderSkin)child;
-                if (tabHeaderSkin.getTab().equals(tab)) {
-                    return tabHeaderSkin;
-                }
-            }
-            return null;
-        }
-
-        private boolean tabsFit() {
-            double headerPrefWidth = snapSize(headersRegion.prefWidth(-1));
-            double controlTabWidth = snapSize(controlButtons.prefWidth(-1));
-            double visibleWidth = headerPrefWidth + controlTabWidth + firstTabIndent() + SPACER;
-            return visibleWidth < getWidth();
-        }
-
-        private void ensureSelectedTabIsVisible() {
-            // work out the visible width of the tab header
-            double tabPaneWidth = snapSize(isHorizontal() ? getSkinnable().getWidth() : getSkinnable().getHeight());
-            double controlTabWidth = snapSize(controlButtons.getWidth());
-            double visibleWidth = tabPaneWidth - controlTabWidth - firstTabIndent() - SPACER;
-
-            // and get where the selected tab is in the header area
-            double offset = 0.0;
-            double selectedTabOffset = 0.0;
-            double selectedTabWidth = 0.0;
-            for (Node node : headersRegion.getChildren()) {
-                TabHeaderSkin tabHeader = (TabHeaderSkin)node;
-
-                double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1));
-
-                if (selectedTab != null && selectedTab.equals(tabHeader.getTab())) {
-                    selectedTabOffset = offset;
-                    selectedTabWidth = tabHeaderPrefWidth;
-                }
-                offset += tabHeaderPrefWidth;
-            }
-
-            final double scrollOffset = getScrollOffset();
-            final double selectedTabStartX = selectedTabOffset;
-            final double selectedTabEndX = selectedTabOffset + selectedTabWidth;
-
-            final double visibleAreaEndX = visibleWidth;
-
-            if (selectedTabStartX < -scrollOffset) {
-                setScrollOffset(-selectedTabStartX);
-            } else if (selectedTabEndX > (visibleAreaEndX - scrollOffset)) {
-                setScrollOffset(visibleAreaEndX - selectedTabEndX);
-            }
-        }
-
-        public double getScrollOffset() {
-            return scrollOffset;
-        }
-
-        private void validateScrollOffset() {
-            setScrollOffset(getScrollOffset());
-        }
-
-        private void setScrollOffset(double newScrollOffset) {
-            // work out the visible width of the tab header
-            double tabPaneWidth = snapSize(isHorizontal() ? getSkinnable().getWidth() : getSkinnable().getHeight());
-            double controlTabWidth = snapSize(controlButtons.getWidth());
-            double visibleWidth = tabPaneWidth - controlTabWidth - firstTabIndent() - SPACER;
-
-            // measure the width of all tabs
-            double offset = 0.0;
-            for (Node node : headersRegion.getChildren()) {
-                TabHeaderSkin tabHeader = (TabHeaderSkin)node;
-                double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1));
-                offset += tabHeaderPrefWidth;
-            }
-
-            double actualNewScrollOffset;
-
-            if ((visibleWidth - newScrollOffset) > offset && newScrollOffset < 0) {
-                // need to make sure the right-most tab is attached to the
-                // right-hand side of the tab header (e.g. if the tab header area width
-                // is expanded), and if it isn't modify the scroll offset to bring
-                // it into line. See RT-35194 for a test case.
-                actualNewScrollOffset = visibleWidth - offset;
-            } else if (newScrollOffset > 0) {
-                // need to prevent the left-most tab from becoming detached
-                // from the left-hand side of the tab header.
-                actualNewScrollOffset = 0;
-            } else {
-                actualNewScrollOffset = newScrollOffset;
-            }
-
-            if (actualNewScrollOffset != scrollOffset) {
-                scrollOffset = actualNewScrollOffset;
-                headersRegion.requestLayout();
-            }
-        }
-
-        private double firstTabIndent() {
-            switch (getSkinnable().getSide()) {
-                case TOP:
-                case BOTTOM:
-                    return snappedLeftInset();
-                case RIGHT:
-                case LEFT:
-                    return snappedTopInset();
-                default:
-                    return 0;
-            }
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            double padding = isHorizontal() ?
-                snappedLeftInset() + snappedRightInset() :
-                snappedTopInset() + snappedBottomInset();
-            return snapSize(headersRegion.prefWidth(height)) + controlButtons.prefWidth(height) +
-                    firstTabIndent() + SPACER + padding;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            double padding = isHorizontal() ?
-                snappedTopInset() + snappedBottomInset() :
-                snappedLeftInset() + snappedRightInset();
-            return snapSize(headersRegion.prefHeight(-1)) + padding;
-        }
-
-        @Override public double getBaselineOffset() {
-            if (getSkinnable().getSide() == Side.TOP) {
-                return headersRegion.getBaselineOffset() + snappedTopInset();
-            }
-            return 0;
-        }
-
-        @Override protected void layoutChildren() {
-            final double leftInset = snappedLeftInset();
-            final double rightInset = snappedRightInset();
-            final double topInset = snappedTopInset();
-            final double bottomInset = snappedBottomInset();
-            double w = snapSize(getWidth()) - (isHorizontal() ?
-                    leftInset + rightInset : topInset + bottomInset);
-            double h = snapSize(getHeight()) - (isHorizontal() ?
-                    topInset + bottomInset : leftInset + rightInset);
-            double tabBackgroundHeight = snapSize(prefHeight(-1));
-            double headersPrefWidth = snapSize(headersRegion.prefWidth(-1));
-            double headersPrefHeight = snapSize(headersRegion.prefHeight(-1));
-
-            controlButtons.showTabsMenu(! tabsFit());
-
-            updateHeaderClip();
-            headersRegion.requestLayout();
-
-            // RESIZE CONTROL BUTTONS
-            double btnWidth = snapSize(controlButtons.prefWidth(-1));
-            final double btnHeight = controlButtons.prefHeight(btnWidth);
-            controlButtons.resize(btnWidth, btnHeight);
-
-            // POSITION TABS
-            headersRegion.resize(headersPrefWidth, headersPrefHeight);
-
-            if (isFloatingStyleClass()) {
-                headerBackground.setVisible(false);
-            } else {
-                headerBackground.resize(snapSize(getWidth()), snapSize(getHeight()));
-                headerBackground.setVisible(true);
-            }
-            
-            double startX = 0;
-            double startY = 0;
-            double controlStartX = 0;
-            double controlStartY = 0;
-            Side tabPosition = getSkinnable().getSide();
-
-            if (tabPosition.equals(Side.TOP)) {
-                startX = leftInset;
-                startY = tabBackgroundHeight - headersPrefHeight - bottomInset;
-                controlStartX = w - btnWidth + leftInset;
-                controlStartY = snapSize(getHeight()) - btnHeight - bottomInset;
-            } else if (tabPosition.equals(Side.RIGHT)) {
-                startX = topInset;
-                startY = tabBackgroundHeight - headersPrefHeight - leftInset;
-                controlStartX = w - btnWidth + topInset;
-                controlStartY = snapSize(getHeight()) - btnHeight - leftInset;
-            } else if (tabPosition.equals(Side.BOTTOM)) {
-                startX = snapSize(getWidth()) - headersPrefWidth - leftInset;
-                startY = tabBackgroundHeight - headersPrefHeight - topInset;
-                controlStartX = rightInset;
-                controlStartY = snapSize(getHeight()) - btnHeight - topInset;
-            } else if (tabPosition.equals(Side.LEFT)) {
-                startX = snapSize(getWidth()) - headersPrefWidth - topInset;
-                startY = tabBackgroundHeight - headersPrefHeight - rightInset;
-                controlStartX = leftInset;
-                controlStartY = snapSize(getHeight()) - btnHeight - rightInset;
-            }
-            if (headerBackground.isVisible()) {
-                positionInArea(headerBackground, 0, 0,
-                        snapSize(getWidth()), snapSize(getHeight()), /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-            }
-            positionInArea(headersRegion, startX, startY, w, h, /*baseline ignored*/0, HPos.LEFT, VPos.CENTER);
-            positionInArea(controlButtons, controlStartX, controlStartY, btnWidth, btnHeight,
-                        /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-        }
-    } /* End TabHeaderArea */
-
-    static int CLOSE_BTN_SIZE = 16;
-
-    /**************************************************************************
-     *
-     * TabHeaderSkin: skin for each tab
-     *
-     **************************************************************************/
-
-    class TabHeaderSkin extends StackPane {
-        private final Tab tab;
-        public Tab getTab() {
-            return tab;
-        }
-        private Label label;
-        private StackPane closeBtn;
-        private StackPane inner;
-        private Tooltip oldTooltip;
-        private Tooltip tooltip;
-        private Rectangle clip;
-
-        private boolean isClosing = false;
-
-        private MultiplePropertyChangeListenerHandler listener =
-                new MultiplePropertyChangeListenerHandler(param -> {
-                    handlePropertyChanged(param);
-                    return null;
-                });
-        
-        private final ListChangeListener<String> styleClassListener = new ListChangeListener<String>() {
-            @Override
-            public void onChanged(Change<? extends String> c) {
-                getStyleClass().setAll(tab.getStyleClass());
-            }
-        };
-        
-        private final WeakListChangeListener<String> weakStyleClassListener =
-                new WeakListChangeListener<>(styleClassListener);
-
-        public TabHeaderSkin(final Tab tab) {
-            getStyleClass().setAll(tab.getStyleClass());
-            setId(tab.getId());
-            setStyle(tab.getStyle());
-            setAccessibleRole(AccessibleRole.TAB_ITEM);
-
-            this.tab = tab;
-            clip = new Rectangle();
-            setClip(clip);
-
-            label = new Label(tab.getText(), tab.getGraphic());
-            label.getStyleClass().setAll("tab-label");
-
-            closeBtn = new StackPane() {
-                @Override protected double computePrefWidth(double h) {
-                    return CLOSE_BTN_SIZE;
-                }
-                @Override protected double computePrefHeight(double w) {
-                    return CLOSE_BTN_SIZE;
-                }
-                @Override
-                public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-                    switch (action) {
-                        case FIRE: {
-                            Tab tab = getTab();
-                            TabPaneBehavior behavior = getBehavior();
-                            if (behavior.canCloseTab(tab)) {
-                                behavior.closeTab(tab);
-                                setOnMousePressed(null);
-                            }
-                        }
-                        default: super.executeAccessibleAction(action, parameters);
-                    }
-                }
-            };
-            closeBtn.setAccessibleRole(AccessibleRole.BUTTON);
-            closeBtn.setAccessibleText(getString("Accessibility.title.TabPane.CloseButton"));
-            closeBtn.getStyleClass().setAll("tab-close-button");
-            closeBtn.setOnMousePressed(new EventHandler<MouseEvent>() {
-                @Override public void handle(MouseEvent me) {
-                    Tab tab = getTab();
-                    TabPaneBehavior behavior = getBehavior();
-                    if (behavior.canCloseTab(tab)) {
-                         behavior.closeTab(tab);
-                         setOnMousePressed(null);    
-                    }
-                }
-            });
-            
-            updateGraphicRotation();
-
-            final Region focusIndicator = new Region();
-            focusIndicator.setMouseTransparent(true);
-            focusIndicator.getStyleClass().add("focus-indicator");
-            
-            inner = new StackPane() {
-                @Override protected void layoutChildren() {
-                    final TabPane skinnable = getSkinnable();
-                    
-                    final double paddingTop = snappedTopInset();
-                    final double paddingRight = snappedRightInset();
-                    final double paddingBottom = snappedBottomInset();
-                    final double paddingLeft = snappedLeftInset();
-                    final double w = getWidth() - (paddingLeft + paddingRight);
-                    final double h = getHeight() - (paddingTop + paddingBottom);
-
-                    final double prefLabelWidth = snapSize(label.prefWidth(-1));
-                    final double prefLabelHeight = snapSize(label.prefHeight(-1));
-                    
-                    final double closeBtnWidth = showCloseButton() ? snapSize(closeBtn.prefWidth(-1)) : 0;
-                    final double closeBtnHeight = showCloseButton() ? snapSize(closeBtn.prefHeight(-1)) : 0;
-                    final double minWidth = snapSize(skinnable.getTabMinWidth());
-                    final double maxWidth = snapSize(skinnable.getTabMaxWidth());
-                    final double maxHeight = snapSize(skinnable.getTabMaxHeight());
-
-                    double labelAreaWidth = prefLabelWidth;
-                    double labelWidth = prefLabelWidth;
-                    double labelHeight = prefLabelHeight;
-                    
-                    final double childrenWidth = labelAreaWidth + closeBtnWidth;
-                    final double childrenHeight = Math.max(labelHeight, closeBtnHeight);
-                    
-                    if (childrenWidth > maxWidth && maxWidth != Double.MAX_VALUE) {
-                        labelAreaWidth = maxWidth - closeBtnWidth;
-                        labelWidth = maxWidth - closeBtnWidth;
-                    } else if (childrenWidth < minWidth) {
-                        labelAreaWidth = minWidth - closeBtnWidth;
-                    }
-
-                    if (childrenHeight > maxHeight && maxHeight != Double.MAX_VALUE) {
-                        labelHeight = maxHeight;
-                    }
-
-                    if (animationState != TabAnimationState.NONE) {
-//                        if (prefWidth.getValue() < labelAreaWidth) {
-//                            labelAreaWidth = prefWidth.getValue();
-//                        }
-                        labelAreaWidth *= animationTransition.get();
-                        closeBtn.setVisible(false);
-                    } else {
-                        closeBtn.setVisible(showCloseButton());
-                    }
-                    
-                    
-                    label.resize(labelWidth, labelHeight);
-                    
-                    
-                    double labelStartX = paddingLeft;
-                    
-                    // If maxWidth is less than Double.MAX_VALUE, the user has 
-                    // clamped the max width, but we should
-                    // position the close button at the end of the tab, 
-                    // which may not necessarily be the entire width of the
-                    // provided max width.
-                    double closeBtnStartX = (maxWidth < Double.MAX_VALUE ? Math.min(w, maxWidth) : w) - paddingRight - closeBtnWidth;
-                    
-                    positionInArea(label, labelStartX, paddingTop, labelAreaWidth, h,
-                            /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-
-                    if (closeBtn.isVisible()) {
-                        closeBtn.resize(closeBtnWidth, closeBtnHeight);
-                        positionInArea(closeBtn, closeBtnStartX, paddingTop, closeBtnWidth, h,
-                                /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-                    }
-
-                    // Magic numbers regretfully introduced for RT-28944 (so that
-                    // the focus rect appears as expected on Windows and Mac).
-                    // In short we use the vPadding to shift the focus rect down
-                    // into the content area (whereas previously it was being clipped
-                    // on Windows, whilst it still looked fine on Mac). In the
-                    // future we may want to improve this code to remove the
-                    // magic number. Similarly, the hPadding differs on Mac.
-                    final int vPadding = Utils.isMac() ? 2 : 3;
-                    final int hPadding = Utils.isMac() ? 2 : 1;
-                    focusIndicator.resizeRelocate(
-                            paddingLeft - hPadding,
-                            paddingTop + vPadding,
-                            w + 2 * hPadding,
-                            h - 2 * vPadding);
-                }
-            };
-            inner.getStyleClass().add("tab-container");
-            inner.setRotate(getSkinnable().getSide().equals(Side.BOTTOM) ? 180.0F : 0.0F);
-            inner.getChildren().addAll(label, closeBtn, focusIndicator);
-
-            getChildren().addAll(inner);
-
-            tooltip = tab.getTooltip();
-            if (tooltip != null) {
-                Tooltip.install(this, tooltip);
-                oldTooltip = tooltip;
-            }
-
-            listener.registerChangeListener(tab.closableProperty(), "CLOSABLE");
-            listener.registerChangeListener(tab.selectedProperty(), "SELECTED");
-            listener.registerChangeListener(tab.textProperty(), "TEXT");
-            listener.registerChangeListener(tab.graphicProperty(), "GRAPHIC");
-            listener.registerChangeListener(tab.contextMenuProperty(), "CONTEXT_MENU");
-            listener.registerChangeListener(tab.tooltipProperty(), "TOOLTIP");
-            listener.registerChangeListener(tab.disableProperty(), "DISABLE");
-            listener.registerChangeListener(tab.styleProperty(), "STYLE");
-            
-            tab.getStyleClass().addListener(weakStyleClassListener);
-
-            listener.registerChangeListener(getSkinnable().tabClosingPolicyProperty(), "TAB_CLOSING_POLICY");
-            listener.registerChangeListener(getSkinnable().sideProperty(), "SIDE");
-            listener.registerChangeListener(getSkinnable().rotateGraphicProperty(), "ROTATE_GRAPHIC");
-            listener.registerChangeListener(getSkinnable().tabMinWidthProperty(), "TAB_MIN_WIDTH");
-            listener.registerChangeListener(getSkinnable().tabMaxWidthProperty(), "TAB_MAX_WIDTH");
-            listener.registerChangeListener(getSkinnable().tabMinHeightProperty(), "TAB_MIN_HEIGHT");
-            listener.registerChangeListener(getSkinnable().tabMaxHeightProperty(), "TAB_MAX_HEIGHT");
-            
-            getProperties().put(Tab.class, tab);
-            getProperties().put(ContextMenu.class, tab.getContextMenu());
-
-            setOnContextMenuRequested((ContextMenuEvent me) -> {
-               if (getTab().getContextMenu() != null) {
-                    getTab().getContextMenu().show(inner, me.getScreenX(), me.getScreenY());
-                    me.consume();
-                }
-            });
-            setOnMousePressed(new EventHandler<MouseEvent>() {
-                @Override public void handle(MouseEvent me) {
-                    if (getTab().isDisable()) {
-                        return;
-                    }
-                    if (me.getButton().equals(MouseButton.MIDDLE)) {
-                        if (showCloseButton()) {
-                            Tab tab = getTab();
-                            TabPaneBehavior behavior = getBehavior();
-                            if (behavior.canCloseTab(tab)) {
-                                removeListeners(tab);
-                                behavior.closeTab(tab);    
-                            }
-                        }
-                    } else if (me.getButton().equals(MouseButton.PRIMARY)) {
-                        getBehavior().selectTab(getTab());
-                    }
-                }
-            });    
-
-            // initialize pseudo-class state
-            pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, tab.isSelected());
-            pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, tab.isDisable());
-            final Side side = getSkinnable().getSide();
-            pseudoClassStateChanged(TOP_PSEUDOCLASS_STATE, (side == Side.TOP));
-            pseudoClassStateChanged(RIGHT_PSEUDOCLASS_STATE, (side == Side.RIGHT));
-            pseudoClassStateChanged(BOTTOM_PSEUDOCLASS_STATE, (side == Side.BOTTOM));
-            pseudoClassStateChanged(LEFT_PSEUDOCLASS_STATE, (side == Side.LEFT));
-        }
-        
-        private void handlePropertyChanged(final String p) {
-            // --- Tab properties
-            if ("CLOSABLE".equals(p)) {
-                inner.requestLayout();
-                requestLayout();
-            } else if ("SELECTED".equals(p)) {
-                pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, tab.isSelected());
-                // Need to request a layout pass for inner because if the width
-                // and height didn't not change the label or close button may have
-                // changed.
-                inner.requestLayout();
-                requestLayout();
-            } else if ("TEXT".equals(p)) {
-                label.setText(getTab().getText());
-            } else if ("GRAPHIC".equals(p)) {
-                label.setGraphic(getTab().getGraphic());
-            } else if ("CONTEXT_MENU".equals(p)) {
-                // todo
-            } else if ("TOOLTIP".equals(p)) {
-                // uninstall the old tooltip
-                if (oldTooltip != null) {
-                    Tooltip.uninstall(this, oldTooltip);
-                }
-                tooltip = tab.getTooltip();
-                if (tooltip != null) {
-                    // install new tooltip and save as old tooltip.
-                    Tooltip.install(this, tooltip);
-                    oldTooltip = tooltip; 
-                }
-            } else if ("DISABLE".equals(p)) {
-                pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, tab.isDisable());
-                inner.requestLayout();
-                requestLayout();
-            } else if ("STYLE".equals(p)) {
-                setStyle(tab.getStyle());
-            }
-            
-            // --- Skinnable properties
-            else if ("TAB_CLOSING_POLICY".equals(p)) {
-                inner.requestLayout();
-                requestLayout(); 
-            } else if ("SIDE".equals(p)) {
-                final Side side = getSkinnable().getSide();
-                pseudoClassStateChanged(TOP_PSEUDOCLASS_STATE, (side == Side.TOP));
-                pseudoClassStateChanged(RIGHT_PSEUDOCLASS_STATE, (side == Side.RIGHT));
-                pseudoClassStateChanged(BOTTOM_PSEUDOCLASS_STATE, (side == Side.BOTTOM));
-                pseudoClassStateChanged(LEFT_PSEUDOCLASS_STATE, (side == Side.LEFT));
-                inner.setRotate(side == Side.BOTTOM ? 180.0F : 0.0F);
-                if (getSkinnable().isRotateGraphic()) {
-                    updateGraphicRotation();
-                }
-            } else if ("ROTATE_GRAPHIC".equals(p)) {
-                updateGraphicRotation();
-            } else if ("TAB_MIN_WIDTH".equals(p)) {
-                requestLayout();
-                getSkinnable().requestLayout();
-            } else if ("TAB_MAX_WIDTH".equals(p)) {
-                requestLayout();
-                getSkinnable().requestLayout();
-            } else if ("TAB_MIN_HEIGHT".equals(p)) {
-                requestLayout();
-                getSkinnable().requestLayout();
-            } else if ("TAB_MAX_HEIGHT".equals(p)) {
-                requestLayout();
-                getSkinnable().requestLayout();
-            } 
-        }
-
-        private void updateGraphicRotation() {
-            if (label.getGraphic() != null) {
-                label.getGraphic().setRotate(getSkinnable().isRotateGraphic() ? 0.0F :
-                    (getSkinnable().getSide().equals(Side.RIGHT) ? -90.0F :
-                        (getSkinnable().getSide().equals(Side.LEFT) ? 90.0F : 0.0F)));
-            }
-        }
-
-        private boolean showCloseButton() {
-            return tab.isClosable() &&
-                    (getSkinnable().getTabClosingPolicy().equals(TabClosingPolicy.ALL_TABS) ||
-                    getSkinnable().getTabClosingPolicy().equals(TabClosingPolicy.SELECTED_TAB) && tab.isSelected());
-        }
-
-        private final DoubleProperty animationTransition = new SimpleDoubleProperty(this, "animationTransition", 1.0) {
-            @Override protected void invalidated() {
-                requestLayout();
-            }
-        };
-
-        private void removeListeners(Tab tab) {
-            listener.dispose();
-            inner.getChildren().clear();
-            getChildren().clear();
-        }
-
-        private TabAnimationState animationState = TabAnimationState.NONE;
-        private Timeline currentAnimation;
-
-        @Override protected double computePrefWidth(double height) {
-//            if (animating) {
-//                return prefWidth.getValue();
-//            }
-            double minWidth = snapSize(getSkinnable().getTabMinWidth());
-            double maxWidth = snapSize(getSkinnable().getTabMaxWidth());
-            double paddingRight = snappedRightInset();
-            double paddingLeft = snappedLeftInset();
-            double tmpPrefWidth = snapSize(label.prefWidth(-1));
-
-            // only include the close button width if it is relevant
-            if (showCloseButton()) {
-                tmpPrefWidth += snapSize(closeBtn.prefWidth(-1));
-            }
-
-            if (tmpPrefWidth > maxWidth) {
-                tmpPrefWidth = maxWidth;
-            } else if (tmpPrefWidth < minWidth) {
-                tmpPrefWidth = minWidth;
-            }
-            tmpPrefWidth += paddingRight + paddingLeft;
-//            prefWidth.setValue(tmpPrefWidth);
-            return tmpPrefWidth;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            double minHeight = snapSize(getSkinnable().getTabMinHeight());
-            double maxHeight = snapSize(getSkinnable().getTabMaxHeight());
-            double paddingTop = snappedTopInset();
-            double paddingBottom = snappedBottomInset();
-            double tmpPrefHeight = snapSize(label.prefHeight(width));
-
-            if (tmpPrefHeight > maxHeight) {
-                tmpPrefHeight = maxHeight;
-            } else if (tmpPrefHeight < minHeight) {
-                tmpPrefHeight = minHeight;
-            }
-            tmpPrefHeight += paddingTop + paddingBottom;
-            return tmpPrefHeight;
-        }
-
-        @Override protected void layoutChildren() {
-            double w = (snapSize(getWidth()) - snappedRightInset() - snappedLeftInset()) * animationTransition.getValue();
-            inner.resize(w, snapSize(getHeight()) - snappedTopInset() - snappedBottomInset());
-            inner.relocate(snappedLeftInset(), snappedTopInset());
-        }
-
-        @Override protected void setWidth(double value) {
-            super.setWidth(value);
-            clip.setWidth(value);
-        }
-
-        @Override protected void setHeight(double value) {
-            super.setHeight(value);
-            clip.setHeight(value);
-        }
-    
-        @Override
-        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-            switch (attribute) {
-                case TEXT: return getTab().getText();
-                case SELECTED: return selectedTab == getTab();
-                default: return super.queryAccessibleAttribute(attribute, parameters);
-            }
-        }
-
-        @Override
-        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-            switch (action) {
-                case REQUEST_FOCUS:
-                    getSkinnable().getSelectionModel().select(getTab());
-                    break;
-                default: super.executeAccessibleAction(action, parameters);
-            }
-        }
-
-    } /* End TabHeaderSkin */
-
-    private static final PseudoClass SELECTED_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("selected");
-    private static final PseudoClass TOP_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("top");
-    private static final PseudoClass BOTTOM_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("bottom");
-    private static final PseudoClass LEFT_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("left");
-    private static final PseudoClass RIGHT_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("right");
-    private static final PseudoClass DISABLED_PSEUDOCLASS_STATE =
-            PseudoClass.getPseudoClass("disabled");    
-
-
-    /**************************************************************************
-     *
-     * TabContentRegion: each tab has one to contain the tab's content node
-     *
-     **************************************************************************/
-    class TabContentRegion extends StackPane {
-
-        private TraversalEngine engine;
-        private Direction direction = Direction.NEXT;
-        private Tab tab;
-
-        private InvalidationListener tabContentListener = valueModel -> {
-            updateContent();
-        };
-        private InvalidationListener tabSelectedListener = new InvalidationListener() {
-            @Override public void invalidated(Observable valueModel) {
-                setVisible(tab.isSelected());
-            }
-        };
-
-        private WeakInvalidationListener weakTabContentListener =
-                new WeakInvalidationListener(tabContentListener);
-        private WeakInvalidationListener weakTabSelectedListener =
-                new WeakInvalidationListener(tabSelectedListener);
-
-        public Tab getTab() {
-            return tab;
-        }
-
-        public TabContentRegion(Tab tab) {
-            getStyleClass().setAll("tab-content-area");
-            setManaged(false);
-            this.tab = tab;
-            updateContent();
-            setVisible(tab.isSelected());
-
-            tab.selectedProperty().addListener(weakTabSelectedListener);
-            tab.contentProperty().addListener(weakTabContentListener);
-        }
-
-        private void updateContent() {
-            Node newContent = getTab().getContent();
-            if (newContent == null) {
-                getChildren().clear();
-            } else {
-                getChildren().setAll(newContent);
-            }
-        }
-
-        private void removeListeners(Tab tab) {
-            tab.selectedProperty().removeListener(weakTabSelectedListener);
-            tab.contentProperty().removeListener(weakTabContentListener);
-        }
-
-    } /* End TabContentRegion */
-
-    /**************************************************************************
-     *
-     * TabControlButtons: controls to manipulate tab interaction
-     *
-     **************************************************************************/
-    class TabControlButtons extends StackPane {
-        private StackPane inner;
-        private StackPane downArrow;
-        private Pane downArrowBtn;
-        private boolean showControlButtons;
-        private ContextMenu popup;
-
-        public TabControlButtons() {            
-            getStyleClass().setAll("control-buttons-tab");
-
-            TabPane tabPane = getSkinnable();
-
-            downArrowBtn = new Pane();
-            downArrowBtn.getStyleClass().setAll("tab-down-button");
-            downArrowBtn.setVisible(isShowTabsMenu());
-            downArrow = new StackPane();
-            downArrow.setManaged(false);
-            downArrow.getStyleClass().setAll("arrow");
-            downArrow.setRotate(tabPane.getSide().equals(Side.BOTTOM) ? 180.0F : 0.0F);
-            downArrowBtn.getChildren().add(downArrow);
-            downArrowBtn.setOnMouseClicked(me -> {
-                showPopupMenu();
-            });
-            
-            setupPopupMenu();
-
-            inner = new StackPane() {
-                @Override protected double computePrefWidth(double height) {
-                    double pw;
-                    double maxArrowWidth = ! isShowTabsMenu() ? 0 : snapSize(downArrow.prefWidth(getHeight())) + snapSize(downArrowBtn.prefWidth(getHeight()));
-                    pw = 0.0F;
-                    if (isShowTabsMenu()) {
-                        pw += maxArrowWidth;
-                    }
-                    if (pw > 0) {
-                        pw += snappedLeftInset() + snappedRightInset();
-                    }
-                    return pw;
-                }
-
-                @Override protected double computePrefHeight(double width) {
-                    double height = 0.0F;
-                    if (isShowTabsMenu()) {
-                        height = Math.max(height, snapSize(downArrowBtn.prefHeight(width)));
-                    }
-                    if (height > 0) {
-                        height += snappedTopInset() + snappedBottomInset();
-                    }
-                    return height;
-                }
-
-                @Override protected void layoutChildren() {
-                    if (isShowTabsMenu()) {
-                        double x = 0;
-                        double y = snappedTopInset();
-                        double w = snapSize(getWidth()) - x + snappedLeftInset();
-                        double h = snapSize(getHeight()) - y + snappedBottomInset();
-                        positionArrow(downArrowBtn, downArrow, x, y, w, h);
-                    }
-                }
-
-                private void positionArrow(Pane btn, StackPane arrow, double x, double y, double width, double height) {
-                    btn.resize(width, height);
-                    positionInArea(btn, x, y, width, height, /*baseline ignored*/0,
-                            HPos.CENTER, VPos.CENTER);
-                    // center arrow region within arrow button
-                    double arrowWidth = snapSize(arrow.prefWidth(-1));
-                    double arrowHeight = snapSize(arrow.prefHeight(-1));
-                    arrow.resize(arrowWidth, arrowHeight);
-                    positionInArea(arrow, btn.snappedLeftInset(), btn.snappedTopInset(),
-                            width - btn.snappedLeftInset() - btn.snappedRightInset(),
-                            height - btn.snappedTopInset() - btn.snappedBottomInset(),
-                            /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-                }
-            };
-            inner.getStyleClass().add("container");
-            inner.getChildren().add(downArrowBtn);
-
-            getChildren().add(inner);
-
-            tabPane.sideProperty().addListener(valueModel -> {
-                Side tabPosition = getSkinnable().getSide();
-                downArrow.setRotate(tabPosition.equals(Side.BOTTOM)? 180.0F : 0.0F);
-            });
-            tabPane.getTabs().addListener((ListChangeListener<Tab>) c -> setupPopupMenu());
-            showControlButtons = false;
-            if (isShowTabsMenu()) {
-                showControlButtons = true;
-                requestLayout();
-            }
-            getProperties().put(ContextMenu.class, popup);
-        }
-
-        private boolean showTabsMenu = false;
-
-        private void showTabsMenu(boolean value) {
-            final boolean wasTabsMenuShowing = isShowTabsMenu();
-            this.showTabsMenu = value;
-
-            if (showTabsMenu && !wasTabsMenuShowing) {
-                downArrowBtn.setVisible(true);
-                showControlButtons = true;
-                inner.requestLayout();
-                tabHeaderArea.requestLayout();
-            } else if (!showTabsMenu && wasTabsMenuShowing) {
-                hideControlButtons();
-            }
-        }
-
-        private boolean isShowTabsMenu() {
-            return showTabsMenu;
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            double pw = snapSize(inner.prefWidth(height));
-            if (pw > 0) {
-                pw += snappedLeftInset() + snappedRightInset();
-            }
-            return pw;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            return Math.max(getSkinnable().getTabMinHeight(), snapSize(inner.prefHeight(width))) +
-                    snappedTopInset() + snappedBottomInset();
-        }
-
-        @Override protected void layoutChildren() {
-            double x = snappedLeftInset();
-            double y = snappedTopInset();
-            double w = snapSize(getWidth()) - x + snappedRightInset();
-            double h = snapSize(getHeight()) - y + snappedBottomInset();
-
-            if (showControlButtons) {
-                showControlButtons();
-                showControlButtons = false;
-            }
-
-            inner.resize(w, h);
-            positionInArea(inner, x, y, w, h, /*baseline ignored*/0, HPos.CENTER, VPos.BOTTOM);
-        }
-
-        private void showControlButtons() {
-            setVisible(true);
-            if (popup == null) {
-                setupPopupMenu();
-            }
-        }
-
-        private void hideControlButtons() {
-            // If the scroll arrows or tab menu is still visible we don't want
-            // to hide it animate it back it.
-            if (isShowTabsMenu()) {
-                showControlButtons = true;
-            } else {
-                setVisible(false);
-                popup.getItems().clear();
-                popup = null;
-            }
-
-            // This needs to be called when we are in the left tabPosition
-            // to allow for the clip offset to move properly (otherwise
-            // it jumps too early - before the animation is done).
-            requestLayout();
-        }
-
-        private void setupPopupMenu() {
-            if (popup == null) {
-                popup = new ContextMenu();
-            }
-            popup.getItems().clear();
-            ToggleGroup group = new ToggleGroup();
-            ObservableList<RadioMenuItem> menuitems = FXCollections.<RadioMenuItem>observableArrayList();
-            for (final Tab tab : getSkinnable().getTabs()) {
-                TabMenuItem item = new TabMenuItem(tab);                
-                item.setToggleGroup(group);
-                item.setOnAction(t -> getSkinnable().getSelectionModel().select(tab));
-                menuitems.add(item);
-            }
-            popup.getItems().addAll(menuitems);
-        }
-        
-        private void showPopupMenu() {
-            for (MenuItem mi: popup.getItems()) {
-                TabMenuItem tmi = (TabMenuItem)mi;
-                if (selectedTab.equals(tmi.getTab())) {
-                    tmi.setSelected(true);
-                    break;
-                }
-            }
-            popup.show(downArrowBtn, Side.BOTTOM, 0, 0);            
-        }
-    } /* End TabControlButtons*/
-
-    class TabMenuItem extends RadioMenuItem {
-        Tab tab;
-
-        private InvalidationListener disableListener = new InvalidationListener() {
-            @Override public void invalidated(Observable o) {
-                setDisable(tab.isDisable());
-            }
-        };
-
-        private WeakInvalidationListener weakDisableListener =
-                new WeakInvalidationListener(disableListener);
-
-        public TabMenuItem(final Tab tab) {
-            super(tab.getText(), TabPaneSkin.clone(tab.getGraphic()));                        
-            this.tab = tab;
-            setDisable(tab.isDisable());
-            tab.disableProperty().addListener(weakDisableListener);
-            textProperty().bind(tab.textProperty());
-        }
-
-        public Tab getTab() {
-            return tab;
-        }
-
-        public void dispose() {
-            tab.disableProperty().removeListener(weakDisableListener);
-        }
-    }
-
-    @Override
-    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_ITEM: return tabHeaderArea.getTabHeaderSkin(selectedTab);
-            case ITEM_COUNT: return tabHeaderArea.headersRegion.getChildren().size();
-            case ITEM_AT_INDEX: {
-                Integer index = (Integer)parameters[0];
-                if (index == null) return null;
-                return tabHeaderArea.headersRegion.getChildren().get(index);
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:22:10.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TabPaneSkin.java	2015-09-03 15:22:08.842000000 -0700
@@ -0,0 +1,1896 @@
+/*
+ * Copyright (c) 2011, 2015, 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 com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.util.Utils;
+import javafx.animation.Animation;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.value.WritableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.WeakListChangeListener;
+import javafx.css.CssMetaData;
+import javafx.css.PseudoClass;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.HPos;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.RadioMenuItem;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.Tab;
+import javafx.scene.control.TabPane;
+import javafx.scene.control.TabPane.TabClosingPolicy;
+import javafx.scene.control.ToggleGroup;
+import javafx.scene.control.Tooltip;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.ContextMenuEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.input.SwipeEvent;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.transform.Rotate;
+import javafx.util.Duration;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javafx.css.converter.EnumConverter;
+import com.sun.javafx.scene.control.behavior.TabPaneBehavior;
+import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalEngine;
+
+import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
+
+/**
+ * Default skin implementation for the {@link TabPane} control.
+ *
+ * @see TabPane
+ * @since 9
+ */
+public class TabPaneSkin extends SkinBase<TabPane> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Enums                                                                   *
+     *                                                                         *
+     **************************************************************************/
+
+    private enum TabAnimation {
+        NONE,
+        GROW
+        // In future we could add FADE, ...
+    }
+
+    private enum TabAnimationState {
+        SHOWING, HIDING, NONE;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    static int CLOSE_BTN_SIZE = 16;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final double ANIMATION_SPEED = 150;
+    private static final int SPACER = 10;
+
+    private TabHeaderArea tabHeaderArea;
+    private ObservableList<TabContentRegion> tabContentRegions;
+    private Rectangle clipRect;
+    private Rectangle tabHeaderAreaClipRect;
+    private Tab selectedTab;
+    private boolean isSelectingTab;
+    private double maxw = 0.0d;
+    private double maxh = 0.0d;
+
+    private final TabPaneBehavior behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TabPaneSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TabPaneSkin(TabPane control) {
+        super(control);
+
+        // install default input map for the TabPane control
+        this.behavior = new TabPaneBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        clipRect = new Rectangle(control.getWidth(), control.getHeight());
+        getSkinnable().setClip(clipRect);
+
+        tabContentRegions = FXCollections.<TabContentRegion>observableArrayList();
+
+        for (Tab tab : getSkinnable().getTabs()) {
+            addTabContent(tab);
+        }
+
+        tabHeaderAreaClipRect = new Rectangle();
+        tabHeaderArea = new TabHeaderArea();
+        tabHeaderArea.setClip(tabHeaderAreaClipRect);
+        getChildren().add(tabHeaderArea);
+        if (getSkinnable().getTabs().size() == 0) {
+            tabHeaderArea.setVisible(false);
+        }
+
+        initializeTabListener();
+
+        registerChangeListener(control.getSelectionModel().selectedItemProperty(), e -> {
+            isSelectingTab = true;
+            selectedTab = getSkinnable().getSelectionModel().getSelectedItem();
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.sideProperty(), e -> updateTabPosition());
+        registerChangeListener(control.widthProperty(), e -> clipRect.setWidth(getSkinnable().getWidth()));
+        registerChangeListener(control.heightProperty(), e -> clipRect.setHeight(getSkinnable().getHeight()));
+
+        selectedTab = getSkinnable().getSelectionModel().getSelectedItem();
+        // Could not find the selected tab try and get the selected tab using the selected index
+        if (selectedTab == null && getSkinnable().getSelectionModel().getSelectedIndex() != -1) {
+            getSkinnable().getSelectionModel().select(getSkinnable().getSelectionModel().getSelectedIndex());
+            selectedTab = getSkinnable().getSelectionModel().getSelectedItem();        
+        } 
+        if (selectedTab == null) {
+            // getSelectedItem and getSelectedIndex failed select the first.
+            getSkinnable().getSelectionModel().selectFirst();
+        } 
+        selectedTab = getSkinnable().getSelectionModel().getSelectedItem();        
+        isSelectingTab = false;
+
+        initializeSwipeHandlers();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    private ObjectProperty<TabAnimation> openTabAnimation = new StyleableObjectProperty<TabAnimation>(TabAnimation.GROW) {
+        @Override public CssMetaData<TabPane,TabAnimation> getCssMetaData() {
+            return StyleableProperties.OPEN_TAB_ANIMATION;
+        }
+
+        @Override public Object getBean() {
+            return TabPaneSkin.this;
+        }
+
+        @Override public String getName() {
+            return "openTabAnimation";
+        }
+    };
+
+    private ObjectProperty<TabAnimation> closeTabAnimation = new StyleableObjectProperty<TabAnimation>(TabAnimation.GROW) {
+        @Override public CssMetaData<TabPane,TabAnimation> getCssMetaData() {
+            return StyleableProperties.CLOSE_TAB_ANIMATION;
+        }
+
+        @Override public Object getBean() {
+            return TabPaneSkin.this;
+        }
+
+        @Override public String getName() {
+            return "closeTabAnimation";
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        // The TabPane can only be as wide as it widest content width.
+        for (TabContentRegion contentRegion: tabContentRegions) {
+            maxw = Math.max(maxw, snapSize(contentRegion.prefWidth(-1)));
+        }
+
+        final boolean isHorizontal = isHorizontal();
+        final double tabHeaderAreaSize = snapSize(isHorizontal ?
+                tabHeaderArea.prefWidth(-1) : tabHeaderArea.prefHeight(-1));
+
+        double prefWidth = isHorizontal ?
+                Math.max(maxw, tabHeaderAreaSize) : maxw + tabHeaderAreaSize;
+        return snapSize(prefWidth) + rightInset + leftInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        // The TabPane can only be as high as it highest content height.
+        for (TabContentRegion contentRegion: tabContentRegions) {
+            maxh = Math.max(maxh, snapSize(contentRegion.prefHeight(-1)));
+        }
+
+        final boolean isHorizontal = isHorizontal();
+        final double tabHeaderAreaSize = snapSize(isHorizontal ?
+                tabHeaderArea.prefHeight(-1) : tabHeaderArea.prefWidth(-1));
+
+        double prefHeight = isHorizontal ?
+                maxh + snapSize(tabHeaderAreaSize) : Math.max(maxh, tabHeaderAreaSize);
+        return snapSize(prefHeight) + topInset + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        Side tabPosition = getSkinnable().getSide();
+        if (tabPosition == Side.TOP) {
+            return tabHeaderArea.getBaselineOffset() + topInset;
+        }
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        TabPane tabPane = getSkinnable();
+        Side tabPosition = tabPane.getSide();
+
+        double headerHeight = snapSize(tabHeaderArea.prefHeight(-1));
+        double tabsStartX = tabPosition.equals(Side.RIGHT)? x + w - headerHeight : x;
+        double tabsStartY = tabPosition.equals(Side.BOTTOM)? y + h - headerHeight : y;
+
+        if (tabPosition == Side.TOP) {
+            tabHeaderArea.resize(w, headerHeight);
+            tabHeaderArea.relocate(tabsStartX, tabsStartY);
+            tabHeaderArea.getTransforms().clear();
+            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.TOP)));
+        } else if (tabPosition == Side.BOTTOM) {
+            tabHeaderArea.resize(w, headerHeight);
+            tabHeaderArea.relocate(w, tabsStartY - headerHeight);
+            tabHeaderArea.getTransforms().clear();
+            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.BOTTOM), 0, headerHeight));
+        } else if (tabPosition == Side.LEFT) {
+            tabHeaderArea.resize(h, headerHeight);
+            tabHeaderArea.relocate(tabsStartX + headerHeight, h - headerHeight);
+            tabHeaderArea.getTransforms().clear();
+            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.LEFT), 0, headerHeight));
+        } else if (tabPosition == Side.RIGHT) {
+            tabHeaderArea.resize(h, headerHeight);
+            tabHeaderArea.relocate(tabsStartX, y - headerHeight);
+            tabHeaderArea.getTransforms().clear();
+            tabHeaderArea.getTransforms().add(new Rotate(getRotation(Side.RIGHT), 0, headerHeight));
+        }
+
+        tabHeaderAreaClipRect.setX(0);
+        tabHeaderAreaClipRect.setY(0);
+        if (isHorizontal()) {
+            tabHeaderAreaClipRect.setWidth(w);
+        } else {
+            tabHeaderAreaClipRect.setWidth(h);
+        }
+        tabHeaderAreaClipRect.setHeight(headerHeight);
+
+        // ==================================
+        // position the tab content for the selected tab only
+        // ==================================
+        // if the tabs are on the left, the content needs to be indented
+        double contentStartX = 0;
+        double contentStartY = 0;
+
+        if (tabPosition == Side.TOP) {
+            contentStartX = x;
+            contentStartY = y + headerHeight;
+            if (isFloatingStyleClass()) {
+                // This is to hide the top border content
+                contentStartY -= 1;
+            }
+        } else if (tabPosition == Side.BOTTOM) {
+            contentStartX = x;
+            contentStartY = y;
+            if (isFloatingStyleClass()) {
+                // This is to hide the bottom border content
+                contentStartY = 1;
+            }
+        } else if (tabPosition == Side.LEFT) {
+            contentStartX = x + headerHeight;
+            contentStartY = y;
+            if (isFloatingStyleClass()) {
+                // This is to hide the left border content
+                contentStartX -= 1;
+            }
+        } else if (tabPosition == Side.RIGHT) {
+            contentStartX = x;
+            contentStartY = y;
+            if (isFloatingStyleClass()) {
+                // This is to hide the right border content
+                contentStartX = 1;
+            }
+        }
+
+        double contentWidth = w - (isHorizontal() ? 0 : headerHeight);
+        double contentHeight = h - (isHorizontal() ? headerHeight: 0);
+
+        for (int i = 0, max = tabContentRegions.size(); i < max; i++) {
+            TabContentRegion tabContent = tabContentRegions.get(i);
+
+            tabContent.setAlignment(Pos.TOP_LEFT);
+            if (tabContent.getClip() != null) {
+                ((Rectangle)tabContent.getClip()).setWidth(contentWidth);
+                ((Rectangle)tabContent.getClip()).setHeight(contentHeight);
+            }
+
+            // we need to size all tabs, even if they aren't visible. For example,
+            // see RT-29167
+            tabContent.resize(contentWidth, contentHeight);
+            tabContent.relocate(contentStartX, contentStartY);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private static int getRotation(Side pos) {
+        switch (pos) {
+            case TOP:
+                return 0;
+            case BOTTOM:
+                return 180;
+            case LEFT:
+                return -90;
+            case RIGHT:
+                return 90;
+            default:
+                return 0;
+        }
+    }
+
+    /**
+     * VERY HACKY - this lets us 'duplicate' Label and ImageView nodes to be used in a
+     * Tab and the tabs menu at the same time.
+     */
+    private static Node clone(Node n) {
+        if (n == null) {
+            return null;
+        }
+        if (n instanceof ImageView) {
+            ImageView iv = (ImageView) n;
+            ImageView imageview = new ImageView();
+            imageview.setImage(iv.getImage());
+            return imageview;
+        }
+        if (n instanceof Label) {
+            Label l = (Label)n;
+            Label label = new Label(l.getText(), l.getGraphic());
+            return label;
+        }
+        return null;
+    }
+
+    private void removeTabs(List<? extends Tab> removedList) {
+        for (final Tab tab : removedList) {
+            stopCurrentAnimation(tab);
+            // Animate the tab removal
+            final TabHeaderSkin tabRegion = tabHeaderArea.getTabHeaderSkin(tab);
+            if (tabRegion != null) {
+                tabRegion.isClosing = true;
+
+                tabRegion.removeListeners(tab);
+                removeTabContent(tab);
+
+                // remove the menu item from the popup menu
+                ContextMenu popupMenu = tabHeaderArea.controlButtons.popup;
+                TabMenuItem tabItem = null;
+                if (popupMenu != null) {
+                    for (MenuItem item : popupMenu.getItems()) {
+                        tabItem = (TabMenuItem) item;
+                        if (tab == tabItem.getTab()) {
+                            break;
+                        }
+                        tabItem = null;
+                    }
+                }
+                if (tabItem != null) {
+                    tabItem.dispose();
+                    popupMenu.getItems().remove(tabItem);
+                }
+                // end of removing menu item
+
+                EventHandler<ActionEvent> cleanup = ae -> {
+                    tabRegion.animationState = TabAnimationState.NONE;
+
+                    tabHeaderArea.removeTab(tab);
+                    tabHeaderArea.requestLayout();
+                    if (getSkinnable().getTabs().isEmpty()) {
+                        tabHeaderArea.setVisible(false);
+                    }
+                };
+
+                if (closeTabAnimation.get() == TabAnimation.GROW) {
+                    tabRegion.animationState = TabAnimationState.HIDING;
+                    Timeline closedTabTimeline = tabRegion.currentAnimation =
+                            createTimeline(tabRegion, Duration.millis(ANIMATION_SPEED), 0.0F, cleanup);
+                    closedTabTimeline.play();    
+                } else {
+                    cleanup.handle(null);
+                }
+            }
+        }
+    }
+
+    private void stopCurrentAnimation(Tab tab) {
+        final TabHeaderSkin tabRegion = tabHeaderArea.getTabHeaderSkin(tab);
+        if (tabRegion != null) {
+            // Execute the code immediately, don't wait for the animation to finish.
+            Timeline timeline = tabRegion.currentAnimation;
+            if (timeline != null && timeline.getStatus() == Animation.Status.RUNNING) {
+                timeline.getOnFinished().handle(null);
+                timeline.stop();
+                tabRegion.currentAnimation = null;
+            }
+        }
+    }
+
+    private void addTabs(List<? extends Tab> addedList, int from) {
+        int i = 0;
+
+        // RT-39984: check if any other tabs are animating - they must be completed first.
+        List<Node> headers = new ArrayList<>(tabHeaderArea.headersRegion.getChildren());
+        for (Node n : headers) {
+            TabHeaderSkin header = (TabHeaderSkin) n;
+            if (header.animationState == TabAnimationState.HIDING) {
+                stopCurrentAnimation(header.tab);
+            }
+        }
+        // end of fix for RT-39984
+
+        for (final Tab tab : addedList) {
+            stopCurrentAnimation(tab); // Note that this must happen before addTab() call below
+            // A new tab was added - animate it out
+            if (!tabHeaderArea.isVisible()) {
+                tabHeaderArea.setVisible(true);
+            }
+            int index = from + i++;
+            tabHeaderArea.addTab(tab, index);
+            addTabContent(tab);
+            final TabHeaderSkin tabRegion = tabHeaderArea.getTabHeaderSkin(tab);
+            if (tabRegion != null) {
+                if (openTabAnimation.get() == TabAnimation.GROW) {
+                    tabRegion.animationState = TabAnimationState.SHOWING;
+                    tabRegion.animationTransition.setValue(0.0);
+                    tabRegion.setVisible(true);
+                    tabRegion.currentAnimation = createTimeline(tabRegion, Duration.millis(ANIMATION_SPEED), 1.0, event -> {
+                        tabRegion.animationState = TabAnimationState.NONE;
+                        tabRegion.setVisible(true);
+                        tabRegion.inner.requestLayout();
+                    });
+                    tabRegion.currentAnimation.play();
+                } else {
+                    tabRegion.setVisible(true);
+                    tabRegion.inner.requestLayout();
+                }
+            }
+        }
+    }
+    
+    private void initializeTabListener() {
+        getSkinnable().getTabs().addListener((ListChangeListener<Tab>) c -> {
+            List<Tab> tabsToRemove = new ArrayList<>();
+            List<Tab> tabsToAdd = new ArrayList<>();
+            int insertPos = -1;
+
+            while (c.next()) {
+                if (c.wasPermutated()) {
+                    TabPane tabPane = getSkinnable();
+                    List<Tab> tabs = tabPane.getTabs();
+
+                    // tabs sorted : create list of permutated tabs.
+                    // clear selection, set tab animation to NONE
+                    // remove permutated tabs, add them back in correct order.
+                    // restore old selection, and old tab animation states.
+                    int size = c.getTo() - c.getFrom();
+                    Tab selTab = tabPane.getSelectionModel().getSelectedItem();
+                    List<Tab> permutatedTabs = new ArrayList<Tab>(size);
+                    getSkinnable().getSelectionModel().clearSelection();
+
+                    // save and set tab animation to none - as it is not a good idea
+                    // to animate on the same data for open and close.
+                    TabAnimation prevOpenAnimation = openTabAnimation.get();
+                    TabAnimation prevCloseAnimation = closeTabAnimation.get();
+                    openTabAnimation.set(TabAnimation.NONE);
+                    closeTabAnimation.set(TabAnimation.NONE);
+                    for (int i = c.getFrom(); i < c.getTo(); i++) {
+                        permutatedTabs.add(tabs.get(i));
+                    }
+
+                    removeTabs(permutatedTabs);
+                    addTabs(permutatedTabs, c.getFrom());
+                    openTabAnimation.set(prevOpenAnimation);
+                    closeTabAnimation.set(prevCloseAnimation);
+                    getSkinnable().getSelectionModel().select(selTab);
+                }
+
+                if (c.wasRemoved()) {
+                    tabsToRemove.addAll(c.getRemoved());
+                }
+
+                if (c.wasAdded()) {
+                    tabsToAdd.addAll(c.getAddedSubList());
+                    insertPos = c.getFrom();
+                }
+            }
+
+            // now only remove the tabs that are not in the tabsToAdd list
+            tabsToRemove.removeAll(tabsToAdd);
+            removeTabs(tabsToRemove);
+
+            // and add in any new tabs (that we don't already have showing)
+            if (!tabsToAdd.isEmpty()) {
+                for (TabContentRegion tabContentRegion : tabContentRegions) {
+                    Tab tab = tabContentRegion.getTab();
+                    TabHeaderSkin tabHeader = tabHeaderArea.getTabHeaderSkin(tab);
+                    if (!tabHeader.isClosing && tabsToAdd.contains(tabContentRegion.getTab())) {
+                        tabsToAdd.remove(tabContentRegion.getTab());
+                    }
+                }
+
+                addTabs(tabsToAdd, insertPos == -1 ? tabContentRegions.size() : insertPos);
+            }
+
+            // Fix for RT-34692
+            getSkinnable().requestLayout();
+        });
+    }
+
+    private void addTabContent(Tab tab) {
+        TabContentRegion tabContentRegion = new TabContentRegion(tab);
+        tabContentRegion.setClip(new Rectangle());
+        tabContentRegions.add(tabContentRegion);
+        // We want the tab content to always sit below the tab headers
+        getChildren().add(0, tabContentRegion);
+    }
+
+    private void removeTabContent(Tab tab) {
+        for (TabContentRegion contentRegion : tabContentRegions) {
+            if (contentRegion.getTab().equals(tab)) {
+                contentRegion.removeListeners(tab);
+                getChildren().remove(contentRegion);
+                tabContentRegions.remove(contentRegion);
+                break;
+            }
+        }
+    }
+
+    private void updateTabPosition() {
+        tabHeaderArea.setScrollOffset(0.0F);
+        getSkinnable().applyCss();
+        getSkinnable().requestLayout();
+    }
+
+    private Timeline createTimeline(final TabHeaderSkin tabRegion, final Duration duration, final double endValue, final EventHandler<ActionEvent> func) {
+        Timeline timeline = new Timeline();
+        timeline.setCycleCount(1);
+
+        KeyValue keyValue = new KeyValue(tabRegion.animationTransition, endValue, Interpolator.LINEAR);
+        timeline.getKeyFrames().clear();
+        timeline.getKeyFrames().add(new KeyFrame(duration, keyValue));
+
+        timeline.setOnFinished(func);
+        return timeline;
+    }
+
+    private boolean isHorizontal() {
+        Side tabPosition = getSkinnable().getSide();
+        return Side.TOP.equals(tabPosition) || Side.BOTTOM.equals(tabPosition);
+    }
+
+    private void initializeSwipeHandlers() {
+        if (Properties.IS_TOUCH_SUPPORTED) {
+            getSkinnable().addEventHandler(SwipeEvent.SWIPE_LEFT, t -> {
+                behavior.selectNextTab();
+            });
+
+            getSkinnable().addEventHandler(SwipeEvent.SWIPE_RIGHT, t -> {
+                behavior.selectPreviousTab();
+            });
+        }    
+    }
+    
+    //TODO need to cache this.
+    private boolean isFloatingStyleClass() {
+        return getSkinnable().getStyleClass().contains(TabPane.STYLE_CLASS_FLOATING);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * CSS                                                                     *
+     *                                                                         *
+     **************************************************************************/
+
+   /**
+    * Super-lazy instantiation pattern from Bill Pugh.
+    * @treatAsPrivate implementation detail
+    */
+   private static class StyleableProperties {
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        
+        private final static CssMetaData<TabPane,TabAnimation> OPEN_TAB_ANIMATION = 
+                new CssMetaData<TabPane, TabPaneSkin.TabAnimation>("-fx-open-tab-animation", 
+                    new EnumConverter<TabAnimation>(TabAnimation.class), TabAnimation.GROW) {
+
+            @Override public boolean isSettable(TabPane node) {
+                return true;
+            }
+
+            @Override public StyleableProperty<TabAnimation> getStyleableProperty(TabPane node) {
+                TabPaneSkin skin = (TabPaneSkin) node.getSkin();
+                return (StyleableProperty<TabAnimation>)(WritableValue<TabAnimation>)skin.openTabAnimation;
+            }
+        };
+        
+        private final static CssMetaData<TabPane,TabAnimation> CLOSE_TAB_ANIMATION = 
+                new CssMetaData<TabPane, TabPaneSkin.TabAnimation>("-fx-close-tab-animation", 
+                    new EnumConverter<TabAnimation>(TabAnimation.class), TabAnimation.GROW) {
+
+            @Override public boolean isSettable(TabPane node) {
+                return true;
+            }
+
+            @Override public StyleableProperty<TabAnimation> getStyleableProperty(TabPane node) {
+                TabPaneSkin skin = (TabPaneSkin) node.getSkin();
+                return (StyleableProperty<TabAnimation>)(WritableValue<TabAnimation>)skin.closeTabAnimation;
+            }
+        };
+        
+        static {
+
+           final List<CssMetaData<? extends Styleable, ?>> styleables = 
+               new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+           styleables.add(OPEN_TAB_ANIMATION);
+           styleables.add(CLOSE_TAB_ANIMATION);
+           STYLEABLES = Collections.unmodifiableList(styleables);
+
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /**************************************************************************
+     *
+     * TabHeaderArea: Area responsible for painting all tabs
+     *
+     **************************************************************************/
+    class TabHeaderArea extends StackPane {
+        private Rectangle headerClip;
+        private StackPane headersRegion;
+        private StackPane headerBackground;
+        private TabControlButtons controlButtons;
+
+        private boolean measureClosingTabs = false;
+
+        private double scrollOffset;
+
+        public TabHeaderArea() {
+            getStyleClass().setAll("tab-header-area");
+            setManaged(false);
+            final TabPane tabPane = getSkinnable();
+
+            headerClip = new Rectangle();
+            
+            headersRegion = new StackPane() {
+                @Override protected double computePrefWidth(double height) {
+                    double width = 0.0F;
+                    for (Node child : getChildren()) {
+                        TabHeaderSkin tabHeaderSkin = (TabHeaderSkin)child;
+                        if (tabHeaderSkin.isVisible() && (measureClosingTabs || ! tabHeaderSkin.isClosing)) {
+                            width += tabHeaderSkin.prefWidth(height);
+                        }
+                    }
+                    return snapSize(width) + snappedLeftInset() + snappedRightInset();
+                }
+
+                @Override protected double computePrefHeight(double width) {
+                    double height = 0.0F;
+                    for (Node child : getChildren()) {
+                        TabHeaderSkin tabHeaderSkin = (TabHeaderSkin)child;
+                        height = Math.max(height, tabHeaderSkin.prefHeight(width));
+                    }
+                    return snapSize(height) + snappedTopInset() + snappedBottomInset();
+                }
+
+                @Override protected void layoutChildren() {
+                    if (tabsFit()) {
+                        setScrollOffset(0.0);
+                    } else {
+                        if (!removeTab.isEmpty()) {                            
+                            double offset = 0;
+                            double w = tabHeaderArea.getWidth() - snapSize(controlButtons.prefWidth(-1)) - firstTabIndent() - SPACER;
+                            Iterator<Node> i = getChildren().iterator();
+                            while (i.hasNext()) {
+                                TabHeaderSkin tabHeader = (TabHeaderSkin)i.next();
+                                double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1));
+                                if (removeTab.contains(tabHeader)) {                                    
+                                    if (offset < w) {
+                                        isSelectingTab = true;
+                                    }
+                                    i.remove();
+                                    removeTab.remove(tabHeader);
+                                    if (removeTab.isEmpty()) {
+                                        break;
+                                    }
+                                }
+                                offset += tabHeaderPrefWidth;                                
+                            }
+//                        } else {
+//                            isSelectingTab = true;
+                        }
+                    }
+
+                    if (isSelectingTab) {
+                        ensureSelectedTabIsVisible();
+                        isSelectingTab = false;
+                    } else {
+                        validateScrollOffset();
+                    }
+
+                    Side tabPosition = getSkinnable().getSide();
+                    double tabBackgroundHeight = snapSize(prefHeight(-1));
+                    double tabX = (tabPosition.equals(Side.LEFT) || tabPosition.equals(Side.BOTTOM)) ?
+                        snapSize(getWidth()) - getScrollOffset() : getScrollOffset();
+
+                    updateHeaderClip();
+                    for (Node node : getChildren()) {
+                        TabHeaderSkin tabHeader = (TabHeaderSkin)node;
+
+                        // size and position the header relative to the other headers
+                        double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1) * tabHeader.animationTransition.get());
+                        double tabHeaderPrefHeight = snapSize(tabHeader.prefHeight(-1));
+                        tabHeader.resize(tabHeaderPrefWidth, tabHeaderPrefHeight);
+
+                        // This ensures that the tabs are located in the correct position
+                        // when there are tabs of differing heights.
+                        double startY = tabPosition.equals(Side.BOTTOM) ?
+                            0 : tabBackgroundHeight - tabHeaderPrefHeight - snappedBottomInset();
+                        if (tabPosition.equals(Side.LEFT) || tabPosition.equals(Side.BOTTOM)) {
+                            // build from the right
+                            tabX -= tabHeaderPrefWidth;
+                            tabHeader.relocate(tabX, startY);
+                        } else {
+                            // build from the left
+                            tabHeader.relocate(tabX, startY);
+                            tabX += tabHeaderPrefWidth;
+                        }
+                    }
+                }
+
+            };
+            headersRegion.getStyleClass().setAll("headers-region");
+            headersRegion.setClip(headerClip);
+
+            headerBackground = new StackPane();
+            headerBackground.getStyleClass().setAll("tab-header-background");
+
+            int i = 0;
+            for (Tab tab: tabPane.getTabs()) {
+                addTab(tab, i++);
+            }
+
+            controlButtons = new TabControlButtons();
+            controlButtons.setVisible(false);
+            if (controlButtons.isVisible()) {
+                controlButtons.setVisible(true);
+            }
+            getChildren().addAll(headerBackground, headersRegion, controlButtons);
+
+            // support for mouse scroll of header area (for when the tabs exceed
+            // the available space)
+            addEventHandler(ScrollEvent.SCROLL, (ScrollEvent e) -> {
+                Side side = getSkinnable().getSide();
+                side = side == null ? Side.TOP : side;
+                switch (side) {
+                    default:
+                    case TOP:
+                    case BOTTOM:
+                        setScrollOffset(scrollOffset - e.getDeltaY());
+                        break;
+                    case LEFT:
+                    case RIGHT:
+                        setScrollOffset(scrollOffset + e.getDeltaY());
+                        break;
+                }
+
+            });
+        }
+
+        private void updateHeaderClip() {
+            Side tabPosition = getSkinnable().getSide();
+
+            double x = 0;
+            double y = 0;
+            double clipWidth = 0;
+            double clipHeight = 0;
+            double maxWidth = 0;
+            double shadowRadius = 0;
+            double clipOffset = firstTabIndent();
+            double controlButtonPrefWidth = snapSize(controlButtons.prefWidth(-1));
+
+            measureClosingTabs = true;
+            double headersPrefWidth = snapSize(headersRegion.prefWidth(-1));
+            measureClosingTabs = false;
+
+            double headersPrefHeight = snapSize(headersRegion.prefHeight(-1));
+
+            // Add the spacer if isShowTabsMenu is true.
+            if (controlButtonPrefWidth > 0) {
+                controlButtonPrefWidth = controlButtonPrefWidth + SPACER;
+            }
+
+            if (headersRegion.getEffect() instanceof DropShadow) {
+                DropShadow shadow = (DropShadow)headersRegion.getEffect();
+                shadowRadius = shadow.getRadius();
+            }
+
+            maxWidth = snapSize(getWidth()) - controlButtonPrefWidth - clipOffset;
+            if (tabPosition.equals(Side.LEFT) || tabPosition.equals(Side.BOTTOM)) {
+                if (headersPrefWidth < maxWidth) {
+                    clipWidth = headersPrefWidth + shadowRadius;
+                } else {
+                    x = headersPrefWidth - maxWidth;
+                    clipWidth = maxWidth + shadowRadius;
+                }
+                clipHeight = headersPrefHeight;
+            } else {
+                // If x = 0 the header region's drop shadow is clipped.
+                x = -shadowRadius;
+                clipWidth = (headersPrefWidth < maxWidth ? headersPrefWidth : maxWidth) + shadowRadius;
+                clipHeight = headersPrefHeight;
+            }
+
+            headerClip.setX(x);
+            headerClip.setY(y);
+            headerClip.setWidth(clipWidth);
+            headerClip.setHeight(clipHeight);
+        }
+
+        private void addTab(Tab tab, int addToIndex) {
+            TabHeaderSkin tabHeaderSkin = new TabHeaderSkin(tab);
+            headersRegion.getChildren().add(addToIndex, tabHeaderSkin);
+        }
+
+        private List<TabHeaderSkin> removeTab = new ArrayList<>();
+        private void removeTab(Tab tab) {
+            TabHeaderSkin tabHeaderSkin = getTabHeaderSkin(tab);
+            if (tabHeaderSkin != null) {
+                if (tabsFit()) {
+                    headersRegion.getChildren().remove(tabHeaderSkin);
+                } else {
+                    // The tab will be removed during layout because
+                    // we need its width to compute the scroll offset.
+                    removeTab.add(tabHeaderSkin);
+                    tabHeaderSkin.removeListeners(tab);
+                }
+            }
+        }
+
+        private TabHeaderSkin getTabHeaderSkin(Tab tab) {
+            for (Node child: headersRegion.getChildren()) {
+                TabHeaderSkin tabHeaderSkin = (TabHeaderSkin)child;
+                if (tabHeaderSkin.getTab().equals(tab)) {
+                    return tabHeaderSkin;
+                }
+            }
+            return null;
+        }
+
+        private boolean tabsFit() {
+            double headerPrefWidth = snapSize(headersRegion.prefWidth(-1));
+            double controlTabWidth = snapSize(controlButtons.prefWidth(-1));
+            double visibleWidth = headerPrefWidth + controlTabWidth + firstTabIndent() + SPACER;
+            return visibleWidth < getWidth();
+        }
+
+        private void ensureSelectedTabIsVisible() {
+            // work out the visible width of the tab header
+            double tabPaneWidth = snapSize(isHorizontal() ? getSkinnable().getWidth() : getSkinnable().getHeight());
+            double controlTabWidth = snapSize(controlButtons.getWidth());
+            double visibleWidth = tabPaneWidth - controlTabWidth - firstTabIndent() - SPACER;
+
+            // and get where the selected tab is in the header area
+            double offset = 0.0;
+            double selectedTabOffset = 0.0;
+            double selectedTabWidth = 0.0;
+            for (Node node : headersRegion.getChildren()) {
+                TabHeaderSkin tabHeader = (TabHeaderSkin)node;
+
+                double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1));
+
+                if (selectedTab != null && selectedTab.equals(tabHeader.getTab())) {
+                    selectedTabOffset = offset;
+                    selectedTabWidth = tabHeaderPrefWidth;
+                }
+                offset += tabHeaderPrefWidth;
+            }
+
+            final double scrollOffset = getScrollOffset();
+            final double selectedTabStartX = selectedTabOffset;
+            final double selectedTabEndX = selectedTabOffset + selectedTabWidth;
+
+            final double visibleAreaEndX = visibleWidth;
+
+            if (selectedTabStartX < -scrollOffset) {
+                setScrollOffset(-selectedTabStartX);
+            } else if (selectedTabEndX > (visibleAreaEndX - scrollOffset)) {
+                setScrollOffset(visibleAreaEndX - selectedTabEndX);
+            }
+        }
+
+        public double getScrollOffset() {
+            return scrollOffset;
+        }
+
+        private void validateScrollOffset() {
+            setScrollOffset(getScrollOffset());
+        }
+
+        private void setScrollOffset(double newScrollOffset) {
+            // work out the visible width of the tab header
+            double tabPaneWidth = snapSize(isHorizontal() ? getSkinnable().getWidth() : getSkinnable().getHeight());
+            double controlTabWidth = snapSize(controlButtons.getWidth());
+            double visibleWidth = tabPaneWidth - controlTabWidth - firstTabIndent() - SPACER;
+
+            // measure the width of all tabs
+            double offset = 0.0;
+            for (Node node : headersRegion.getChildren()) {
+                TabHeaderSkin tabHeader = (TabHeaderSkin)node;
+                double tabHeaderPrefWidth = snapSize(tabHeader.prefWidth(-1));
+                offset += tabHeaderPrefWidth;
+            }
+
+            double actualNewScrollOffset;
+
+            if ((visibleWidth - newScrollOffset) > offset && newScrollOffset < 0) {
+                // need to make sure the right-most tab is attached to the
+                // right-hand side of the tab header (e.g. if the tab header area width
+                // is expanded), and if it isn't modify the scroll offset to bring
+                // it into line. See RT-35194 for a test case.
+                actualNewScrollOffset = visibleWidth - offset;
+            } else if (newScrollOffset > 0) {
+                // need to prevent the left-most tab from becoming detached
+                // from the left-hand side of the tab header.
+                actualNewScrollOffset = 0;
+            } else {
+                actualNewScrollOffset = newScrollOffset;
+            }
+
+            if (actualNewScrollOffset != scrollOffset) {
+                scrollOffset = actualNewScrollOffset;
+                headersRegion.requestLayout();
+            }
+        }
+
+        private double firstTabIndent() {
+            switch (getSkinnable().getSide()) {
+                case TOP:
+                case BOTTOM:
+                    return snappedLeftInset();
+                case RIGHT:
+                case LEFT:
+                    return snappedTopInset();
+                default:
+                    return 0;
+            }
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            double padding = isHorizontal() ?
+                snappedLeftInset() + snappedRightInset() :
+                snappedTopInset() + snappedBottomInset();
+            return snapSize(headersRegion.prefWidth(height)) + controlButtons.prefWidth(height) +
+                    firstTabIndent() + SPACER + padding;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            double padding = isHorizontal() ?
+                snappedTopInset() + snappedBottomInset() :
+                snappedLeftInset() + snappedRightInset();
+            return snapSize(headersRegion.prefHeight(-1)) + padding;
+        }
+
+        @Override public double getBaselineOffset() {
+            if (getSkinnable().getSide() == Side.TOP) {
+                return headersRegion.getBaselineOffset() + snappedTopInset();
+            }
+            return 0;
+        }
+
+        @Override protected void layoutChildren() {
+            final double leftInset = snappedLeftInset();
+            final double rightInset = snappedRightInset();
+            final double topInset = snappedTopInset();
+            final double bottomInset = snappedBottomInset();
+            double w = snapSize(getWidth()) - (isHorizontal() ?
+                    leftInset + rightInset : topInset + bottomInset);
+            double h = snapSize(getHeight()) - (isHorizontal() ?
+                    topInset + bottomInset : leftInset + rightInset);
+            double tabBackgroundHeight = snapSize(prefHeight(-1));
+            double headersPrefWidth = snapSize(headersRegion.prefWidth(-1));
+            double headersPrefHeight = snapSize(headersRegion.prefHeight(-1));
+
+            controlButtons.showTabsMenu(! tabsFit());
+
+            updateHeaderClip();
+            headersRegion.requestLayout();
+
+            // RESIZE CONTROL BUTTONS
+            double btnWidth = snapSize(controlButtons.prefWidth(-1));
+            final double btnHeight = controlButtons.prefHeight(btnWidth);
+            controlButtons.resize(btnWidth, btnHeight);
+
+            // POSITION TABS
+            headersRegion.resize(headersPrefWidth, headersPrefHeight);
+
+            if (isFloatingStyleClass()) {
+                headerBackground.setVisible(false);
+            } else {
+                headerBackground.resize(snapSize(getWidth()), snapSize(getHeight()));
+                headerBackground.setVisible(true);
+            }
+            
+            double startX = 0;
+            double startY = 0;
+            double controlStartX = 0;
+            double controlStartY = 0;
+            Side tabPosition = getSkinnable().getSide();
+
+            if (tabPosition.equals(Side.TOP)) {
+                startX = leftInset;
+                startY = tabBackgroundHeight - headersPrefHeight - bottomInset;
+                controlStartX = w - btnWidth + leftInset;
+                controlStartY = snapSize(getHeight()) - btnHeight - bottomInset;
+            } else if (tabPosition.equals(Side.RIGHT)) {
+                startX = topInset;
+                startY = tabBackgroundHeight - headersPrefHeight - leftInset;
+                controlStartX = w - btnWidth + topInset;
+                controlStartY = snapSize(getHeight()) - btnHeight - leftInset;
+            } else if (tabPosition.equals(Side.BOTTOM)) {
+                startX = snapSize(getWidth()) - headersPrefWidth - leftInset;
+                startY = tabBackgroundHeight - headersPrefHeight - topInset;
+                controlStartX = rightInset;
+                controlStartY = snapSize(getHeight()) - btnHeight - topInset;
+            } else if (tabPosition.equals(Side.LEFT)) {
+                startX = snapSize(getWidth()) - headersPrefWidth - topInset;
+                startY = tabBackgroundHeight - headersPrefHeight - rightInset;
+                controlStartX = leftInset;
+                controlStartY = snapSize(getHeight()) - btnHeight - rightInset;
+            }
+            if (headerBackground.isVisible()) {
+                positionInArea(headerBackground, 0, 0,
+                        snapSize(getWidth()), snapSize(getHeight()), /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+            }
+            positionInArea(headersRegion, startX, startY, w, h, /*baseline ignored*/0, HPos.LEFT, VPos.CENTER);
+            positionInArea(controlButtons, controlStartX, controlStartY, btnWidth, btnHeight,
+                        /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+        }
+    } /* End TabHeaderArea */
+
+
+
+
+    /**************************************************************************
+     *
+     * TabHeaderSkin: skin for each tab
+     *
+     **************************************************************************/
+
+    class TabHeaderSkin extends StackPane {
+        private final Tab tab;
+        public Tab getTab() {
+            return tab;
+        }
+        private Label label;
+        private StackPane closeBtn;
+        private StackPane inner;
+        private Tooltip oldTooltip;
+        private Tooltip tooltip;
+        private Rectangle clip;
+
+        private boolean isClosing = false;
+
+        private LambdaMultiplePropertyChangeListenerHandler listener = new LambdaMultiplePropertyChangeListenerHandler();
+        
+        private final ListChangeListener<String> styleClassListener = new ListChangeListener<String>() {
+            @Override
+            public void onChanged(Change<? extends String> c) {
+                getStyleClass().setAll(tab.getStyleClass());
+            }
+        };
+        
+        private final WeakListChangeListener<String> weakStyleClassListener =
+                new WeakListChangeListener<>(styleClassListener);
+
+        public TabHeaderSkin(final Tab tab) {
+            getStyleClass().setAll(tab.getStyleClass());
+            setId(tab.getId());
+            setStyle(tab.getStyle());
+            setAccessibleRole(AccessibleRole.TAB_ITEM);
+
+            this.tab = tab;
+            clip = new Rectangle();
+            setClip(clip);
+
+            label = new Label(tab.getText(), tab.getGraphic());
+            label.getStyleClass().setAll("tab-label");
+
+            closeBtn = new StackPane() {
+                @Override protected double computePrefWidth(double h) {
+                    return CLOSE_BTN_SIZE;
+                }
+                @Override protected double computePrefHeight(double w) {
+                    return CLOSE_BTN_SIZE;
+                }
+                @Override
+                public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+                    switch (action) {
+                        case FIRE: {
+                            Tab tab = getTab();
+                            if (behavior.canCloseTab(tab)) {
+                                behavior.closeTab(tab);
+                                setOnMousePressed(null);
+                            }
+                        }
+                        default: super.executeAccessibleAction(action, parameters);
+                    }
+                }
+            };
+            closeBtn.setAccessibleRole(AccessibleRole.BUTTON);
+            closeBtn.setAccessibleText(getString("Accessibility.title.TabPane.CloseButton"));
+            closeBtn.getStyleClass().setAll("tab-close-button");
+            closeBtn.setOnMousePressed(new EventHandler<MouseEvent>() {
+                @Override
+                public void handle(MouseEvent me) {
+                    Tab tab = getTab();
+                    if (behavior.canCloseTab(tab)) {
+                        behavior.closeTab(tab);
+                        setOnMousePressed(null);
+                    }
+                }
+            });
+            
+            updateGraphicRotation();
+
+            final Region focusIndicator = new Region();
+            focusIndicator.setMouseTransparent(true);
+            focusIndicator.getStyleClass().add("focus-indicator");
+            
+            inner = new StackPane() {
+                @Override protected void layoutChildren() {
+                    final TabPane skinnable = getSkinnable();
+                    
+                    final double paddingTop = snappedTopInset();
+                    final double paddingRight = snappedRightInset();
+                    final double paddingBottom = snappedBottomInset();
+                    final double paddingLeft = snappedLeftInset();
+                    final double w = getWidth() - (paddingLeft + paddingRight);
+                    final double h = getHeight() - (paddingTop + paddingBottom);
+
+                    final double prefLabelWidth = snapSize(label.prefWidth(-1));
+                    final double prefLabelHeight = snapSize(label.prefHeight(-1));
+                    
+                    final double closeBtnWidth = showCloseButton() ? snapSize(closeBtn.prefWidth(-1)) : 0;
+                    final double closeBtnHeight = showCloseButton() ? snapSize(closeBtn.prefHeight(-1)) : 0;
+                    final double minWidth = snapSize(skinnable.getTabMinWidth());
+                    final double maxWidth = snapSize(skinnable.getTabMaxWidth());
+                    final double maxHeight = snapSize(skinnable.getTabMaxHeight());
+
+                    double labelAreaWidth = prefLabelWidth;
+                    double labelWidth = prefLabelWidth;
+                    double labelHeight = prefLabelHeight;
+                    
+                    final double childrenWidth = labelAreaWidth + closeBtnWidth;
+                    final double childrenHeight = Math.max(labelHeight, closeBtnHeight);
+                    
+                    if (childrenWidth > maxWidth && maxWidth != Double.MAX_VALUE) {
+                        labelAreaWidth = maxWidth - closeBtnWidth;
+                        labelWidth = maxWidth - closeBtnWidth;
+                    } else if (childrenWidth < minWidth) {
+                        labelAreaWidth = minWidth - closeBtnWidth;
+                    }
+
+                    if (childrenHeight > maxHeight && maxHeight != Double.MAX_VALUE) {
+                        labelHeight = maxHeight;
+                    }
+
+                    if (animationState != TabAnimationState.NONE) {
+//                        if (prefWidth.getValue() < labelAreaWidth) {
+//                            labelAreaWidth = prefWidth.getValue();
+//                        }
+                        labelAreaWidth *= animationTransition.get();
+                        closeBtn.setVisible(false);
+                    } else {
+                        closeBtn.setVisible(showCloseButton());
+                    }
+                    
+                    
+                    label.resize(labelWidth, labelHeight);
+                    
+                    
+                    double labelStartX = paddingLeft;
+                    
+                    // If maxWidth is less than Double.MAX_VALUE, the user has 
+                    // clamped the max width, but we should
+                    // position the close button at the end of the tab, 
+                    // which may not necessarily be the entire width of the
+                    // provided max width.
+                    double closeBtnStartX = (maxWidth < Double.MAX_VALUE ? Math.min(w, maxWidth) : w) - paddingRight - closeBtnWidth;
+                    
+                    positionInArea(label, labelStartX, paddingTop, labelAreaWidth, h,
+                            /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+
+                    if (closeBtn.isVisible()) {
+                        closeBtn.resize(closeBtnWidth, closeBtnHeight);
+                        positionInArea(closeBtn, closeBtnStartX, paddingTop, closeBtnWidth, h,
+                                /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+                    }
+
+                    // Magic numbers regretfully introduced for RT-28944 (so that
+                    // the focus rect appears as expected on Windows and Mac).
+                    // In short we use the vPadding to shift the focus rect down
+                    // into the content area (whereas previously it was being clipped
+                    // on Windows, whilst it still looked fine on Mac). In the
+                    // future we may want to improve this code to remove the
+                    // magic number. Similarly, the hPadding differs on Mac.
+                    final int vPadding = Utils.isMac() ? 2 : 3;
+                    final int hPadding = Utils.isMac() ? 2 : 1;
+                    focusIndicator.resizeRelocate(
+                            paddingLeft - hPadding,
+                            paddingTop + vPadding,
+                            w + 2 * hPadding,
+                            h - 2 * vPadding);
+                }
+            };
+            inner.getStyleClass().add("tab-container");
+            inner.setRotate(getSkinnable().getSide().equals(Side.BOTTOM) ? 180.0F : 0.0F);
+            inner.getChildren().addAll(label, closeBtn, focusIndicator);
+
+            getChildren().addAll(inner);
+
+            tooltip = tab.getTooltip();
+            if (tooltip != null) {
+                Tooltip.install(this, tooltip);
+                oldTooltip = tooltip;
+            }
+
+            listener.registerChangeListener(tab.closableProperty(), e -> {
+                inner.requestLayout();
+                requestLayout();
+            });
+            listener.registerChangeListener(tab.selectedProperty(), e -> {
+                pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, tab.isSelected());
+                // Need to request a layout pass for inner because if the width
+                // and height didn't not change the label or close button may have
+                // changed.
+                inner.requestLayout();
+                requestLayout();
+            });
+            listener.registerChangeListener(tab.textProperty(),e -> label.setText(getTab().getText()));
+            listener.registerChangeListener(tab.graphicProperty(), e -> label.setGraphic(getTab().getGraphic()));
+            listener.registerChangeListener(tab.tooltipProperty(), e -> {
+                // uninstall the old tooltip
+                if (oldTooltip != null) {
+                    Tooltip.uninstall(this, oldTooltip);
+                }
+                tooltip = tab.getTooltip();
+                if (tooltip != null) {
+                    // install new tooltip and save as old tooltip.
+                    Tooltip.install(this, tooltip);
+                    oldTooltip = tooltip;
+                }
+            });
+            listener.registerChangeListener(tab.disableProperty(), e -> {
+                pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, tab.isDisable());
+                inner.requestLayout();
+                requestLayout();
+            });
+            listener.registerChangeListener(tab.styleProperty(), e -> setStyle(tab.getStyle()));
+            
+            tab.getStyleClass().addListener(weakStyleClassListener);
+
+            listener.registerChangeListener(getSkinnable().tabClosingPolicyProperty(),e -> {
+                inner.requestLayout();
+                requestLayout();
+            });
+            listener.registerChangeListener(getSkinnable().sideProperty(),e -> {
+                final Side side = getSkinnable().getSide();
+                pseudoClassStateChanged(TOP_PSEUDOCLASS_STATE, (side == Side.TOP));
+                pseudoClassStateChanged(RIGHT_PSEUDOCLASS_STATE, (side == Side.RIGHT));
+                pseudoClassStateChanged(BOTTOM_PSEUDOCLASS_STATE, (side == Side.BOTTOM));
+                pseudoClassStateChanged(LEFT_PSEUDOCLASS_STATE, (side == Side.LEFT));
+                inner.setRotate(side == Side.BOTTOM ? 180.0F : 0.0F);
+                if (getSkinnable().isRotateGraphic()) {
+                    updateGraphicRotation();
+                }
+            });
+            listener.registerChangeListener(getSkinnable().rotateGraphicProperty(), e -> updateGraphicRotation());
+            listener.registerChangeListener(getSkinnable().tabMinWidthProperty(), e -> {
+                requestLayout();
+                getSkinnable().requestLayout();
+            });
+            listener.registerChangeListener(getSkinnable().tabMaxWidthProperty(), e -> {
+                requestLayout();
+                getSkinnable().requestLayout();
+            });
+            listener.registerChangeListener(getSkinnable().tabMinHeightProperty(), e -> {
+                requestLayout();
+                getSkinnable().requestLayout();
+            });
+            listener.registerChangeListener(getSkinnable().tabMaxHeightProperty(), e -> {
+                requestLayout();
+                getSkinnable().requestLayout();
+            });
+
+            getProperties().put(Tab.class, tab);
+            getProperties().put(ContextMenu.class, tab.getContextMenu());
+
+            setOnContextMenuRequested((ContextMenuEvent me) -> {
+               if (getTab().getContextMenu() != null) {
+                    getTab().getContextMenu().show(inner, me.getScreenX(), me.getScreenY());
+                    me.consume();
+                }
+            });
+            setOnMousePressed(new EventHandler<MouseEvent>() {
+                @Override public void handle(MouseEvent me) {
+                    if (getTab().isDisable()) {
+                        return;
+                    }
+                    if (me.getButton().equals(MouseButton.MIDDLE)) {
+                        if (showCloseButton()) {
+                            Tab tab = getTab();
+                            if (behavior.canCloseTab(tab)) {
+                                removeListeners(tab);
+                                behavior.closeTab(tab);    
+                            }
+                        }
+                    } else if (me.getButton().equals(MouseButton.PRIMARY)) {
+                        behavior.selectTab(getTab());
+                    }
+                }
+            });    
+
+            // initialize pseudo-class state
+            pseudoClassStateChanged(SELECTED_PSEUDOCLASS_STATE, tab.isSelected());
+            pseudoClassStateChanged(DISABLED_PSEUDOCLASS_STATE, tab.isDisable());
+            final Side side = getSkinnable().getSide();
+            pseudoClassStateChanged(TOP_PSEUDOCLASS_STATE, (side == Side.TOP));
+            pseudoClassStateChanged(RIGHT_PSEUDOCLASS_STATE, (side == Side.RIGHT));
+            pseudoClassStateChanged(BOTTOM_PSEUDOCLASS_STATE, (side == Side.BOTTOM));
+            pseudoClassStateChanged(LEFT_PSEUDOCLASS_STATE, (side == Side.LEFT));
+        }
+
+        private void updateGraphicRotation() {
+            if (label.getGraphic() != null) {
+                label.getGraphic().setRotate(getSkinnable().isRotateGraphic() ? 0.0F :
+                    (getSkinnable().getSide().equals(Side.RIGHT) ? -90.0F :
+                        (getSkinnable().getSide().equals(Side.LEFT) ? 90.0F : 0.0F)));
+            }
+        }
+
+        private boolean showCloseButton() {
+            return tab.isClosable() &&
+                    (getSkinnable().getTabClosingPolicy().equals(TabClosingPolicy.ALL_TABS) ||
+                    getSkinnable().getTabClosingPolicy().equals(TabClosingPolicy.SELECTED_TAB) && tab.isSelected());
+        }
+
+        private final DoubleProperty animationTransition = new SimpleDoubleProperty(this, "animationTransition", 1.0) {
+            @Override protected void invalidated() {
+                requestLayout();
+            }
+        };
+
+        private void removeListeners(Tab tab) {
+            listener.dispose();
+            inner.getChildren().clear();
+            getChildren().clear();
+        }
+
+        private TabAnimationState animationState = TabAnimationState.NONE;
+        private Timeline currentAnimation;
+
+        @Override protected double computePrefWidth(double height) {
+//            if (animating) {
+//                return prefWidth.getValue();
+//            }
+            double minWidth = snapSize(getSkinnable().getTabMinWidth());
+            double maxWidth = snapSize(getSkinnable().getTabMaxWidth());
+            double paddingRight = snappedRightInset();
+            double paddingLeft = snappedLeftInset();
+            double tmpPrefWidth = snapSize(label.prefWidth(-1));
+
+            // only include the close button width if it is relevant
+            if (showCloseButton()) {
+                tmpPrefWidth += snapSize(closeBtn.prefWidth(-1));
+            }
+
+            if (tmpPrefWidth > maxWidth) {
+                tmpPrefWidth = maxWidth;
+            } else if (tmpPrefWidth < minWidth) {
+                tmpPrefWidth = minWidth;
+            }
+            tmpPrefWidth += paddingRight + paddingLeft;
+//            prefWidth.setValue(tmpPrefWidth);
+            return tmpPrefWidth;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            double minHeight = snapSize(getSkinnable().getTabMinHeight());
+            double maxHeight = snapSize(getSkinnable().getTabMaxHeight());
+            double paddingTop = snappedTopInset();
+            double paddingBottom = snappedBottomInset();
+            double tmpPrefHeight = snapSize(label.prefHeight(width));
+
+            if (tmpPrefHeight > maxHeight) {
+                tmpPrefHeight = maxHeight;
+            } else if (tmpPrefHeight < minHeight) {
+                tmpPrefHeight = minHeight;
+            }
+            tmpPrefHeight += paddingTop + paddingBottom;
+            return tmpPrefHeight;
+        }
+
+        @Override protected void layoutChildren() {
+            double w = (snapSize(getWidth()) - snappedRightInset() - snappedLeftInset()) * animationTransition.getValue();
+            inner.resize(w, snapSize(getHeight()) - snappedTopInset() - snappedBottomInset());
+            inner.relocate(snappedLeftInset(), snappedTopInset());
+        }
+
+        @Override protected void setWidth(double value) {
+            super.setWidth(value);
+            clip.setWidth(value);
+        }
+
+        @Override protected void setHeight(double value) {
+            super.setHeight(value);
+            clip.setHeight(value);
+        }
+    
+        @Override
+        public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+            switch (attribute) {
+                case TEXT: return getTab().getText();
+                case SELECTED: return selectedTab == getTab();
+                default: return super.queryAccessibleAttribute(attribute, parameters);
+            }
+        }
+
+        @Override
+        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+            switch (action) {
+                case REQUEST_FOCUS:
+                    getSkinnable().getSelectionModel().select(getTab());
+                    break;
+                default: super.executeAccessibleAction(action, parameters);
+            }
+        }
+
+    } /* End TabHeaderSkin */
+
+    private static final PseudoClass SELECTED_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("selected");
+    private static final PseudoClass TOP_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("top");
+    private static final PseudoClass BOTTOM_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("bottom");
+    private static final PseudoClass LEFT_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("left");
+    private static final PseudoClass RIGHT_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("right");
+    private static final PseudoClass DISABLED_PSEUDOCLASS_STATE =
+            PseudoClass.getPseudoClass("disabled");    
+
+
+    /**************************************************************************
+     *
+     * TabContentRegion: each tab has one to contain the tab's content node
+     *
+     **************************************************************************/
+    class TabContentRegion extends StackPane {
+
+        private TraversalEngine engine;
+        private Direction direction = Direction.NEXT;
+        private Tab tab;
+
+        private InvalidationListener tabContentListener = valueModel -> {
+            updateContent();
+        };
+        private InvalidationListener tabSelectedListener = new InvalidationListener() {
+            @Override public void invalidated(Observable valueModel) {
+                setVisible(tab.isSelected());
+            }
+        };
+
+        private WeakInvalidationListener weakTabContentListener =
+                new WeakInvalidationListener(tabContentListener);
+        private WeakInvalidationListener weakTabSelectedListener =
+                new WeakInvalidationListener(tabSelectedListener);
+
+        public Tab getTab() {
+            return tab;
+        }
+
+        public TabContentRegion(Tab tab) {
+            getStyleClass().setAll("tab-content-area");
+            setManaged(false);
+            this.tab = tab;
+            updateContent();
+            setVisible(tab.isSelected());
+
+            tab.selectedProperty().addListener(weakTabSelectedListener);
+            tab.contentProperty().addListener(weakTabContentListener);
+        }
+
+        private void updateContent() {
+            Node newContent = getTab().getContent();
+            if (newContent == null) {
+                getChildren().clear();
+            } else {
+                getChildren().setAll(newContent);
+            }
+        }
+
+        private void removeListeners(Tab tab) {
+            tab.selectedProperty().removeListener(weakTabSelectedListener);
+            tab.contentProperty().removeListener(weakTabContentListener);
+        }
+
+    } /* End TabContentRegion */
+
+    /**************************************************************************
+     *
+     * TabControlButtons: controls to manipulate tab interaction
+     *
+     **************************************************************************/
+    class TabControlButtons extends StackPane {
+        private StackPane inner;
+        private StackPane downArrow;
+        private Pane downArrowBtn;
+        private boolean showControlButtons;
+        private ContextMenu popup;
+
+        public TabControlButtons() {            
+            getStyleClass().setAll("control-buttons-tab");
+
+            TabPane tabPane = getSkinnable();
+
+            downArrowBtn = new Pane();
+            downArrowBtn.getStyleClass().setAll("tab-down-button");
+            downArrowBtn.setVisible(isShowTabsMenu());
+            downArrow = new StackPane();
+            downArrow.setManaged(false);
+            downArrow.getStyleClass().setAll("arrow");
+            downArrow.setRotate(tabPane.getSide().equals(Side.BOTTOM) ? 180.0F : 0.0F);
+            downArrowBtn.getChildren().add(downArrow);
+            downArrowBtn.setOnMouseClicked(me -> {
+                showPopupMenu();
+            });
+            
+            setupPopupMenu();
+
+            inner = new StackPane() {
+                @Override protected double computePrefWidth(double height) {
+                    double pw;
+                    double maxArrowWidth = ! isShowTabsMenu() ? 0 : snapSize(downArrow.prefWidth(getHeight())) + snapSize(downArrowBtn.prefWidth(getHeight()));
+                    pw = 0.0F;
+                    if (isShowTabsMenu()) {
+                        pw += maxArrowWidth;
+                    }
+                    if (pw > 0) {
+                        pw += snappedLeftInset() + snappedRightInset();
+                    }
+                    return pw;
+                }
+
+                @Override protected double computePrefHeight(double width) {
+                    double height = 0.0F;
+                    if (isShowTabsMenu()) {
+                        height = Math.max(height, snapSize(downArrowBtn.prefHeight(width)));
+                    }
+                    if (height > 0) {
+                        height += snappedTopInset() + snappedBottomInset();
+                    }
+                    return height;
+                }
+
+                @Override protected void layoutChildren() {
+                    if (isShowTabsMenu()) {
+                        double x = 0;
+                        double y = snappedTopInset();
+                        double w = snapSize(getWidth()) - x + snappedLeftInset();
+                        double h = snapSize(getHeight()) - y + snappedBottomInset();
+                        positionArrow(downArrowBtn, downArrow, x, y, w, h);
+                    }
+                }
+
+                private void positionArrow(Pane btn, StackPane arrow, double x, double y, double width, double height) {
+                    btn.resize(width, height);
+                    positionInArea(btn, x, y, width, height, /*baseline ignored*/0,
+                            HPos.CENTER, VPos.CENTER);
+                    // center arrow region within arrow button
+                    double arrowWidth = snapSize(arrow.prefWidth(-1));
+                    double arrowHeight = snapSize(arrow.prefHeight(-1));
+                    arrow.resize(arrowWidth, arrowHeight);
+                    positionInArea(arrow, btn.snappedLeftInset(), btn.snappedTopInset(),
+                            width - btn.snappedLeftInset() - btn.snappedRightInset(),
+                            height - btn.snappedTopInset() - btn.snappedBottomInset(),
+                            /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+                }
+            };
+            inner.getStyleClass().add("container");
+            inner.getChildren().add(downArrowBtn);
+
+            getChildren().add(inner);
+
+            tabPane.sideProperty().addListener(valueModel -> {
+                Side tabPosition = getSkinnable().getSide();
+                downArrow.setRotate(tabPosition.equals(Side.BOTTOM)? 180.0F : 0.0F);
+            });
+            tabPane.getTabs().addListener((ListChangeListener<Tab>) c -> setupPopupMenu());
+            showControlButtons = false;
+            if (isShowTabsMenu()) {
+                showControlButtons = true;
+                requestLayout();
+            }
+            getProperties().put(ContextMenu.class, popup);
+        }
+
+        private boolean showTabsMenu = false;
+
+        private void showTabsMenu(boolean value) {
+            final boolean wasTabsMenuShowing = isShowTabsMenu();
+            this.showTabsMenu = value;
+
+            if (showTabsMenu && !wasTabsMenuShowing) {
+                downArrowBtn.setVisible(true);
+                showControlButtons = true;
+                inner.requestLayout();
+                tabHeaderArea.requestLayout();
+            } else if (!showTabsMenu && wasTabsMenuShowing) {
+                hideControlButtons();
+            }
+        }
+
+        private boolean isShowTabsMenu() {
+            return showTabsMenu;
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            double pw = snapSize(inner.prefWidth(height));
+            if (pw > 0) {
+                pw += snappedLeftInset() + snappedRightInset();
+            }
+            return pw;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            return Math.max(getSkinnable().getTabMinHeight(), snapSize(inner.prefHeight(width))) +
+                    snappedTopInset() + snappedBottomInset();
+        }
+
+        @Override protected void layoutChildren() {
+            double x = snappedLeftInset();
+            double y = snappedTopInset();
+            double w = snapSize(getWidth()) - x + snappedRightInset();
+            double h = snapSize(getHeight()) - y + snappedBottomInset();
+
+            if (showControlButtons) {
+                showControlButtons();
+                showControlButtons = false;
+            }
+
+            inner.resize(w, h);
+            positionInArea(inner, x, y, w, h, /*baseline ignored*/0, HPos.CENTER, VPos.BOTTOM);
+        }
+
+        private void showControlButtons() {
+            setVisible(true);
+            if (popup == null) {
+                setupPopupMenu();
+            }
+        }
+
+        private void hideControlButtons() {
+            // If the scroll arrows or tab menu is still visible we don't want
+            // to hide it animate it back it.
+            if (isShowTabsMenu()) {
+                showControlButtons = true;
+            } else {
+                setVisible(false);
+                popup.getItems().clear();
+                popup = null;
+            }
+
+            // This needs to be called when we are in the left tabPosition
+            // to allow for the clip offset to move properly (otherwise
+            // it jumps too early - before the animation is done).
+            requestLayout();
+        }
+
+        private void setupPopupMenu() {
+            if (popup == null) {
+                popup = new ContextMenu();
+            }
+            popup.getItems().clear();
+            ToggleGroup group = new ToggleGroup();
+            ObservableList<RadioMenuItem> menuitems = FXCollections.<RadioMenuItem>observableArrayList();
+            for (final Tab tab : getSkinnable().getTabs()) {
+                TabMenuItem item = new TabMenuItem(tab);                
+                item.setToggleGroup(group);
+                item.setOnAction(t -> getSkinnable().getSelectionModel().select(tab));
+                menuitems.add(item);
+            }
+            popup.getItems().addAll(menuitems);
+        }
+        
+        private void showPopupMenu() {
+            for (MenuItem mi: popup.getItems()) {
+                TabMenuItem tmi = (TabMenuItem)mi;
+                if (selectedTab.equals(tmi.getTab())) {
+                    tmi.setSelected(true);
+                    break;
+                }
+            }
+            popup.show(downArrowBtn, Side.BOTTOM, 0, 0);            
+        }
+    } /* End TabControlButtons*/
+
+    class TabMenuItem extends RadioMenuItem {
+        Tab tab;
+
+        private InvalidationListener disableListener = new InvalidationListener() {
+            @Override public void invalidated(Observable o) {
+                setDisable(tab.isDisable());
+            }
+        };
+
+        private WeakInvalidationListener weakDisableListener =
+                new WeakInvalidationListener(disableListener);
+
+        public TabMenuItem(final Tab tab) {
+            super(tab.getText(), TabPaneSkin.clone(tab.getGraphic()));                        
+            this.tab = tab;
+            setDisable(tab.isDisable());
+            tab.disableProperty().addListener(weakDisableListener);
+            textProperty().bind(tab.textProperty());
+        }
+
+        public Tab getTab() {
+            return tab;
+        }
+
+        public void dispose() {
+            tab.disableProperty().removeListener(weakDisableListener);
+        }
+    }
+
+    @Override
+    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: return tabHeaderArea.getTabHeaderSkin(selectedTab);
+            case ITEM_COUNT: return tabHeaderArea.headersRegion.getChildren().size();
+            case ITEM_AT_INDEX: {
+                Integer index = (Integer)parameters[0];
+                if (index == null) return null;
+                return tabHeaderArea.headersRegion.getChildren().get(index);
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableCellSkin.java	2015-09-03 15:22:17.957521400 -0700
+++ /dev/null	2015-09-03 15:22:19.000000000 -0700
@@ -1,56 +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.TableCell;
-
-import com.sun.javafx.scene.control.behavior.TableCellBehavior;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.scene.control.TableColumn;
-
-/**
- */
-public class TableCellSkin<S,T> extends TableCellSkinBase<TableCell<S,T>, TableCellBehavior<S,T>> {
-    
-    private final TableColumn<S,T> tableColumn;
-    
-    public TableCellSkin(TableCell<S,T> tableCell) {
-        super(tableCell, new TableCellBehavior<S,T>(tableCell));
-        
-        this.tableColumn = tableCell.getTableColumn();
-        
-        super.init(tableCell);
-    }
-
-    @Override protected BooleanProperty columnVisibleProperty() {
-        return tableColumn.visibleProperty();
-    }
-
-    @Override protected ReadOnlyDoubleProperty columnWidthProperty() {
-        return tableColumn.widthProperty();
-    }
-}
--- /dev/null	2015-09-03 15:22:19.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkin.java	2015-09-03 15:22:17.161475900 -0700
@@ -0,0 +1,105 @@
+/*
+ * 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.TableCell;
+
+import com.sun.javafx.scene.control.behavior.TableCellBehavior;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.scene.control.TableColumn;
+
+/**
+ * Default skin implementation for the {@link TableCell} control.
+ *
+ * @see TableCell
+ * @since 9
+ */
+public class TableCellSkin<S,T> extends TableCellSkinBase<TableCell<S,T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final BehaviorBase<TableCell<S,T>> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TableCellSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TableCellSkin(TableCell<S,T> control) {
+        super(control);
+
+        // install default input map for the TableCell control
+        behavior = new TableCellBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override BooleanProperty columnVisibleProperty() {
+        return getSkinnable().getTableColumn().visibleProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ReadOnlyDoubleProperty columnWidthProperty() {
+        return getSkinnable().getTableColumn().widthProperty();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableCellSkinBase.java	2015-09-03 15:22:26.175991500 -0700
+++ /dev/null	2015-09-03 15:22:27.000000000 -0700
@@ -1,157 +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 com.sun.javafx.scene.control.behavior.CellBehaviorBase;
-import javafx.beans.InvalidationListener;
-import javafx.beans.WeakInvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.shape.Rectangle;
-
-public abstract class TableCellSkinBase<C extends IndexedCell, B extends CellBehaviorBase<C>> extends CellSkinBase<C,B> {
-
-    /***************************************************************************
-     *                                                                         *
-     * Static Fields                                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    // This property is set on the cell when we want to know its actual
-    // preferred width, not the width of the associated TableColumn.
-    // This is primarily used in NestedTableColumnHeader such that user double
-    // clicks result in the column being resized to fit the widest content in
-    // the column
-    static final String DEFER_TO_PARENT_PREF_WIDTH = "deferToParentPrefWidth";
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    // Equivalent to tableColumn.widthProperty()
-    protected abstract ReadOnlyDoubleProperty columnWidthProperty();
-
-    // Equivalent to tableColumn.visibleProperty()
-    protected abstract BooleanProperty columnVisibleProperty();
-    
-    boolean isDeferToParentForPrefWidth = false;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public TableCellSkinBase(final C control, final B behavior) {
-        super(control, behavior);
-        
-        // init(control) should not be called here - it should be called by the
-        // subclass after initialising itself. This is to prevent NPEs (for 
-        // example, getVisibleLeafColumns() throws a NPE as the control itself
-        // is not yet set in subclasses).
-    }
-    
-    protected void init(C control) {
-        // RT-22038
-        Rectangle clip = new Rectangle();
-        clip.widthProperty().bind(control.widthProperty());
-        clip.heightProperty().bind(control.heightProperty());
-        getSkinnable().setClip(clip);
-        // --- end of RT-22038
-        
-        ReadOnlyDoubleProperty columnWidthProperty = columnWidthProperty();
-        if (columnWidthProperty != null) {
-            columnWidthProperty.addListener(weakColumnWidthListener);
-        }
-
-        registerChangeListener(control.visibleProperty(), "VISIBLE");
-        
-        if (control.getProperties().containsKey(DEFER_TO_PARENT_PREF_WIDTH)) {
-            isDeferToParentForPrefWidth = true;
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-
-    private InvalidationListener columnWidthListener = valueModel -> {
-        getSkinnable().requestLayout();
-    };
-
-    private WeakInvalidationListener weakColumnWidthListener =
-            new WeakInvalidationListener(columnWidthListener);
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Public Methods                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("VISIBLE".equals(p)) {
-            getSkinnable().setVisible(columnVisibleProperty().get());
-        }
-    }
-    
-    @Override public void dispose() {
-        ReadOnlyDoubleProperty columnWidthProperty = columnWidthProperty();
-        if (columnWidthProperty != null) {
-            columnWidthProperty.removeListener(weakColumnWidthListener);
-        }
-        
-        super.dispose();
-    }
-    
-    @Override protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        // fit the cell within this space
-        // FIXME the subtraction of bottom padding isn't right here - but it
-        // results in better visuals, so I'm leaving it in place for now.
-        layoutLabelInArea(x, y, w, h - getSkinnable().getPadding().getBottom());
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (isDeferToParentForPrefWidth) {
-            return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-        }
-        return columnWidthProperty().get();
-    }
-}
--- /dev/null	2015-09-03 15:22:27.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableCellSkinBase.java	2015-09-03 15:22:25.465950800 -0700
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2011, 2015, 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 com.sun.javafx.scene.control.Properties;
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Control;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.shape.Rectangle;
+
+/**
+ * Base skin for table cell controls, for example:
+ * {@link javafx.scene.control.TableCell} and {@link javafx.scene.control.TreeTableCell}.
+ *
+ * @see javafx.scene.control.TableCell
+ * @see javafx.scene.control.TreeTableCell
+ * @since 9
+ */
+public abstract class TableCellSkinBase<C extends IndexedCell> extends CellSkinBase<C> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    boolean isDeferToParentForPrefWidth = false;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TableCellSkinBase instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary {@link Node#getInputMap() input mappings} for
+     * handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TableCellSkinBase(final C control) {
+        super(control);
+        
+        // RT-22038
+        Rectangle clip = new Rectangle();
+        clip.widthProperty().bind(control.widthProperty());
+        clip.heightProperty().bind(control.heightProperty());
+        getSkinnable().setClip(clip);
+        // --- end of RT-22038
+        
+        ReadOnlyDoubleProperty columnWidthProperty = columnWidthProperty();
+        if (columnWidthProperty != null) {
+            columnWidthProperty.addListener(weakColumnWidthListener);
+        }
+
+        registerChangeListener(control.visibleProperty(), e -> getSkinnable().setVisible(columnVisibleProperty().get()));
+        
+        if (control.getProperties().containsKey(Properties.DEFER_TO_PARENT_PREF_WIDTH)) {
+            isDeferToParentForPrefWidth = true;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private InvalidationListener columnWidthListener = valueModel -> getSkinnable().requestLayout();
+
+    private WeakInvalidationListener weakColumnWidthListener =
+            new WeakInvalidationListener(columnWidthListener);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Abstract Methods                                                        *
+     *                                                                         *
+     **************************************************************************/
+
+    // Equivalent to tableColumn.widthProperty()
+    abstract ReadOnlyDoubleProperty columnWidthProperty();
+
+    // Equivalent to tableColumn.visibleProperty()
+    abstract BooleanProperty columnVisibleProperty();
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public Methods                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        ReadOnlyDoubleProperty columnWidthProperty = columnWidthProperty();
+        if (columnWidthProperty != null) {
+            columnWidthProperty.removeListener(weakColumnWidthListener);
+        }
+        
+        super.dispose();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+            final double w, final double h) {
+        // fit the cell within this space
+        // FIXME the subtraction of bottom padding isn't right here - but it
+        // results in better visuals, so I'm leaving it in place for now.
+        layoutLabelInArea(x, y, w, h - getSkinnable().getPadding().getBottom());
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (isDeferToParentForPrefWidth) {
+            return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+        }
+        return columnWidthProperty().get();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableColumnHeader.java	2015-09-03 15:22:34.609473800 -0700
+++ /dev/null	2015-09-03 15:22:35.000000000 -0700
@@ -1,1038 +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.beans.property.DoubleProperty;
-import javafx.beans.value.WritableValue;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.WeakListChangeListener;
-import javafx.css.CssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableProperty;
-import javafx.event.EventHandler;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.geometry.VPos;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Label;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableColumnBase;
-import javafx.scene.input.ContextMenuEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.Region;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.MultiplePropertyChangeListenerHandler;
-
-import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.getSortTypeName;
-import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.getSortTypeProperty;
-import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.isAscending;
-import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.isDescending;
-import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.setSortType;
-
-
-/**
- * Region responsible for painting a single column header.
- */
-public class TableColumnHeader extends Region {
-
-    /***************************************************************************
-     *                                                                         *
-     * Static Fields                                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    // Copied from TableColumn. The value here should always be in-sync with
-    // the value in TableColumn
-    static final double DEFAULT_COLUMN_WIDTH = 80.0F;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-    
-    private boolean autoSizeComplete = false;
-
-    private double dragOffset;
-    private final TableViewSkinBase<?,?,?,?,?,TableColumnBase<?,?>> skin;
-    private NestedTableColumnHeader nestedColumnHeader;
-    private final TableColumnBase<?,?> column;
-    private TableHeaderRow tableHeaderRow;
-    private NestedTableColumnHeader parentHeader;
-
-    // work out where this column currently is within its parent
-    Label label;
-
-    // sort order
-    int sortPos = -1;
-    private Region arrow;
-    private Label sortOrderLabel;
-    private HBox sortOrderDots;
-    private Node sortArrow;
-    private boolean isSortColumn;
-
-    private boolean isSizeDirty = false;
-
-    boolean isLastVisibleColumn = false;
-
-    // package for testing
-    int columnIndex = -1;
-
-    private int newColumnPos;
-
-    // the line drawn in the table when a user presses and moves a column header
-    // to indicate where the column will be dropped. This is provided by the
-    // table skin, but manipulated by the header
-    protected final Region columnReorderLine;
-
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
-
-    public TableColumnHeader(final TableViewSkinBase skin, final TableColumnBase tc) {
-        this.skin = skin;
-        this.column = tc;
-        this.columnReorderLine = skin.getColumnReorderLine();
-        
-        setFocusTraversable(false);
-
-        updateColumnIndex();
-        initUI();
-        
-        // change listener for multiple properties
-        changeListenerHandler = new MultiplePropertyChangeListenerHandler(p -> {
-            handlePropertyChanged(p);
-            return null;
-        });
-        changeListenerHandler.registerChangeListener(sceneProperty(), "SCENE");
-        
-        if (column != null && skin != null) {
-            updateSortPosition();
-            skin.getSortOrder().addListener(weakSortOrderListener);
-            skin.getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
-        }
-
-        if (column != null) {
-            changeListenerHandler.registerChangeListener(column.idProperty(), "TABLE_COLUMN_ID");
-            changeListenerHandler.registerChangeListener(column.styleProperty(), "TABLE_COLUMN_STYLE");
-            changeListenerHandler.registerChangeListener(column.widthProperty(), "TABLE_COLUMN_WIDTH");
-            changeListenerHandler.registerChangeListener(column.visibleProperty(), "TABLE_COLUMN_VISIBLE");
-            changeListenerHandler.registerChangeListener(column.sortNodeProperty(), "TABLE_COLUMN_SORT_NODE");
-            changeListenerHandler.registerChangeListener(column.sortableProperty(), "TABLE_COLUMN_SORTABLE");
-            changeListenerHandler.registerChangeListener(column.textProperty(), "TABLE_COLUMN_TEXT");
-            changeListenerHandler.registerChangeListener(column.graphicProperty(), "TABLE_COLUMN_GRAPHIC");
-
-            column.getStyleClass().addListener(weakStyleClassListener);
-
-            setId(column.getId());
-            setStyle(column.getStyle());
-            updateStyleClass();
-            /* Having TableColumn role parented by TableColumn causes VoiceOver to be unhappy */
-            setAccessibleRole(AccessibleRole.TABLE_COLUMN);
-        }
-    }
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-    
-    protected final MultiplePropertyChangeListenerHandler changeListenerHandler;
-    
-    private ListChangeListener<TableColumnBase<?,?>> sortOrderListener = c -> {
-        updateSortPosition();
-    };
-    
-    private ListChangeListener<TableColumnBase<?,?>> visibleLeafColumnsListener = c -> {
-        updateColumnIndex();
-        updateSortPosition();
-    };
-    
-    private ListChangeListener<String> styleClassListener = c -> {
-        updateStyleClass();
-    };
-    
-    private WeakListChangeListener<TableColumnBase<?,?>> weakSortOrderListener =
-            new WeakListChangeListener<TableColumnBase<?,?>>(sortOrderListener);
-    private final WeakListChangeListener<TableColumnBase<?,?>> weakVisibleLeafColumnsListener =
-            new WeakListChangeListener<TableColumnBase<?,?>>(visibleLeafColumnsListener);
-    private final WeakListChangeListener<String> weakStyleClassListener =
-            new WeakListChangeListener<String>(styleClassListener);
-    
-    private static final EventHandler<MouseEvent> mousePressedHandler = me -> {
-        TableColumnHeader header = (TableColumnHeader) me.getSource();
-
-        // pass focus to the table, so that the user immediately sees
-        // the focus rectangle around the table control.
-        header.getTableViewSkin().getSkinnable().requestFocus();
-
-        if (me.isPrimaryButtonDown() && header.isColumnReorderingEnabled()) {
-            header.columnReorderingStarted(me.getX());
-        }
-        me.consume();
-    };
-    
-    private static final EventHandler<MouseEvent> mouseDraggedHandler = me -> {
-        TableColumnHeader header = (TableColumnHeader) me.getSource();
-
-        if (me.isPrimaryButtonDown() && header.isColumnReorderingEnabled()) {
-            header.columnReordering(me.getSceneX(), me.getSceneY());
-        }
-        me.consume();
-    };
-    
-    private static final EventHandler<MouseEvent> mouseReleasedHandler = me -> {
-        if (me.isPopupTrigger()) return;
-
-        TableColumnHeader header = (TableColumnHeader) me.getSource();
-        TableColumnBase tableColumn = header.getTableColumn();
-
-        ContextMenu menu = tableColumn.getContextMenu();
-        if (menu != null && menu.isShowing()) return;
-        if (header.getTableHeaderRow().isReordering() && header.isColumnReorderingEnabled()) {
-            header.columnReorderingComplete();
-        } else if (me.isStillSincePress()) {
-            header.sortColumn(me.isShiftDown());
-        }
-        me.consume();
-    };
-    
-    private static final EventHandler<ContextMenuEvent> contextMenuRequestedHandler = me -> {
-        TableColumnHeader header = (TableColumnHeader) me.getSource();
-        TableColumnBase tableColumn = header.getTableColumn();
-
-        ContextMenu menu = tableColumn.getContextMenu();
-        if (menu != null) {
-            menu.show(header, me.getScreenX(), me.getScreenY());
-            me.consume();
-        }
-    };
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Properties                                                              *
-     *                                                                         *
-     **************************************************************************/
-
-    private DoubleProperty size;
-    private double getSize() {
-        return size == null ? 20.0 : size.doubleValue();
-    }
-    private DoubleProperty sizeProperty() {
-        if (size == null) {
-            size = new StyleableDoubleProperty(20) {
-                @Override
-                protected void invalidated() {
-                    double value = get();
-                    if (value <= 0) {
-                        if (isBound()) {
-                            unbind();
-                        }
-                        set(20);
-                        throw new IllegalArgumentException("Size cannot be 0 or negative");
-                    }
-                }
-                
-                
-
-                @Override public Object getBean() {
-                    return TableColumnHeader.this;
-                }
-
-                @Override public String getName() {
-                    return "size";
-                }
-
-                @Override public CssMetaData<TableColumnHeader,Number> getCssMetaData() {
-                    return StyleableProperties.SIZE;
-                }
-            };
-        }
-        return size;
-    }
-
-
-    
-    /***************************************************************************
-     *                                                                         *
-     * Public Methods                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    protected void handlePropertyChanged(String p) {
-        if ("SCENE".equals(p)) {
-            updateScene();
-        } else if ("TABLE_COLUMN_VISIBLE".equals(p)) {
-            setVisible(getTableColumn().isVisible());
-        } else if ("TABLE_COLUMN_WIDTH".equals(p)) {
-            // It is this that ensures that when a column is resized that the header
-            // visually adjusts its width as necessary.
-            isSizeDirty = true;
-            requestLayout();
-        } else if ("TABLE_COLUMN_ID".equals(p)) {
-            setId(column.getId());
-        } else if ("TABLE_COLUMN_STYLE".equals(p)) {
-            setStyle(column.getStyle());
-        } else if ("TABLE_COLUMN_SORT_TYPE".equals(p)) {
-            updateSortGrid();
-            if (arrow != null) {
-                arrow.setRotate(isAscending(column) ? 180 : 0.0);
-            }
-        } else if ("TABLE_COLUMN_SORT_NODE".equals(p)) {
-            updateSortGrid();
-        } else if ("TABLE_COLUMN_SORTABLE".equals(p)) {
-            // we need to notify all headers that a sortable state has changed,
-            // in case the sort grid in other columns needs to be updated.
-            if (skin.getSortOrder().contains(getTableColumn())) {
-                NestedTableColumnHeader root = getTableHeaderRow().getRootHeader();
-                updateAllHeaders(root);
-            }
-        } else if ("TABLE_COLUMN_TEXT".equals(p)) {
-            label.setText(column.getText());
-        } else if ("TABLE_COLUMN_GRAPHIC".equals(p)) {
-            label.setGraphic(column.getGraphic());
-        }
-    }
-    
-    protected TableViewSkinBase<?,?,?,?,?,TableColumnBase<?,?>> getTableViewSkin() {
-        return skin;
-    }
-
-    NestedTableColumnHeader getNestedColumnHeader() { return nestedColumnHeader; }
-    void setNestedColumnHeader(NestedTableColumnHeader nch) { nestedColumnHeader = nch; }
-
-    public TableColumnBase getTableColumn() { return column; }
-
-    TableHeaderRow getTableHeaderRow() { return tableHeaderRow; }
-    void setTableHeaderRow(TableHeaderRow thr) { tableHeaderRow = thr; }
-
-    NestedTableColumnHeader getParentHeader() { return parentHeader; }
-    void setParentHeader(NestedTableColumnHeader ph) { parentHeader = ph; }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    /** {@inheritDoc} */
-    @Override protected void layoutChildren() {
-        if (isSizeDirty) {
-            resize(getTableColumn().getWidth(), getHeight());
-            isSizeDirty = false;
-        }
-
-        double sortWidth = 0;
-        double w = snapSize(getWidth()) - (snappedLeftInset() + snappedRightInset());
-        double h = getHeight() - (snappedTopInset() + snappedBottomInset());
-        double x = w;
-
-        // a bit hacky, but we REALLY don't want the arrow shape to fluctuate
-        // in size
-        if (arrow != null) {
-            arrow.setMaxSize(arrow.prefWidth(-1), arrow.prefHeight(-1));
-        }
-
-        if (sortArrow != null && sortArrow.isVisible()) {
-            sortWidth = sortArrow.prefWidth(-1);
-            x -= sortWidth;
-            sortArrow.resize(sortWidth, sortArrow.prefHeight(-1));
-            positionInArea(sortArrow, x, snappedTopInset(),
-                    sortWidth, h, 0, HPos.CENTER, VPos.CENTER);
-        }
-
-        if (label != null) {
-            double labelWidth = w - sortWidth;
-            label.resizeRelocate(snappedLeftInset(), 0, labelWidth, getHeight());
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computePrefWidth(double height) {
-        if (getNestedColumnHeader() != null) {
-            double width = getNestedColumnHeader().prefWidth(height);
-
-            if (column != null) {
-                column.impl_setWidth(width);
-            }
-
-            return width;
-        } else if (column != null && column.isVisible()) {
-            return column.getWidth();
-        }
-
-        return 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computeMinHeight(double width) {
-        return label == null ? 0 : label.minHeight(width);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computePrefHeight(double width) {
-        if (getTableColumn() == null) return 0;
-        return Math.max(getSize(), label.prefHeight(-1));
-    }
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation                                                  *
-     *                                                                         *
-     **************************************************************************/   
-    
-    // RT-29682: When the sortable property of a TableColumnBase changes this
-    // may impact other TableColumnHeaders, as they may need to change their
-    // sort order representation. Rather than install listeners across all 
-    // TableColumn in the sortOrder list for their sortable property, we simply
-    // update the sortPosition of all headers whenever the sortOrder property
-    // changes, assuming the column is within the sortOrder list.
-    private void updateAllHeaders(TableColumnHeader header) {
-        if (header instanceof NestedTableColumnHeader) {
-            List<TableColumnHeader> children = ((NestedTableColumnHeader)header).getColumnHeaders();
-            for (int i = 0; i < children.size(); i++) {
-                updateAllHeaders(children.get(i));
-            }
-        } else {
-            header.updateSortPosition();
-        }
-    }
-    
-    private void updateStyleClass() {
-        // For now we leave the 'column-header' style class intact so that the
-        // appropriate border styles are shown, etc.
-        getStyleClass().setAll("column-header");
-        getStyleClass().addAll(column.getStyleClass());
-    }
-    
-    private void updateScene() {
-        // RT-17684: If the TableColumn widths are all currently the default,
-        // we attempt to 'auto-size' based on the preferred width of the first
-        // n rows (we can't do all rows, as that could conceivably be an unlimited
-        // number of rows retrieved from a very slow (e.g. remote) data source.
-        // Obviously, the bigger the value of n, the more likely the default 
-        // width will be suitable for most values in the column
-        final int n = 30;
-        if (! autoSizeComplete) {
-            if (getTableColumn() == null || getTableColumn().getWidth() != DEFAULT_COLUMN_WIDTH || getScene() == null) {
-                return;
-            }
-            doColumnAutoSize(getTableColumn(), n);
-            autoSizeComplete = true;
-        }
-    }
-    
-    void dispose() {
-        TableViewSkinBase skin = getTableViewSkin();
-        if (skin != null) {
-            skin.getVisibleLeafColumns().removeListener(weakVisibleLeafColumnsListener);
-            skin.getSortOrder().removeListener(weakSortOrderListener);
-        }
-
-        changeListenerHandler.dispose();
-    }
-    
-    private boolean isSortingEnabled() {
-        // this used to check if ! PlatformUtil.isEmbedded(), but has been changed
-        // to always return true (for now), as we want to support column sorting
-        // everywhere
-        return true;
-    }
-    
-    private boolean isColumnReorderingEnabled() {
-        // we only allow for column reordering if there are more than one column,
-        return !BehaviorSkinBase.IS_TOUCH_SUPPORTED && getTableViewSkin().getVisibleLeafColumns().size() > 1;
-    }
-    
-    private void initUI() {
-        // TableColumn will be null if we are dealing with the root NestedTableColumnHeader
-        if (column == null) return;
-        
-        // set up mouse events
-        setOnMousePressed(mousePressedHandler);
-        setOnMouseDragged(mouseDraggedHandler);
-        setOnDragDetected(event -> event.consume());
-        setOnContextMenuRequested(contextMenuRequestedHandler);
-        setOnMouseReleased(mouseReleasedHandler);
-
-        // --- label
-        label = new Label();
-        label.setText(column.getText());
-        label.setGraphic(column.getGraphic());
-        label.setVisible(column.isVisible());
-
-        // ---- container for the sort arrow (which is not supported on embedded
-        // platforms)
-        if (isSortingEnabled()) {
-            // put together the grid
-            updateSortGrid();
-        }
-    }
-
-    private void doColumnAutoSize(TableColumnBase<?,?> column, int cellsToMeasure) {
-        double prefWidth = column.getPrefWidth();
-
-        // if the prefWidth has been set, we do _not_ autosize columns
-        if (prefWidth == DEFAULT_COLUMN_WIDTH) {
-            getTableViewSkin().resizeColumnToFitContent(column, cellsToMeasure);
-        }
-    }
-    
-    private void updateSortPosition() {
-        this.sortPos = ! column.isSortable() ? -1 : getSortPosition();
-        updateSortGrid();
-    }
-    
-    private void updateSortGrid() {
-        // Fix for RT-14488
-        if (this instanceof NestedTableColumnHeader) return;
-        
-        getChildren().clear();
-        getChildren().add(label);
-        
-        // we do not support sorting in embedded devices
-        if (! isSortingEnabled()) return;
-        
-        isSortColumn = sortPos != -1;
-        if (! isSortColumn) {
-            if (sortArrow != null) {
-                sortArrow.setVisible(false);
-            }
-            return;
-        }
-        
-        // RT-28016: if the tablecolumn is not a visible leaf column, we should ignore this
-        int visibleLeafIndex = skin.getVisibleLeafIndex(getTableColumn());
-        if (visibleLeafIndex == -1) return;
-        
-        final int sortColumnCount = getVisibleSortOrderColumnCount();
-        boolean showSortOrderDots = sortPos <= 3 && sortColumnCount > 1;
-        
-        Node _sortArrow = null;
-        if (getTableColumn().getSortNode() != null) {
-            _sortArrow = getTableColumn().getSortNode();
-            getChildren().add(_sortArrow);
-        } else {
-            GridPane sortArrowGrid = new GridPane();
-            _sortArrow = sortArrowGrid;
-            sortArrowGrid.setPadding(new Insets(0, 3, 0, 0));
-            getChildren().add(sortArrowGrid);
-            
-            // if we are here, and the sort arrow is null, we better create it
-            if (arrow == null) {
-                arrow = new Region();
-                arrow.getStyleClass().setAll("arrow");
-                arrow.setVisible(true);
-                arrow.setRotate(isAscending(column) ? 180.0F : 0.0F);
-                changeListenerHandler.registerChangeListener(getSortTypeProperty(column), "TABLE_COLUMN_SORT_TYPE");
-            }
-            
-            arrow.setVisible(isSortColumn);
-            
-            if (sortPos > 2) {
-                if (sortOrderLabel == null) {
-                    // ---- sort order label (for sort positions greater than 3)
-                    sortOrderLabel = new Label();
-                    sortOrderLabel.getStyleClass().add("sort-order");
-                }
-
-                // only show the label if the sortPos is greater than 3 (for sortPos 
-                // values less than three, we show the sortOrderDots instead)
-                sortOrderLabel.setText("" + (sortPos + 1));
-                sortOrderLabel.setVisible(sortColumnCount > 1);
-
-                // update the grid layout
-                sortArrowGrid.add(arrow, 1, 1);
-                GridPane.setHgrow(arrow, Priority.NEVER);
-                GridPane.setVgrow(arrow, Priority.NEVER);
-                sortArrowGrid.add(sortOrderLabel, 2, 1);
-            } else if (showSortOrderDots) {
-                if (sortOrderDots == null) {
-                    sortOrderDots = new HBox(0);
-                    sortOrderDots.getStyleClass().add("sort-order-dots-container");
-                }
-
-                // show the sort order dots
-                boolean isAscending = isAscending(column);
-                int arrowRow = isAscending ? 1 : 2;
-                int dotsRow = isAscending ? 2 : 1;
-
-                sortArrowGrid.add(arrow, 1, arrowRow);
-                GridPane.setHalignment(arrow, HPos.CENTER);
-                sortArrowGrid.add(sortOrderDots, 1, dotsRow);
-
-                updateSortOrderDots(sortPos);
-            } else {
-                // only show the arrow
-                sortArrowGrid.add(arrow, 1, 1);
-                GridPane.setHgrow(arrow, Priority.NEVER);
-                GridPane.setVgrow(arrow, Priority.ALWAYS);
-            }
-        }
-        
-        sortArrow = _sortArrow;
-        if (sortArrow != null) {
-            sortArrow.setVisible(isSortColumn);
-        }
-        
-        requestLayout();
-    }
-    
-    private void updateSortOrderDots(int sortPos) {
-        double arrowWidth = arrow.prefWidth(-1);
-        
-        sortOrderDots.getChildren().clear();
-
-        for (int i = 0; i <= sortPos; i++) {
-            Region r = new Region();
-            r.getStyleClass().add("sort-order-dot");
-            
-            String sortTypeName = getSortTypeName(column);
-            if (sortTypeName != null && ! sortTypeName.isEmpty()) {
-                r.getStyleClass().add(sortTypeName.toLowerCase(Locale.ROOT));
-            }
-            
-            sortOrderDots.getChildren().add(r);
-
-            // RT-34914: fine tuning the placement of the sort dots. We could have gone to a custom layout, but for now
-            // this works fine.
-            if (i < sortPos) {
-                Region spacer = new Region();
-                double rp = sortPos == 1 ? 1 : 1;
-                double lp = sortPos == 1 ? 1 : 0;
-                spacer.setPadding(new Insets(0, rp, 0, lp));
-                sortOrderDots.getChildren().add(spacer);
-            }
-        }
-        
-        sortOrderDots.setAlignment(Pos.TOP_CENTER);
-        sortOrderDots.setMaxWidth(arrowWidth);
-    }
-
-    // Package for testing purposes only.
-    void moveColumn(TableColumnBase column, final int newColumnPos) {
-        if (column == null || newColumnPos < 0) return;
-
-        ObservableList<TableColumnBase<?,?>> columns = getColumns(column);
-
-        final int columnsCount = columns.size();
-        final int currentPos = columns.indexOf(column);
-
-        int actualNewColumnPos = newColumnPos;
-
-        // Fix for RT-35141: We need to account for hidden columns
-        final int max = actualNewColumnPos;
-        for (int i = 0; i <= max && i < columnsCount; i++) {
-            actualNewColumnPos += columns.get(i).isVisible() ? 0 : 1;
-        }
-        // --- end of RT-35141 fix
-
-        if (actualNewColumnPos >= columnsCount) {
-            actualNewColumnPos = columnsCount - 1;
-        } else if (actualNewColumnPos < 0) {
-            actualNewColumnPos = 0;
-        }
-
-        if (actualNewColumnPos == currentPos) return;
-
-        List<TableColumnBase<?,?>> tempList = new ArrayList<>(columns);
-        tempList.remove(column);
-        tempList.add(actualNewColumnPos, column);
-        
-        columns.setAll(tempList);
-    }
-
-    private ObservableList<TableColumnBase<?,?>> getColumns(TableColumnBase column) {
-        return column.getParentColumn() == null ?
-                getTableViewSkin().getColumns() :
-                column.getParentColumn().getColumns();
-    }
-
-    private int getIndex(TableColumnBase<?,?> column) {
-        if (column == null) return -1;
-
-        ObservableList<? extends TableColumnBase<?,?>> columns = getColumns(column);
-
-        int index = -1;
-        for (int i = 0; i < columns.size(); i++) {
-            TableColumnBase<?,?> _column = columns.get(i);
-            if (! _column.isVisible()) continue;
-
-            index++;
-            if (column.equals(_column)) break;
-        }
-
-        return index;
-    }
-
-    private void updateColumnIndex() {
-//        TableView tv = getTableView();
-        TableViewSkinBase skin = getTableViewSkin();
-        TableColumnBase tc = getTableColumn();
-        columnIndex = skin == null || tc == null ? -1 : skin.getVisibleLeafIndex(tc);
-        
-        // update the pseudo class state regarding whether this is the last
-        // visible cell (i.e. the right-most). 
-        isLastVisibleColumn = getTableColumn() != null &&
-                columnIndex != -1 && 
-                columnIndex == getTableViewSkin().getVisibleLeafColumns().size() - 1;
-        pseudoClassStateChanged(PSEUDO_CLASS_LAST_VISIBLE, isLastVisibleColumn);
-    }
-
-    private void sortColumn(final boolean addColumn) {
-        if (! isSortingEnabled()) return;
-
-        // we only allow sorting on the leaf columns and columns
-        // that actually have comparators defined, and are sortable
-        if (column == null || column.getColumns().size() != 0 || column.getComparator() == null || !column.isSortable()) return;
-//        final int sortPos = getTable().getSortOrder().indexOf(column);
-//        final boolean isSortColumn = sortPos != -1;
-
-        final ObservableList<TableColumnBase<?,?>> sortOrder = getTableViewSkin().getSortOrder();
-
-        // addColumn is true e.g. when the user is holding down Shift
-        if (addColumn) {
-            if (!isSortColumn) {
-                setSortType(column, TableColumn.SortType.ASCENDING);
-                sortOrder.add(column);
-            } else if (isAscending(column)) {
-                setSortType(column, TableColumn.SortType.DESCENDING);
-            } else {
-                int i = sortOrder.indexOf(column);
-                if (i != -1) {
-                    sortOrder.remove(i);
-                }
-            }
-        } else {
-            // the user has clicked on a column header - we should add this to
-            // the TableView sortOrder list if it isn't already there.
-            if (isSortColumn && sortOrder.size() == 1) {
-                // the column is already being sorted, and it's the only column.
-                // We therefore move through the 2nd or 3rd states:
-                //   1st click: sort ascending
-                //   2nd click: sort descending
-                //   3rd click: natural sorting (sorting is switched off)
-                if (isAscending(column)) {
-                    setSortType(column, TableColumn.SortType.DESCENDING);
-                } else {
-                    // remove from sort
-                    sortOrder.remove(column);
-                }
-            } else if (isSortColumn) {
-                // the column is already being used to sort, so we toggle its
-                // sortAscending property, and also make the column become the
-                // primary sort column
-                if (isAscending(column)) {
-                    setSortType(column, TableColumn.SortType.DESCENDING);
-                } else if (isDescending(column)) {
-                    setSortType(column, TableColumn.SortType.ASCENDING);
-                }
-
-                // to prevent multiple sorts, we make a copy of the sort order
-                // list, moving the column value from the current position to
-                // its new position at the front of the list
-                List<TableColumnBase<?,?>> sortOrderCopy = new ArrayList<TableColumnBase<?,?>>(sortOrder);
-                sortOrderCopy.remove(column);
-                sortOrderCopy.add(0, column);
-                sortOrder.setAll(column);
-            } else {
-                // add to the sort order, in ascending form
-                setSortType(column, TableColumn.SortType.ASCENDING);
-                sortOrder.setAll(column);
-            }
-        }
-    }
-
-    // Because it is possible that some columns are in the sortOrder list but are
-    // not themselves sortable, we cannot just do sortOrderList.indexOf(column).
-    // Therefore, this method does the proper work required of iterating through
-    // and ignoring non-sortable (and null) columns in the sortOrder list.
-    private int getSortPosition() {
-        if (column == null) {
-            return -1;
-        }
-
-        final List<TableColumnBase> sortOrder = getVisibleSortOrderColumns();
-        int pos = 0;
-        for (int i = 0; i < sortOrder.size(); i++) {
-            TableColumnBase _tc = sortOrder.get(i);
-
-            if (column.equals(_tc)) {
-                return pos;
-            }
-
-            pos++;
-        }
-
-        return -1;
-    }
-
-    private List<TableColumnBase> getVisibleSortOrderColumns() {
-        final ObservableList<TableColumnBase<?,?>> sortOrder = getTableViewSkin().getSortOrder();
-
-        List<TableColumnBase> visibleSortOrderColumns = new ArrayList<>();
-        for (int i = 0; i < sortOrder.size(); i++) {
-            TableColumnBase _tc = sortOrder.get(i);
-            if (_tc == null || ! _tc.isSortable() || ! _tc.isVisible()) {
-                continue;
-            }
-
-            visibleSortOrderColumns.add(_tc);
-        }
-
-        return visibleSortOrderColumns;
-    }
-
-    // as with getSortPosition above, this method iterates through the sortOrder
-    // list ignoring the null and non-sortable columns, so that we get the correct
-    // number of columns in the sortOrder list.
-    private int getVisibleSortOrderColumnCount() {
-        return getVisibleSortOrderColumns().size();
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation: Column Reordering                               *
-     *                                                                         *
-     **************************************************************************/   
-
-    // package for testing
-    void columnReorderingStarted(double dragOffset) {
-        if (! column.impl_isReorderable()) return;
-        
-        // Used to ensure the column ghost is positioned relative to where the
-        // user clicked on the column header
-        this.dragOffset = dragOffset;
-
-        // Note here that we only allow for reordering of 'root' columns
-        getTableHeaderRow().setReorderingColumn(column);
-        getTableHeaderRow().setReorderingRegion(this);
-    }
-
-    // package for testing
-    void columnReordering(double sceneX, double sceneY) {
-        if (! column.impl_isReorderable()) return;
-
-        // this is for handling the column drag to reorder columns.
-        // It shows a line to indicate where the 'drop' will be.
-
-        // indicate that we've started dragging so that the dragging
-        // line overlay is shown
-        getTableHeaderRow().setReordering(true);
-
-        // Firstly we need to determine where to draw the line.
-        // Find which column we're over
-        TableColumnHeader hoverHeader = null;
-
-        // x represents where the mouse is relative to the parent
-        // NestedTableColumnHeader
-        final double x = getParentHeader().sceneToLocal(sceneX, sceneY).getX();
-
-        // calculate where the ghost column header should be
-        double dragX = getTableViewSkin().getSkinnable().sceneToLocal(sceneX, sceneY).getX() - dragOffset;
-        getTableHeaderRow().setDragHeaderX(dragX);
-
-        double startX = 0;
-        double endX = 0;
-        double headersWidth = 0;
-        newColumnPos = 0;
-        for (TableColumnHeader header : getParentHeader().getColumnHeaders()) {
-            if (! header.isVisible()) continue;
-
-            double headerWidth = header.prefWidth(-1);
-            headersWidth += headerWidth;
-
-            startX = header.getBoundsInParent().getMinX();
-            endX = startX + headerWidth;
-
-            if (x >= startX && x < endX) {
-                hoverHeader = header;
-                break;
-            }
-            newColumnPos++;
-        }
-
-        // hoverHeader will be null if the drag occurs outside of the
-        // tableview. In this case we handle the newColumnPos specially
-        // and then short-circuit. This results in the drop action
-        // resulting in the correct result (the column will drop at
-        // the start or end of the table).
-        if (hoverHeader == null) {
-            newColumnPos = x > headersWidth ? (getParentHeader().getColumns().size() - 1) : 0;
-            return;
-        }
-
-        // This is the x-axis value midway through hoverHeader. It's
-        // used to determine whether the drop should be to the left
-        // or the right of hoverHeader.
-        double midPoint = startX + (endX - startX) / 2;
-        boolean beforeMidPoint = x <= midPoint;
-
-        // Based on where the mouse actually is, we have to shuffle
-        // where we want the column to end up. This code handles that.
-        int currentPos = getIndex(column);
-        newColumnPos += newColumnPos > currentPos && beforeMidPoint ?
-            -1 : (newColumnPos < currentPos && !beforeMidPoint ? 1 : 0);
-        
-        double lineX = getTableHeaderRow().sceneToLocal(hoverHeader.localToScene(hoverHeader.getBoundsInLocal())).getMinX();
-        lineX = lineX + ((beforeMidPoint) ? (0) : (hoverHeader.getWidth()));
-        
-        if (lineX >= -0.5 && lineX <= getTableViewSkin().getSkinnable().getWidth()) {
-            columnReorderLine.setTranslateX(lineX);
-
-            // then if this is the first event, we set the property to true
-            // so that the line becomes visible until the drop is completed.
-            // We also set reordering to true so that the various reordering
-            // effects become visible (ghost, transparent overlay, etc).
-            columnReorderLine.setVisible(true);
-        }
-        
-        getTableHeaderRow().setReordering(true);
-    }
-
-    // package for testing
-    void columnReorderingComplete() {
-        if (! column.impl_isReorderable()) return;
-        
-        // Move col from where it is now to the new position.
-        moveColumn(getTableColumn(), newColumnPos);
-        
-        // cleanup
-        columnReorderLine.setTranslateX(0.0F);
-        columnReorderLine.setLayoutX(0.0F);
-        newColumnPos = 0;
-
-        getTableHeaderRow().setReordering(false);
-        columnReorderLine.setVisible(false);
-        getTableHeaderRow().setReorderingColumn(null);
-        getTableHeaderRow().setReorderingRegion(null);
-        dragOffset = 0.0F;
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Stylesheet Handling                                                     *
-     *                                                                         *
-     **************************************************************************/
-    
-    private static final PseudoClass PSEUDO_CLASS_LAST_VISIBLE = 
-            PseudoClass.getPseudoClass("last-visible");
-
-    double getDragRectHeight() {
-        return getHeight();
-    }
-
-    /**
-      * Super-lazy instantiation pattern from Bill Pugh.
-      * @treatAsPrivate implementation detail
-      */
-     private static class StyleableProperties {
-         private static final CssMetaData<TableColumnHeader,Number> SIZE =
-            new CssMetaData<TableColumnHeader,Number>("-fx-size",
-                 SizeConverter.getInstance(), 20.0) {
-
-            @Override
-            public boolean isSettable(TableColumnHeader n) {
-                return n.size == null || !n.size.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Number> getStyleableProperty(TableColumnHeader n) {
-                return (StyleableProperty<Number>)(WritableValue<Number>)n.sizeProperty();
-            }
-        };
-
-         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-         static {
-
-            final List<CssMetaData<? extends Styleable, ?>> styleables = 
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(Region.getClassCssMetaData());
-            styleables.add(SIZE);
-            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();
-    }
-
-    @Override
-    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case INDEX: return getIndex(column);
-            case TEXT: return column != null ? column.getText() : null;
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:22:35.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableColumnHeader.java	2015-09-03 15:22:33.730423500 -0700
@@ -0,0 +1,1031 @@
+/*
+ * 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 com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler;
+import com.sun.javafx.scene.control.Properties;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.value.WritableValue;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.WeakListChangeListener;
+import javafx.css.CssMetaData;
+import javafx.css.PseudoClass;
+import javafx.css.Styleable;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableProperty;
+import javafx.event.EventHandler;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumnBase;
+import javafx.scene.input.ContextMenuEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import javafx.css.converter.SizeConverter;
+
+import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.getSortTypeName;
+import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.getSortTypeProperty;
+import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.isAscending;
+import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.isDescending;
+import static com.sun.javafx.scene.control.TableColumnSortTypeWrapper.setSortType;
+
+
+/**
+ * Region responsible for painting a single column header.
+ */
+public class TableColumnHeader extends Region {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static Fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    // Copied from TableColumn. The value here should always be in-sync with
+    // the value in TableColumn
+    static final double DEFAULT_COLUMN_WIDTH = 80.0F;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+    
+    private boolean autoSizeComplete = false;
+
+    private double dragOffset;
+    private final TableViewSkinBase<?,?,?,?,TableColumnBase<?,?>> skin;
+    private NestedTableColumnHeader nestedColumnHeader;
+    private TableHeaderRow tableHeaderRow;
+    private NestedTableColumnHeader parentHeader;
+
+    // work out where this column currently is within its parent
+    Label label;
+
+    // sort order
+    int sortPos = -1;
+    private Region arrow;
+    private Label sortOrderLabel;
+    private HBox sortOrderDots;
+    private Node sortArrow;
+    private boolean isSortColumn;
+
+    private boolean isSizeDirty = false;
+
+    boolean isLastVisibleColumn = false;
+
+    // package for testing
+    int columnIndex = -1;
+
+    private int newColumnPos;
+
+    // the line drawn in the table when a user presses and moves a column header
+    // to indicate where the column will be dropped. This is provided by the
+    // table skin, but manipulated by the header
+    final Region columnReorderLine;
+
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Constructor                                                             *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TableColumnHeader instance to visually represent the given
+     * {@link TableColumnBase} instance.
+     *
+     * @param skin The skin used by the UI control.
+     * @param tc The table column to be visually represented by this instance.
+     */
+    public TableColumnHeader(final TableViewSkinBase skin, final TableColumnBase tc) {
+        this.skin = skin;
+        setTableColumn(tc);
+        this.columnReorderLine = skin.getColumnReorderLine();
+        
+        setFocusTraversable(false);
+
+        updateColumnIndex();
+        initUI();
+        
+        // change listener for multiple properties
+        changeListenerHandler = new LambdaMultiplePropertyChangeListenerHandler();
+        changeListenerHandler.registerChangeListener(sceneProperty(), e -> updateScene());
+        
+        if (getTableColumn() != null && skin != null) {
+            updateSortPosition();
+            skin.getSortOrder().addListener(weakSortOrderListener);
+            skin.getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
+        }
+
+        if (getTableColumn() != null) {
+            changeListenerHandler.registerChangeListener(tc.idProperty(), e -> setId(tc.getId()));
+            changeListenerHandler.registerChangeListener(tc.styleProperty(), e -> setStyle(tc.getStyle()));
+            changeListenerHandler.registerChangeListener(tc.widthProperty(), e -> {
+                // It is this that ensures that when a column is resized that the header
+                // visually adjusts its width as necessary.
+                isSizeDirty = true;
+                requestLayout();
+            });
+            changeListenerHandler.registerChangeListener(tc.visibleProperty(), e -> setVisible(getTableColumn().isVisible()));
+            changeListenerHandler.registerChangeListener(tc.sortNodeProperty(), e -> updateSortGrid());
+            changeListenerHandler.registerChangeListener(tc.sortableProperty(), e -> {
+                // we need to notify all headers that a sortable state has changed,
+                // in case the sort grid in other columns needs to be updated.
+                if (skin.getSortOrder().contains(getTableColumn())) {
+                    NestedTableColumnHeader root = getTableHeaderRow().getRootHeader();
+                    updateAllHeaders(root);
+                }
+            });
+            changeListenerHandler.registerChangeListener(tc.textProperty(), e -> label.setText(tc.getText()));
+            changeListenerHandler.registerChangeListener(tc.graphicProperty(), e -> label.setGraphic(tc.getGraphic()));
+
+            tc.getStyleClass().addListener(weakStyleClassListener);
+
+            setId(tc.getId());
+            setStyle(tc.getStyle());
+            updateStyleClass();
+            /* Having TableColumn role parented by TableColumn causes VoiceOver to be unhappy */
+            setAccessibleRole(AccessibleRole.TABLE_COLUMN);
+        }
+    }
+
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+    
+    final LambdaMultiplePropertyChangeListenerHandler changeListenerHandler;
+    
+    private ListChangeListener<TableColumnBase<?,?>> sortOrderListener = c -> {
+        updateSortPosition();
+    };
+    
+    private ListChangeListener<TableColumnBase<?,?>> visibleLeafColumnsListener = c -> {
+        updateColumnIndex();
+        updateSortPosition();
+    };
+    
+    private ListChangeListener<String> styleClassListener = c -> {
+        updateStyleClass();
+    };
+    
+    private WeakListChangeListener<TableColumnBase<?,?>> weakSortOrderListener =
+            new WeakListChangeListener<TableColumnBase<?,?>>(sortOrderListener);
+    private final WeakListChangeListener<TableColumnBase<?,?>> weakVisibleLeafColumnsListener =
+            new WeakListChangeListener<TableColumnBase<?,?>>(visibleLeafColumnsListener);
+    private final WeakListChangeListener<String> weakStyleClassListener =
+            new WeakListChangeListener<String>(styleClassListener);
+    
+    private static final EventHandler<MouseEvent> mousePressedHandler = me -> {
+        TableColumnHeader header = (TableColumnHeader) me.getSource();
+
+        // pass focus to the table, so that the user immediately sees
+        // the focus rectangle around the table control.
+        header.getTableViewSkin().getSkinnable().requestFocus();
+
+        if (me.isPrimaryButtonDown() && header.isColumnReorderingEnabled()) {
+            header.columnReorderingStarted(me.getX());
+        }
+        me.consume();
+    };
+    
+    private static final EventHandler<MouseEvent> mouseDraggedHandler = me -> {
+        TableColumnHeader header = (TableColumnHeader) me.getSource();
+
+        if (me.isPrimaryButtonDown() && header.isColumnReorderingEnabled()) {
+            header.columnReordering(me.getSceneX(), me.getSceneY());
+        }
+        me.consume();
+    };
+    
+    private static final EventHandler<MouseEvent> mouseReleasedHandler = me -> {
+        if (me.isPopupTrigger()) return;
+
+        TableColumnHeader header = (TableColumnHeader) me.getSource();
+        TableColumnBase tableColumn = header.getTableColumn();
+
+        ContextMenu menu = tableColumn.getContextMenu();
+        if (menu != null && menu.isShowing()) return;
+        if (header.getTableHeaderRow().isReordering() && header.isColumnReorderingEnabled()) {
+            header.columnReorderingComplete();
+        } else if (me.isStillSincePress()) {
+            header.sortColumn(me.isShiftDown());
+        }
+        me.consume();
+    };
+    
+    private static final EventHandler<ContextMenuEvent> contextMenuRequestedHandler = me -> {
+        TableColumnHeader header = (TableColumnHeader) me.getSource();
+        TableColumnBase tableColumn = header.getTableColumn();
+
+        ContextMenu menu = tableColumn.getContextMenu();
+        if (menu != null) {
+            menu.show(header, me.getScreenX(), me.getScreenY());
+            me.consume();
+        }
+    };
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    // --- size
+    private DoubleProperty size;
+    private final double getSize() {
+        return size == null ? 20.0 : size.doubleValue();
+    }
+    private final DoubleProperty sizeProperty() {
+        if (size == null) {
+            size = new StyleableDoubleProperty(20) {
+                @Override
+                protected void invalidated() {
+                    double value = get();
+                    if (value <= 0) {
+                        if (isBound()) {
+                            unbind();
+                        }
+                        set(20);
+                        throw new IllegalArgumentException("Size cannot be 0 or negative");
+                    }
+                }
+                
+                
+
+                @Override public Object getBean() {
+                    return TableColumnHeader.this;
+                }
+
+                @Override public String getName() {
+                    return "size";
+                }
+
+                @Override public CssMetaData<TableColumnHeader,Number> getCssMetaData() {
+                    return StyleableProperties.SIZE;
+                }
+            };
+        }
+        return size;
+    }
+
+
+    /**
+     * A property that refers to the {@link TableColumnBase} instance that this
+     * header is visually represents.
+     */
+    // --- table column
+    private ReadOnlyObjectWrapper<TableColumnBase<?,?>> tableColumn = new ReadOnlyObjectWrapper<>(this, "tableColumn");
+    private final void setTableColumn(TableColumnBase<?,?> column) {
+        tableColumn.set(column);
+    }
+    public final TableColumnBase<?,?> getTableColumn() {
+        return tableColumn.get();
+    }
+    public final ReadOnlyObjectProperty<TableColumnBase<?,?>> tableColumnProperty() {
+        return tableColumn.getReadOnlyProperty();
+    }
+
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren() {
+        if (isSizeDirty) {
+            resize(getTableColumn().getWidth(), getHeight());
+            isSizeDirty = false;
+        }
+
+        double sortWidth = 0;
+        double w = snapSize(getWidth()) - (snappedLeftInset() + snappedRightInset());
+        double h = getHeight() - (snappedTopInset() + snappedBottomInset());
+        double x = w;
+
+        // a bit hacky, but we REALLY don't want the arrow shape to fluctuate
+        // in size
+        if (arrow != null) {
+            arrow.setMaxSize(arrow.prefWidth(-1), arrow.prefHeight(-1));
+        }
+
+        if (sortArrow != null && sortArrow.isVisible()) {
+            sortWidth = sortArrow.prefWidth(-1);
+            x -= sortWidth;
+            sortArrow.resize(sortWidth, sortArrow.prefHeight(-1));
+            positionInArea(sortArrow, x, snappedTopInset(),
+                    sortWidth, h, 0, HPos.CENTER, VPos.CENTER);
+        }
+
+        if (label != null) {
+            double labelWidth = w - sortWidth;
+            label.resizeRelocate(snappedLeftInset(), 0, labelWidth, getHeight());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height) {
+        if (getNestedColumnHeader() != null) {
+            double width = getNestedColumnHeader().prefWidth(height);
+
+            if (getTableColumn() != null) {
+                getTableColumn().impl_setWidth(width);
+            }
+
+            return width;
+        } else if (getTableColumn() != null && getTableColumn().isVisible()) {
+            return getTableColumn().getWidth();
+        }
+
+        return 0;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width) {
+        return label == null ? 0 : label.minHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width) {
+        if (getTableColumn() == null) return 0;
+        return Math.max(getSize(), label.prefHeight(-1));
+    }
+
+    /** {@inheritDoc} */
+    @Override public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
+        return getClassCssMetaData();
+    }
+
+    /** {@inheritDoc} */
+    @Override  public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case INDEX: return getIndex(getTableColumn());
+            case TEXT: return getTableColumn() != null ? getTableColumn().getText() : null;
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    TableViewSkinBase<?,?,?,?,TableColumnBase<?,?>> getTableViewSkin() {
+        return skin;
+    }
+
+    NestedTableColumnHeader getNestedColumnHeader() { return nestedColumnHeader; }
+    void setNestedColumnHeader(NestedTableColumnHeader nch) { nestedColumnHeader = nch; }
+
+    TableHeaderRow getTableHeaderRow() { return tableHeaderRow; }
+    void setTableHeaderRow(TableHeaderRow thr) { tableHeaderRow = thr; }
+
+    NestedTableColumnHeader getParentHeader() { return parentHeader; }
+    void setParentHeader(NestedTableColumnHeader ph) { parentHeader = ph; }
+    
+    // RT-29682: When the sortable property of a TableColumnBase changes this
+    // may impact other TableColumnHeaders, as they may need to change their
+    // sort order representation. Rather than install listeners across all 
+    // TableColumn in the sortOrder list for their sortable property, we simply
+    // update the sortPosition of all headers whenever the sortOrder property
+    // changes, assuming the column is within the sortOrder list.
+    private void updateAllHeaders(TableColumnHeader header) {
+        if (header instanceof NestedTableColumnHeader) {
+            List<TableColumnHeader> children = ((NestedTableColumnHeader)header).getColumnHeaders();
+            for (int i = 0; i < children.size(); i++) {
+                updateAllHeaders(children.get(i));
+            }
+        } else {
+            header.updateSortPosition();
+        }
+    }
+    
+    private void updateStyleClass() {
+        // For now we leave the 'column-header' style class intact so that the
+        // appropriate border styles are shown, etc.
+        getStyleClass().setAll("column-header");
+        getStyleClass().addAll(getTableColumn().getStyleClass());
+    }
+    
+    private void updateScene() {
+        // RT-17684: If the TableColumn widths are all currently the default,
+        // we attempt to 'auto-size' based on the preferred width of the first
+        // n rows (we can't do all rows, as that could conceivably be an unlimited
+        // number of rows retrieved from a very slow (e.g. remote) data source.
+        // Obviously, the bigger the value of n, the more likely the default 
+        // width will be suitable for most values in the column
+        final int n = 30;
+        if (! autoSizeComplete) {
+            if (getTableColumn() == null || getTableColumn().getWidth() != DEFAULT_COLUMN_WIDTH || getScene() == null) {
+                return;
+            }
+            doColumnAutoSize(getTableColumn(), n);
+            autoSizeComplete = true;
+        }
+    }
+    
+    void dispose() {
+        TableViewSkinBase skin = getTableViewSkin();
+        if (skin != null) {
+            skin.getVisibleLeafColumns().removeListener(weakVisibleLeafColumnsListener);
+            skin.getSortOrder().removeListener(weakSortOrderListener);
+        }
+
+        changeListenerHandler.dispose();
+    }
+    
+    private boolean isSortingEnabled() {
+        // this used to check if ! PlatformUtil.isEmbedded(), but has been changed
+        // to always return true (for now), as we want to support column sorting
+        // everywhere
+        return true;
+    }
+    
+    private boolean isColumnReorderingEnabled() {
+        // we only allow for column reordering if there are more than one column,
+        return !Properties.IS_TOUCH_SUPPORTED && getTableViewSkin().getVisibleLeafColumns().size() > 1;
+    }
+    
+    private void initUI() {
+        // TableColumn will be null if we are dealing with the root NestedTableColumnHeader
+        if (getTableColumn() == null) return;
+        
+        // set up mouse events
+        setOnMousePressed(mousePressedHandler);
+        setOnMouseDragged(mouseDraggedHandler);
+        setOnDragDetected(event -> event.consume());
+        setOnContextMenuRequested(contextMenuRequestedHandler);
+        setOnMouseReleased(mouseReleasedHandler);
+
+        // --- label
+        label = new Label();
+        label.setText(getTableColumn().getText());
+        label.setGraphic(getTableColumn().getGraphic());
+        label.setVisible(getTableColumn().isVisible());
+
+        // ---- container for the sort arrow (which is not supported on embedded
+        // platforms)
+        if (isSortingEnabled()) {
+            // put together the grid
+            updateSortGrid();
+        }
+    }
+
+    private void doColumnAutoSize(TableColumnBase<?,?> column, int cellsToMeasure) {
+        double prefWidth = column.getPrefWidth();
+
+        // if the prefWidth has been set, we do _not_ autosize columns
+        if (prefWidth == DEFAULT_COLUMN_WIDTH) {
+            getTableViewSkin().resizeColumnToFitContent(column, cellsToMeasure);
+        }
+    }
+    
+    private void updateSortPosition() {
+        this.sortPos = ! getTableColumn().isSortable() ? -1 : getSortPosition();
+        updateSortGrid();
+    }
+    
+    private void updateSortGrid() {
+        // Fix for RT-14488
+        if (this instanceof NestedTableColumnHeader) return;
+        
+        getChildren().clear();
+        getChildren().add(label);
+        
+        // we do not support sorting in embedded devices
+        if (! isSortingEnabled()) return;
+        
+        isSortColumn = sortPos != -1;
+        if (! isSortColumn) {
+            if (sortArrow != null) {
+                sortArrow.setVisible(false);
+            }
+            return;
+        }
+        
+        // RT-28016: if the tablecolumn is not a visible leaf column, we should ignore this
+        int visibleLeafIndex = skin.getVisibleLeafIndex(getTableColumn());
+        if (visibleLeafIndex == -1) return;
+        
+        final int sortColumnCount = getVisibleSortOrderColumnCount();
+        boolean showSortOrderDots = sortPos <= 3 && sortColumnCount > 1;
+        
+        Node _sortArrow = null;
+        if (getTableColumn().getSortNode() != null) {
+            _sortArrow = getTableColumn().getSortNode();
+            getChildren().add(_sortArrow);
+        } else {
+            GridPane sortArrowGrid = new GridPane();
+            _sortArrow = sortArrowGrid;
+            sortArrowGrid.setPadding(new Insets(0, 3, 0, 0));
+            getChildren().add(sortArrowGrid);
+            
+            // if we are here, and the sort arrow is null, we better create it
+            if (arrow == null) {
+                arrow = new Region();
+                arrow.getStyleClass().setAll("arrow");
+                arrow.setVisible(true);
+                arrow.setRotate(isAscending(getTableColumn()) ? 180.0F : 0.0F);
+                changeListenerHandler.registerChangeListener(getSortTypeProperty(getTableColumn()), e -> {
+                    updateSortGrid();
+                    if (arrow != null) {
+                        arrow.setRotate(isAscending(getTableColumn()) ? 180 : 0.0);
+                    }
+                });
+            }
+            
+            arrow.setVisible(isSortColumn);
+            
+            if (sortPos > 2) {
+                if (sortOrderLabel == null) {
+                    // ---- sort order label (for sort positions greater than 3)
+                    sortOrderLabel = new Label();
+                    sortOrderLabel.getStyleClass().add("sort-order");
+                }
+
+                // only show the label if the sortPos is greater than 3 (for sortPos 
+                // values less than three, we show the sortOrderDots instead)
+                sortOrderLabel.setText("" + (sortPos + 1));
+                sortOrderLabel.setVisible(sortColumnCount > 1);
+
+                // update the grid layout
+                sortArrowGrid.add(arrow, 1, 1);
+                GridPane.setHgrow(arrow, Priority.NEVER);
+                GridPane.setVgrow(arrow, Priority.NEVER);
+                sortArrowGrid.add(sortOrderLabel, 2, 1);
+            } else if (showSortOrderDots) {
+                if (sortOrderDots == null) {
+                    sortOrderDots = new HBox(0);
+                    sortOrderDots.getStyleClass().add("sort-order-dots-container");
+                }
+
+                // show the sort order dots
+                boolean isAscending = isAscending(getTableColumn());
+                int arrowRow = isAscending ? 1 : 2;
+                int dotsRow = isAscending ? 2 : 1;
+
+                sortArrowGrid.add(arrow, 1, arrowRow);
+                GridPane.setHalignment(arrow, HPos.CENTER);
+                sortArrowGrid.add(sortOrderDots, 1, dotsRow);
+
+                updateSortOrderDots(sortPos);
+            } else {
+                // only show the arrow
+                sortArrowGrid.add(arrow, 1, 1);
+                GridPane.setHgrow(arrow, Priority.NEVER);
+                GridPane.setVgrow(arrow, Priority.ALWAYS);
+            }
+        }
+        
+        sortArrow = _sortArrow;
+        if (sortArrow != null) {
+            sortArrow.setVisible(isSortColumn);
+        }
+        
+        requestLayout();
+    }
+    
+    private void updateSortOrderDots(int sortPos) {
+        double arrowWidth = arrow.prefWidth(-1);
+        
+        sortOrderDots.getChildren().clear();
+
+        for (int i = 0; i <= sortPos; i++) {
+            Region r = new Region();
+            r.getStyleClass().add("sort-order-dot");
+            
+            String sortTypeName = getSortTypeName(getTableColumn());
+            if (sortTypeName != null && ! sortTypeName.isEmpty()) {
+                r.getStyleClass().add(sortTypeName.toLowerCase(Locale.ROOT));
+            }
+            
+            sortOrderDots.getChildren().add(r);
+
+            // RT-34914: fine tuning the placement of the sort dots. We could have gone to a custom layout, but for now
+            // this works fine.
+            if (i < sortPos) {
+                Region spacer = new Region();
+                double rp = sortPos == 1 ? 1 : 1;
+                double lp = sortPos == 1 ? 1 : 0;
+                spacer.setPadding(new Insets(0, rp, 0, lp));
+                sortOrderDots.getChildren().add(spacer);
+            }
+        }
+        
+        sortOrderDots.setAlignment(Pos.TOP_CENTER);
+        sortOrderDots.setMaxWidth(arrowWidth);
+    }
+
+    // Package for testing purposes only.
+    void moveColumn(TableColumnBase column, final int newColumnPos) {
+        if (column == null || newColumnPos < 0) return;
+
+        ObservableList<TableColumnBase<?,?>> columns = getColumns(column);
+
+        final int columnsCount = columns.size();
+        final int currentPos = columns.indexOf(column);
+
+        int actualNewColumnPos = newColumnPos;
+
+        // Fix for RT-35141: We need to account for hidden columns
+        final int max = actualNewColumnPos;
+        for (int i = 0; i <= max && i < columnsCount; i++) {
+            actualNewColumnPos += columns.get(i).isVisible() ? 0 : 1;
+        }
+        // --- end of RT-35141 fix
+
+        if (actualNewColumnPos >= columnsCount) {
+            actualNewColumnPos = columnsCount - 1;
+        } else if (actualNewColumnPos < 0) {
+            actualNewColumnPos = 0;
+        }
+
+        if (actualNewColumnPos == currentPos) return;
+
+        List<TableColumnBase<?,?>> tempList = new ArrayList<>(columns);
+        tempList.remove(column);
+        tempList.add(actualNewColumnPos, column);
+        
+        columns.setAll(tempList);
+    }
+
+    private ObservableList<TableColumnBase<?,?>> getColumns(TableColumnBase column) {
+        return column.getParentColumn() == null ?
+                getTableViewSkin().getColumns() :
+                column.getParentColumn().getColumns();
+    }
+
+    private int getIndex(TableColumnBase<?,?> column) {
+        if (column == null) return -1;
+
+        ObservableList<? extends TableColumnBase<?,?>> columns = getColumns(column);
+
+        int index = -1;
+        for (int i = 0; i < columns.size(); i++) {
+            TableColumnBase<?,?> _column = columns.get(i);
+            if (! _column.isVisible()) continue;
+
+            index++;
+            if (column.equals(_column)) break;
+        }
+
+        return index;
+    }
+
+    private void updateColumnIndex() {
+//        TableView tv = getTableView();
+        TableViewSkinBase skin = getTableViewSkin();
+        TableColumnBase tc = getTableColumn();
+        columnIndex = skin == null || tc == null ? -1 : skin.getVisibleLeafIndex(tc);
+        
+        // update the pseudo class state regarding whether this is the last
+        // visible cell (i.e. the right-most). 
+        isLastVisibleColumn = getTableColumn() != null &&
+                columnIndex != -1 && 
+                columnIndex == getTableViewSkin().getVisibleLeafColumns().size() - 1;
+        pseudoClassStateChanged(PSEUDO_CLASS_LAST_VISIBLE, isLastVisibleColumn);
+    }
+
+    private void sortColumn(final boolean addColumn) {
+        if (! isSortingEnabled()) return;
+
+        // we only allow sorting on the leaf columns and columns
+        // that actually have comparators defined, and are sortable
+        if (getTableColumn() == null || getTableColumn().getColumns().size() != 0 || getTableColumn().getComparator() == null || !getTableColumn().isSortable()) return;
+//        final int sortPos = getTable().getSortOrder().indexOf(column);
+//        final boolean isSortColumn = sortPos != -1;
+
+        final ObservableList<TableColumnBase<?,?>> sortOrder = getTableViewSkin().getSortOrder();
+
+        // addColumn is true e.g. when the user is holding down Shift
+        if (addColumn) {
+            if (!isSortColumn) {
+                setSortType(getTableColumn(), TableColumn.SortType.ASCENDING);
+                sortOrder.add(getTableColumn());
+            } else if (isAscending(getTableColumn())) {
+                setSortType(getTableColumn(), TableColumn.SortType.DESCENDING);
+            } else {
+                int i = sortOrder.indexOf(getTableColumn());
+                if (i != -1) {
+                    sortOrder.remove(i);
+                }
+            }
+        } else {
+            // the user has clicked on a column header - we should add this to
+            // the TableView sortOrder list if it isn't already there.
+            if (isSortColumn && sortOrder.size() == 1) {
+                // the column is already being sorted, and it's the only column.
+                // We therefore move through the 2nd or 3rd states:
+                //   1st click: sort ascending
+                //   2nd click: sort descending
+                //   3rd click: natural sorting (sorting is switched off)
+                if (isAscending(getTableColumn())) {
+                    setSortType(getTableColumn(), TableColumn.SortType.DESCENDING);
+                } else {
+                    // remove from sort
+                    sortOrder.remove(getTableColumn());
+                }
+            } else if (isSortColumn) {
+                // the column is already being used to sort, so we toggle its
+                // sortAscending property, and also make the column become the
+                // primary sort column
+                if (isAscending(getTableColumn())) {
+                    setSortType(getTableColumn(), TableColumn.SortType.DESCENDING);
+                } else if (isDescending(getTableColumn())) {
+                    setSortType(getTableColumn(), TableColumn.SortType.ASCENDING);
+                }
+
+                // to prevent multiple sorts, we make a copy of the sort order
+                // list, moving the column value from the current position to
+                // its new position at the front of the list
+                List<TableColumnBase<?,?>> sortOrderCopy = new ArrayList<TableColumnBase<?,?>>(sortOrder);
+                sortOrderCopy.remove(getTableColumn());
+                sortOrderCopy.add(0, getTableColumn());
+                sortOrder.setAll(getTableColumn());
+            } else {
+                // add to the sort order, in ascending form
+                setSortType(getTableColumn(), TableColumn.SortType.ASCENDING);
+                sortOrder.setAll(getTableColumn());
+            }
+        }
+    }
+
+    // Because it is possible that some columns are in the sortOrder list but are
+    // not themselves sortable, we cannot just do sortOrderList.indexOf(column).
+    // Therefore, this method does the proper work required of iterating through
+    // and ignoring non-sortable (and null) columns in the sortOrder list.
+    private int getSortPosition() {
+        if (getTableColumn() == null) {
+            return -1;
+        }
+
+        final List<TableColumnBase> sortOrder = getVisibleSortOrderColumns();
+        int pos = 0;
+        for (int i = 0; i < sortOrder.size(); i++) {
+            TableColumnBase _tc = sortOrder.get(i);
+
+            if (getTableColumn().equals(_tc)) {
+                return pos;
+            }
+
+            pos++;
+        }
+
+        return -1;
+    }
+
+    private List<TableColumnBase> getVisibleSortOrderColumns() {
+        final ObservableList<TableColumnBase<?,?>> sortOrder = getTableViewSkin().getSortOrder();
+
+        List<TableColumnBase> visibleSortOrderColumns = new ArrayList<>();
+        for (int i = 0; i < sortOrder.size(); i++) {
+            TableColumnBase _tc = sortOrder.get(i);
+            if (_tc == null || ! _tc.isSortable() || ! _tc.isVisible()) {
+                continue;
+            }
+
+            visibleSortOrderColumns.add(_tc);
+        }
+
+        return visibleSortOrderColumns;
+    }
+
+    // as with getSortPosition above, this method iterates through the sortOrder
+    // list ignoring the null and non-sortable columns, so that we get the correct
+    // number of columns in the sortOrder list.
+    private int getVisibleSortOrderColumnCount() {
+        return getVisibleSortOrderColumns().size();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation: Column Reordering                               *
+     *                                                                         *
+     **************************************************************************/   
+
+    // package for testing
+    void columnReorderingStarted(double dragOffset) {
+        if (! getTableColumn().impl_isReorderable()) return;
+        
+        // Used to ensure the column ghost is positioned relative to where the
+        // user clicked on the column header
+        this.dragOffset = dragOffset;
+
+        // Note here that we only allow for reordering of 'root' columns
+        getTableHeaderRow().setReorderingColumn(getTableColumn());
+        getTableHeaderRow().setReorderingRegion(this);
+    }
+
+    // package for testing
+    void columnReordering(double sceneX, double sceneY) {
+        if (! getTableColumn().impl_isReorderable()) return;
+
+        // this is for handling the column drag to reorder columns.
+        // It shows a line to indicate where the 'drop' will be.
+
+        // indicate that we've started dragging so that the dragging
+        // line overlay is shown
+        getTableHeaderRow().setReordering(true);
+
+        // Firstly we need to determine where to draw the line.
+        // Find which column we're over
+        TableColumnHeader hoverHeader = null;
+
+        // x represents where the mouse is relative to the parent
+        // NestedTableColumnHeader
+        final double x = getParentHeader().sceneToLocal(sceneX, sceneY).getX();
+
+        // calculate where the ghost column header should be
+        double dragX = getTableViewSkin().getSkinnable().sceneToLocal(sceneX, sceneY).getX() - dragOffset;
+        getTableHeaderRow().setDragHeaderX(dragX);
+
+        double startX = 0;
+        double endX = 0;
+        double headersWidth = 0;
+        newColumnPos = 0;
+        for (TableColumnHeader header : getParentHeader().getColumnHeaders()) {
+            if (! header.isVisible()) continue;
+
+            double headerWidth = header.prefWidth(-1);
+            headersWidth += headerWidth;
+
+            startX = header.getBoundsInParent().getMinX();
+            endX = startX + headerWidth;
+
+            if (x >= startX && x < endX) {
+                hoverHeader = header;
+                break;
+            }
+            newColumnPos++;
+        }
+
+        // hoverHeader will be null if the drag occurs outside of the
+        // tableview. In this case we handle the newColumnPos specially
+        // and then short-circuit. This results in the drop action
+        // resulting in the correct result (the column will drop at
+        // the start or end of the table).
+        if (hoverHeader == null) {
+            newColumnPos = x > headersWidth ? (getParentHeader().getColumns().size() - 1) : 0;
+            return;
+        }
+
+        // This is the x-axis value midway through hoverHeader. It's
+        // used to determine whether the drop should be to the left
+        // or the right of hoverHeader.
+        double midPoint = startX + (endX - startX) / 2;
+        boolean beforeMidPoint = x <= midPoint;
+
+        // Based on where the mouse actually is, we have to shuffle
+        // where we want the column to end up. This code handles that.
+        int currentPos = getIndex(getTableColumn());
+        newColumnPos += newColumnPos > currentPos && beforeMidPoint ?
+            -1 : (newColumnPos < currentPos && !beforeMidPoint ? 1 : 0);
+        
+        double lineX = getTableHeaderRow().sceneToLocal(hoverHeader.localToScene(hoverHeader.getBoundsInLocal())).getMinX();
+        lineX = lineX + ((beforeMidPoint) ? (0) : (hoverHeader.getWidth()));
+        
+        if (lineX >= -0.5 && lineX <= getTableViewSkin().getSkinnable().getWidth()) {
+            columnReorderLine.setTranslateX(lineX);
+
+            // then if this is the first event, we set the property to true
+            // so that the line becomes visible until the drop is completed.
+            // We also set reordering to true so that the various reordering
+            // effects become visible (ghost, transparent overlay, etc).
+            columnReorderLine.setVisible(true);
+        }
+        
+        getTableHeaderRow().setReordering(true);
+    }
+
+    // package for testing
+    void columnReorderingComplete() {
+        if (! getTableColumn().impl_isReorderable()) return;
+        
+        // Move col from where it is now to the new position.
+        moveColumn(getTableColumn(), newColumnPos);
+        
+        // cleanup
+        columnReorderLine.setTranslateX(0.0F);
+        columnReorderLine.setLayoutX(0.0F);
+        newColumnPos = 0;
+
+        getTableHeaderRow().setReordering(false);
+        columnReorderLine.setVisible(false);
+        getTableHeaderRow().setReorderingColumn(null);
+        getTableHeaderRow().setReorderingRegion(null);
+        dragOffset = 0.0F;
+    }
+
+    double getDragRectHeight() {
+        return getHeight();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Stylesheet Handling                                                     *
+     *                                                                         *
+     **************************************************************************/
+    
+    private static final PseudoClass PSEUDO_CLASS_LAST_VISIBLE = 
+            PseudoClass.getPseudoClass("last-visible");
+
+    /**
+      * Super-lazy instantiation pattern from Bill Pugh.
+      * @treatAsPrivate implementation detail
+      */
+     private static class StyleableProperties {
+         private static final CssMetaData<TableColumnHeader,Number> SIZE =
+            new CssMetaData<TableColumnHeader,Number>("-fx-size",
+                 SizeConverter.getInstance(), 20.0) {
+
+            @Override
+            public boolean isSettable(TableColumnHeader n) {
+                return n.size == null || !n.size.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Number> getStyleableProperty(TableColumnHeader n) {
+                return (StyleableProperty<Number>)(WritableValue<Number>)n.sizeProperty();
+            }
+        };
+
+         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+         static {
+
+            final List<CssMetaData<? extends Styleable, ?>> styleables = 
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(Region.getClassCssMetaData());
+            styleables.add(SIZE);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+
+         }
+    }
+
+    /**
+     * Returnst he CssMetaData associated with this class, which may include the
+     * CssMetaData of its super classes.
+     */
+    public static List<CssMetaData<? extends Styleable, ?>> getClassCssMetaData() {
+        return StyleableProperties.STYLEABLES;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableHeaderRow.java	2015-09-03 15:22:43.001953800 -0700
+++ /dev/null	2015-09-03 15:22:44.000000000 -0700
@@ -1,562 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 java.util.*;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.WeakInvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.WeakListChangeListener;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Side;
-import javafx.geometry.VPos;
-import javafx.scene.control.CheckMenuItem;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Control;
-import javafx.scene.control.Label;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableColumnBase;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
-
-/**
- * Region responsible for painting the entire row of column headers.
- */
-public class TableHeaderRow extends StackPane {
-
-    /***************************************************************************
-     *                                                                         *
-     * Static Fields                                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    private static final String MENU_SEPARATOR = 
-            ControlResources.getString("TableView.nestedColumnControlMenuSeparator");
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    private final VirtualFlow flow;
-
-    private final TableViewSkinBase tableSkin;
-
-    private Map<TableColumnBase, CheckMenuItem> columnMenuItems = new HashMap<TableColumnBase, CheckMenuItem>();
-
-    // Vertical line that is shown when columns are being reordered
-//    private Region columnReorderLine;
-
-    private double scrollX;
-
-    private double tableWidth;
-
-    private Rectangle clip;
-
-    private TableColumnHeader reorderingRegion;
-
-    /**
-     * This is the ghosted region representing the table column that is being
-     * dragged. It moves along the x-axis but is fixed in the y-axis.
-     */
-    private StackPane dragHeader;
-    private final Label dragHeaderLabel = new Label();
-
-    /*
-     * The header row is actually just one NestedTableColumnHeader that spans
-     * the entire width. Nested within this is the TableColumnHeader's and
-     * NestedTableColumnHeader's, as necessary. This makes it nice and clean
-     * to handle column reordering - we basically enforce the rule that column
-     * reordering only occurs within a single NestedTableColumnHeader, and only
-     * at that level.
-     */
-    private final NestedTableColumnHeader header;
-
-    private Region filler;
-
-    /**
-     * This is the region where the user can interact with to show/hide columns.
-     * It is positioned in the top-right hand corner of the TableHeaderRow, and
-     * when clicked shows a PopupMenu consisting of all leaf columns.
-     */
-    private Pane cornerRegion;
-
-    /**
-     * PopupMenu shown to users to allow for them to hide/show columns in the
-     * table.
-     */
-    private ContextMenu columnPopupMenu;
-
-    private BooleanProperty reordering = new SimpleBooleanProperty(this, "reordering", false) {
-        @Override protected void invalidated() {
-            TableColumnHeader r = getReorderingRegion();
-            if (r != null) {
-                double dragHeaderHeight = r.getNestedColumnHeader() != null ?
-                        r.getNestedColumnHeader().getHeight() :
-                        getReorderingRegion().getHeight();
-
-                dragHeader.resize(dragHeader.getWidth(), dragHeaderHeight);
-                dragHeader.setTranslateY(getHeight() - dragHeaderHeight);
-            }
-            dragHeader.setVisible(isReordering());
-        }
-    };
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
-    
-    public TableHeaderRow(final TableViewSkinBase skin) {
-        this.tableSkin = skin;
-        this.flow = skin.flow;
-
-        getStyleClass().setAll("column-header-background");
-
-        // clip the header so it doesn't show outside of the table bounds
-        clip = new Rectangle();
-        clip.setSmooth(false);
-        clip.heightProperty().bind(heightProperty());
-        setClip(clip);
-
-        // listen to table width to keep header in sync
-        updateTableWidth();
-        tableSkin.getSkinnable().widthProperty().addListener(weakTableWidthListener);
-        tableSkin.getSkinnable().paddingProperty().addListener(weakTablePaddingListener);
-        skin.getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
-
-        // popup menu for hiding/showing columns
-        columnPopupMenu = new ContextMenu();
-        updateTableColumnListeners(tableSkin.getColumns(), Collections.<TableColumnBase<?,?>>emptyList());
-        tableSkin.getVisibleLeafColumns().addListener(weakTableColumnsListener);
-        tableSkin.getColumns().addListener(weakTableColumnsListener);
-
-        // drag header region. Used to indicate the current column being reordered
-        dragHeader = new StackPane();
-        dragHeader.setVisible(false);
-        dragHeader.getStyleClass().setAll("column-drag-header");
-        dragHeader.setManaged(false);
-        dragHeader.getChildren().add(dragHeaderLabel);
-
-        // the header lives inside a NestedTableColumnHeader
-        header = createRootHeader();
-        header.setFocusTraversable(false);
-        header.setTableHeaderRow(this);
-
-        // The 'filler' area that extends from the right-most column to the edge
-        // of the tableview, or up to the 'column control' button
-        filler = new Region();
-        filler.getStyleClass().setAll("filler");
-
-        // Give focus to the table when an empty area of the header row is clicked.
-        // This ensures the user knows that the table has focus.
-        setOnMousePressed(e -> {
-            skin.getSkinnable().requestFocus();
-        });
-
-        // build the corner region button for showing the popup menu
-        final StackPane image = new StackPane();
-        image.setSnapToPixel(false);
-        image.getStyleClass().setAll("show-hide-column-image");
-        cornerRegion = new StackPane() {
-            @Override protected void layoutChildren() {
-                double imageWidth = image.snappedLeftInset() + image.snappedRightInset();
-                double imageHeight = image.snappedTopInset() + image.snappedBottomInset();
-                
-                image.resize(imageWidth, imageHeight);
-                positionInArea(image, 0, 0, getWidth(), getHeight() - 3, 
-                        0, HPos.CENTER, VPos.CENTER);
-            }
-        };
-        cornerRegion.getStyleClass().setAll("show-hide-columns-button");
-        cornerRegion.getChildren().addAll(image);
-        cornerRegion.setVisible(tableSkin.tableMenuButtonVisibleProperty().get());
-        tableSkin.tableMenuButtonVisibleProperty().addListener(valueModel -> {
-            cornerRegion.setVisible(tableSkin.tableMenuButtonVisibleProperty().get());
-            requestLayout();
-        });
-        cornerRegion.setOnMousePressed(me -> {
-            // show a popupMenu which lists all columns
-            columnPopupMenu.show(cornerRegion, Side.BOTTOM, 0, 0);
-            me.consume();
-        });
-
-        // the actual header
-        // the region that is anchored above the vertical scrollbar
-        // a 'ghost' of the header being dragged by the user to force column
-        // reordering
-        getChildren().addAll(filler, header, cornerRegion, dragHeader);
-    }
-    
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/    
-    
-    private InvalidationListener tableWidthListener = valueModel -> {
-        updateTableWidth();
-    };
-
-    private InvalidationListener tablePaddingListener = valueModel -> {
-        updateTableWidth();
-    };
-    
-    private ListChangeListener visibleLeafColumnsListener = new ListChangeListener<TableColumn<?,?>>() {
-        @Override public void onChanged(ListChangeListener.Change<? extends TableColumn<?,?>> c) {
-            // This is necessary for RT-20300 (but was updated for RT-20840)
-            header.setHeadersNeedUpdate();
-        }
-    };
-    
-    private final ListChangeListener tableColumnsListener = c -> {
-        while (c.next()) {
-            updateTableColumnListeners(c.getAddedSubList(), c.getRemoved());
-        }
-    };
-    
-    private final InvalidationListener columnTextListener = observable -> {
-        TableColumnBase<?,?> column = (TableColumnBase<?,?>) ((StringProperty)observable).getBean();
-        CheckMenuItem menuItem = columnMenuItems.get(column);
-        if (menuItem != null) {
-            menuItem.setText(getText(column.getText(), column));
-        }
-    };
-    
-    private final WeakInvalidationListener weakTableWidthListener = 
-            new WeakInvalidationListener(tableWidthListener);
-
-    private final WeakInvalidationListener weakTablePaddingListener =
-            new WeakInvalidationListener(tablePaddingListener);
-
-    private final WeakListChangeListener weakVisibleLeafColumnsListener =
-            new WeakListChangeListener(visibleLeafColumnsListener);
-    
-    private final WeakListChangeListener weakTableColumnsListener =
-            new WeakListChangeListener(tableColumnsListener);
-    
-    private final WeakInvalidationListener weakColumnTextListener = 
-            new WeakInvalidationListener(columnTextListener);
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Public Methods                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    /** {@inheritDoc} */
-    @Override protected void layoutChildren() {
-        double x = scrollX;
-        double headerWidth = snapSize(header.prefWidth(-1));
-        double prefHeight = getHeight() - snappedTopInset() - snappedBottomInset();
-        double cornerWidth = snapSize(flow.getVbar().prefWidth(-1));
-
-        // position the main nested header
-        header.resizeRelocate(x, snappedTopInset(), headerWidth, prefHeight);
-        
-        // position the filler region
-        final Control control = tableSkin.getSkinnable();
-        if (control == null) {
-            return;
-        }
-
-        final double controlInsets = control.snappedLeftInset() + control.snappedRightInset();
-        double fillerWidth = tableWidth - headerWidth + filler.getInsets().getLeft() - controlInsets;
-        fillerWidth -= tableSkin.tableMenuButtonVisibleProperty().get() ? cornerWidth : 0;
-        filler.setVisible(fillerWidth > 0);
-        if (fillerWidth > 0) {
-            filler.resizeRelocate(x + headerWidth, snappedTopInset(), fillerWidth, prefHeight);
-        }
-
-        // position the top-right rectangle (which sits above the scrollbar)
-        cornerRegion.resizeRelocate(tableWidth - cornerWidth, snappedTopInset(), cornerWidth, prefHeight);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computePrefWidth(double height) {
-        return header.prefWidth(height);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computeMinHeight(double width) {
-        return computePrefHeight(width);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computePrefHeight(double width) {
-        // we hardcode 24.0 here to avoid RT-37616, where the
-        // entire header row would disappear when all columns were hidden. 
-        double headerPrefHeight = header.prefHeight(width);
-        headerPrefHeight = headerPrefHeight == 0.0 ? 24.0 : headerPrefHeight;
-        return snappedTopInset() + headerPrefHeight + snappedBottomInset();
-    }
-
-    // protected to allow subclasses to provide a custom root header
-    protected NestedTableColumnHeader createRootHeader() {
-        return new NestedTableColumnHeader(tableSkin, null);
-    }
-
-    // protected to allow subclasses access to the TableViewSkinBase instance
-    protected TableViewSkinBase<?,?,?,?,?,?> getTableSkin() {
-        return this.tableSkin;
-    }
-
-    // protected to allow subclasses to modify the horizontal scrolling
-    protected void updateScrollX() {
-        scrollX = flow.getHbar().isVisible() ? -flow.getHbar().getValue() : 0.0F;
-        requestLayout();
-
-        // Fix for RT-36392: without this call even though we call requestLayout()
-        // we don't seem to ever see the layoutChildren() method above called,
-        // which means the layout is not always updated to use the latest scrollX.
-        layout();
-    }
-
-    public final void setReordering(boolean value) {
-        this.reordering.set(value);
-    }
-
-    public final boolean isReordering() {
-        return reordering.get();
-    }
-
-    public final BooleanProperty reorderingProperty() {
-        return reordering;
-    }
-
-    public TableColumnHeader getReorderingRegion() {
-        return reorderingRegion;
-    }
-
-    public void setReorderingColumn(TableColumnBase rc) {
-        dragHeaderLabel.setText(rc == null ? "" : rc.getText());
-    }
-
-    public void setReorderingRegion(TableColumnHeader reorderingRegion) {
-        this.reorderingRegion = reorderingRegion;
-
-        if (reorderingRegion != null) {
-            dragHeader.resize(reorderingRegion.getWidth(), dragHeader.getHeight());
-        }
-    }
-
-    public void setDragHeaderX(double dragHeaderX) {
-        dragHeader.setTranslateX(dragHeaderX);
-    }
-
-    public NestedTableColumnHeader getRootHeader() {
-        return header;
-    }
-
-    // protected to allow subclass to customise the width, to allow for features
-    // such as row headers
-    protected void updateTableWidth() {
-        // snapping added for RT-19428
-        final Control c = tableSkin.getSkinnable();
-        if (c == null) {
-            this.tableWidth = 0;
-        } else {
-            Insets insets = c.getInsets() == null ? Insets.EMPTY : c.getInsets();
-            double padding = snapSize(insets.getLeft()) + snapSize(insets.getRight());
-            this.tableWidth = snapSize(c.getWidth()) - padding;
-        }
-
-        clip.setWidth(tableWidth);
-    }
-
-    public TableColumnHeader getColumnHeaderFor(final TableColumnBase<?,?> col) {
-        if (col == null) return null;
-        List<TableColumnBase<?,?>> columnChain = new ArrayList<>();
-        columnChain.add(col);
-
-        TableColumnBase<?,?> parent = col.getParentColumn();
-        while (parent != null) {
-            columnChain.add(0, parent);
-            parent = parent.getParentColumn();
-        }
-
-        // we now have a list from top to bottom of a nested column hierarchy,
-        // and we can now navigate down to retrieve the header with ease
-        TableColumnHeader currentHeader = getRootHeader();
-        for (int depth = 0; depth < columnChain.size(); depth++) {
-            // this is the column we are looking for at this depth
-            TableColumnBase<?,?> column = columnChain.get(depth);
-
-            // and now we iterate through the nested table column header at this
-            // level to get the header
-            currentHeader = getColumnHeaderFor(column, currentHeader);
-        }
-        return currentHeader;
-    }
-
-    public TableColumnHeader getColumnHeaderFor(final TableColumnBase<?,?> col, TableColumnHeader currentHeader) {
-        if (currentHeader instanceof NestedTableColumnHeader) {
-            List<TableColumnHeader> headers = ((NestedTableColumnHeader)currentHeader).getColumnHeaders();
-
-            for (int i = 0; i < headers.size(); i++) {
-                TableColumnHeader header = headers.get(i);
-                if (header.getTableColumn() == col) {
-                    return header;
-                }
-            }
-        }
-
-        return null;
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    private void updateTableColumnListeners(List<? extends TableColumnBase<?,?>> added, List<? extends TableColumnBase<?,?>> removed) {
-        // remove binding from all removed items
-        for (TableColumnBase tc : removed) {
-            remove(tc);
-        }
-
-        rebuildColumnMenu();
-    }
-
-    private void remove(TableColumnBase<?,?> col) {
-        if (col == null) return;
-
-        CheckMenuItem item = columnMenuItems.remove(col);
-        if (item != null) {
-            col.textProperty().removeListener(weakColumnTextListener);
-            item.selectedProperty().unbindBidirectional(col.visibleProperty());
-
-            columnPopupMenu.getItems().remove(item);
-        }
-
-        if (! col.getColumns().isEmpty()) {
-            for (TableColumnBase tc : col.getColumns()) {
-                remove(tc);
-            }
-        }
-    }
-
-    private void rebuildColumnMenu() {
-        columnPopupMenu.getItems().clear();
-
-        for (TableColumnBase<?,?> col : getTableSkin().getColumns()) {
-            // we only create menu items for leaf columns, visible or not
-            if (col.getColumns().isEmpty()) {
-                createMenuItem(col);
-            } else {
-                List<TableColumnBase<?,?>> leafColumns = getLeafColumns(col);
-                for (TableColumnBase<?,?> _col : leafColumns) {
-                    createMenuItem(_col);
-                }
-            }
-        }
-    }
-
-    private List<TableColumnBase<?,?>> getLeafColumns(TableColumnBase<?,?> col) {
-        List<TableColumnBase<?,?>> leafColumns = new ArrayList<>();
-
-        for (TableColumnBase<?,?> _col : col.getColumns()) {
-            if (_col.getColumns().isEmpty()) {
-                leafColumns.add(_col);
-            } else {
-                leafColumns.addAll(getLeafColumns(_col));
-            }
-        }
-
-        return leafColumns;
-    }
-
-    private void createMenuItem(TableColumnBase<?,?> col) {
-        CheckMenuItem item = columnMenuItems.get(col);
-        if (item == null) {
-            item = new CheckMenuItem();
-            columnMenuItems.put(col, item);
-        }
-
-        // bind column text and isVisible so that the menu item is always correct
-        item.setText(getText(col.getText(), col));
-        col.textProperty().addListener(weakColumnTextListener);
-        item.selectedProperty().bindBidirectional(col.visibleProperty());
-
-        columnPopupMenu.getItems().add(item);
-    }
-
-    /*
-     * Function used for building the strings in the popup menu
-     */
-    private String getText(String text, TableColumnBase col) {
-        String s = text;
-        TableColumnBase parentCol = col.getParentColumn();
-        while (parentCol != null) {
-            if (isColumnVisibleInHeader(parentCol, tableSkin.getColumns())) {
-                s = parentCol.getText() + MENU_SEPARATOR + s;
-            }
-            parentCol = parentCol.getParentColumn();
-        }
-        return s;
-    }
-    
-    // We need to show strings properly. If a column has a parent column which is
-    // not inserted into the TableView columns list, it effectively doesn't have
-    // a parent column from the users perspective. As such, we shouldn't include
-    // the parent column text in the menu. Fixes RT-14482.
-    private boolean isColumnVisibleInHeader(TableColumnBase col, List columns) {
-        if (col == null) return false;
-        
-        for (int i = 0; i < columns.size(); i++) {
-            TableColumnBase column = (TableColumnBase) columns.get(i);
-            if (col.equals(column)) return true;
-            
-            if (! column.getColumns().isEmpty()) {
-                boolean isVisible = isColumnVisibleInHeader(col, column.getColumns());
-                if (isVisible) return true;
-            }
-        }
-        
-        return false;
-    }
-}
--- /dev/null	2015-09-03 15:22:44.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableHeaderRow.java	2015-09-03 15:22:42.067900400 -0700
@@ -0,0 +1,567 @@
+/*
+ * Copyright (c) 2011, 2015, 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 java.util.*;
+
+import javafx.beans.InvalidationListener;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.WeakListChangeListener;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.geometry.Side;
+import javafx.geometry.VPos;
+import javafx.scene.control.CheckMenuItem;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Control;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumnBase;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+
+import com.sun.javafx.scene.control.skin.resources.ControlResources;
+
+/**
+ * Region responsible for painting the entire row of column headers.
+ *
+ * @since 9
+ * @see TableView
+ * @see TableViewSkin
+ * @see TreeTableView
+ * @see TreeTableViewSkin
+ */
+public class TableHeaderRow extends StackPane {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static Fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final String MENU_SEPARATOR = 
+            ControlResources.getString("TableView.nestedColumnControlMenuSeparator");
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final VirtualFlow flow;
+    private final TableViewSkinBase<?,?,?,?,?> tableSkin;
+    private Map<TableColumnBase, CheckMenuItem> columnMenuItems = new HashMap<TableColumnBase, CheckMenuItem>();
+    private double scrollX;
+    private double tableWidth;
+    private Rectangle clip;
+    private TableColumnHeader reorderingRegion;
+
+    /**
+     * This is the ghosted region representing the table column that is being
+     * dragged. It moves along the x-axis but is fixed in the y-axis.
+     */
+    private StackPane dragHeader;
+    private final Label dragHeaderLabel = new Label();
+
+    private Region filler;
+
+    /**
+     * This is the region where the user can interact with to show/hide columns.
+     * It is positioned in the top-right hand corner of the TableHeaderRow, and
+     * when clicked shows a PopupMenu consisting of all leaf columns.
+     */
+    private Pane cornerRegion;
+
+    /**
+     * PopupMenu shown to users to allow for them to hide/show columns in the
+     * table.
+     */
+    private ContextMenu columnPopupMenu;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private InvalidationListener tableWidthListener = o -> updateTableWidth();
+
+    private InvalidationListener tablePaddingListener = o -> updateTableWidth();
+
+    // This is necessary for RT-20300 (but was updated for RT-20840)
+    private ListChangeListener visibleLeafColumnsListener = c -> getRootHeader().setHeadersNeedUpdate();
+
+    private final ListChangeListener tableColumnsListener = c -> {
+        while (c.next()) {
+            updateTableColumnListeners(c.getAddedSubList(), c.getRemoved());
+        }
+    };
+
+    private final InvalidationListener columnTextListener = observable -> {
+        TableColumnBase<?,?> column = (TableColumnBase<?,?>) ((StringProperty)observable).getBean();
+        CheckMenuItem menuItem = columnMenuItems.get(column);
+        if (menuItem != null) {
+            menuItem.setText(getText(column.getText(), column));
+        }
+    };
+
+    private final WeakInvalidationListener weakTableWidthListener =
+            new WeakInvalidationListener(tableWidthListener);
+
+    private final WeakInvalidationListener weakTablePaddingListener =
+            new WeakInvalidationListener(tablePaddingListener);
+
+    private final WeakListChangeListener weakVisibleLeafColumnsListener =
+            new WeakListChangeListener(visibleLeafColumnsListener);
+
+    private final WeakListChangeListener weakTableColumnsListener =
+            new WeakListChangeListener(tableColumnsListener);
+
+    private final WeakInvalidationListener weakColumnTextListener =
+            new WeakInvalidationListener(columnTextListener);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructor                                                             *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TableHeaderRow instance to visually represent the column
+     * header area of controls such as {@link javafx.scene.control.TableView} and
+     * {@link javafx.scene.control.TreeTableView}.
+     *
+     * @param skin The skin used by the UI control.
+     */
+    public TableHeaderRow(final TableViewSkinBase skin) {
+        this.tableSkin = skin;
+        this.flow = skin.flow;
+
+        getStyleClass().setAll("column-header-background");
+
+        // clip the header so it doesn't show outside of the table bounds
+        clip = new Rectangle();
+        clip.setSmooth(false);
+        clip.heightProperty().bind(heightProperty());
+        setClip(clip);
+
+        // listen to table width to keep header in sync
+        updateTableWidth();
+        tableSkin.getSkinnable().widthProperty().addListener(weakTableWidthListener);
+        tableSkin.getSkinnable().paddingProperty().addListener(weakTablePaddingListener);
+        skin.getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
+
+        // popup menu for hiding/showing columns
+        columnPopupMenu = new ContextMenu();
+        updateTableColumnListeners(tableSkin.getColumns(), Collections.<TableColumnBase<?,?>>emptyList());
+        tableSkin.getVisibleLeafColumns().addListener(weakTableColumnsListener);
+        tableSkin.getColumns().addListener(weakTableColumnsListener);
+
+        // drag header region. Used to indicate the current column being reordered
+        dragHeader = new StackPane();
+        dragHeader.setVisible(false);
+        dragHeader.getStyleClass().setAll("column-drag-header");
+        dragHeader.setManaged(false);
+        dragHeader.getChildren().add(dragHeaderLabel);
+
+        // the header lives inside a NestedTableColumnHeader
+        NestedTableColumnHeader rootHeader = new NestedTableColumnHeader(tableSkin, null);
+        setRootHeader(rootHeader);
+        rootHeader.setFocusTraversable(false);
+        rootHeader.setTableHeaderRow(this);
+
+        // The 'filler' area that extends from the right-most column to the edge
+        // of the tableview, or up to the 'column control' button
+        filler = new Region();
+        filler.getStyleClass().setAll("filler");
+
+        // Give focus to the table when an empty area of the header row is clicked.
+        // This ensures the user knows that the table has focus.
+        setOnMousePressed(e -> {
+            skin.getSkinnable().requestFocus();
+        });
+
+        // build the corner region button for showing the popup menu
+        final StackPane image = new StackPane();
+        image.setSnapToPixel(false);
+        image.getStyleClass().setAll("show-hide-column-image");
+        cornerRegion = new StackPane() {
+            @Override protected void layoutChildren() {
+                double imageWidth = image.snappedLeftInset() + image.snappedRightInset();
+                double imageHeight = image.snappedTopInset() + image.snappedBottomInset();
+                
+                image.resize(imageWidth, imageHeight);
+                positionInArea(image, 0, 0, getWidth(), getHeight() - 3, 
+                        0, HPos.CENTER, VPos.CENTER);
+            }
+        };
+        cornerRegion.getStyleClass().setAll("show-hide-columns-button");
+        cornerRegion.getChildren().addAll(image);
+        cornerRegion.setVisible(tableSkin.tableMenuButtonVisibleProperty().get());
+        tableSkin.tableMenuButtonVisibleProperty().addListener(valueModel -> {
+            cornerRegion.setVisible(tableSkin.tableMenuButtonVisibleProperty().get());
+            requestLayout();
+        });
+        cornerRegion.setOnMousePressed(me -> {
+            // show a popupMenu which lists all columns
+            columnPopupMenu.show(cornerRegion, Side.BOTTOM, 0, 0);
+            me.consume();
+        });
+
+        // the actual header
+        // the region that is anchored above the vertical scrollbar
+        // a 'ghost' of the header being dragged by the user to force column
+        // reordering
+        getChildren().addAll(filler, rootHeader, cornerRegion, dragHeader);
+    }
+    
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    // --- reordering
+    private BooleanProperty reordering = new SimpleBooleanProperty(this, "reordering", false) {
+        @Override protected void invalidated() {
+            TableColumnHeader r = getReorderingRegion();
+            if (r != null) {
+                double dragHeaderHeight = r.getNestedColumnHeader() != null ?
+                        r.getNestedColumnHeader().getHeight() :
+                        getReorderingRegion().getHeight();
+
+                dragHeader.resize(dragHeader.getWidth(), dragHeaderHeight);
+                dragHeader.setTranslateY(getHeight() - dragHeaderHeight);
+            }
+            dragHeader.setVisible(isReordering());
+        }
+    };
+    final void setReordering(boolean value) {
+        this.reordering.set(value);
+    }
+    final boolean isReordering() {
+        return reordering.get();
+    }
+    final BooleanProperty reorderingProperty() {
+        return reordering;
+    }
+
+    // --- root header
+    /*
+     * The header row is actually just one NestedTableColumnHeader that spans
+     * the entire width. Nested within this is the TableColumnHeader's and
+     * NestedTableColumnHeader's, as necessary. This makes it nice and clean
+     * to handle column reordering - we basically enforce the rule that column
+     * reordering only occurs within a single NestedTableColumnHeader, and only
+     * at that level.
+     */
+    private ReadOnlyObjectWrapper<NestedTableColumnHeader> rootHeader = new ReadOnlyObjectWrapper<>(this, "rootHeader");
+    private final ReadOnlyObjectProperty<NestedTableColumnHeader> rootHeaderProperty() {
+        return rootHeader.getReadOnlyProperty();
+    }
+    final NestedTableColumnHeader getRootHeader() {
+        return rootHeader.get();
+    }
+    private final void setRootHeader(NestedTableColumnHeader value) {
+        rootHeader.set(value);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren() {
+        double x = scrollX;
+        double headerWidth = snapSize(getRootHeader().prefWidth(-1));
+        double prefHeight = getHeight() - snappedTopInset() - snappedBottomInset();
+        double cornerWidth = snapSize(flow.getVbar().prefWidth(-1));
+
+        // position the main nested header
+        getRootHeader().resizeRelocate(x, snappedTopInset(), headerWidth, prefHeight);
+        
+        // position the filler region
+        final Control control = tableSkin.getSkinnable();
+        if (control == null) {
+            return;
+        }
+
+        final double controlInsets = control.snappedLeftInset() + control.snappedRightInset();
+        double fillerWidth = tableWidth - headerWidth + filler.getInsets().getLeft() - controlInsets;
+        fillerWidth -= tableSkin.tableMenuButtonVisibleProperty().get() ? cornerWidth : 0;
+        filler.setVisible(fillerWidth > 0);
+        if (fillerWidth > 0) {
+            filler.resizeRelocate(x + headerWidth, snappedTopInset(), fillerWidth, prefHeight);
+        }
+
+        // position the top-right rectangle (which sits above the scrollbar)
+        cornerRegion.resizeRelocate(tableWidth - cornerWidth, snappedTopInset(), cornerWidth, prefHeight);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height) {
+        return getRootHeader().prefWidth(height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width) {
+        return computePrefHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width) {
+        // we hardcode 24.0 here to avoid RT-37616, where the
+        // entire header row would disappear when all columns were hidden. 
+        double headerPrefHeight = getRootHeader().prefHeight(width);
+        headerPrefHeight = headerPrefHeight == 0.0 ? 24.0 : headerPrefHeight;
+        return snappedTopInset() + headerPrefHeight + snappedBottomInset();
+    }
+
+    // used to be protected to allow subclasses to modify the horizontal scrolling,
+    // but made private again for JDK 9
+    void updateScrollX() {
+        scrollX = flow.getHbar().isVisible() ? -flow.getHbar().getValue() : 0.0F;
+        requestLayout();
+
+        // Fix for RT-36392: without this call even though we call requestLayout()
+        // we don't seem to ever see the layoutChildren() method above called,
+        // which means the layout is not always updated to use the latest scrollX.
+        layout();
+    }
+
+    // used to be protected to allow subclass to customise the width, to allow for features
+    // such as row headers, but made private again for JDK 9
+    private void updateTableWidth() {
+        // snapping added for RT-19428
+        final Control c = tableSkin.getSkinnable();
+        if (c == null) {
+            this.tableWidth = 0;
+        } else {
+            Insets insets = c.getInsets() == null ? Insets.EMPTY : c.getInsets();
+            double padding = snapSize(insets.getLeft()) + snapSize(insets.getRight());
+            this.tableWidth = snapSize(c.getWidth()) - padding;
+        }
+
+        clip.setWidth(tableWidth);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    TableColumnHeader getReorderingRegion() {
+        return reorderingRegion;
+    }
+
+    void setReorderingColumn(TableColumnBase rc) {
+        dragHeaderLabel.setText(rc == null ? "" : rc.getText());
+    }
+
+    void setReorderingRegion(TableColumnHeader reorderingRegion) {
+        this.reorderingRegion = reorderingRegion;
+
+        if (reorderingRegion != null) {
+            dragHeader.resize(reorderingRegion.getWidth(), dragHeader.getHeight());
+        }
+    }
+
+    void setDragHeaderX(double dragHeaderX) {
+        dragHeader.setTranslateX(dragHeaderX);
+    }
+
+    TableColumnHeader getColumnHeaderFor(final TableColumnBase<?,?> col) {
+        if (col == null) return null;
+        List<TableColumnBase<?,?>> columnChain = new ArrayList<>();
+        columnChain.add(col);
+
+        TableColumnBase<?,?> parent = col.getParentColumn();
+        while (parent != null) {
+            columnChain.add(0, parent);
+            parent = parent.getParentColumn();
+        }
+
+        // we now have a list from top to bottom of a nested column hierarchy,
+        // and we can now navigate down to retrieve the header with ease
+        TableColumnHeader currentHeader = getRootHeader();
+        for (int depth = 0; depth < columnChain.size(); depth++) {
+            // this is the column we are looking for at this depth
+            TableColumnBase<?,?> column = columnChain.get(depth);
+
+            // and now we iterate through the nested table column header at this
+            // level to get the header
+            currentHeader = getColumnHeaderFor(column, currentHeader);
+        }
+        return currentHeader;
+    }
+
+    private TableColumnHeader getColumnHeaderFor(final TableColumnBase<?,?> col, TableColumnHeader currentHeader) {
+        if (currentHeader instanceof NestedTableColumnHeader) {
+            List<TableColumnHeader> headers = ((NestedTableColumnHeader)currentHeader).getColumnHeaders();
+
+            for (int i = 0; i < headers.size(); i++) {
+                TableColumnHeader header = headers.get(i);
+                if (header.getTableColumn() == col) {
+                    return header;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private void updateTableColumnListeners(List<? extends TableColumnBase<?,?>> added, List<? extends TableColumnBase<?,?>> removed) {
+        // remove binding from all removed items
+        for (TableColumnBase tc : removed) {
+            remove(tc);
+        }
+
+        rebuildColumnMenu();
+    }
+
+    private void remove(TableColumnBase<?,?> col) {
+        if (col == null) return;
+
+        CheckMenuItem item = columnMenuItems.remove(col);
+        if (item != null) {
+            col.textProperty().removeListener(weakColumnTextListener);
+            item.selectedProperty().unbindBidirectional(col.visibleProperty());
+
+            columnPopupMenu.getItems().remove(item);
+        }
+
+        if (! col.getColumns().isEmpty()) {
+            for (TableColumnBase tc : col.getColumns()) {
+                remove(tc);
+            }
+        }
+    }
+
+    private void rebuildColumnMenu() {
+        columnPopupMenu.getItems().clear();
+
+        for (TableColumnBase<?,?> col : tableSkin.getColumns()) {
+            // we only create menu items for leaf columns, visible or not
+            if (col.getColumns().isEmpty()) {
+                createMenuItem(col);
+            } else {
+                List<TableColumnBase<?,?>> leafColumns = getLeafColumns(col);
+                for (TableColumnBase<?,?> _col : leafColumns) {
+                    createMenuItem(_col);
+                }
+            }
+        }
+    }
+
+    private List<TableColumnBase<?,?>> getLeafColumns(TableColumnBase<?,?> col) {
+        List<TableColumnBase<?,?>> leafColumns = new ArrayList<>();
+
+        for (TableColumnBase<?,?> _col : col.getColumns()) {
+            if (_col.getColumns().isEmpty()) {
+                leafColumns.add(_col);
+            } else {
+                leafColumns.addAll(getLeafColumns(_col));
+            }
+        }
+
+        return leafColumns;
+    }
+
+    private void createMenuItem(TableColumnBase<?,?> col) {
+        CheckMenuItem item = columnMenuItems.get(col);
+        if (item == null) {
+            item = new CheckMenuItem();
+            columnMenuItems.put(col, item);
+        }
+
+        // bind column text and isVisible so that the menu item is always correct
+        item.setText(getText(col.getText(), col));
+        col.textProperty().addListener(weakColumnTextListener);
+        item.selectedProperty().bindBidirectional(col.visibleProperty());
+
+        columnPopupMenu.getItems().add(item);
+    }
+
+    /*
+     * Function used for building the strings in the popup menu
+     */
+    private String getText(String text, TableColumnBase col) {
+        String s = text;
+        TableColumnBase parentCol = col.getParentColumn();
+        while (parentCol != null) {
+            if (isColumnVisibleInHeader(parentCol, tableSkin.getColumns())) {
+                s = parentCol.getText() + MENU_SEPARATOR + s;
+            }
+            parentCol = parentCol.getParentColumn();
+        }
+        return s;
+    }
+    
+    // We need to show strings properly. If a column has a parent column which is
+    // not inserted into the TableView columns list, it effectively doesn't have
+    // a parent column from the users perspective. As such, we shouldn't include
+    // the parent column text in the menu. Fixes RT-14482.
+    private boolean isColumnVisibleInHeader(TableColumnBase col, List columns) {
+        if (col == null) return false;
+        
+        for (int i = 0; i < columns.size(); i++) {
+            TableColumnBase column = (TableColumnBase) columns.get(i);
+            if (col.equals(column)) return true;
+            
+            if (! column.getColumns().isEmpty()) {
+                boolean isVisible = isColumnVisibleInHeader(col, column.getColumns());
+                if (isVisible) return true;
+            }
+        }
+        
+        return false;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableRowSkin.java	2015-09-03 15:22:51.286427700 -0700
+++ /dev/null	2015-09-03 15:22:52.000000000 -0700
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 java.util.ArrayList;
-import java.util.List;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.scene.control.TableCell;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TablePosition;
-import javafx.scene.control.TableRow;
-import javafx.scene.control.TableView;
-
-import com.sun.javafx.scene.control.behavior.CellBehaviorBase;
-import com.sun.javafx.scene.control.behavior.TableRowBehavior;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.Control;
-import javafx.scene.control.TableColumnBase;
-import javafx.scene.control.TableView.TableViewFocusModel;
-
-/**
- */
-public class TableRowSkin<T> extends TableRowSkinBase<T, TableRow<T>, CellBehaviorBase<TableRow<T>>, TableCell<T,?>> {
-
-    private TableView<T> tableView;
-    private TableViewSkin<T> tableViewSkin;
-    
-    public TableRowSkin(TableRow<T> tableRow) {
-        super(tableRow, new TableRowBehavior<T>(tableRow));
-        
-        this.tableView = tableRow.getTableView();
-        updateTableViewSkin();
-        
-        super.init(tableRow);
-
-        registerChangeListener(tableRow.tableViewProperty(), "TABLE_VIEW");
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("TABLE_VIEW".equals(p)) {
-            updateTableViewSkin();
-            
-            for (int i = 0, max = cells.size(); i < max; i++) {
-                Node n = cells.get(i);
-                if (n instanceof TableCell) {
-                    ((TableCell)n).updateTableView(getSkinnable().getTableView());
-                }
-            }
-            
-            this.tableView = getSkinnable().getTableView();
-        }
-    }
-    
-    @Override protected TableCell<T, ?> getCell(TableColumnBase tcb) {
-        TableColumn tableColumn = (TableColumn<T,?>) tcb;
-        TableCell cell = (TableCell) tableColumn.getCellFactory().call(tableColumn);
-
-        // we set it's TableColumn, TableView and TableRow
-        cell.updateTableColumn(tableColumn);
-        cell.updateTableView(tableColumn.getTableView());
-        cell.updateTableRow(getSkinnable());
-        
-        return cell;
-    }
-
-    @Override protected ObservableList<TableColumn<T, ?>> getVisibleLeafColumns() {
-        return tableView.getVisibleLeafColumns();
-    }
-
-    @Override protected void updateCell(TableCell<T, ?> cell, TableRow<T> row) {
-        cell.updateTableRow(row);
-    }
-
-    @Override protected DoubleProperty fixedCellSizeProperty() {
-        return tableView.fixedCellSizeProperty();
-    }
-
-    @Override protected boolean isColumnPartiallyOrFullyVisible(TableColumnBase tc) {
-        return tableViewSkin == null ? false : tableViewSkin.isColumnPartiallyOrFullyVisible((TableColumn)tc);
-    }
-
-    @Override protected TableColumn<T, ?> getTableColumnBase(TableCell<T, ?> cell) {
-        return cell.getTableColumn();
-    }
-
-    @Override protected ObjectProperty<Node> graphicProperty() {
-        return null;
-    }
-
-    @Override protected Control getVirtualFlowOwner() {
-        return getSkinnable().getTableView();
-    }
-    
-    private void updateTableViewSkin() {
-        TableView<T> tableView = getSkinnable().getTableView();
-        if (tableView.getSkin() instanceof TableViewSkin) {
-            tableViewSkin = (TableViewSkin)tableView.getSkin();
-        }
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case SELECTED_ITEMS: {
-                // FIXME this could be optimised to iterate over cellsMap only
-                // (selectedCells could be big, cellsMap is much smaller)
-                List<Node> selection = new ArrayList<>();
-                int index = getSkinnable().getIndex();
-                for (TablePosition<T,?> pos : tableView.getSelectionModel().getSelectedCells()) {
-                    if (pos.getRow() == index) {
-                        TableColumn<T,?> column = pos.getTableColumn();
-                        if (column == null) {
-                            /* This is the row-based case */
-                            column = tableView.getVisibleLeafColumn(0);
-                        }
-                        TableCell<T,?> cell = cellsMap.get(column).get();
-                        if (cell != null) selection.add(cell);
-                    }
-                    return FXCollections.observableArrayList(selection);
-                }
-            }
-            case CELL_AT_ROW_COLUMN: {
-                int colIndex = (Integer)parameters[1];
-                TableColumn<T,?> column = tableView.getVisibleLeafColumn(colIndex);
-                if (cellsMap.containsKey(column)) {
-                    return cellsMap.get(column).get();
-                }
-                return null;
-            }
-            case FOCUS_ITEM: {
-                TableViewFocusModel<T> fm = tableView.getFocusModel();
-                TablePosition<T,?> focusedCell = fm.getFocusedCell();
-                TableColumn<T,?> column = focusedCell.getTableColumn();
-                if (column == null) {
-                    /* This is the row-based case */
-                    column = tableView.getVisibleLeafColumn(0);
-                }
-                if (cellsMap.containsKey(column)) {
-                    return cellsMap.get(column).get();
-                }
-                return null;
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:22:52.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableRowSkin.java	2015-09-03 15:22:50.512383400 -0700
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2011, 2015, 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 java.util.ArrayList;
+import java.util.List;
+
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.property.DoubleProperty;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TablePosition;
+import javafx.scene.control.TableRow;
+import javafx.scene.control.TableView;
+
+import com.sun.javafx.scene.control.behavior.TableRowBehavior;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.TableColumnBase;
+import javafx.scene.control.TableView.TableViewFocusModel;
+
+/**
+ * Default skin implementation for the {@link TableRow} control.
+ *
+ * @see TableRow
+ * @since 9
+ */
+public class TableRowSkin<T> extends TableRowSkinBase<T, TableRow<T>, TableCell<T,?>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private TableViewSkin<T> tableViewSkin;
+    private final BehaviorBase<TableRow<T>> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TableRowSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TableRowSkin(TableRow<T> control) {
+        super(control);
+
+        // install default input map for the TableRow control
+        behavior = new TableRowBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+        
+        updateTableViewSkin();
+
+        registerChangeListener(control.tableViewProperty(), e -> {
+            updateTableViewSkin();
+
+            for (int i = 0, max = cells.size(); i < max; i++) {
+                Node n = cells.get(i);
+                if (n instanceof TableCell) {
+                    ((TableCell)n).updateTableView(getSkinnable().getTableView());
+                }
+            }
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case SELECTED_ITEMS: {
+                // FIXME this could be optimised to iterate over cellsMap only
+                // (selectedCells could be big, cellsMap is much smaller)
+                List<Node> selection = new ArrayList<>();
+                int index = getSkinnable().getIndex();
+                for (TablePosition<T,?> pos : getVirtualFlowOwner().getSelectionModel().getSelectedCells()) {
+                    if (pos.getRow() == index) {
+                        TableColumn<T,?> column = pos.getTableColumn();
+                        if (column == null) {
+                            /* This is the row-based case */
+                            column = getVirtualFlowOwner().getVisibleLeafColumn(0);
+                        }
+                        TableCell<T,?> cell = cellsMap.get(column).get();
+                        if (cell != null) selection.add(cell);
+                    }
+                    return FXCollections.observableArrayList(selection);
+                }
+            }
+            case CELL_AT_ROW_COLUMN: {
+                int colIndex = (Integer)parameters[1];
+                TableColumn<T,?> column = getVirtualFlowOwner().getVisibleLeafColumn(colIndex);
+                if (cellsMap.containsKey(column)) {
+                    return cellsMap.get(column).get();
+                }
+                return null;
+            }
+            case FOCUS_ITEM: {
+                TableViewFocusModel<T> fm = getVirtualFlowOwner().getFocusModel();
+                TablePosition<T,?> focusedCell = fm.getFocusedCell();
+                TableColumn<T,?> column = focusedCell.getTableColumn();
+                if (column == null) {
+                    /* This is the row-based case */
+                    column = getVirtualFlowOwner().getVisibleLeafColumn(0);
+                }
+                if (cellsMap.containsKey(column)) {
+                    return cellsMap.get(column).get();
+                }
+                return null;
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override TableCell<T, ?> getCell(TableColumnBase tcb) {
+        TableColumn tableColumn = (TableColumn<T,?>) tcb;
+        TableCell cell = (TableCell) tableColumn.getCellFactory().call(tableColumn);
+
+        // we set it's TableColumn, TableView and TableRow
+        cell.updateTableColumn(tableColumn);
+        cell.updateTableView(tableColumn.getTableView());
+        cell.updateTableRow(getSkinnable());
+        
+        return cell;
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TableColumn<T, ?>> getVisibleLeafColumns() {
+        return getVirtualFlowOwner().getVisibleLeafColumns();
+    }
+
+    /** {@inheritDoc} */
+    @Override void updateCell(TableCell<T, ?> cell, TableRow<T> row) {
+        cell.updateTableRow(row);
+    }
+
+    /** {@inheritDoc} */
+    @Override DoubleProperty fixedCellSizeProperty() {
+        return getVirtualFlowOwner().fixedCellSizeProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override boolean isColumnPartiallyOrFullyVisible(TableColumnBase tc) {
+        return tableViewSkin == null ? false : tableViewSkin.isColumnPartiallyOrFullyVisible((TableColumn)tc);
+    }
+
+    /** {@inheritDoc} */
+    @Override TableColumn<T, ?> getTableColumnBase(TableCell<T, ?> cell) {
+        return cell.getTableColumn();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Node> graphicProperty() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override TableView<T> getVirtualFlowOwner() {
+        return getSkinnable().getTableView();
+    }
+
+    private void updateTableViewSkin() {
+        TableView<T> tableView = getSkinnable().getTableView();
+        if (tableView.getSkin() instanceof TableViewSkin) {
+            tableViewSkin = (TableViewSkin)tableView.getSkin();
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableRowSkinBase.java	2015-09-03 15:22:59.484896600 -0700
+++ /dev/null	2015-09-03 15:23:00.000000000 -0700
@@ -1,731 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import com.sun.javafx.PlatformUtil;
-import javafx.animation.FadeTransition;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.WeakListChangeListener;
-import javafx.css.StyleOrigin;
-import javafx.css.StyleableObjectProperty;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.control.Control;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.TableColumnBase;
-import javafx.util.Duration;
-
-import com.sun.javafx.scene.control.behavior.CellBehaviorBase;
-import com.sun.javafx.tk.Toolkit;
-
-public abstract class TableRowSkinBase<T,
-                                       C extends IndexedCell/*<T>*/,
-                                       B extends CellBehaviorBase<C>,
-                                       R extends IndexedCell> extends CellSkinBase<C,B> {
-
-    /***************************************************************************
-     *                                                                         *
-     * Static Fields                                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    // There appears to be a memory leak when using the stub toolkit. Therefore,
-    // to prevent tests from failing we disable the animations below when the
-    // stub toolkit is being used.
-    // Filed as RT-29163.
-    private static boolean IS_STUB_TOOLKIT = Toolkit.getToolkit().toString().contains("StubToolkit");
-
-    // lets save the CPU and not do animations when on embedded platforms
-    private static boolean DO_ANIMATIONS = ! IS_STUB_TOOLKIT && ! PlatformUtil.isEmbedded();
-
-    private static final Duration FADE_DURATION = Duration.millis(200);
-
-    /*
-     * This is rather hacky - but it is a quick workaround to resolve the
-     * issue that we don't know maximum width of a disclosure node for a given
-     * TreeView. If we don't know the maximum width, we have no way to ensure
-     * consistent indentation for a given TreeView.
-     *
-     * To work around this, we create a single WeakHashMap to store a max
-     * disclosureNode width per TreeView. We use WeakHashMap to help prevent
-     * any memory leaks.
-     */
-    static final Map<Control, Double> maxDisclosureWidthMap = new WeakHashMap<Control, Double>();
-
-    // Specifies the number of times we will call 'recreateCells()' before we blow
-    // out the cellsMap structure and rebuild all cells. This helps to prevent
-    // against memory leaks in certain extreme circumstances.
-    private static final int DEFAULT_FULL_REFRESH_COUNTER = 100;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    /*
-     * A map that maps from TableColumn to TableCell (i.e. model to view).
-     * This is recreated whenever the leaf columns change, however to increase
-     * efficiency we create cells for all columns, even if they aren't visible,
-     * and we only create new cells if we don't already have it cached in this
-     * map.
-     *
-     * Note that this means that it is possible for this map to therefore be
-     * a memory leak if an application uses TableView and is creating and removing
-     * a large number of tableColumns. This is mitigated in the recreateCells()
-     * function below - refer to that to learn more.
-     */
-    protected WeakHashMap<TableColumnBase, Reference<R>> cellsMap;
-
-    // This observableArrayList contains the currently visible table cells for this row.
-    protected final List<R> cells = new ArrayList<R>();
-
-    private int fullRefreshCounter = DEFAULT_FULL_REFRESH_COUNTER;
-
-    protected boolean isDirty = false;
-    protected boolean updateCells = false;
-
-    private double fixedCellSize;
-    private boolean fixedCellSizeEnabled;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public TableRowSkinBase(C control, B behavior) {
-        super(control, behavior);
-
-        // init(control) should not be called here - it should be called by the
-        // subclass after initialising itself. This is to prevent NPEs (for
-        // example, getVisibleLeafColumns() throws a NPE as the control itself
-        // is not yet set in subclasses).
-    }
-
-    // init isn't a constructor, but it is part of the initialisation routine
-    protected void init(C control) {
-        getSkinnable().setPickOnBounds(false);
-
-        recreateCells();
-        updateCells(true);
-
-        // init bindings
-        // watches for any change in the leaf columns observableArrayList - this will indicate
-        // that the column order has changed and that we should update the row
-        // such that the cells are in the new order
-        getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
-        // --- end init bindings
-
-
-        // use invalidation listener here to update even when item equality is true
-        // (e.g. see RT-22463)
-        control.itemProperty().addListener(o -> requestCellUpdate());
-        registerChangeListener(control.indexProperty(), "INDEX");
-
-        if (fixedCellSizeProperty() != null) {
-            registerChangeListener(fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-            fixedCellSize = fixedCellSizeProperty().get();
-            fixedCellSizeEnabled = fixedCellSize > 0;
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-
-    private ListChangeListener<TableColumnBase> visibleLeafColumnsListener = c -> {
-        isDirty = true;
-        getSkinnable().requestLayout();
-    };
-
-    private WeakListChangeListener<TableColumnBase> weakVisibleLeafColumnsListener =
-            new WeakListChangeListener<TableColumnBase>(visibleLeafColumnsListener);
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Abstract Methods                                                        *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Returns the graphic to draw on the inside of the disclosure node. Null
-     * is acceptable when no graphic should be shown. Commonly this is the
-     * graphic associated with a TreeItem (i.e. treeItem.getGraphic()), rather
-     * than a graphic associated with a cell.
-     */
-    protected abstract ObjectProperty<Node> graphicProperty();
-
-    // return TableView / TreeTableView / etc
-    protected abstract Control getVirtualFlowOwner();
-
-    protected abstract ObservableList<? extends TableColumnBase/*<T,?>*/> getVisibleLeafColumns();
-
-    // cell.updateTableRow(skinnable); (i.e cell.updateTableRow(row))
-    protected abstract void updateCell(R cell, C row);
-
-    protected abstract DoubleProperty fixedCellSizeProperty();
-
-    protected abstract boolean isColumnPartiallyOrFullyVisible(TableColumnBase tc);
-
-    protected abstract R getCell(TableColumnBase tc);
-
-    protected abstract TableColumnBase<T,?> getTableColumnBase(R cell);
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Public Methods                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("INDEX".equals(p)) {
-            // Fix for RT-36661, where empty table cells were showing content, as they
-            // had incorrect table cell indices (but the table row index was correct).
-            // Note that we only do the update on empty cells to avoid the issue
-            // noted below in requestCellUpdate().
-            if (getSkinnable().isEmpty()) {
-                requestCellUpdate();
-            }
-        } else if ("FIXED_CELL_SIZE".equals(p)) {
-            fixedCellSize = fixedCellSizeProperty().get();
-            fixedCellSizeEnabled = fixedCellSize > 0;
-        }
-    }
-
-    @Override protected void layoutChildren(double x, final double y, final double w, final double h) {
-        checkState();
-        if (cellsMap.isEmpty()) return;
-
-        ObservableList<? extends TableColumnBase> visibleLeafColumns = getVisibleLeafColumns();
-        if (visibleLeafColumns.isEmpty()) {
-            super.layoutChildren(x,y,w,h);
-            return;
-        }
-
-        C control = getSkinnable();
-
-        ///////////////////////////////////////////
-        // indentation code starts here
-        ///////////////////////////////////////////
-        double leftMargin = 0;
-        double disclosureWidth = 0;
-        double graphicWidth = 0;
-        boolean indentationRequired = isIndentationRequired();
-        boolean disclosureVisible = isDisclosureNodeVisible();
-        int indentationColumnIndex = 0;
-        Node disclosureNode = null;
-        if (indentationRequired) {
-            // Determine the column in which we want to put the disclosure node.
-            // By default it is null, which means the 0th column should be
-            // where the indentation occurs.
-            TableColumnBase<?,?> treeColumn = getTreeColumn();
-            indentationColumnIndex = treeColumn == null ? 0 : visibleLeafColumns.indexOf(treeColumn);
-            indentationColumnIndex = indentationColumnIndex < 0 ? 0 : indentationColumnIndex;
-
-            int indentationLevel = getIndentationLevel(control);
-            if (! isShowRoot()) indentationLevel--;
-            final double indentationPerLevel = getIndentationPerLevel();
-            leftMargin = indentationLevel * indentationPerLevel;
-
-            // position the disclosure node so that it is at the proper indent
-            Control c = getVirtualFlowOwner();
-            final double defaultDisclosureWidth = maxDisclosureWidthMap.containsKey(c) ?
-                maxDisclosureWidthMap.get(c) : 0;
-            disclosureWidth = defaultDisclosureWidth;
-
-            disclosureNode = getDisclosureNode();
-            if (disclosureNode != null) {
-                disclosureNode.setVisible(disclosureVisible);
-
-                if (disclosureVisible) {
-                    disclosureWidth = disclosureNode.prefWidth(h);
-                    if (disclosureWidth > defaultDisclosureWidth) {
-                        maxDisclosureWidthMap.put(c, disclosureWidth);
-
-                        // RT-36359: The recorded max width of the disclosure node
-                        // has increased. We need to go back and request all
-                        // earlier rows to update themselves to take into account
-                        // this increased indentation.
-                        final VirtualFlow<C> flow = getVirtualFlow();
-                        final int thisIndex = getSkinnable().getIndex();
-                        for (int i = 0; i < flow.cells.size(); i++) {
-                            C cell = flow.cells.get(i);
-                            if (cell == null || cell.isEmpty()) continue;
-                            cell.requestLayout();
-                            cell.layout();
-                        }
-                    }
-                }
-            }
-        }
-        ///////////////////////////////////////////
-        // indentation code ends here
-        ///////////////////////////////////////////
-
-        // layout the individual column cells
-        double width;
-        double height;
-
-        final double verticalPadding = snappedTopInset() + snappedBottomInset();
-        final double horizontalPadding = snappedLeftInset() + snappedRightInset();
-        final double controlHeight = control.getHeight();
-
-        /**
-         * RT-26743:TreeTableView: Vertical Line looks unfinished.
-         * We used to not do layout on cells whose row exceeded the number
-         * of items, but now we do so as to ensure we get vertical lines
-         * where expected in cases where the vertical height exceeds the
-         * number of items.
-         */
-        int index = control.getIndex();
-        if (index < 0/* || row >= itemsProperty().get().size()*/) return;
-
-        for (int column = 0, max = cells.size(); column < max; column++) {
-            R tableCell = cells.get(column);
-            TableColumnBase<T, ?> tableColumn = getTableColumnBase(tableCell);
-
-            boolean isVisible = true;
-            if (fixedCellSizeEnabled) {
-                // we determine if the cell is visible, and if not we have the
-                // ability to take it out of the scenegraph to help improve
-                // performance. However, we only do this when there is a
-                // fixed cell length specified in the TableView. This is because
-                // when we have a fixed cell length it is possible to know with
-                // certainty the height of each TableCell - it is the fixed value
-                // provided by the developer, and this means that we do not have
-                // to concern ourselves with the possibility that the height
-                // may be variable and / or dynamic.
-                isVisible = isColumnPartiallyOrFullyVisible(tableColumn);
-
-                height = fixedCellSize;
-            } else {
-                height = Math.max(controlHeight, tableCell.prefHeight(-1));
-                height = snapSize(height) - snapSize(verticalPadding);
-            }
-
-            if (isVisible) {
-                if (fixedCellSizeEnabled && tableCell.getParent() == null) {
-                    getChildren().add(tableCell);
-                }
-
-                width = snapSize(tableCell.prefWidth(-1)) - snapSize(horizontalPadding);
-
-                // Added for RT-32700, and then updated for RT-34074.
-                // We change the alignment from CENTER_LEFT to TOP_LEFT if the
-                // height of the row is greater than the default size, and if
-                // the alignment is the default alignment.
-                // What I would rather do is only change the alignment if the
-                // alignment has not been manually changed, but for now this will
-                // do.
-                final boolean centreContent = h <= 24.0;
-
-                // if the style origin is null then the property has not been
-                // set (or it has been reset to its default), which means that
-                // we can set it without overwriting someone elses settings.
-                final StyleOrigin origin = ((StyleableObjectProperty<?>) tableCell.alignmentProperty()).getStyleOrigin();
-                if (! centreContent && origin == null) {
-                    tableCell.setAlignment(Pos.TOP_LEFT);
-                }
-                // --- end of RT-32700 fix
-
-                ///////////////////////////////////////////
-                // further indentation code starts here
-                ///////////////////////////////////////////
-                if (indentationRequired && column == indentationColumnIndex) {
-                    if (disclosureVisible) {
-                        double ph = disclosureNode.prefHeight(disclosureWidth);
-
-                        if (width > 0 && width < (disclosureWidth + leftMargin)) {
-                            fadeOut(disclosureNode);
-                        } else {
-                            fadeIn(disclosureNode);
-                            disclosureNode.resize(disclosureWidth, ph);
-
-                            disclosureNode.relocate(x + leftMargin,
-                                    centreContent ? (h / 2.0 - ph / 2.0) :
-                                            (y + tableCell.getPadding().getTop()));
-                            disclosureNode.toFront();
-                        }
-                    }
-
-                    // determine starting point of the graphic or cell node, and the
-                    // remaining width available to them
-                    ObjectProperty<Node> graphicProperty = graphicProperty();
-                    Node graphic = graphicProperty == null ? null : graphicProperty.get();
-
-                    if (graphic != null) {
-                        graphicWidth = graphic.prefWidth(-1) + 3;
-                        double ph = graphic.prefHeight(graphicWidth);
-
-                        if (width > 0 && width < disclosureWidth + leftMargin + graphicWidth) {
-                            fadeOut(graphic);
-                        } else {
-                            fadeIn(graphic);
-
-                            graphic.relocate(x + leftMargin + disclosureWidth,
-                                    centreContent ? (h / 2.0 - ph / 2.0) :
-                                            (y + tableCell.getPadding().getTop()));
-
-                            graphic.toFront();
-                        }
-                    }
-                }
-                ///////////////////////////////////////////
-                // further indentation code ends here
-                ///////////////////////////////////////////
-
-                tableCell.resize(width, height);
-                tableCell.relocate(x, snappedTopInset());
-
-                // Request layout is here as (partial) fix for RT-28684.
-                // This does not appear to impact performance...
-                tableCell.requestLayout();
-            } else {
-                if (fixedCellSizeEnabled) {
-                    // we only add/remove to the scenegraph if the fixed cell
-                    // length support is enabled - otherwise we keep all
-                    // TableCells in the scenegraph
-                    getChildren().remove(tableCell);
-                }
-
-                width = snapSize(tableCell.prefWidth(-1)) - snapSize(horizontalPadding);
-            }
-
-            x += width;
-        }
-    }
-
-    protected int getIndentationLevel(C control) {
-        return 0;
-    }
-
-    protected double getIndentationPerLevel() {
-        return 0;
-    }
-
-    /**
-     * Used to represent whether the current virtual flow owner is wanting
-     * indentation to be used in this table row.
-     */
-    protected boolean isIndentationRequired() {
-        return false;
-    }
-
-    /**
-     * Returns the table column that should show the disclosure nodes and / or
-     * a graphic. By default this is the left-most column.
-     */
-    protected TableColumnBase getTreeColumn() {
-        return null;
-    }
-
-    protected Node getDisclosureNode() {
-        return null;
-    }
-
-    /**
-     * Used to represent whether a disclosure node is visible for _this_
-     * table row. Not to be confused with isIndentationRequired(), which is the
-     * more general API.
-     */
-    protected boolean isDisclosureNodeVisible() {
-        return false;
-    }
-
-    protected boolean isShowRoot() {
-        return true;
-    }
-
-    protected TableColumnBase<T,?> getVisibleLeafColumn(int column) {
-        final List<? extends TableColumnBase/*<T,?>*/> visibleLeafColumns = getVisibleLeafColumns();
-        if (column < 0 || column >= visibleLeafColumns.size()) return null;
-        return visibleLeafColumns.get(column);
-    }
-
-    protected void updateCells(boolean resetChildren) {
-        // To avoid a potential memory leak (when the TableColumns in the
-        // TableView are created/inserted/removed/deleted, we have a 'refresh
-        // counter' that when we reach 0 will delete all cells in this row
-        // and recreate all of them.
-        if (resetChildren) {
-            if (fullRefreshCounter == 0) {
-                recreateCells();
-            }
-            fullRefreshCounter--;
-        }
-
-        // if clear isn't called first, we can run into situations where the
-        // cells aren't updated properly.
-        final boolean cellsEmpty = cells.isEmpty();
-        cells.clear();
-
-        final C skinnable = getSkinnable();
-        final int skinnableIndex = skinnable.getIndex();
-        final List<? extends TableColumnBase/*<T,?>*/> visibleLeafColumns = getVisibleLeafColumns();
-
-        for (int i = 0, max = visibleLeafColumns.size(); i < max; i++) {
-            TableColumnBase<T,?> col = visibleLeafColumns.get(i);
-
-            R cell = null;
-            if (cellsMap.containsKey(col)) {
-                cell = cellsMap.get(col).get();
-
-                // the reference has been gc'd, remove key entry from map
-                if (cell == null) {
-                    cellsMap.remove(col);
-                }
-            }
-
-            if (cell == null) {
-                // if the cell is null it means we don't have it in cache and
-                // need to create it
-                cell = createCell(col);
-            }
-
-            updateCell(cell, skinnable);
-            cell.updateIndex(skinnableIndex);
-            cells.add(cell);
-        }
-
-        // update children of each row
-        if (!fixedCellSizeEnabled && (resetChildren || cellsEmpty)) {
-            getChildren().setAll(cells);
-        }
-    }
-
-    private VirtualFlow<C> getVirtualFlow() {
-        Parent p = getSkinnable();
-        while (p != null) {
-            if (p instanceof VirtualFlow) {
-                return (VirtualFlow<C>) p;
-            }
-            p = p.getParent();
-        }
-        return null;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double prefWidth = 0.0;
-
-        final List<? extends TableColumnBase/*<T,?>*/> visibleLeafColumns = getVisibleLeafColumns();
-        for (int i = 0, max = visibleLeafColumns.size(); i < max; i++) {
-            prefWidth += visibleLeafColumns.get(i).getWidth();
-        }
-
-        return prefWidth;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        // fix for RT-29080
-        checkState();
-
-        // Support for RT-18467: making it easier to specify a height for
-        // cells via CSS, where the desired height is less than the height
-        // of the TableCells. Essentially, -fx-cell-size is given higher
-        // precedence now
-        if (getCellSize() < CellSkinBase.DEFAULT_CELL_SIZE) {
-            return getCellSize();
-        }
-
-        // FIXME according to profiling, this method is slow and should
-        // be optimised
-        double prefHeight = 0.0f;
-        final int count = cells.size();
-        for (int i=0; i<count; i++) {
-            final R tableCell = cells.get(i);
-            prefHeight = Math.max(prefHeight, tableCell.prefHeight(-1));
-        }
-        double ph = Math.max(prefHeight, Math.max(getCellSize(), getSkinnable().minHeight(-1)));
-
-        return ph;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        // fix for RT-29080
-        checkState();
-
-        // Support for RT-18467: making it easier to specify a height for
-        // cells via CSS, where the desired height is less than the height
-        // of the TableCells. Essentially, -fx-cell-size is given higher
-        // precedence now
-        if (getCellSize() < CellSkinBase.DEFAULT_CELL_SIZE) {
-            return getCellSize();
-        }
-
-        // FIXME according to profiling, this method is slow and should
-        // be optimised
-        double minHeight = 0.0f;
-        final int count = cells.size();
-        for (int i = 0; i < count; i++) {
-            final R tableCell = cells.get(i);
-            minHeight = Math.max(minHeight, tableCell.minHeight(-1));
-        }
-        return minHeight;
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    // protected to allow subclasses to ensure a consistent state during layout
-    protected final void checkState() {
-        if (isDirty) {
-            updateCells(true);
-            isDirty = false;
-        } else if (updateCells) {
-            updateCells(false);
-            updateCells = false;
-        }
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    private void requestCellUpdate() {
-        updateCells = true;
-        getSkinnable().requestLayout();
-
-        // update the index of all children cells (RT-29849).
-        // Note that we do this after the TableRow item has been updated,
-        // rather than when the TableRow index has changed (as this will be
-        // before the row has updated its item). This will result in the
-        // issue highlighted in RT-33602, where the table cell had the correct
-        // item whilst the row had the old item.
-        final int newIndex = getSkinnable().getIndex();
-        for (int i = 0, max = cells.size(); i < max; i++) {
-            cells.get(i).updateIndex(newIndex);
-        }
-    }
-
-    private void recreateCells() {
-        if (cellsMap != null) {
-            Collection<Reference<R>> cells = cellsMap.values();
-            Iterator<Reference<R>> cellsIter = cells.iterator();
-            while (cellsIter.hasNext()) {
-                Reference<R> cellRef = cellsIter.next();
-                R cell = cellRef.get();
-                if (cell != null) {
-                    cell.updateIndex(-1);
-                    cell.getSkin().dispose();
-                    cell.setSkin(null);
-                }
-            }
-            cellsMap.clear();
-        }
-
-        ObservableList<? extends TableColumnBase/*<T,?>*/> columns = getVisibleLeafColumns();
-
-        cellsMap = new WeakHashMap<TableColumnBase, Reference<R>>(columns.size());
-        fullRefreshCounter = DEFAULT_FULL_REFRESH_COUNTER;
-        getChildren().clear();
-
-        for (TableColumnBase col : columns) {
-            if (cellsMap.containsKey(col)) {
-                continue;
-            }
-
-            // create a TableCell for this column and store it in the cellsMap
-            // for future use
-            createCell(col);
-        }
-    }
-
-    private R createCell(TableColumnBase col) {
-        // we must create a TableCell for this table column
-        R cell = getCell(col);
-
-        // and store this in our HashMap until needed
-        cellsMap.put(col, new WeakReference<R>(cell));
-
-        return cell;
-    }
-
-    private void fadeOut(final Node node) {
-        if (node.getOpacity() < 1.0) return;
-
-        if (! DO_ANIMATIONS) {
-            node.setOpacity(0);
-            return;
-        }
-
-        final FadeTransition fader = new FadeTransition(FADE_DURATION, node);
-        fader.setToValue(0.0);
-        fader.play();
-    }
-
-    private void fadeIn(final Node node) {
-        if (node.getOpacity() > 0.0) return;
-
-        if (! DO_ANIMATIONS) {
-            node.setOpacity(1);
-            return;
-        }
-
-        final FadeTransition fader = new FadeTransition(FADE_DURATION, node);
-        fader.setToValue(1.0);
-        fader.play();
-    }
-}
--- /dev/null	2015-09-03 15:23:00.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableRowSkinBase.java	2015-09-03 15:22:58.706852100 -0700
@@ -0,0 +1,738 @@
+/*
+ * Copyright (c) 2012, 2015, 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 java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.util.*;
+
+import com.sun.javafx.PlatformUtil;
+import javafx.animation.FadeTransition;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.WeakListChangeListener;
+import javafx.css.StyleOrigin;
+import javafx.css.StyleableObjectProperty;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.control.Control;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.TableColumnBase;
+import javafx.util.Duration;
+
+import com.sun.javafx.tk.Toolkit;
+
+/**
+ * TableRowSkinBase is the base skin class used by controls such as
+ * {@link javafx.scene.control.TableRow} and {@link javafx.scene.control.TreeTableRow}
+ * (the concrete classes are {@link TableRowSkin} and {@link TreeTableRowSkin},
+ * respectively).
+ *
+ * @param <T> The type of the cell (i.e. the generic type of the {@link IndexedCell} subclass).
+ * @param <C> The cell type (e.g. TableRow or TreeTableRow)
+ * @param <R> The type of cell that is contained within each row (e.g.
+ *           {@link javafx.scene.control.TableCell or {@link javafx.scene.control.TreeTableCell}}).
+ *
+ * @since 9
+ * @see javafx.scene.control.TableRow
+ * @see javafx.scene.control.TreeTableRow
+ * @see TableRowSkin
+ * @see TreeTableRowSkin
+ */
+public abstract class TableRowSkinBase<T,
+                                       C extends IndexedCell/*<T>*/,
+                                       R extends IndexedCell> extends CellSkinBase<C> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static Fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    // There appears to be a memory leak when using the stub toolkit. Therefore,
+    // to prevent tests from failing we disable the animations below when the
+    // stub toolkit is being used.
+    // Filed as RT-29163.
+    private static boolean IS_STUB_TOOLKIT = Toolkit.getToolkit().toString().contains("StubToolkit");
+
+    // lets save the CPU and not do animations when on embedded platforms
+    private static boolean DO_ANIMATIONS = ! IS_STUB_TOOLKIT && ! PlatformUtil.isEmbedded();
+
+    private static final Duration FADE_DURATION = Duration.millis(200);
+
+    /*
+     * This is rather hacky - but it is a quick workaround to resolve the
+     * issue that we don't know maximum width of a disclosure node for a given
+     * TreeView. If we don't know the maximum width, we have no way to ensure
+     * consistent indentation for a given TreeView.
+     *
+     * To work around this, we create a single WeakHashMap to store a max
+     * disclosureNode width per TreeView. We use WeakHashMap to help prevent
+     * any memory leaks.
+     */
+    static final Map<Control, Double> maxDisclosureWidthMap = new WeakHashMap<Control, Double>();
+
+    // Specifies the number of times we will call 'recreateCells()' before we blow
+    // out the cellsMap structure and rebuild all cells. This helps to prevent
+    // against memory leaks in certain extreme circumstances.
+    private static final int DEFAULT_FULL_REFRESH_COUNTER = 100;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /*
+     * A map that maps from TableColumn to TableCell (i.e. model to view).
+     * This is recreated whenever the leaf columns change, however to increase
+     * efficiency we create cells for all columns, even if they aren't visible,
+     * and we only create new cells if we don't already have it cached in this
+     * map.
+     *
+     * Note that this means that it is possible for this map to therefore be
+     * a memory leak if an application uses TableView and is creating and removing
+     * a large number of tableColumns. This is mitigated in the recreateCells()
+     * function below - refer to that to learn more.
+     */
+    WeakHashMap<TableColumnBase, Reference<R>> cellsMap;
+
+    // This observableArrayList contains the currently visible table cells for this row.
+    final List<R> cells = new ArrayList<>();
+
+    private int fullRefreshCounter = DEFAULT_FULL_REFRESH_COUNTER;
+
+    boolean isDirty = false;
+    boolean updateCells = false;
+
+    private double fixedCellSize;
+    private boolean fixedCellSizeEnabled;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new instance of TableRowSkinBase, although note that this
+     * instance does not handle any behavior / input mappings - this needs to be
+     * handled appropriately by subclasses.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TableRowSkinBase(C control) {
+        super(control);
+        getSkinnable().setPickOnBounds(false);
+
+        recreateCells();
+        updateCells(true);
+
+        // init bindings
+        // watches for any change in the leaf columns observableArrayList - this will indicate
+        // that the column order has changed and that we should update the row
+        // such that the cells are in the new order
+        getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
+        // --- end init bindings
+
+
+        // use invalidation listener here to update even when item equality is true
+        // (e.g. see RT-22463)
+        control.itemProperty().addListener(o -> requestCellUpdate());
+        registerChangeListener(control.indexProperty(), e -> {
+            // Fix for RT-36661, where empty table cells were showing content, as they
+            // had incorrect table cell indices (but the table row index was correct).
+            // Note that we only do the update on empty cells to avoid the issue
+            // noted below in requestCellUpdate().
+            if (getSkinnable().isEmpty()) {
+                requestCellUpdate();
+            }
+        });
+
+        if (fixedCellSizeProperty() != null) {
+            registerChangeListener(fixedCellSizeProperty(), e -> {
+                fixedCellSize = fixedCellSizeProperty().get();
+                fixedCellSizeEnabled = fixedCellSize > 0;
+            });
+            fixedCellSize = fixedCellSizeProperty().get();
+            fixedCellSizeEnabled = fixedCellSize > 0;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private ListChangeListener<TableColumnBase> visibleLeafColumnsListener = c -> {
+        isDirty = true;
+        getSkinnable().requestLayout();
+    };
+
+    private WeakListChangeListener<TableColumnBase> weakVisibleLeafColumnsListener =
+            new WeakListChangeListener<TableColumnBase>(visibleLeafColumnsListener);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Abstract Methods                                                        *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Returns the graphic to draw on the inside of the disclosure node. Null
+     * is acceptable when no graphic should be shown. Commonly this is the
+     * graphic associated with a TreeItem (i.e. treeItem.getGraphic()), rather
+     * than a graphic associated with a cell.
+     */
+    abstract ObjectProperty<Node> graphicProperty();
+
+    // return TableView / TreeTableView / etc
+    abstract Control getVirtualFlowOwner();
+
+    abstract ObservableList<? extends TableColumnBase/*<T,?>*/> getVisibleLeafColumns();
+
+    // cell.updateTableRow(skinnable); (i.e cell.updateTableRow(row))
+    abstract void updateCell(R cell, C row);
+
+    abstract DoubleProperty fixedCellSizeProperty();
+
+    abstract boolean isColumnPartiallyOrFullyVisible(TableColumnBase tc);
+
+    abstract R getCell(TableColumnBase tc);
+
+    abstract TableColumnBase<T,?> getTableColumnBase(R cell);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public Methods                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(double x, final double y, final double w, final double h) {
+        checkState();
+        if (cellsMap.isEmpty()) return;
+
+        ObservableList<? extends TableColumnBase> visibleLeafColumns = getVisibleLeafColumns();
+        if (visibleLeafColumns.isEmpty()) {
+            super.layoutChildren(x,y,w,h);
+            return;
+        }
+
+        C control = getSkinnable();
+
+        ///////////////////////////////////////////
+        // indentation code starts here
+        ///////////////////////////////////////////
+        double leftMargin = 0;
+        double disclosureWidth = 0;
+        double graphicWidth = 0;
+        boolean indentationRequired = isIndentationRequired();
+        boolean disclosureVisible = isDisclosureNodeVisible();
+        int indentationColumnIndex = 0;
+        Node disclosureNode = null;
+        if (indentationRequired) {
+            // Determine the column in which we want to put the disclosure node.
+            // By default it is null, which means the 0th column should be
+            // where the indentation occurs.
+            TableColumnBase<?,?> treeColumn = getTreeColumn();
+            indentationColumnIndex = treeColumn == null ? 0 : visibleLeafColumns.indexOf(treeColumn);
+            indentationColumnIndex = indentationColumnIndex < 0 ? 0 : indentationColumnIndex;
+
+            int indentationLevel = getIndentationLevel(control);
+            if (! isShowRoot()) indentationLevel--;
+            final double indentationPerLevel = getIndentationPerLevel();
+            leftMargin = indentationLevel * indentationPerLevel;
+
+            // position the disclosure node so that it is at the proper indent
+            Control c = getVirtualFlowOwner();
+            final double defaultDisclosureWidth = maxDisclosureWidthMap.containsKey(c) ?
+                maxDisclosureWidthMap.get(c) : 0;
+            disclosureWidth = defaultDisclosureWidth;
+
+            disclosureNode = getDisclosureNode();
+            if (disclosureNode != null) {
+                disclosureNode.setVisible(disclosureVisible);
+
+                if (disclosureVisible) {
+                    disclosureWidth = disclosureNode.prefWidth(h);
+                    if (disclosureWidth > defaultDisclosureWidth) {
+                        maxDisclosureWidthMap.put(c, disclosureWidth);
+
+                        // RT-36359: The recorded max width of the disclosure node
+                        // has increased. We need to go back and request all
+                        // earlier rows to update themselves to take into account
+                        // this increased indentation.
+                        final VirtualFlow<C> flow = getVirtualFlow();
+                        final int thisIndex = getSkinnable().getIndex();
+                        for (int i = 0; i < flow.cells.size(); i++) {
+                            C cell = flow.cells.get(i);
+                            if (cell == null || cell.isEmpty()) continue;
+                            cell.requestLayout();
+                            cell.layout();
+                        }
+                    }
+                }
+            }
+        }
+        ///////////////////////////////////////////
+        // indentation code ends here
+        ///////////////////////////////////////////
+
+        // layout the individual column cells
+        double width;
+        double height;
+
+        final double verticalPadding = snappedTopInset() + snappedBottomInset();
+        final double horizontalPadding = snappedLeftInset() + snappedRightInset();
+        final double controlHeight = control.getHeight();
+
+        /**
+         * RT-26743:TreeTableView: Vertical Line looks unfinished.
+         * We used to not do layout on cells whose row exceeded the number
+         * of items, but now we do so as to ensure we get vertical lines
+         * where expected in cases where the vertical height exceeds the
+         * number of items.
+         */
+        int index = control.getIndex();
+        if (index < 0/* || row >= itemsProperty().get().size()*/) return;
+
+        for (int column = 0, max = cells.size(); column < max; column++) {
+            R tableCell = cells.get(column);
+            TableColumnBase<T, ?> tableColumn = getTableColumnBase(tableCell);
+
+            boolean isVisible = true;
+            if (fixedCellSizeEnabled) {
+                // we determine if the cell is visible, and if not we have the
+                // ability to take it out of the scenegraph to help improve
+                // performance. However, we only do this when there is a
+                // fixed cell length specified in the TableView. This is because
+                // when we have a fixed cell length it is possible to know with
+                // certainty the height of each TableCell - it is the fixed value
+                // provided by the developer, and this means that we do not have
+                // to concern ourselves with the possibility that the height
+                // may be variable and / or dynamic.
+                isVisible = isColumnPartiallyOrFullyVisible(tableColumn);
+
+                height = fixedCellSize;
+            } else {
+                height = Math.max(controlHeight, tableCell.prefHeight(-1));
+                height = snapSize(height) - snapSize(verticalPadding);
+            }
+
+            if (isVisible) {
+                if (fixedCellSizeEnabled && tableCell.getParent() == null) {
+                    getChildren().add(tableCell);
+                }
+
+                width = snapSize(tableCell.prefWidth(-1)) - snapSize(horizontalPadding);
+
+                // Added for RT-32700, and then updated for RT-34074.
+                // We change the alignment from CENTER_LEFT to TOP_LEFT if the
+                // height of the row is greater than the default size, and if
+                // the alignment is the default alignment.
+                // What I would rather do is only change the alignment if the
+                // alignment has not been manually changed, but for now this will
+                // do.
+                final boolean centreContent = h <= 24.0;
+
+                // if the style origin is null then the property has not been
+                // set (or it has been reset to its default), which means that
+                // we can set it without overwriting someone elses settings.
+                final StyleOrigin origin = ((StyleableObjectProperty<?>) tableCell.alignmentProperty()).getStyleOrigin();
+                if (! centreContent && origin == null) {
+                    tableCell.setAlignment(Pos.TOP_LEFT);
+                }
+                // --- end of RT-32700 fix
+
+                ///////////////////////////////////////////
+                // further indentation code starts here
+                ///////////////////////////////////////////
+                if (indentationRequired && column == indentationColumnIndex) {
+                    if (disclosureVisible) {
+                        double ph = disclosureNode.prefHeight(disclosureWidth);
+
+                        if (width > 0 && width < (disclosureWidth + leftMargin)) {
+                            fadeOut(disclosureNode);
+                        } else {
+                            fadeIn(disclosureNode);
+                            disclosureNode.resize(disclosureWidth, ph);
+
+                            disclosureNode.relocate(x + leftMargin,
+                                    centreContent ? (h / 2.0 - ph / 2.0) :
+                                            (y + tableCell.getPadding().getTop()));
+                            disclosureNode.toFront();
+                        }
+                    }
+
+                    // determine starting point of the graphic or cell node, and the
+                    // remaining width available to them
+                    ObjectProperty<Node> graphicProperty = graphicProperty();
+                    Node graphic = graphicProperty == null ? null : graphicProperty.get();
+
+                    if (graphic != null) {
+                        graphicWidth = graphic.prefWidth(-1) + 3;
+                        double ph = graphic.prefHeight(graphicWidth);
+
+                        if (width > 0 && width < disclosureWidth + leftMargin + graphicWidth) {
+                            fadeOut(graphic);
+                        } else {
+                            fadeIn(graphic);
+
+                            graphic.relocate(x + leftMargin + disclosureWidth,
+                                    centreContent ? (h / 2.0 - ph / 2.0) :
+                                            (y + tableCell.getPadding().getTop()));
+
+                            graphic.toFront();
+                        }
+                    }
+                }
+                ///////////////////////////////////////////
+                // further indentation code ends here
+                ///////////////////////////////////////////
+
+                tableCell.resize(width, height);
+                tableCell.relocate(x, snappedTopInset());
+
+                // Request layout is here as (partial) fix for RT-28684.
+                // This does not appear to impact performance...
+                tableCell.requestLayout();
+            } else {
+                if (fixedCellSizeEnabled) {
+                    // we only add/remove to the scenegraph if the fixed cell
+                    // length support is enabled - otherwise we keep all
+                    // TableCells in the scenegraph
+                    getChildren().remove(tableCell);
+                }
+
+                width = snapSize(tableCell.prefWidth(-1)) - snapSize(horizontalPadding);
+            }
+
+            x += width;
+        }
+    }
+
+    int getIndentationLevel(C control) {
+        return 0;
+    }
+
+    double getIndentationPerLevel() {
+        return 0;
+    }
+
+    /**
+     * Used to represent whether the current virtual flow owner is wanting
+     * indentation to be used in this table row.
+     */
+    boolean isIndentationRequired() {
+        return false;
+    }
+
+    /**
+     * Returns the table column that should show the disclosure nodes and / or
+     * a graphic. By default this is the left-most column.
+     */
+    TableColumnBase getTreeColumn() {
+        return null;
+    }
+
+    Node getDisclosureNode() {
+        return null;
+    }
+
+    /**
+     * Used to represent whether a disclosure node is visible for _this_
+     * table row. Not to be confused with isIndentationRequired(), which is the
+     * more general API.
+     */
+    boolean isDisclosureNodeVisible() {
+        return false;
+    }
+
+    boolean isShowRoot() {
+        return true;
+    }
+
+    TableColumnBase<T,?> getVisibleLeafColumn(int column) {
+        final List<? extends TableColumnBase/*<T,?>*/> visibleLeafColumns = getVisibleLeafColumns();
+        if (column < 0 || column >= visibleLeafColumns.size()) return null;
+        return visibleLeafColumns.get(column);
+    }
+
+    void updateCells(boolean resetChildren) {
+        // To avoid a potential memory leak (when the TableColumns in the
+        // TableView are created/inserted/removed/deleted, we have a 'refresh
+        // counter' that when we reach 0 will delete all cells in this row
+        // and recreate all of them.
+        if (resetChildren) {
+            if (fullRefreshCounter == 0) {
+                recreateCells();
+            }
+            fullRefreshCounter--;
+        }
+
+        // if clear isn't called first, we can run into situations where the
+        // cells aren't updated properly.
+        final boolean cellsEmpty = cells.isEmpty();
+        cells.clear();
+
+        final C skinnable = getSkinnable();
+        final int skinnableIndex = skinnable.getIndex();
+        final List<? extends TableColumnBase/*<T,?>*/> visibleLeafColumns = getVisibleLeafColumns();
+
+        for (int i = 0, max = visibleLeafColumns.size(); i < max; i++) {
+            TableColumnBase<T,?> col = visibleLeafColumns.get(i);
+
+            R cell = null;
+            if (cellsMap.containsKey(col)) {
+                cell = cellsMap.get(col).get();
+
+                // the reference has been gc'd, remove key entry from map
+                if (cell == null) {
+                    cellsMap.remove(col);
+                }
+            }
+
+            if (cell == null) {
+                // if the cell is null it means we don't have it in cache and
+                // need to create it
+                cell = createCell(col);
+            }
+
+            updateCell(cell, skinnable);
+            cell.updateIndex(skinnableIndex);
+            cells.add(cell);
+        }
+
+        // update children of each row
+        if (!fixedCellSizeEnabled && (resetChildren || cellsEmpty)) {
+            getChildren().setAll(cells);
+        }
+    }
+
+    private VirtualFlow<C> getVirtualFlow() {
+        Parent p = getSkinnable();
+        while (p != null) {
+            if (p instanceof VirtualFlow) {
+                return (VirtualFlow<C>) p;
+            }
+            p = p.getParent();
+        }
+        return null;
+    }
+
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double prefWidth = 0.0;
+
+        final List<? extends TableColumnBase/*<T,?>*/> visibleLeafColumns = getVisibleLeafColumns();
+        for (int i = 0, max = visibleLeafColumns.size(); i < max; i++) {
+            prefWidth += visibleLeafColumns.get(i).getWidth();
+        }
+
+        return prefWidth;
+    }
+
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        // fix for RT-29080
+        checkState();
+
+        // Support for RT-18467: making it easier to specify a height for
+        // cells via CSS, where the desired height is less than the height
+        // of the TableCells. Essentially, -fx-cell-size is given higher
+        // precedence now
+        if (getCellSize() < DEFAULT_CELL_SIZE) {
+            return getCellSize();
+        }
+
+        // FIXME according to profiling, this method is slow and should
+        // be optimised
+        double prefHeight = 0.0f;
+        final int count = cells.size();
+        for (int i=0; i<count; i++) {
+            final R tableCell = cells.get(i);
+            prefHeight = Math.max(prefHeight, tableCell.prefHeight(-1));
+        }
+        double ph = Math.max(prefHeight, Math.max(getCellSize(), getSkinnable().minHeight(-1)));
+
+        return ph;
+    }
+
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        // fix for RT-29080
+        checkState();
+
+        // Support for RT-18467: making it easier to specify a height for
+        // cells via CSS, where the desired height is less than the height
+        // of the TableCells. Essentially, -fx-cell-size is given higher
+        // precedence now
+        if (getCellSize() < DEFAULT_CELL_SIZE) {
+            return getCellSize();
+        }
+
+        // FIXME according to profiling, this method is slow and should
+        // be optimised
+        double minHeight = 0.0f;
+        final int count = cells.size();
+        for (int i = 0; i < count; i++) {
+            final R tableCell = cells.get(i);
+            minHeight = Math.max(minHeight, tableCell.minHeight(-1));
+        }
+        return minHeight;
+    }
+
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    final void checkState() {
+        if (isDirty) {
+            updateCells(true);
+            isDirty = false;
+        } else if (updateCells) {
+            updateCells(false);
+            updateCells = false;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void requestCellUpdate() {
+        updateCells = true;
+        getSkinnable().requestLayout();
+
+        // update the index of all children cells (RT-29849).
+        // Note that we do this after the TableRow item has been updated,
+        // rather than when the TableRow index has changed (as this will be
+        // before the row has updated its item). This will result in the
+        // issue highlighted in RT-33602, where the table cell had the correct
+        // item whilst the row had the old item.
+        final int newIndex = getSkinnable().getIndex();
+        for (int i = 0, max = cells.size(); i < max; i++) {
+            cells.get(i).updateIndex(newIndex);
+        }
+    }
+
+    private void recreateCells() {
+        if (cellsMap != null) {
+            Collection<Reference<R>> cells = cellsMap.values();
+            Iterator<Reference<R>> cellsIter = cells.iterator();
+            while (cellsIter.hasNext()) {
+                Reference<R> cellRef = cellsIter.next();
+                R cell = cellRef.get();
+                if (cell != null) {
+                    cell.updateIndex(-1);
+                    cell.getSkin().dispose();
+                    cell.setSkin(null);
+                }
+            }
+            cellsMap.clear();
+        }
+
+        ObservableList<? extends TableColumnBase/*<T,?>*/> columns = getVisibleLeafColumns();
+
+        cellsMap = new WeakHashMap<TableColumnBase, Reference<R>>(columns.size());
+        fullRefreshCounter = DEFAULT_FULL_REFRESH_COUNTER;
+        getChildren().clear();
+
+        for (TableColumnBase col : columns) {
+            if (cellsMap.containsKey(col)) {
+                continue;
+            }
+
+            // create a TableCell for this column and store it in the cellsMap
+            // for future use
+            createCell(col);
+        }
+    }
+
+    private R createCell(TableColumnBase col) {
+        // we must create a TableCell for this table column
+        R cell = getCell(col);
+
+        // and store this in our HashMap until needed
+        cellsMap.put(col, new WeakReference<R>(cell));
+
+        return cell;
+    }
+
+    private void fadeOut(final Node node) {
+        if (node.getOpacity() < 1.0) return;
+
+        if (! DO_ANIMATIONS) {
+            node.setOpacity(0);
+            return;
+        }
+
+        final FadeTransition fader = new FadeTransition(FADE_DURATION, node);
+        fader.setToValue(0.0);
+        fader.play();
+    }
+
+    private void fadeIn(final Node node) {
+        if (node.getOpacity() > 0.0) return;
+
+        if (! DO_ANIMATIONS) {
+            node.setOpacity(1);
+            return;
+        }
+
+        final FadeTransition fader = new FadeTransition(FADE_DURATION, node);
+        fader.setToValue(1.0);
+        fader.play();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkin.java	2015-09-03 15:23:06.924322100 -0700
+++ /dev/null	2015-09-03 15:23:08.000000000 -0700
@@ -1,362 +0,0 @@
-/*
- * Copyright (c) 2010, 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 java.util.ArrayList;
-import java.util.List;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.EventHandler;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.ResizeFeaturesBase;
-import javafx.scene.control.TableCell;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TablePosition;
-import javafx.scene.control.TableRow;
-import javafx.scene.control.TableSelectionModel;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TableView.TableViewFocusModel;
-import javafx.scene.control.TableView.TableViewSelectionModel;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Region;
-import javafx.util.Callback;
-
-import com.sun.javafx.scene.control.behavior.TableViewBehavior;
-
-public class TableViewSkin<T> extends TableViewSkinBase<T, T, TableView<T>, TableViewBehavior<T>, TableRow<T>, TableColumn<T, ?>> {
-    
-    private final TableView<T> tableView;
-
-    public TableViewSkin(final TableView<T> tableView) {
-        super(tableView, new TableViewBehavior<T>(tableView));
-        
-        this.tableView = tableView;
-        flow.setFixedCellSize(tableView.getFixedCellSize());
-        
-        super.init(tableView);
-
-        EventHandler<MouseEvent> ml = event -> {
-            // RT-15127: cancel editing on scroll. This is a bit extreme
-            // (we are cancelling editing on touching the scrollbars).
-            // This can be improved at a later date.
-            if (tableView.getEditingCell() != null) {
-                tableView.edit(-1, null);
-            }
-
-            // This ensures that the table maintains the focus, even when the vbar
-            // and hbar controls inside the flow are clicked. Without this, the
-            // focus border will not be shown when the user interacts with the
-            // scrollbars, and more importantly, keyboard navigation won't be
-            // available to the user.
-            if (tableView.isFocusTraversable()) {
-                tableView.requestFocus();
-            }
-        };
-        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-
-        // init the behavior 'closures'
-        TableViewBehavior<T> behavior = getBehavior();
-        behavior.setOnFocusPreviousRow(() -> { onFocusPreviousCell(); });
-        behavior.setOnFocusNextRow(() -> { onFocusNextCell(); });
-        behavior.setOnMoveToFirstCell(() -> { onMoveToFirstCell(); });
-        behavior.setOnMoveToLastCell(() -> { onMoveToLastCell(); });
-        behavior.setOnScrollPageDown(isFocusDriven -> onScrollPageDown(isFocusDriven));
-        behavior.setOnScrollPageUp(isFocusDriven -> onScrollPageUp(isFocusDriven));
-        behavior.setOnSelectPreviousRow(() -> { onSelectPreviousCell(); });
-        behavior.setOnSelectNextRow(() -> { onSelectNextCell(); });
-        behavior.setOnSelectLeftCell(() -> { onSelectLeftCell(); });
-        behavior.setOnSelectRightCell(() -> { onSelectRightCell(); });
-
-        registerChangeListener(tableView.fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("FIXED_CELL_SIZE".equals(p)) {
-            flow.setFixedCellSize(getSkinnable().getFixedCellSize());
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Internal Fields                                                         *
-     *                                                                         *
-     **************************************************************************/
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/  
-    
-    /** {@inheritDoc} */
-    @Override protected ObservableList<TableColumn<T, ?>> getVisibleLeafColumns() {
-        return tableView.getVisibleLeafColumns();
-    }
-
-    @Override protected int getVisibleLeafIndex(TableColumn<T, ?> tc) {
-        return tableView.getVisibleLeafIndex(tc);
-    }
-    
-    @Override protected TableColumn<T, ?> getVisibleLeafColumn(int col) {
-        return tableView.getVisibleLeafColumn(col);
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected TableViewFocusModel<T> getFocusModel() {
-        return tableView.getFocusModel();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected TablePosition<T, ?> getFocusedCell() {
-        return tableView.getFocusModel().getFocusedCell();
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected TableSelectionModel<T> getSelectionModel() {
-        return tableView.getSelectionModel();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<Callback<TableView<T>, TableRow<T>>> rowFactoryProperty() {
-        return tableView.rowFactoryProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<Node> placeholderProperty() {
-        return tableView.placeholderProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<ObservableList<T>> itemsProperty() {
-        return tableView.itemsProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObservableList<TableColumn<T, ?>> getColumns() {
-        return tableView.getColumns();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected BooleanProperty tableMenuButtonVisibleProperty() {
-        return tableView.tableMenuButtonVisibleProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<Callback<ResizeFeaturesBase, Boolean>> columnResizePolicyProperty() {
-        // TODO Ugly!
-        return (ObjectProperty<Callback<ResizeFeaturesBase, Boolean>>) (Object) tableView.columnResizePolicyProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObservableList<TableColumn<T,?>> getSortOrder() {
-        return tableView.getSortOrder();
-    }
-
-    @Override protected boolean resizeColumn(TableColumn<T, ?> tc, double delta) {
-        return tableView.resizeColumn(tc, delta);
-    }
-
-    @Override protected void edit(int index, TableColumn<T, ?> column) {
-        tableView.edit(index, (TableColumn<T,?>)column);
-    }
-
-    /*
-     * FIXME: Naive implementation ahead
-     * Attempts to resize column based on the pref width of all items contained
-     * in this column. This can be potentially very expensive if the number of
-     * rows is large.
-     */
-    @Override protected void resizeColumnToFitContent(TableColumn<T, ?> tc, int maxRows) {
-        if (!tc.isResizable()) return;
-
-//        final TableColumn<T, ?> col = tc;
-        List<?> items = itemsProperty().get();
-        if (items == null || items.isEmpty()) return;
-    
-        Callback/*<TableColumn<T, ?>, TableCell<T,?>>*/ cellFactory = tc.getCellFactory();
-        if (cellFactory == null) return;
-    
-        TableCell<T,?> cell = (TableCell<T, ?>) cellFactory.call(tc);
-        if (cell == null) return;
-        
-        // set this property to tell the TableCell we want to know its actual
-        // preferred width, not the width of the associated TableColumnBase
-        cell.getProperties().put(TableCellSkin.DEFER_TO_PARENT_PREF_WIDTH, Boolean.TRUE);
-        
-        // determine cell padding
-        double padding = 10;
-        Node n = cell.getSkin() == null ? null : cell.getSkin().getNode();
-        if (n instanceof Region) {
-            Region r = (Region) n;
-            padding = r.snappedLeftInset() + r.snappedRightInset();
-        } 
-        
-        int rows = maxRows == -1 ? items.size() : Math.min(items.size(), maxRows);
-        double maxWidth = 0;
-        for (int row = 0; row < rows; row++) {
-            cell.updateTableColumn(tc);
-            cell.updateTableView(tableView);
-            cell.updateIndex(row);
-            
-            if ((cell.getText() != null && !cell.getText().isEmpty()) || cell.getGraphic() != null) {
-                getChildren().add(cell);
-                cell.applyCss();
-                maxWidth = Math.max(maxWidth, cell.prefWidth(-1));
-                getChildren().remove(cell);
-            }
-        }
-
-        // dispose of the cell to prevent it retaining listeners (see RT-31015)
-        cell.updateIndex(-1);
-
-        // RT-36855 - take into account the column header text / graphic widths.
-        // Magic 10 is to allow for sort arrow to appear without text truncation.
-        TableColumnHeader header = getTableHeaderRow().getColumnHeaderFor(tc);
-        double headerTextWidth = Utils.computeTextWidth(header.label.getFont(), tc.getText(), -1);
-        Node graphic = header.label.getGraphic();
-        double headerGraphicWidth = graphic == null ? 0 : graphic.prefWidth(-1) + header.label.getGraphicTextGap();
-        double headerWidth = headerTextWidth + headerGraphicWidth + 10 + header.snappedLeftInset() + header.snappedRightInset();
-        maxWidth = Math.max(maxWidth, headerWidth);
-        
-        // RT-23486
-        maxWidth += padding;
-        if(tableView.getColumnResizePolicy() == TableView.CONSTRAINED_RESIZE_POLICY) {
-            maxWidth = Math.max(maxWidth, tc.getWidth());
-        }
-
-        tc.impl_setWidth(maxWidth);
-    }
-    
-    /** {@inheritDoc} */
-    @Override public int getItemCount() {
-        return tableView.getItems() == null ? 0 : tableView.getItems().size();
-    }
-    
-    /** {@inheritDoc} */
-    @Override public TableRow<T> createCell() {
-        TableRow<T> cell;
-
-        if (tableView.getRowFactory() != null) {
-            cell = tableView.getRowFactory().call(tableView);
-        } else {
-            cell = new TableRow<T>();
-        }
-
-        cell.updateTableView(tableView);
-        return cell;
-    }
-
-    @Override protected void horizontalScroll() {
-        super.horizontalScroll();
-        if (getSkinnable().getFixedCellSize() > 0) {
-            flow.requestCellLayout();
-        }
-    }
-    
-    @Override
-    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case SELECTED_ITEMS: {
-                List<Node> selection = new ArrayList<>();
-                TableViewSelectionModel<T> sm = getSkinnable().getSelectionModel();
-                for (TablePosition<T,?> pos : sm.getSelectedCells()) {
-                    TableRow<T> row = flow.getPrivateCell(pos.getRow());
-                    if (row != null) selection.add(row);
-                }
-                return FXCollections.observableArrayList(selection);
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-    @Override
-    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-        switch (action) {
-            case SHOW_ITEM: {
-                Node item = (Node)parameters[0];
-                if (item instanceof TableCell) {
-                    @SuppressWarnings("unchecked")
-                    TableCell<T, ?> cell = (TableCell<T, ?>)item;
-                    flow.show(cell.getIndex());
-                }
-                break;
-            }
-            case SET_SELECTED_ITEMS: {
-                @SuppressWarnings("unchecked")
-                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
-                if (items != null) {
-                    TableSelectionModel<T> sm = getSkinnable().getSelectionModel();
-                    if (sm != null) {
-                        sm.clearSelection();
-                        for (Node item : items) {
-                            if (item instanceof TableCell) {
-                                @SuppressWarnings("unchecked")
-                                TableCell<T, ?> cell = (TableCell<T, ?>)item;
-                                sm.select(cell.getIndex(), cell.getTableColumn());
-                            }
-                        }
-                    }
-                }
-                break;
-            }
-            default: super.executeAccessibleAction(action, parameters);
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/    
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Private methods                                                         *
-     *                                                                         *
-     **************************************************************************/
-    
-}
--- /dev/null	2015-09-03 15:23:08.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableViewSkin.java	2015-09-03 15:23:06.217281700 -0700
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 2010, 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 java.util.ArrayList;
+import java.util.List;
+
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.EventHandler;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.ResizeFeaturesBase;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TablePosition;
+import javafx.scene.control.TableRow;
+import javafx.scene.control.TableSelectionModel;
+import javafx.scene.control.TableView;
+import javafx.scene.control.TableView.TableViewFocusModel;
+import javafx.scene.control.TableView.TableViewSelectionModel;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import javafx.util.Callback;
+
+import com.sun.javafx.scene.control.behavior.TableViewBehavior;
+
+/**
+ * Default skin implementation for the {@link TableView} control.
+ *
+ * @see TableView
+ * @since 9
+ */
+public class TableViewSkin<T> extends TableViewSkinBase<T, T, TableView<T>, TableRow<T>, TableColumn<T, ?>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final TableViewBehavior<T>  behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TableViewSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TableViewSkin(final TableView<T> control) {
+        super(control);
+
+        // install default input map for the TableView control
+        behavior = new TableViewBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        flow.setFixedCellSize(control.getFixedCellSize());
+        flow.setCellFactory(flow -> createCell());
+
+        EventHandler<MouseEvent> ml = event -> {
+            // RT-15127: cancel editing on scroll. This is a bit extreme
+            // (we are cancelling editing on touching the scrollbars).
+            // This can be improved at a later date.
+            if (control.getEditingCell() != null) {
+                control.edit(-1, null);
+            }
+
+            // This ensures that the table maintains the focus, even when the vbar
+            // and hbar controls inside the flow are clicked. Without this, the
+            // focus border will not be shown when the user interacts with the
+            // scrollbars, and more importantly, keyboard navigation won't be
+            // available to the user.
+            if (control.isFocusTraversable()) {
+                control.requestFocus();
+            }
+        };
+        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+
+        // init the behavior 'closures'
+        behavior.setOnFocusPreviousRow(() -> onFocusPreviousCell());
+        behavior.setOnFocusNextRow(() -> onFocusNextCell());
+        behavior.setOnMoveToFirstCell(() -> onMoveToFirstCell());
+        behavior.setOnMoveToLastCell(() -> onMoveToLastCell());
+        behavior.setOnScrollPageDown(isFocusDriven -> onScrollPageDown(isFocusDriven));
+        behavior.setOnScrollPageUp(isFocusDriven -> onScrollPageUp(isFocusDriven));
+        behavior.setOnSelectPreviousRow(() -> onSelectPreviousCell());
+        behavior.setOnSelectNextRow(() -> onSelectNextCell());
+        behavior.setOnSelectLeftCell(() -> onSelectLeftCell());
+        behavior.setOnSelectRightCell(() -> onSelectRightCell());
+
+        registerChangeListener(control.fixedCellSizeProperty(), e -> flow.setFixedCellSize(getSkinnable().getFixedCellSize()));
+
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+    
+    /** {@inheritDoc} */
+    @Override public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case SELECTED_ITEMS: {
+                List<Node> selection = new ArrayList<>();
+                TableViewSelectionModel<T> sm = getSkinnable().getSelectionModel();
+                for (TablePosition<T,?> pos : sm.getSelectedCells()) {
+                    TableRow<T> row = flow.getPrivateCell(pos.getRow());
+                    if (row != null) selection.add(row);
+                }
+                return FXCollections.observableArrayList(selection);
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+        switch (action) {
+            case SHOW_ITEM: {
+                Node item = (Node)parameters[0];
+                if (item instanceof TableCell) {
+                    @SuppressWarnings("unchecked")
+                    TableCell<T, ?> cell = (TableCell<T, ?>)item;
+                    flow.scrollTo(cell.getIndex());
+                }
+                break;
+            }
+            case SET_SELECTED_ITEMS: {
+                @SuppressWarnings("unchecked")
+                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
+                if (items != null) {
+                    TableSelectionModel<T> sm = getSkinnable().getSelectionModel();
+                    if (sm != null) {
+                        sm.clearSelection();
+                        for (Node item : items) {
+                            if (item instanceof TableCell) {
+                                @SuppressWarnings("unchecked")
+                                TableCell<T, ?> cell = (TableCell<T, ?>)item;
+                                sm.select(cell.getIndex(), cell.getTableColumn());
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+            default: super.executeAccessibleAction(action, parameters);
+        }
+    }
+
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    private TableRow<T> createCell() {
+        TableRow<T> cell;
+
+        TableView<T> tableView = getSkinnable();
+        if (tableView.getRowFactory() != null) {
+            cell = tableView.getRowFactory().call(tableView);
+        } else {
+            cell = new TableRow<T>();
+        }
+
+        cell.updateTableView(tableView);
+        return cell;
+    }
+
+    /** {@inheritDoc} */
+    @Override int getItemCount() {
+        TableView<T> tableView = getSkinnable();
+        return tableView.getItems() == null ? 0 : tableView.getItems().size();
+    }
+
+    /** {@inheritDoc} */
+    @Override void horizontalScroll() {
+        super.horizontalScroll();
+        if (getSkinnable().getFixedCellSize() > 0) {
+            flow.requestCellLayout();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TableColumn<T, ?>> getVisibleLeafColumns() {
+        return getSkinnable().getVisibleLeafColumns();
+    }
+
+    @Override int getVisibleLeafIndex(TableColumn<T, ?> tc) {
+        return getSkinnable().getVisibleLeafIndex(tc);
+    }
+
+    @Override TableColumn<T, ?> getVisibleLeafColumn(int col) {
+        return getSkinnable().getVisibleLeafColumn(col);
+    }
+
+    /** {@inheritDoc} */
+    @Override TableViewFocusModel<T> getFocusModel() {
+        return getSkinnable().getFocusModel();
+    }
+
+    /** {@inheritDoc} */
+    @Override TablePosition<T, ?> getFocusedCell() {
+        return getSkinnable().getFocusModel().getFocusedCell();
+    }
+
+    /** {@inheritDoc} */
+    @Override TableSelectionModel<T> getSelectionModel() {
+        return getSkinnable().getSelectionModel();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Callback<TableView<T>, TableRow<T>>> rowFactoryProperty() {
+        return getSkinnable().rowFactoryProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Node> placeholderProperty() {
+        return getSkinnable().placeholderProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<ObservableList<T>> itemsProperty() {
+        return getSkinnable().itemsProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TableColumn<T, ?>> getColumns() {
+        return getSkinnable().getColumns();
+    }
+
+    /** {@inheritDoc} */
+    @Override BooleanProperty tableMenuButtonVisibleProperty() {
+        return getSkinnable().tableMenuButtonVisibleProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Callback<ResizeFeaturesBase, Boolean>> columnResizePolicyProperty() {
+        return (ObjectProperty<Callback<ResizeFeaturesBase, Boolean>>) (Object) getSkinnable().columnResizePolicyProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TableColumn<T,?>> getSortOrder() {
+        return getSkinnable().getSortOrder();
+    }
+
+    /** {@inheritDoc} */
+    @Override boolean resizeColumn(TableColumn<T, ?> tc, double delta) {
+        return getSkinnable().resizeColumn(tc, delta);
+    }
+
+    /*
+     * FIXME: Naive implementation ahead
+     * Attempts to resize column based on the pref width of all items contained
+     * in this column. This can be potentially very expensive if the number of
+     * rows is large.
+     */
+    /** {@inheritDoc} */
+    @Override void resizeColumnToFitContent(TableColumn<T, ?> tc, int maxRows) {
+        if (!tc.isResizable()) return;
+
+//        final TableColumn<T, ?> col = tc;
+        List<?> items = itemsProperty().get();
+        if (items == null || items.isEmpty()) return;
+
+        Callback/*<TableColumn<T, ?>, TableCell<T,?>>*/ cellFactory = tc.getCellFactory();
+        if (cellFactory == null) return;
+
+        TableCell<T,?> cell = (TableCell<T, ?>) cellFactory.call(tc);
+        if (cell == null) return;
+
+        // set this property to tell the TableCell we want to know its actual
+        // preferred width, not the width of the associated TableColumnBase
+        cell.getProperties().put(Properties.DEFER_TO_PARENT_PREF_WIDTH, Boolean.TRUE);
+
+        // determine cell padding
+        double padding = 10;
+        Node n = cell.getSkin() == null ? null : cell.getSkin().getNode();
+        if (n instanceof Region) {
+            Region r = (Region) n;
+            padding = r.snappedLeftInset() + r.snappedRightInset();
+        }
+
+        int rows = maxRows == -1 ? items.size() : Math.min(items.size(), maxRows);
+        double maxWidth = 0;
+        for (int row = 0; row < rows; row++) {
+            cell.updateTableColumn(tc);
+            cell.updateTableView(getSkinnable());
+            cell.updateIndex(row);
+
+            if ((cell.getText() != null && !cell.getText().isEmpty()) || cell.getGraphic() != null) {
+                getChildren().add(cell);
+                cell.applyCss();
+                maxWidth = Math.max(maxWidth, cell.prefWidth(-1));
+                getChildren().remove(cell);
+            }
+        }
+
+        // dispose of the cell to prevent it retaining listeners (see RT-31015)
+        cell.updateIndex(-1);
+
+        // RT-36855 - take into account the column header text / graphic widths.
+        // Magic 10 is to allow for sort arrow to appear without text truncation.
+        TableColumnHeader header = getTableHeaderRow().getColumnHeaderFor(tc);
+        double headerTextWidth = Utils.computeTextWidth(header.label.getFont(), tc.getText(), -1);
+        Node graphic = header.label.getGraphic();
+        double headerGraphicWidth = graphic == null ? 0 : graphic.prefWidth(-1) + header.label.getGraphicTextGap();
+        double headerWidth = headerTextWidth + headerGraphicWidth + 10 + header.snappedLeftInset() + header.snappedRightInset();
+        maxWidth = Math.max(maxWidth, headerWidth);
+
+        // RT-23486
+        maxWidth += padding;
+        if(getSkinnable().getColumnResizePolicy() == TableView.CONSTRAINED_RESIZE_POLICY) {
+            maxWidth = Math.max(maxWidth, tc.getWidth());
+        }
+
+        tc.impl_setWidth(maxWidth);
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TableViewSkinBase.java	2015-09-03 15:23:15.144792300 -0700
+++ /dev/null	2015-09-03 15:23:16.000000000 -0700
@@ -1,1010 +0,0 @@
-/*
- * Copyright (c) 2012, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ChangeListener;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.ObservableMap;
-import javafx.geometry.Insets;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.*;
-
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.util.Callback;
-
-import javafx.collections.WeakListChangeListener;
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
-
-import java.lang.ref.WeakReference;
-import java.util.List;
-import javafx.beans.WeakInvalidationListener;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.WeakChangeListener;
-import javafx.geometry.HPos;
-import javafx.geometry.VPos;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Map;
-
-/**
- *
- * @param <M> The type of the item stored in the cell
- * @param <S> The type of the item represented by the virtualised control (e.g. TableView<S>)
- * @param <C> The type of the virtualised control (e.g TableView, TreeTableView)
- * @param <B> The Behavior of the virtualised control
- * @param <I> The type of cell used by this virtualised control (e.g. TableRow, TreeTableRow)
- * @param <TC> The type of TableColumnBase used by this virtualised control (e.g. TableColumn, TreeTableColumn)
- */
-public abstract class TableViewSkinBase<M, S, C extends Control, B extends BehaviorBase<C>, I extends IndexedCell<M>, TC extends TableColumnBase<S,?>> extends VirtualContainerBase<C, B, I> {
-
-    /***************************************************************************
-     *                                                                         *
-     * Static Fields                                                           *
-     *                                                                         *
-     **************************************************************************/
-
-    public static final String REFRESH = "tableRefreshKey";
-    public static final String RECREATE = "tableRecreateKey";
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Internal Fields                                                         *
-     *                                                                         *
-     **************************************************************************/
-
-    private boolean contentWidthDirty = true;
-
-    /**
-     * This region is used to overlay atop the table when the user is performing
-     * a column resize operation or a column reordering operation. It is a line
-     * that runs the height of the table to indicate either the final width of
-     * of the selected column, or the position the column will be 'dropped' into
-     * when the reordering operation completes.
-     */
-    private Region columnReorderLine;
-
-    /**
-     * A region which is resized and positioned such that it perfectly matches
-     * the dimensions of any TableColumn that is being reordered by the user.
-     * This is useful, for example, as a semi-transparent overlay to give
-     * feedback to the user as to which column is currently being moved.
-     */
-    private Region columnReorderOverlay;
-
-    /**
-     * The entire header region for all columns. This header region handles
-     * column reordering and resizing. It also handles the positioning and
-     * resizing of thte columnReorderLine and columnReorderOverlay.
-     */
-    private TableHeaderRow tableHeaderRow;
-
-    private Callback<C, I> rowFactory;
-
-    /**
-     * Region placed over the top of the flow (and possibly the header row) if
-     * there is no data and/or there are no columns specified.
-     */
-    private StackPane placeholderRegion;
-    private Label placeholderLabel;
-    private static final String EMPTY_TABLE_TEXT = ControlResources.getString("TableView.noContent");
-    private static final String NO_COLUMNS_TEXT = ControlResources.getString("TableView.noColumns");
-
-    private int visibleColCount;
-
-    protected boolean needCellsRebuilt = true;
-    protected boolean needCellsRecreated = true;
-    protected boolean needCellsReconfigured = false;
-
-    private int itemCount = -1;
-    protected boolean forceCellRecreate = false;
-
-    // RT-34744 : IS_PANNABLE will be false unless
-    // com.sun.javafx.scene.control.skin.TableViewSkin.pannable
-    // is set to true. This is done in order to make TableView functional
-    // on embedded systems with touch screens which do not generate scroll
-    // events for touch drag gestures.
-    private static final boolean IS_PANNABLE =
-            AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> Boolean.getBoolean("com.sun.javafx.scene.control.skin.TableViewSkin.pannable"));
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-
-    public TableViewSkinBase(final C control, final B behavior) {
-        super(control, behavior);
-        
-        // init(control) should not be called here - it should be called by the
-        // subclass after initialising itself. This is to prevent NPEs (for 
-        // example, getVisibleLeafColumns() throws a NPE as the control itself
-        // is not yet set in subclasses).
-    }
-
-    // init isn't a constructor, but it is part of the initialisation routine
-    protected void init(final C control) {
-        // init the VirtualFlow
-        flow.setPannable(IS_PANNABLE);
-        flow.setCreateCell(flow1 -> TableViewSkinBase.this.createCell());
-        
-        /*
-         * Listening for scrolling along the X axis, but we need to be careful
-         * to handle the situation appropriately when the hbar is invisible.
-         */
-        final InvalidationListener hbarValueListener = valueModel -> {
-            horizontalScroll();
-        };
-        flow.getHbar().valueProperty().addListener(hbarValueListener);
-
-        // RT-37152
-        flow.getHbar().setUnitIncrement(15);
-        flow.getHbar().setBlockIncrement(TableColumnHeader.DEFAULT_COLUMN_WIDTH);
-
-        columnReorderLine = new Region();
-        columnReorderLine.getStyleClass().setAll("column-resize-line");
-        columnReorderLine.setManaged(false);
-        columnReorderLine.setVisible(false);
-
-        columnReorderOverlay = new Region();
-        columnReorderOverlay.getStyleClass().setAll("column-overlay");
-        columnReorderOverlay.setVisible(false);
-        columnReorderOverlay.setManaged(false);
-
-        tableHeaderRow = createTableHeaderRow();
-//        tableHeaderRow.setColumnReorderLine(columnReorderLine);
-        tableHeaderRow.setFocusTraversable(false);
-
-        getChildren().addAll(tableHeaderRow, flow, columnReorderOverlay, columnReorderLine);
-
-        updateVisibleColumnCount();
-        updateVisibleLeafColumnWidthListeners(getVisibleLeafColumns(), FXCollections.<TC>emptyObservableList());
-
-        tableHeaderRow.reorderingProperty().addListener(valueModel -> {
-            getSkinnable().requestLayout();
-        });
-
-        getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
-        
-        updateTableItems(null, itemsProperty().get());
-        itemsChangeListener = new InvalidationListener() {
-            private WeakReference<ObservableList<S>> weakItemsRef = new WeakReference<>(itemsProperty().get());
-
-            @Override public void invalidated(Observable observable) {
-                ObservableList<S> oldItems = weakItemsRef.get();
-                weakItemsRef = new WeakReference<>(itemsProperty().get());
-                updateTableItems(oldItems, itemsProperty().get());
-            }
-        };
-        weakItemsChangeListener = new WeakInvalidationListener(itemsChangeListener);
-        itemsProperty().addListener(weakItemsChangeListener);
-
-        final ObservableMap<Object, Object> properties = control.getProperties();
-        properties.remove(REFRESH);
-        properties.remove(RECREATE);
-        properties.addListener(propertiesMapListener);
-        
-        control.addEventHandler(ScrollToEvent.<TC>scrollToColumn(), event -> {
-            scrollHorizontally(event.getScrollTarget());
-        });
-
-        // flow and flow.vbar width observer
-        InvalidationListener widthObserver = valueModel -> {
-            contentWidthDirty = true;
-            getSkinnable().requestLayout();
-        };
-        flow.widthProperty().addListener(widthObserver);
-        flow.getVbar().widthProperty().addListener(widthObserver);
-
-        registerChangeListener(rowFactoryProperty(), "ROW_FACTORY");
-        registerChangeListener(placeholderProperty(), "PLACEHOLDER");
-        registerChangeListener(control.widthProperty(), "WIDTH");
-        registerChangeListener(flow.getVbar().visibleProperty(), "VBAR_VISIBLE");
-    }
-    
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-
-    private MapChangeListener<Object, Object> propertiesMapListener = c -> {
-        if (! c.wasAdded()) return;
-        if (REFRESH.equals(c.getKey())) {
-            refreshView();
-            getSkinnable().getProperties().remove(REFRESH);
-        } else if (RECREATE.equals(c.getKey())) {
-            forceCellRecreate = true;
-            refreshView();
-            getSkinnable().getProperties().remove(RECREATE);
-        }
-    };
-    
-    private ListChangeListener<S> rowCountListener = c -> {
-        while (c.next()) {
-            if (c.wasReplaced()) {
-                // RT-28397: Support for when an item is replaced with itself (but
-                // updated internal values that should be shown visually).
-
-                // The ListViewSkin equivalent code here was updated to use the
-                // flow.setDirtyCell(int) API, but it was left alone here, otherwise
-                // our unit test for RT-36220 fails as we do not handle the case
-                // where the TableCell gets updated (only the TableRow does).
-                // Ideally we would use the dirtyCell API:
-                //
-                // for (int i = c.getFrom(); i < c.getTo(); i++) {
-                //     flow.setCellDirty(i);
-                // }
-                itemCount = 0;
-                break;
-            } else if (c.getRemovedSize() == itemCount) {
-                // RT-22463: If the user clears out an items list then we
-                // should reset all cells (in particular their contained
-                // items) such that a subsequent addition to the list of
-                // an item which equals the old item (but is rendered
-                // differently) still displays as expected (i.e. with the
-                // updated display, not the old display).
-                itemCount = 0;
-                break;
-            }
-        }
-
-        // fix for RT-37853
-        if (getSkinnable() instanceof TableView) {
-            edit(-1, null);
-        }
-
-        rowCountDirty = true;
-        getSkinnable().requestLayout();
-    };
-    
-    private ListChangeListener<TC> visibleLeafColumnsListener =
-            c -> {
-                updateVisibleColumnCount();
-                while (c.next()) {
-                    updateVisibleLeafColumnWidthListeners(c.getAddedSubList(), c.getRemoved());
-                }
-            };
-    
-    private InvalidationListener widthListener = observable -> {
-        // This forces the horizontal scrollbar to show when the column
-        // resizing occurs. It is not ideal, but will work for now.
-
-        // using 'needCellsReconfigured' here rather than 'needCellsRebuilt'
-        // as otherwise performance suffers massively (RT-27831)
-        needCellsReconfigured = true;
-        if (getSkinnable() != null) {
-            getSkinnable().requestLayout();
-        }
-    };
-    
-    private InvalidationListener itemsChangeListener;
-    
-    private WeakListChangeListener<S> weakRowCountListener =
-            new WeakListChangeListener<S>(rowCountListener);
-    private WeakListChangeListener<TC> weakVisibleLeafColumnsListener =
-            new WeakListChangeListener<TC>(visibleLeafColumnsListener);
-    private WeakInvalidationListener weakWidthListener = 
-            new WeakInvalidationListener(widthListener);
-    private WeakInvalidationListener weakItemsChangeListener;
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Abstract Methods                                                        *
-     *                                                                         *
-     **************************************************************************/
-
-    // returns the selection model of the control
-    protected abstract TableSelectionModel<S> getSelectionModel();
-
-    // returns the focus model of the control
-    protected abstract TableFocusModel<S,TC> getFocusModel();
-
-    // returns the currently focused cell in the focus model
-    protected abstract TablePositionBase<? extends TC> getFocusedCell();
-
-    // returns an ObservableList of the visible leaf columns of the control
-    protected abstract ObservableList<? extends TC> getVisibleLeafColumns();
-
-    // returns the index of a column in the visible leaf columns
-    protected abstract int getVisibleLeafIndex(TC tc);
-
-    // returns the leaf column at the given index
-    protected abstract TC getVisibleLeafColumn(int col);
-
-    // returns a list of the root columns
-    protected abstract ObservableList<TC> getColumns();
-
-    // returns the sort order of the control
-    protected abstract ObservableList<TC> getSortOrder();
-
-    // returns a property representing the list of items in the control
-    protected abstract ObjectProperty<ObservableList<S>> itemsProperty();
-
-    // returns a property representing the row factory in the control
-    protected abstract ObjectProperty<Callback<C, I>> rowFactoryProperty();
-
-    // returns the placeholder property for the control
-    protected abstract ObjectProperty<Node> placeholderProperty();
-
-    // returns the property used to represent whether the tableMenuButton should
-    // be visible
-    protected abstract BooleanProperty tableMenuButtonVisibleProperty();
-
-    // returns a property representing the column resize properyt in the control
-    protected abstract ObjectProperty<Callback<ResizeFeaturesBase, Boolean>> columnResizePolicyProperty();
-
-    // Method to resize the given column by the given delta, returning a boolean
-    // to indicate success or failure
-    protected abstract boolean resizeColumn(TC tc, double delta);
-
-    // Method to resize the column based on the content in that column, based on
-    // the maxRows number of rows
-    protected abstract void resizeColumnToFitContent(TC tc, int maxRows);
-
-    protected abstract void edit(int index, TC column);
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("ROW_FACTORY".equals(p)) {
-            Callback<C, I> oldFactory = rowFactory;
-            rowFactory = rowFactoryProperty().get();
-            if (oldFactory != rowFactory) {
-                needCellsRebuilt = true;
-                getSkinnable().requestLayout();
-            }
-        } else if ("PLACEHOLDER".equals(p)) {
-            updatePlaceholderRegionVisibility();
-//        } else if ("WIDTH".equals(p)) {
-//            tableHeaderRow.setTablePadding(getSkinnable().getInsets());
-        } else if ("VBAR_VISIBLE".equals(p)) {
-            updateContentWidth();
-        }
-    }
-
-    @Override public void dispose() {
-        getVisibleLeafColumns().removeListener(weakVisibleLeafColumnsListener);
-        itemsProperty().removeListener(weakItemsChangeListener);
-        getSkinnable().getProperties().removeListener(propertiesMapListener);
-        updateTableItems(itemsProperty().get(), null);
-
-        super.dispose();
-    }
-
-    protected TableHeaderRow createTableHeaderRow() {
-        return new TableHeaderRow(this);
-    }
-
-    /**
-     * 
-     */
-    public TableHeaderRow getTableHeaderRow() {
-        return tableHeaderRow;
-    }
-
-    public Region getColumnReorderLine() {
-        return columnReorderLine;
-    }
-    
-    /**
-     * Function used to scroll the container down by one 'page', although
-     * if this is a horizontal container, then the scrolling will be to the right.
-     */
-    public int onScrollPageDown(boolean isFocusDriven) {
-        TableSelectionModel<S> sm = getSelectionModel();
-        if (sm == null) return -1;
-
-        final int itemCount = getItemCount();
-
-        I lastVisibleCell = flow.getLastVisibleCellWithinViewPort();
-        if (lastVisibleCell == null) return -1;
-        
-        int lastVisibleCellIndex = lastVisibleCell.getIndex();
-
-        // we include this test here as the virtual flow will return cells that
-        // exceed past the item count, so we need to clamp here (and further down
-        // in this method also). See RT-19053 for more information.
-        lastVisibleCellIndex = lastVisibleCellIndex >= itemCount ? itemCount - 1 : lastVisibleCellIndex;
-        
-        // isSelected represents focus OR selection
-        boolean isSelected;
-        if (isFocusDriven) {
-            isSelected = lastVisibleCell.isFocused() || isCellFocused(lastVisibleCellIndex);
-        } else {
-            isSelected = lastVisibleCell.isSelected() || isCellSelected(lastVisibleCellIndex);
-        }
-        
-        if (isSelected) {
-            boolean isLeadIndex = isLeadIndex(isFocusDriven, lastVisibleCellIndex);
-
-            if (isLeadIndex) {
-                // if the last visible cell is selected, we want to shift that cell up
-                // to be the top-most cell, or at least as far to the top as we can go.
-                flow.showAsFirst(lastVisibleCell);
-
-                I newLastVisibleCell = flow.getLastVisibleCellWithinViewPort();
-                lastVisibleCell = newLastVisibleCell == null ? lastVisibleCell : newLastVisibleCell;
-            }
-        } 
-
-        int newSelectionIndex = lastVisibleCell.getIndex();
-        newSelectionIndex = newSelectionIndex >= itemCount ? itemCount - 1 : newSelectionIndex;
-        flow.show(newSelectionIndex);
-        return newSelectionIndex;
-    }
-
-    /**
-     * Function used to scroll the container up by one 'page', although
-     * if this is a horizontal container, then the scrolling will be to the left.
-     */
-    public int onScrollPageUp(boolean isFocusDriven) {
-        I firstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
-        if (firstVisibleCell == null) return -1;
-
-        int firstVisibleCellIndex = firstVisibleCell.getIndex();
-
-        // isSelected represents focus OR selection
-        boolean isSelected = false;
-        if (isFocusDriven) {
-            isSelected = firstVisibleCell.isFocused() || isCellFocused(firstVisibleCellIndex);
-        } else {
-            isSelected = firstVisibleCell.isSelected() || isCellSelected(firstVisibleCellIndex);
-        }
-
-        if (isSelected) {
-            boolean isLeadIndex = isLeadIndex(isFocusDriven, firstVisibleCellIndex);
-
-            if (isLeadIndex) {
-                // if the first visible cell is selected, we want to shift that cell down
-                // to be the bottom-most cell, or at least as far to the bottom as we can go.
-                flow.showAsLast(firstVisibleCell);
-
-                I newFirstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
-                firstVisibleCell = newFirstVisibleCell == null ? firstVisibleCell : newFirstVisibleCell;
-            }
-        }
-
-        int newSelectionIndex = firstVisibleCell.getIndex();
-        flow.show(newSelectionIndex);
-        return newSelectionIndex;
-    }
-
-    private boolean isLeadIndex(boolean isFocusDriven, int index) {
-        final TableSelectionModel<S> sm = getSelectionModel();
-        final FocusModel<S> fm = getFocusModel();
-
-        return (isFocusDriven && fm.getFocusedIndex() == index)
-                || (! isFocusDriven && sm.getSelectedIndex() == index);
-    }
-    
-     boolean isColumnPartiallyOrFullyVisible(TC col) {
-        if (col == null || !col.isVisible()) return false;
-        
-        double scrollX = flow.getHbar().getValue(); 
-
-        // work out where this column header is, and it's width (start -> end)
-        double start = 0;
-        final ObservableList<? extends TC> visibleLeafColumns = getVisibleLeafColumns();
-        for (int i = 0, max = visibleLeafColumns.size(); i < max; i++) {
-            TableColumnBase<S,?> c = visibleLeafColumns.get(i);
-            if (c.equals(col)) break;
-            start += c.getWidth();
-        }
-        double end = start + col.getWidth();
-
-        // determine the width of the table
-        final Insets padding = getSkinnable().getPadding();
-        double headerWidth = getSkinnable().getWidth() - padding.getLeft() + padding.getRight();
-        
-        return (start >= scrollX || end > scrollX) && (start < (headerWidth + scrollX) || end <= (headerWidth + scrollX));
-    }
-
-    protected void horizontalScroll() {
-        tableHeaderRow.updateScrollX();
-    }
-
-    @Override protected void updateRowCount() {
-        updatePlaceholderRegionVisibility();
-
-        int oldCount = itemCount;
-        int newCount = getItemCount();
-
-        itemCount = newCount;
-
-        // if this is not called even when the count is the same, we get a
-        // memory leak in VirtualFlow.sheet.children. This can probably be
-        // optimised in the future when time permits.
-        flow.setCellCount(newCount);
-
-        if (forceCellRecreate) {
-            needCellsRecreated = true;
-            forceCellRecreate = false;
-        } else if (newCount != oldCount) {
-            // FIXME updateRowCount is called _a lot_. Perhaps we can make rebuildCells
-            // smarter. Imagine if items has one million items added - do we really
-            // need to rebuildCells a million times? Maybe this is better now that
-            // we do rebuildCells instead of recreateCells.
-            needCellsRebuilt = true;
-        } else {
-            needCellsReconfigured = true;
-        }
-    }
-
-    protected void onFocusPreviousCell() {
-        TableFocusModel<S,TC> fm = getFocusModel();
-        if (fm == null) return;
-
-        flow.show(fm.getFocusedIndex());
-    }
-
-    protected void onFocusNextCell() {
-        TableFocusModel<S,TC> fm = getFocusModel();
-        if (fm == null) return;
-
-        flow.show(fm.getFocusedIndex());
-    }
-
-    protected void onSelectPreviousCell() {
-        SelectionModel<S> sm = getSelectionModel();
-        if (sm == null) return;
-
-        flow.show(sm.getSelectedIndex());
-    }
-
-    protected void onSelectNextCell() {
-        SelectionModel<S> sm = getSelectionModel();
-        if (sm == null) return;
-
-        flow.show(sm.getSelectedIndex());
-    }
-
-    protected void onSelectLeftCell() {
-        scrollHorizontally();
-    }
-
-    protected void onSelectRightCell() {
-        scrollHorizontally();
-    }
-
-    protected void onMoveToFirstCell() {
-        flow.show(0);
-        flow.setPosition(0);
-    }
-
-    protected void onMoveToLastCell() {
-        int endPos = getItemCount();
-        flow.show(endPos);
-        flow.setPosition(1);
-    }
-
-    public void updateTableItems(ObservableList<S> oldList, ObservableList<S> newList) {
-        if (oldList != null) {
-            oldList.removeListener(weakRowCountListener);
-        }
-
-        if (newList != null) {
-            newList.addListener(weakRowCountListener);
-        }
-
-        rowCountDirty = true;
-        getSkinnable().requestLayout();
-    }
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/    
-    
-    private static final double GOLDEN_RATIO_MULTIPLIER = 0.618033987;
-
-    private void checkContentWidthState() {
-        // we test for item count here to resolve RT-14855, where the column
-        // widths weren't being resized properly when in constrained layout mode
-        // if there were no items.
-        if (contentWidthDirty || getItemCount() == 0) {
-            updateContentWidth();
-            contentWidthDirty = false;
-        }
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return 400;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double prefHeight = computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset);
-        
-        List<? extends TC> cols = getVisibleLeafColumns();
-        if (cols == null || cols.isEmpty()) {
-            return prefHeight * GOLDEN_RATIO_MULTIPLIER;
-        } 
-
-        double pw = leftInset + rightInset;
-        for (int i = 0, max = cols.size(); i < max; i++) {
-            TC tc = cols.get(i);
-            pw += Math.max(tc.getPrefWidth(), tc.getMinWidth());
-        }
-//        return pw;
-        return Math.max(pw, prefHeight * GOLDEN_RATIO_MULTIPLIER);
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected void layoutChildren(final double x, double y,
-            final double w, final double h) {
-
-        C table = getSkinnable();
-
-        // an unlikely scenario, but it does pop up in unit tests, so guarding
-        // here to prevent test failures seems ok.
-        if (table == null) {
-            return;
-        }
-
-        super.layoutChildren(x, y, w, h);
-        
-        if (needCellsRecreated) {
-            flow.recreateCells();
-        } else if (needCellsRebuilt) {
-            flow.rebuildCells();
-        } else if (needCellsReconfigured) {
-            flow.reconfigureCells();
-        }
-
-        needCellsRebuilt = false;
-        needCellsRecreated = false;
-        needCellsReconfigured = false;
-
-        final double baselineOffset = table.getLayoutBounds().getHeight() / 2;
-
-        // position the table header
-        double tableHeaderRowHeight = tableHeaderRow.prefHeight(-1);
-        layoutInArea(tableHeaderRow, x, y, w, tableHeaderRowHeight, baselineOffset, 
-                HPos.CENTER, VPos.CENTER);
-        y += tableHeaderRowHeight;
-
-        // let the virtual flow take up all remaining space
-        // TODO this calculation is to ensure the bottom border is visible when
-        // placed in a Pane. It is not ideal, but will suffice for now. See 
-        // RT-14335 for more information.
-        double flowHeight = Math.floor(h - tableHeaderRowHeight);
-        if (getItemCount() == 0 || visibleColCount == 0) {
-            // show message overlay instead of empty table
-            layoutInArea(placeholderRegion, x, y,
-                    w, flowHeight,
-                    baselineOffset, HPos.CENTER, VPos.CENTER);
-        } else {
-            layoutInArea(flow, x, y,
-                    w, flowHeight,
-                    baselineOffset, HPos.CENTER, VPos.CENTER);
-        }
-        
-        // painting the overlay over the column being reordered
-        if (tableHeaderRow.getReorderingRegion() != null) {
-            TableColumnHeader reorderingColumnHeader = tableHeaderRow.getReorderingRegion();
-            TableColumnBase reorderingColumn = reorderingColumnHeader.getTableColumn();
-            if (reorderingColumn != null) {
-                Node n = tableHeaderRow.getReorderingRegion();
-                
-                // determine where to draw the column header overlay, it's 
-                // either from the left-edge of the column, or 0, if the column
-                // is off the left-side of the TableView (i.e. horizontal 
-                // scrolling has occured).
-                double minX = tableHeaderRow.sceneToLocal(n.localToScene(n.getBoundsInLocal())).getMinX();
-                double overlayWidth = reorderingColumnHeader.getWidth();
-                if (minX < 0) {
-                    overlayWidth += minX;
-                }
-                minX = minX < 0 ? 0 : minX;
-                
-                // prevent the overlay going out the right-hand side of the 
-                // TableView
-                if (minX + overlayWidth > w) {
-                    overlayWidth = w - minX;
-                    
-                    if (flow.getVbar().isVisible()) {
-                        overlayWidth -= flow.getVbar().getWidth() - 1;
-                    }
-                }
-                
-                double contentAreaHeight = flowHeight;
-                if (flow.getHbar().isVisible()) {
-                    contentAreaHeight -= flow.getHbar().getHeight();
-                }
-                
-                columnReorderOverlay.resize(overlayWidth, contentAreaHeight);
-                
-                columnReorderOverlay.setLayoutX(minX);
-                columnReorderOverlay.setLayoutY(tableHeaderRow.getHeight());
-            }
-            
-            // paint the reorder line as well
-            double cw = columnReorderLine.snappedLeftInset() + columnReorderLine.snappedRightInset();
-            double lineHeight = h - (flow.getHbar().isVisible() ? flow.getHbar().getHeight() - 1 : 0);
-            columnReorderLine.resizeRelocate(0, columnReorderLine.snappedTopInset(), cw, lineHeight);
-        }
-        
-        columnReorderLine.setVisible(tableHeaderRow.isReordering());
-        columnReorderOverlay.setVisible(tableHeaderRow.isReordering());
-
-        checkContentWidthState();
-    }
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Private methods                                                         *
-     *                                                                         *
-     **************************************************************************/
-    
-    /**
-     * Keeps track of how many leaf columns are currently visible in this table.
-     */
-    private void updateVisibleColumnCount() {
-        visibleColCount = getVisibleLeafColumns().size();
-
-        updatePlaceholderRegionVisibility();
-        needCellsRebuilt = true;
-        getSkinnable().requestLayout();
-    }
-    
-    private void updateVisibleLeafColumnWidthListeners(
-            List<? extends TC> added, List<? extends TC> removed) {
-        
-        for (int i = 0, max = removed.size(); i < max; i++) {
-            TC tc = removed.get(i);
-            tc.widthProperty().removeListener(weakWidthListener);
-        }
-        for (int i = 0, max = added.size(); i < max; i++) {
-            TC tc = added.get(i);
-            tc.widthProperty().addListener(weakWidthListener);
-        }
-        needCellsRebuilt = true;
-        getSkinnable().requestLayout();
-    }
-
-    protected final void updatePlaceholderRegionVisibility() {
-        boolean visible = visibleColCount == 0 || getItemCount() == 0;
-        
-        if (visible) {
-            if (placeholderRegion == null) {
-                placeholderRegion = new StackPane();
-                placeholderRegion.getStyleClass().setAll("placeholder");
-                getChildren().add(placeholderRegion);
-            }
-            
-            Node placeholderNode = placeholderProperty().get();
-
-            if (placeholderNode == null) {
-                if (placeholderLabel == null) {
-                    placeholderLabel = new Label();
-                }
-                String s = visibleColCount == 0 ? NO_COLUMNS_TEXT : EMPTY_TABLE_TEXT;
-                placeholderLabel.setText(s);
-
-                placeholderRegion.getChildren().setAll(placeholderLabel);
-            } else {
-                placeholderRegion.getChildren().setAll(placeholderNode);
-            }
-        }
-
-        flow.setVisible(! visible);
-        if (placeholderRegion != null) {
-            placeholderRegion.setVisible(visible);
-        }
-    }
-
-    /*
-     * It's often important to know how much width is available for content
-     * within the table, and this needs to exclude the width of any vertical
-     * scrollbar.
-     */
-    private void updateContentWidth() {
-        double contentWidth = flow.getWidth();
-        
-        if (flow.getVbar().isVisible()) {
-            contentWidth -= flow.getVbar().getWidth();
-        }
-        
-        if (contentWidth <= 0) {
-            // Fix for RT-14855 when there is no content in the TableView.
-            Control c = getSkinnable();
-            contentWidth = c.getWidth() - (snappedLeftInset() + snappedRightInset());
-        }
-
-        contentWidth = Math.max(0.0, contentWidth);
-
-        // FIXME this isn't perfect, but it prevents RT-14885, which results in
-        // undesired horizontal scrollbars when in constrained resize mode
-        getSkinnable().getProperties().put("TableView.contentWidth", Math.floor(contentWidth));
-    }
-
-    private void refreshView() {
-        rowCountDirty = true;
-        Control c = getSkinnable();
-        if (c != null) {
-            c.requestLayout();
-        }
-    }
-
-    // Handles the horizontal scrolling when the selection mode is cell-based
-    // and the newly selected cell belongs to a column which is not totally
-    // visible.
-    protected void scrollHorizontally() {
-        TableFocusModel<S,TC> fm = getFocusModel();
-        if (fm == null) return;
-
-        TC col = getFocusedCell().getTableColumn();
-        scrollHorizontally(col);
-    }
-
-    protected void scrollHorizontally(TC col) {
-        if (col == null || !col.isVisible()) return;
-        
-        final Control control = getSkinnable();
-
-        // RT-37060 - if we are trying to scroll to a column that has not
-        // yet even been rendered, we must wait until the layout pass has
-        // happened and then do the scroll. The laziest way to do this is to
-        // queue up the task to run later, at which point we will have hopefully
-        // fully run the column through layout and css.
-        TableColumnHeader header = tableHeaderRow.getColumnHeaderFor(col);
-        if (header == null || header.getWidth() <= 0) {
-            Platform.runLater(() -> scrollHorizontally(col));
-            return;
-        }
-
-        // work out where this column header is, and it's width (start -> end)
-        double start = 0;
-        for (TC c : getVisibleLeafColumns()) {
-            if (c.equals(col)) break;
-            start += c.getWidth();
-        }
-        double end = start + col.getWidth();
-
-        // determine the visible width of the table
-        double headerWidth = control.getWidth() - snappedLeftInset() - snappedRightInset();
-
-        // determine by how much we need to translate the table to ensure that
-        // the start position of this column lines up with the left edge of the
-        // tableview, and also that the columns don't become detached from the
-        // right edge of the table
-        double pos = flow.getHbar().getValue();
-        double max = flow.getHbar().getMax();
-        double newPos;
-        
-        if (start < pos && start >= 0) {
-            newPos = start;
-        } else {
-            double delta = start < 0 || end > headerWidth ? start - pos : 0;
-            newPos = pos + delta > max ? max : pos + delta;
-        }
-
-        // FIXME we should add API in VirtualFlow so we don't end up going
-        // direct to the hbar.
-        // actually shift the flow - this will result in the header moving
-        // as well
-        flow.getHbar().setValue(newPos);
-    }
-
-    private boolean isCellSelected(int row) {
-        TableSelectionModel<S> sm = getSelectionModel();
-        if (sm == null) return false;
-        if (! sm.isCellSelectionEnabled()) return false;
-
-        int columnCount = getVisibleLeafColumns().size();
-        for (int col = 0; col < columnCount; col++) {
-            if (sm.isSelected(row, getVisibleLeafColumn(col))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-    
-    private boolean isCellFocused(int row) {
-        TableFocusModel<S,TC> fm = getFocusModel();
-        if (fm == null) return false;
-
-        int columnCount = getVisibleLeafColumns().size();
-        for (int col = 0; col < columnCount; col++) {
-            if (fm.isFocused(row, getVisibleLeafColumn(col))) {
-                return true;
-            }
-        }
-        
-        return false;
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_ITEM: {
-                TableFocusModel<S,?> fm = getFocusModel();
-                int focusedIndex = fm.getFocusedIndex();
-                if (focusedIndex == -1) {
-                    if (placeholderRegion != null && placeholderRegion.isVisible()) {
-                        return placeholderRegion.getChildren().get(0);
-                    }
-                    if (getItemCount() > 0) {
-                        focusedIndex = 0;
-                    } else {
-                        return null;
-                    }
-                }
-                return flow.getPrivateCell(focusedIndex);
-            }
-            case CELL_AT_ROW_COLUMN: {
-                int rowIndex = (Integer)parameters[0];
-                return flow.getPrivateCell(rowIndex);
-            }
-            case COLUMN_AT_INDEX: {
-                int index = (Integer)parameters[0];
-                TableColumnBase<S,?> column = getVisibleLeafColumn(index);
-                return getTableHeaderRow().getColumnHeaderFor(column);
-            }
-            case HEADER: {
-                /* Not sure how this is used by Accessibility, but without this VoiceOver will not
-                 * look for column headers */
-                return getTableHeaderRow();
-            }
-            case VERTICAL_SCROLLBAR: return flow.getVbar();
-            case HORIZONTAL_SCROLLBAR: return flow.getHbar();
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:23:16.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TableViewSkinBase.java	2015-09-03 15:23:14.407750100 -0700
@@ -0,0 +1,1000 @@
+/*
+ * Copyright (c) 2012, 2015, 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 com.sun.javafx.scene.control.Properties;
+import javafx.application.Platform;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.MapChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
+import javafx.geometry.Insets;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.util.Callback;
+
+import javafx.collections.WeakListChangeListener;
+import com.sun.javafx.scene.control.skin.resources.ControlResources;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+import javafx.beans.WeakInvalidationListener;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.geometry.HPos;
+import javafx.geometry.VPos;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * TableViewSkinBase is the base skin class used by controls such as
+ * {@link javafx.scene.control.TableView} and {@link javafx.scene.control.TreeTableView}
+ * (the concrete classes are {@link TableViewSkin} and {@link TreeTableViewSkin},
+ * respectively).
+ *
+ * @param <M> The type of the item stored in each row (for TableView, this is the type
+ *           of the items list, and for TreeTableView, this is the type of the
+ *           TreeItem).
+ * @param <S> The type of the item, as represented by the selection model (for
+ *           TableView, this is, again, the type of the items list, and for
+ *           TreeTableView, this is TreeItem typed to the same type as M).
+ * @param <C> The type of the virtualised control (e.g TableView, TreeTableView)
+ * @param <I> The type of cell used by this virtualised control (e.g. TableRow, TreeTableRow)
+ * @param <TC> The type of TableColumnBase used by this virtualised control (e.g. TableColumn, TreeTableColumn)
+ *
+ * @since 9
+ * @see TableView
+ * @see TreeTableView
+ * @see TableViewSkin
+ * @see TreeTableViewSkin
+ */
+public abstract class TableViewSkinBase<M, S, C extends Control, I extends IndexedCell<M>, TC extends TableColumnBase<S,?>> extends VirtualContainerBase<C, I> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static Fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final double GOLDEN_RATIO_MULTIPLIER = 0.618033987;
+
+    private static final String EMPTY_TABLE_TEXT = ControlResources.getString("TableView.noContent");
+    private static final String NO_COLUMNS_TEXT = ControlResources.getString("TableView.noColumns");
+
+    // RT-34744 : IS_PANNABLE will be false unless
+    // javafx.scene.control.skin.TableViewSkin.pannable
+    // is set to true. This is done in order to make TableView functional
+    // on embedded systems with touch screens which do not generate scroll
+    // events for touch drag gestures.
+    private static final boolean IS_PANNABLE =
+            AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> Boolean.getBoolean("javafx.scene.control.skin.TableViewSkin.pannable"));
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Internal Fields                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    VirtualFlow<I> flow;
+
+    private boolean contentWidthDirty = true;
+
+    /**
+     * This region is used to overlay atop the table when the user is performing
+     * a column resize operation or a column reordering operation. It is a line
+     * that runs the height of the table to indicate either the final width of
+     * of the selected column, or the position the column will be 'dropped' into
+     * when the reordering operation completes.
+     */
+    private Region columnReorderLine;
+
+    /**
+     * A region which is resized and positioned such that it perfectly matches
+     * the dimensions of any TableColumn that is being reordered by the user.
+     * This is useful, for example, as a semi-transparent overlay to give
+     * feedback to the user as to which column is currently being moved.
+     */
+    private Region columnReorderOverlay;
+
+    /**
+     * The entire header region for all columns. This header region handles
+     * column reordering and resizing. It also handles the positioning and
+     * resizing of thte columnReorderLine and columnReorderOverlay.
+     */
+    private TableHeaderRow tableHeaderRow;
+
+    private Callback<C, I> rowFactory;
+
+    /**
+     * Region placed over the top of the flow (and possibly the header row) if
+     * there is no data and/or there are no columns specified.
+     */
+    private StackPane placeholderRegion;
+    private Label placeholderLabel;
+
+    private int visibleColCount;
+
+    boolean needCellsRebuilt = true;
+    boolean needCellsRecreated = true;
+    boolean needCellsReconfigured = false;
+    boolean forceCellRecreate = false;
+
+    private int itemCount = -1;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private MapChangeListener<Object, Object> propertiesMapListener = c -> {
+        if (! c.wasAdded()) return;
+        if (Properties.REFRESH.equals(c.getKey())) {
+            refreshView();
+            getSkinnable().getProperties().remove(Properties.REFRESH);
+        } else if (Properties.RECREATE.equals(c.getKey())) {
+            forceCellRecreate = true;
+            refreshView();
+            getSkinnable().getProperties().remove(Properties.RECREATE);
+        }
+    };
+
+    private ListChangeListener<S> rowCountListener = c -> {
+        while (c.next()) {
+            if (c.wasReplaced()) {
+                // RT-28397: Support for when an item is replaced with itself (but
+                // updated internal values that should be shown visually).
+
+                // The ListViewSkin equivalent code here was updated to use the
+                // flow.setDirtyCell(int) API, but it was left alone here, otherwise
+                // our unit test for RT-36220 fails as we do not handle the case
+                // where the TableCell gets updated (only the TableRow does).
+                // Ideally we would use the dirtyCell API:
+                //
+                // for (int i = c.getFrom(); i < c.getTo(); i++) {
+                //     flow.setCellDirty(i);
+                // }
+                itemCount = 0;
+                break;
+            } else if (c.getRemovedSize() == itemCount) {
+                // RT-22463: If the user clears out an items list then we
+                // should reset all cells (in particular their contained
+                // items) such that a subsequent addition to the list of
+                // an item which equals the old item (but is rendered
+                // differently) still displays as expected (i.e. with the
+                // updated display, not the old display).
+                itemCount = 0;
+                break;
+            }
+        }
+
+        // fix for RT-37853
+        if (getSkinnable() instanceof TableView) {
+            ((TableView)getSkinnable()).edit(-1, null);
+        }
+
+        rowCountDirty = true;
+        getSkinnable().requestLayout();
+    };
+
+    private ListChangeListener<TC> visibleLeafColumnsListener =
+            c -> {
+                updateVisibleColumnCount();
+                while (c.next()) {
+                    updateVisibleLeafColumnWidthListeners(c.getAddedSubList(), c.getRemoved());
+                }
+            };
+
+    private InvalidationListener widthListener = observable -> {
+        // This forces the horizontal scrollbar to show when the column
+        // resizing occurs. It is not ideal, but will work for now.
+
+        // using 'needCellsReconfigured' here rather than 'needCellsRebuilt'
+        // as otherwise performance suffers massively (RT-27831)
+        needCellsReconfigured = true;
+        if (getSkinnable() != null) {
+            getSkinnable().requestLayout();
+        }
+    };
+
+    private InvalidationListener itemsChangeListener;
+
+    private WeakListChangeListener<S> weakRowCountListener =
+            new WeakListChangeListener<>(rowCountListener);
+    private WeakListChangeListener<TC> weakVisibleLeafColumnsListener =
+            new WeakListChangeListener<>(visibleLeafColumnsListener);
+    private WeakInvalidationListener weakWidthListener =
+            new WeakInvalidationListener(widthListener);
+    private WeakInvalidationListener weakItemsChangeListener;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     *
+     * @param control
+     */
+    public TableViewSkinBase(final C control) {
+        super(control);
+        
+        // init the VirtualFlow
+        flow = getVirtualFlow();
+        flow.setPannable(IS_PANNABLE);
+//        flow.setCellFactory(flow1 -> TableViewSkinBase.this.createCell());
+        
+        /*
+         * Listening for scrolling along the X axis, but we need to be careful
+         * to handle the situation appropriately when the hbar is invisible.
+         */
+        flow.getHbar().valueProperty().addListener(o -> horizontalScroll());
+
+        // RT-37152
+        flow.getHbar().setUnitIncrement(15);
+        flow.getHbar().setBlockIncrement(TableColumnHeader.DEFAULT_COLUMN_WIDTH);
+
+        columnReorderLine = new Region();
+        columnReorderLine.getStyleClass().setAll("column-resize-line");
+        columnReorderLine.setManaged(false);
+        columnReorderLine.setVisible(false);
+
+        columnReorderOverlay = new Region();
+        columnReorderOverlay.getStyleClass().setAll("column-overlay");
+        columnReorderOverlay.setVisible(false);
+        columnReorderOverlay.setManaged(false);
+
+        tableHeaderRow = createTableHeaderRow();
+//        tableHeaderRow.setColumnReorderLine(columnReorderLine);
+        tableHeaderRow.setFocusTraversable(false);
+
+        getChildren().addAll(tableHeaderRow, flow, columnReorderOverlay, columnReorderLine);
+
+        updateVisibleColumnCount();
+        updateVisibleLeafColumnWidthListeners(getVisibleLeafColumns(), FXCollections.<TC>emptyObservableList());
+
+        tableHeaderRow.reorderingProperty().addListener(valueModel -> {
+            getSkinnable().requestLayout();
+        });
+
+        getVisibleLeafColumns().addListener(weakVisibleLeafColumnsListener);
+        
+        updateTableItems(null, itemsProperty().get());
+        itemsChangeListener = new InvalidationListener() {
+            private WeakReference<ObservableList<S>> weakItemsRef = new WeakReference<>(itemsProperty().get());
+
+            @Override public void invalidated(Observable observable) {
+                ObservableList<S> oldItems = weakItemsRef.get();
+                weakItemsRef = new WeakReference<>(itemsProperty().get());
+                updateTableItems(oldItems, itemsProperty().get());
+            }
+        };
+        weakItemsChangeListener = new WeakInvalidationListener(itemsChangeListener);
+        itemsProperty().addListener(weakItemsChangeListener);
+
+        final ObservableMap<Object, Object> properties = control.getProperties();
+        properties.remove(Properties.REFRESH);
+        properties.remove(Properties.RECREATE);
+        properties.addListener(propertiesMapListener);
+        
+        control.addEventHandler(ScrollToEvent.<TC>scrollToColumn(), event -> {
+            scrollHorizontally(event.getScrollTarget());
+        });
+
+        // flow and flow.vbar width observer
+        InvalidationListener widthObserver = valueModel -> {
+            contentWidthDirty = true;
+            getSkinnable().requestLayout();
+        };
+        flow.widthProperty().addListener(widthObserver);
+        flow.getVbar().widthProperty().addListener(widthObserver);
+
+        registerChangeListener(rowFactoryProperty(), e -> {
+            Callback<C, I> oldFactory = rowFactory;
+            rowFactory = rowFactoryProperty().get();
+            if (oldFactory != rowFactory) {
+                needCellsRebuilt = true;
+                getSkinnable().requestLayout();
+            }
+        });
+        registerChangeListener(placeholderProperty(), e -> updatePlaceholderRegionVisibility());
+        registerChangeListener(flow.getVbar().visibleProperty(), e -> updateContentWidth());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Abstract Methods                                                        *
+     *                                                                         *
+     **************************************************************************/
+
+    // returns the selection model of the control
+    abstract TableSelectionModel<S> getSelectionModel();
+
+    // returns the focus model of the control
+    abstract TableFocusModel<S,TC> getFocusModel();
+
+    // returns the currently focused cell in the focus model
+    abstract TablePositionBase<? extends TC> getFocusedCell();
+
+    // returns an ObservableList of the visible leaf columns of the control
+    abstract ObservableList<? extends TC> getVisibleLeafColumns();
+
+    // returns the index of a column in the visible leaf columns
+    abstract int getVisibleLeafIndex(TC tc);
+
+    // returns the leaf column at the given index
+    abstract TC getVisibleLeafColumn(int col);
+
+    // returns a list of the root columns
+    abstract ObservableList<TC> getColumns();
+
+    // returns the sort order of the control
+    abstract ObservableList<TC> getSortOrder();
+
+    // returns a property representing the list of items in the control
+    abstract ObjectProperty<ObservableList<S>> itemsProperty();
+
+    // returns a property representing the row factory in the control
+    abstract ObjectProperty<Callback<C, I>> rowFactoryProperty();
+
+    // returns the placeholder property for the control
+    abstract ObjectProperty<Node> placeholderProperty();
+
+    // returns the property used to represent whether the tableMenuButton should
+    // be visible
+    abstract BooleanProperty tableMenuButtonVisibleProperty();
+
+    // returns a property representing the column resize properyt in the control
+    abstract ObjectProperty<Callback<ResizeFeaturesBase, Boolean>> columnResizePolicyProperty();
+
+    // Method to resize the given column by the given delta, returning a boolean
+    // to indicate success or failure
+    abstract boolean resizeColumn(TC tc, double delta);
+
+    // Method to resize the column based on the content in that column, based on
+    // the maxRows number of rows
+    abstract void resizeColumnToFitContent(TC tc, int maxRows);
+
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        getVisibleLeafColumns().removeListener(weakVisibleLeafColumnsListener);
+        itemsProperty().removeListener(weakItemsChangeListener);
+        getSkinnable().getProperties().removeListener(propertiesMapListener);
+        updateTableItems(itemsProperty().get(), null);
+
+        super.dispose();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return 400;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double prefHeight = computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset);
+        
+        List<? extends TC> cols = getVisibleLeafColumns();
+        if (cols == null || cols.isEmpty()) {
+            return prefHeight * GOLDEN_RATIO_MULTIPLIER;
+        } 
+
+        double pw = leftInset + rightInset;
+        for (int i = 0, max = cols.size(); i < max; i++) {
+            TC tc = cols.get(i);
+            pw += Math.max(tc.getPrefWidth(), tc.getMinWidth());
+        }
+//        return pw;
+        return Math.max(pw, prefHeight * GOLDEN_RATIO_MULTIPLIER);
+    }
+    
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, double y,
+            final double w, final double h) {
+
+        C table = getSkinnable();
+
+        // an unlikely scenario, but it does pop up in unit tests, so guarding
+        // here to prevent test failures seems ok.
+        if (table == null) {
+            return;
+        }
+
+        super.layoutChildren(x, y, w, h);
+        
+        if (needCellsRecreated) {
+            flow.recreateCells();
+        } else if (needCellsRebuilt) {
+            flow.rebuildCells();
+        } else if (needCellsReconfigured) {
+            flow.reconfigureCells();
+        }
+
+        needCellsRebuilt = false;
+        needCellsRecreated = false;
+        needCellsReconfigured = false;
+
+        final double baselineOffset = table.getLayoutBounds().getHeight() / 2;
+
+        // position the table header
+        double tableHeaderRowHeight = tableHeaderRow.prefHeight(-1);
+        layoutInArea(tableHeaderRow, x, y, w, tableHeaderRowHeight, baselineOffset, 
+                HPos.CENTER, VPos.CENTER);
+        y += tableHeaderRowHeight;
+
+        // let the virtual flow take up all remaining space
+        // TODO this calculation is to ensure the bottom border is visible when
+        // placed in a Pane. It is not ideal, but will suffice for now. See 
+        // RT-14335 for more information.
+        double flowHeight = Math.floor(h - tableHeaderRowHeight);
+        if (getItemCount() == 0 || visibleColCount == 0) {
+            // show message overlay instead of empty table
+            layoutInArea(placeholderRegion, x, y,
+                    w, flowHeight,
+                    baselineOffset, HPos.CENTER, VPos.CENTER);
+        } else {
+            layoutInArea(flow, x, y,
+                    w, flowHeight,
+                    baselineOffset, HPos.CENTER, VPos.CENTER);
+        }
+        
+        // painting the overlay over the column being reordered
+        if (tableHeaderRow.getReorderingRegion() != null) {
+            TableColumnHeader reorderingColumnHeader = tableHeaderRow.getReorderingRegion();
+            TableColumnBase reorderingColumn = reorderingColumnHeader.getTableColumn();
+            if (reorderingColumn != null) {
+                Node n = tableHeaderRow.getReorderingRegion();
+                
+                // determine where to draw the column header overlay, it's 
+                // either from the left-edge of the column, or 0, if the column
+                // is off the left-side of the TableView (i.e. horizontal 
+                // scrolling has occured).
+                double minX = tableHeaderRow.sceneToLocal(n.localToScene(n.getBoundsInLocal())).getMinX();
+                double overlayWidth = reorderingColumnHeader.getWidth();
+                if (minX < 0) {
+                    overlayWidth += minX;
+                }
+                minX = minX < 0 ? 0 : minX;
+                
+                // prevent the overlay going out the right-hand side of the 
+                // TableView
+                if (minX + overlayWidth > w) {
+                    overlayWidth = w - minX;
+                    
+                    if (flow.getVbar().isVisible()) {
+                        overlayWidth -= flow.getVbar().getWidth() - 1;
+                    }
+                }
+                
+                double contentAreaHeight = flowHeight;
+                if (flow.getHbar().isVisible()) {
+                    contentAreaHeight -= flow.getHbar().getHeight();
+                }
+                
+                columnReorderOverlay.resize(overlayWidth, contentAreaHeight);
+                
+                columnReorderOverlay.setLayoutX(minX);
+                columnReorderOverlay.setLayoutY(tableHeaderRow.getHeight());
+            }
+            
+            // paint the reorder line as well
+            double cw = columnReorderLine.snappedLeftInset() + columnReorderLine.snappedRightInset();
+            double lineHeight = h - (flow.getHbar().isVisible() ? flow.getHbar().getHeight() - 1 : 0);
+            columnReorderLine.resizeRelocate(0, columnReorderLine.snappedTopInset(), cw, lineHeight);
+        }
+        
+        columnReorderLine.setVisible(tableHeaderRow.isReordering());
+        columnReorderOverlay.setVisible(tableHeaderRow.isReordering());
+
+        checkContentWidthState();
+    }
+    
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    final TableHeaderRow getTableHeaderRow() {
+        return tableHeaderRow;
+    }
+
+    private TableHeaderRow createTableHeaderRow() {
+        return new TableHeaderRow(this);
+    }
+
+    @Override void updateRowCount() {
+        updatePlaceholderRegionVisibility();
+
+        int oldCount = itemCount;
+        int newCount = getItemCount();
+
+        itemCount = newCount;
+
+        // if this is not called even when the count is the same, we get a
+        // memory leak in VirtualFlow.sheet.children. This can probably be
+        // optimised in the future when time permits.
+        flow.setCellCount(newCount);
+
+        if (forceCellRecreate) {
+            needCellsRecreated = true;
+            forceCellRecreate = false;
+        } else if (newCount != oldCount) {
+            // FIXME updateRowCount is called _a lot_. Perhaps we can make rebuildCells
+            // smarter. Imagine if items has one million items added - do we really
+            // need to rebuildCells a million times? Maybe this is better now that
+            // we do rebuildCells instead of recreateCells.
+            needCellsRebuilt = true;
+        } else {
+            needCellsReconfigured = true;
+        }
+    }
+
+    private void checkContentWidthState() {
+        // we test for item count here to resolve RT-14855, where the column
+        // widths weren't being resized properly when in constrained layout mode
+        // if there were no items.
+        if (contentWidthDirty || getItemCount() == 0) {
+            updateContentWidth();
+            contentWidthDirty = false;
+        }
+    }
+
+    void horizontalScroll() {
+        tableHeaderRow.updateScrollX();
+    }
+
+    void onFocusPreviousCell() {
+        TableFocusModel<S,TC> fm = getFocusModel();
+        if (fm == null) return;
+
+        flow.scrollTo(fm.getFocusedIndex());
+    }
+
+    void onFocusNextCell() {
+        TableFocusModel<S,TC> fm = getFocusModel();
+        if (fm == null) return;
+
+        flow.scrollTo(fm.getFocusedIndex());
+    }
+
+    void onSelectPreviousCell() {
+        SelectionModel<S> sm = getSelectionModel();
+        if (sm == null) return;
+
+        flow.scrollTo(sm.getSelectedIndex());
+    }
+
+    void onSelectNextCell() {
+        SelectionModel<S> sm = getSelectionModel();
+        if (sm == null) return;
+
+        flow.scrollTo(sm.getSelectedIndex());
+    }
+
+    void onSelectLeftCell() {
+        scrollHorizontally();
+    }
+
+    void onSelectRightCell() {
+        scrollHorizontally();
+    }
+
+    void onMoveToFirstCell() {
+        flow.scrollTo(0);
+        flow.setPosition(0);
+    }
+
+    void onMoveToLastCell() {
+        int endPos = getItemCount();
+        flow.scrollTo(endPos);
+        flow.setPosition(1);
+    }
+
+    private void updateTableItems(ObservableList<S> oldList, ObservableList<S> newList) {
+        if (oldList != null) {
+            oldList.removeListener(weakRowCountListener);
+        }
+
+        if (newList != null) {
+            newList.addListener(weakRowCountListener);
+        }
+
+        rowCountDirty = true;
+        getSkinnable().requestLayout();
+    }
+
+    Region getColumnReorderLine() {
+        return columnReorderLine;
+    }
+
+    /**
+     * Function used to scroll the container down by one 'page', although
+     * if this is a horizontal container, then the scrolling will be to the right.
+     */
+    int onScrollPageDown(boolean isFocusDriven) {
+        TableSelectionModel<S> sm = getSelectionModel();
+        if (sm == null) return -1;
+
+        final int itemCount = getItemCount();
+
+        I lastVisibleCell = flow.getLastVisibleCellWithinViewPort();
+        if (lastVisibleCell == null) return -1;
+
+        int lastVisibleCellIndex = lastVisibleCell.getIndex();
+
+        // we include this test here as the virtual flow will return cells that
+        // exceed past the item count, so we need to clamp here (and further down
+        // in this method also). See RT-19053 for more information.
+        lastVisibleCellIndex = lastVisibleCellIndex >= itemCount ? itemCount - 1 : lastVisibleCellIndex;
+
+        // isSelected represents focus OR selection
+        boolean isSelected;
+        if (isFocusDriven) {
+            isSelected = lastVisibleCell.isFocused() || isCellFocused(lastVisibleCellIndex);
+        } else {
+            isSelected = lastVisibleCell.isSelected() || isCellSelected(lastVisibleCellIndex);
+        }
+
+        if (isSelected) {
+            boolean isLeadIndex = isLeadIndex(isFocusDriven, lastVisibleCellIndex);
+
+            if (isLeadIndex) {
+                // if the last visible cell is selected, we want to shift that cell up
+                // to be the top-most cell, or at least as far to the top as we can go.
+                flow.scrollToTop(lastVisibleCell);
+
+                I newLastVisibleCell = flow.getLastVisibleCellWithinViewPort();
+                lastVisibleCell = newLastVisibleCell == null ? lastVisibleCell : newLastVisibleCell;
+            }
+        }
+
+        int newSelectionIndex = lastVisibleCell.getIndex();
+        newSelectionIndex = newSelectionIndex >= itemCount ? itemCount - 1 : newSelectionIndex;
+        flow.scrollTo(newSelectionIndex);
+        return newSelectionIndex;
+    }
+
+    /**
+     * Function used to scroll the container up by one 'page', although
+     * if this is a horizontal container, then the scrolling will be to the left.
+     */
+    int onScrollPageUp(boolean isFocusDriven) {
+        I firstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
+        if (firstVisibleCell == null) return -1;
+
+        int firstVisibleCellIndex = firstVisibleCell.getIndex();
+
+        // isSelected represents focus OR selection
+        boolean isSelected = false;
+        if (isFocusDriven) {
+            isSelected = firstVisibleCell.isFocused() || isCellFocused(firstVisibleCellIndex);
+        } else {
+            isSelected = firstVisibleCell.isSelected() || isCellSelected(firstVisibleCellIndex);
+        }
+
+        if (isSelected) {
+            boolean isLeadIndex = isLeadIndex(isFocusDriven, firstVisibleCellIndex);
+
+            if (isLeadIndex) {
+                // if the first visible cell is selected, we want to shift that cell down
+                // to be the bottom-most cell, or at least as far to the bottom as we can go.
+                flow.scrollToBottom(firstVisibleCell);
+
+                I newFirstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
+                firstVisibleCell = newFirstVisibleCell == null ? firstVisibleCell : newFirstVisibleCell;
+            }
+        }
+
+        int newSelectionIndex = firstVisibleCell.getIndex();
+        flow.scrollTo(newSelectionIndex);
+        return newSelectionIndex;
+    }
+
+    private boolean isLeadIndex(boolean isFocusDriven, int index) {
+        final TableSelectionModel<S> sm = getSelectionModel();
+        final FocusModel<S> fm = getFocusModel();
+
+        return (isFocusDriven && fm.getFocusedIndex() == index)
+                || (! isFocusDriven && sm.getSelectedIndex() == index);
+    }
+
+    boolean isColumnPartiallyOrFullyVisible(TC col) {
+        if (col == null || !col.isVisible()) return false;
+
+        double scrollX = flow.getHbar().getValue();
+
+        // work out where this column header is, and it's width (start -> end)
+        double start = 0;
+        final ObservableList<? extends TC> visibleLeafColumns = getVisibleLeafColumns();
+        for (int i = 0, max = visibleLeafColumns.size(); i < max; i++) {
+            TableColumnBase<S,?> c = visibleLeafColumns.get(i);
+            if (c.equals(col)) break;
+            start += c.getWidth();
+        }
+        double end = start + col.getWidth();
+
+        // determine the width of the table
+        final Insets padding = getSkinnable().getPadding();
+        double headerWidth = getSkinnable().getWidth() - padding.getLeft() + padding.getRight();
+
+        return (start >= scrollX || end > scrollX) && (start < (headerWidth + scrollX) || end <= (headerWidth + scrollX));
+    }
+    
+    /**
+     * Keeps track of how many leaf columns are currently visible in this table.
+     */
+    private void updateVisibleColumnCount() {
+        visibleColCount = getVisibleLeafColumns().size();
+
+        updatePlaceholderRegionVisibility();
+        needCellsRebuilt = true;
+        getSkinnable().requestLayout();
+    }
+    
+    private void updateVisibleLeafColumnWidthListeners(
+            List<? extends TC> added, List<? extends TC> removed) {
+        
+        for (int i = 0, max = removed.size(); i < max; i++) {
+            TC tc = removed.get(i);
+            tc.widthProperty().removeListener(weakWidthListener);
+        }
+        for (int i = 0, max = added.size(); i < max; i++) {
+            TC tc = added.get(i);
+            tc.widthProperty().addListener(weakWidthListener);
+        }
+        needCellsRebuilt = true;
+        getSkinnable().requestLayout();
+    }
+
+    final void updatePlaceholderRegionVisibility() {
+        boolean visible = visibleColCount == 0 || getItemCount() == 0;
+        
+        if (visible) {
+            if (placeholderRegion == null) {
+                placeholderRegion = new StackPane();
+                placeholderRegion.getStyleClass().setAll("placeholder");
+                getChildren().add(placeholderRegion);
+            }
+            
+            Node placeholderNode = placeholderProperty().get();
+
+            if (placeholderNode == null) {
+                if (placeholderLabel == null) {
+                    placeholderLabel = new Label();
+                }
+                String s = visibleColCount == 0 ? NO_COLUMNS_TEXT : EMPTY_TABLE_TEXT;
+                placeholderLabel.setText(s);
+
+                placeholderRegion.getChildren().setAll(placeholderLabel);
+            } else {
+                placeholderRegion.getChildren().setAll(placeholderNode);
+            }
+        }
+
+        flow.setVisible(! visible);
+        if (placeholderRegion != null) {
+            placeholderRegion.setVisible(visible);
+        }
+    }
+
+    /*
+     * It's often important to know how much width is available for content
+     * within the table, and this needs to exclude the width of any vertical
+     * scrollbar.
+     */
+    private void updateContentWidth() {
+        double contentWidth = flow.getWidth();
+        
+        if (flow.getVbar().isVisible()) {
+            contentWidth -= flow.getVbar().getWidth();
+        }
+        
+        if (contentWidth <= 0) {
+            // Fix for RT-14855 when there is no content in the TableView.
+            Control c = getSkinnable();
+            contentWidth = c.getWidth() - (snappedLeftInset() + snappedRightInset());
+        }
+
+        contentWidth = Math.max(0.0, contentWidth);
+
+        // FIXME this isn't perfect, but it prevents RT-14885, which results in
+        // undesired horizontal scrollbars when in constrained resize mode
+        getSkinnable().getProperties().put("TableView.contentWidth", Math.floor(contentWidth));
+    }
+
+    private void refreshView() {
+        rowCountDirty = true;
+        Control c = getSkinnable();
+        if (c != null) {
+            c.requestLayout();
+        }
+    }
+
+    // Handles the horizontal scrolling when the selection mode is cell-based
+    // and the newly selected cell belongs to a column which is not totally
+    // visible.
+    void scrollHorizontally() {
+        TableFocusModel<S,TC> fm = getFocusModel();
+        if (fm == null) return;
+
+        TC col = getFocusedCell().getTableColumn();
+        scrollHorizontally(col);
+    }
+
+    void scrollHorizontally(TC col) {
+        if (col == null || !col.isVisible()) return;
+        
+        final Control control = getSkinnable();
+
+        // RT-37060 - if we are trying to scroll to a column that has not
+        // yet even been rendered, we must wait until the layout pass has
+        // happened and then do the scroll. The laziest way to do this is to
+        // queue up the task to run later, at which point we will have hopefully
+        // fully run the column through layout and css.
+        TableColumnHeader header = tableHeaderRow.getColumnHeaderFor(col);
+        if (header == null || header.getWidth() <= 0) {
+            Platform.runLater(() -> scrollHorizontally(col));
+            return;
+        }
+
+        // work out where this column header is, and it's width (start -> end)
+        double start = 0;
+        for (TC c : getVisibleLeafColumns()) {
+            if (c.equals(col)) break;
+            start += c.getWidth();
+        }
+        double end = start + col.getWidth();
+
+        // determine the visible width of the table
+        double headerWidth = control.getWidth() - snappedLeftInset() - snappedRightInset();
+
+        // determine by how much we need to translate the table to ensure that
+        // the start position of this column lines up with the left edge of the
+        // tableview, and also that the columns don't become detached from the
+        // right edge of the table
+        double pos = flow.getHbar().getValue();
+        double max = flow.getHbar().getMax();
+        double newPos;
+        
+        if (start < pos && start >= 0) {
+            newPos = start;
+        } else {
+            double delta = start < 0 || end > headerWidth ? start - pos : 0;
+            newPos = pos + delta > max ? max : pos + delta;
+        }
+
+        // FIXME we should add API in VirtualFlow so we don't end up going
+        // direct to the hbar.
+        // actually shift the flow - this will result in the header moving
+        // as well
+        flow.getHbar().setValue(newPos);
+    }
+
+    private boolean isCellSelected(int row) {
+        TableSelectionModel<S> sm = getSelectionModel();
+        if (sm == null) return false;
+        if (! sm.isCellSelectionEnabled()) return false;
+
+        int columnCount = getVisibleLeafColumns().size();
+        for (int col = 0; col < columnCount; col++) {
+            if (sm.isSelected(row, getVisibleLeafColumn(col))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    
+    private boolean isCellFocused(int row) {
+        TableFocusModel<S,TC> fm = getFocusModel();
+        if (fm == null) return false;
+
+        int columnCount = getVisibleLeafColumns().size();
+        for (int col = 0; col < columnCount; col++) {
+            if (fm.isFocused(row, getVisibleLeafColumn(col))) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * A11y                                                                    *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: {
+                TableFocusModel<S,?> fm = getFocusModel();
+                int focusedIndex = fm.getFocusedIndex();
+                if (focusedIndex == -1) {
+                    if (placeholderRegion != null && placeholderRegion.isVisible()) {
+                        return placeholderRegion.getChildren().get(0);
+                    }
+                    if (getItemCount() > 0) {
+                        focusedIndex = 0;
+                    } else {
+                        return null;
+                    }
+                }
+                return flow.getPrivateCell(focusedIndex);
+            }
+            case CELL_AT_ROW_COLUMN: {
+                int rowIndex = (Integer)parameters[0];
+                return flow.getPrivateCell(rowIndex);
+            }
+            case COLUMN_AT_INDEX: {
+                int index = (Integer)parameters[0];
+                TableColumnBase<S,?> column = getVisibleLeafColumn(index);
+                return getTableHeaderRow().getColumnHeaderFor(column);
+            }
+            case HEADER: {
+                /* Not sure how this is used by Accessibility, but without this VoiceOver will not
+                 * look for column headers */
+                return getTableHeaderRow();
+            }
+            case VERTICAL_SCROLLBAR: return flow.getVbar();
+            case HORIZONTAL_SCROLLBAR: return flow.getHbar();
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TextAreaSkin.java	2015-09-03 15:23:23.151250200 -0700
+++ /dev/null	2015-09-03 15:23:24.000000000 -0700
@@ -1,1388 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 com.sun.javafx.scene.control.behavior.TextAreaBehavior;
-import com.sun.javafx.scene.text.HitInfo;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.application.Platform;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.binding.DoubleBinding;
-import javafx.beans.binding.IntegerBinding;
-import javafx.beans.value.ObservableBooleanValue;
-import javafx.beans.value.ObservableIntegerValue;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Bounds;
-import javafx.geometry.Orientation;
-import javafx.geometry.Point2D;
-import javafx.geometry.Rectangle2D;
-import javafx.geometry.VPos;
-import javafx.geometry.VerticalDirection;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.control.IndexRange;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextArea;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.shape.MoveTo;
-import javafx.scene.shape.Path;
-import javafx.scene.shape.PathElement;
-import javafx.scene.text.Text;
-import javafx.util.Duration;
-
-import java.util.List;
-
-/**
- * Text area skin.
- */
-public class TextAreaSkin extends TextInputControlSkin<TextArea, TextAreaBehavior> {
-
-    final private TextArea textArea;
-
-    // *** NOTE: Multiple node mode is not yet fully implemented *** //
-    private final boolean USE_MULTIPLE_NODES = false;
-
-    private double computedMinWidth = Double.NEGATIVE_INFINITY;
-    private double computedMinHeight = Double.NEGATIVE_INFINITY;
-    private double computedPrefWidth = Double.NEGATIVE_INFINITY;
-    private double computedPrefHeight = Double.NEGATIVE_INFINITY;
-    private double widthForComputedPrefHeight = Double.NEGATIVE_INFINITY;
-    private double characterWidth;
-    private double lineHeight;
-
-    @Override protected void invalidateMetrics() {
-        computedMinWidth = Double.NEGATIVE_INFINITY;
-        computedMinHeight = Double.NEGATIVE_INFINITY;
-        computedPrefWidth = Double.NEGATIVE_INFINITY;
-        computedPrefHeight = Double.NEGATIVE_INFINITY;
-    }
-
-    private class ContentView extends Region {
-        {
-            getStyleClass().add("content");
-
-            addEventHandler(MouseEvent.MOUSE_PRESSED, event -> {
-                getBehavior().mousePressed(event);
-                event.consume();
-            });
-
-            addEventHandler(MouseEvent.MOUSE_RELEASED, event -> {
-                getBehavior().mouseReleased(event);
-                event.consume();
-            });
-
-            addEventHandler(MouseEvent.MOUSE_DRAGGED, event -> {
-                getBehavior().mouseDragged(event);
-                event.consume();
-            });
-        }
-
-        @Override protected ObservableList<Node> getChildren() {
-            return super.getChildren();
-        }
-
-        @Override public Orientation getContentBias() {
-            return Orientation.HORIZONTAL;
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            if (computedPrefWidth < 0) {
-                double prefWidth = 0;
-
-                for (Node node : paragraphNodes.getChildren()) {
-                    Text paragraphNode = (Text)node;
-                    prefWidth = Math.max(prefWidth,
-                            Utils.computeTextWidth(paragraphNode.getFont(),
-                                    paragraphNode.getText(), 0));
-                }
-
-                prefWidth += snappedLeftInset() + snappedRightInset();
-
-                Bounds viewPortBounds = scrollPane.getViewportBounds();
-                computedPrefWidth = Math.max(prefWidth, (viewPortBounds != null) ? viewPortBounds.getWidth() : 0);
-            }
-            return computedPrefWidth;
-        }
-
-        @Override
-        protected double computePrefHeight(double width) {
-            if (width != widthForComputedPrefHeight) {
-                invalidateMetrics();
-                widthForComputedPrefHeight = width;
-            }
-
-            if (computedPrefHeight < 0) {
-                double wrappingWidth;
-                if (width == -1) {
-                    wrappingWidth = 0;
-                } else {
-                    wrappingWidth = Math.max(width - (snappedLeftInset() + snappedRightInset()), 0);
-                }
-
-                double prefHeight = 0;
-
-                for (Node node : paragraphNodes.getChildren()) {
-                    Text paragraphNode = (Text)node;
-                    prefHeight += Utils.computeTextHeight(
-                            paragraphNode.getFont(),
-                            paragraphNode.getText(),
-                            wrappingWidth, 
-                            paragraphNode.getBoundsType());
-                }
-
-                prefHeight += snappedTopInset() + snappedBottomInset();
-
-                Bounds viewPortBounds = scrollPane.getViewportBounds();
-                computedPrefHeight = Math.max(prefHeight, (viewPortBounds != null) ? viewPortBounds.getHeight() : 0);
-            }
-            return computedPrefHeight;
-        }
-
-        @Override protected double computeMinWidth(double height) {
-            if (computedMinWidth < 0) {
-                double hInsets = snappedLeftInset() + snappedRightInset();
-                computedMinWidth = Math.min(characterWidth + hInsets, computePrefWidth(height));
-            }
-            return computedMinWidth;
-        }
-
-        @Override protected double computeMinHeight(double width) {
-            if (computedMinHeight < 0) {
-                double vInsets = snappedTopInset() + snappedBottomInset();
-                computedMinHeight = Math.min(lineHeight + vInsets, computePrefHeight(width));
-            }
-            return computedMinHeight;
-        }
-
-        @Override
-        public void layoutChildren() {
-            TextArea textArea = getSkinnable();
-            double width = getWidth();
-
-            // Lay out paragraphs
-            final double topPadding = snappedTopInset();
-            final double leftPadding = snappedLeftInset();
-
-            double wrappingWidth = Math.max(width - (leftPadding + snappedRightInset()), 0);
-
-            double y = topPadding;
-            
-            final List<Node> paragraphNodesChildren = paragraphNodes.getChildren();
-
-            for (int i = 0; i < paragraphNodesChildren.size(); i++) {
-                Node node = paragraphNodesChildren.get(i);
-                Text paragraphNode = (Text)node;
-                paragraphNode.setWrappingWidth(wrappingWidth);
-
-                Bounds bounds = paragraphNode.getBoundsInLocal();
-                paragraphNode.setLayoutX(leftPadding);
-                paragraphNode.setLayoutY(y);
-                
-                y += bounds.getHeight();
-            }
-
-            if (promptNode != null) {
-                promptNode.setLayoutX(leftPadding);
-                promptNode.setLayoutY(topPadding + promptNode.getBaselineOffset());
-                promptNode.setWrappingWidth(wrappingWidth);
-            }
-
-            // Update the selection
-            IndexRange selection = textArea.getSelection();
-            Bounds oldCaretBounds = caretPath.getBoundsInParent();
-
-            selectionHighlightGroup.getChildren().clear();
-
-            int caretPos = textArea.getCaretPosition();
-            int anchorPos = textArea.getAnchor();
-
-            if (SHOW_HANDLES) {
-                // Install and resize the handles for caret and anchor.
-                if (selection.getLength() > 0) {
-                    selectionHandle1.resize(selectionHandle1.prefWidth(-1),
-                                            selectionHandle1.prefHeight(-1));
-                    selectionHandle2.resize(selectionHandle2.prefWidth(-1),
-                                            selectionHandle2.prefHeight(-1));
-                } else {
-                    caretHandle.resize(caretHandle.prefWidth(-1),
-                                       caretHandle.prefHeight(-1));
-                }
-
-                // Position the handle for the anchor. This could be handle1 or handle2.
-                // Do this before positioning the actual caret.
-                if (selection.getLength() > 0) {
-                    int paragraphIndex = paragraphNodesChildren.size();
-                    int paragraphOffset = textArea.getLength() + 1;
-                    Text paragraphNode = null;
-                    do {
-                        paragraphNode = (Text)paragraphNodesChildren.get(--paragraphIndex);
-                        paragraphOffset -= paragraphNode.getText().length() + 1;
-                    } while (anchorPos < paragraphOffset);
-
-                    updateTextNodeCaretPos(anchorPos - paragraphOffset);
-                    caretPath.getElements().clear();
-                    caretPath.getElements().addAll(paragraphNode.getImpl_caretShape());
-                    caretPath.setLayoutX(paragraphNode.getLayoutX());
-                    caretPath.setLayoutY(paragraphNode.getLayoutY());
-
-                    Bounds b = caretPath.getBoundsInParent();
-                    if (caretPos < anchorPos) {
-                        selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
-                        selectionHandle2.setLayoutY(b.getMaxY() - 1);
-                    } else {
-                        selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
-                        selectionHandle1.setLayoutY(b.getMinY() - selectionHandle1.getHeight() + 1);
-                    }
-                }
-            }
-
-            {
-                // Position caret
-                int paragraphIndex = paragraphNodesChildren.size();
-                int paragraphOffset = textArea.getLength() + 1;
-
-                Text paragraphNode = null;
-                do {
-                    paragraphNode = (Text)paragraphNodesChildren.get(--paragraphIndex);
-                    paragraphOffset -= paragraphNode.getText().length() + 1;
-                } while (caretPos < paragraphOffset);
-
-                updateTextNodeCaretPos(caretPos - paragraphOffset);
-
-                caretPath.getElements().clear();
-                caretPath.getElements().addAll(paragraphNode.getImpl_caretShape());
-
-                caretPath.setLayoutX(paragraphNode.getLayoutX());
-
-                // TODO: Remove this temporary workaround for RT-27533
-                paragraphNode.setLayoutX(2 * paragraphNode.getLayoutX() - paragraphNode.getBoundsInParent().getMinX());
-
-                caretPath.setLayoutY(paragraphNode.getLayoutY());
-                if (oldCaretBounds == null || !oldCaretBounds.equals(caretPath.getBoundsInParent())) {
-                    scrollCaretToVisible();
-                }
-            }
-
-            // Update selection fg and bg
-            int start = selection.getStart();
-            int end = selection.getEnd();
-            for (int i = 0, max = paragraphNodesChildren.size(); i < max; i++) {
-                Node paragraphNode = paragraphNodesChildren.get(i);
-                Text textNode = (Text)paragraphNode;
-                int paragraphLength = textNode.getText().length() + 1;
-                if (end > start && start < paragraphLength) {
-                    textNode.setImpl_selectionStart(start);
-                    textNode.setImpl_selectionEnd(Math.min(end, paragraphLength));
-
-                    Path selectionHighlightPath = new Path();
-                    selectionHighlightPath.setManaged(false);
-                    selectionHighlightPath.setStroke(null);
-                    PathElement[] selectionShape = textNode.getImpl_selectionShape();
-                    if (selectionShape != null) {
-                        selectionHighlightPath.getElements().addAll(selectionShape);
-                    }
-                    selectionHighlightGroup.getChildren().add(selectionHighlightPath);
-                    selectionHighlightGroup.setVisible(true);
-                    selectionHighlightPath.setLayoutX(textNode.getLayoutX());
-                    selectionHighlightPath.setLayoutY(textNode.getLayoutY());
-                    updateHighlightFill();
-                } else {
-                    textNode.setImpl_selectionStart(-1);
-                    textNode.setImpl_selectionEnd(-1);
-                    selectionHighlightGroup.setVisible(false);
-                }
-                start = Math.max(0, start - paragraphLength);
-                end   = Math.max(0, end   - paragraphLength);
-            }
-
-            if (SHOW_HANDLES) {
-                // Position handle for the caret. This could be handle1 or handle2 when
-                // a selection is active.
-                Bounds b = caretPath.getBoundsInParent();
-                if (selection.getLength() > 0) {
-                    if (caretPos < anchorPos) {
-                        selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
-                        selectionHandle1.setLayoutY(b.getMinY() - selectionHandle1.getHeight() + 1);
-                    } else {
-                        selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
-                        selectionHandle2.setLayoutY(b.getMaxY() - 1);
-                    }
-                } else {
-                    caretHandle.setLayoutX(b.getMinX() - caretHandle.getWidth() / 2 + 1);
-                    caretHandle.setLayoutY(b.getMaxY());
-                }
-            }
-
-            if (scrollPane.getPrefViewportWidth() == 0
-                || scrollPane.getPrefViewportHeight() == 0) {
-                updatePrefViewportWidth();
-                updatePrefViewportHeight();
-                if (getParent() != null && scrollPane.getPrefViewportWidth() > 0
-                                        || scrollPane.getPrefViewportHeight() > 0) {
-                    // Force layout of viewRect in ScrollPaneSkin
-                    getParent().requestLayout();
-                }
-            }
-
-            // RT-36454: Fit to width/height only if smaller than viewport.
-            // That is, grow to fit but don't shrink to fit.
-            Bounds viewportBounds = scrollPane.getViewportBounds();
-            boolean wasFitToWidth = scrollPane.isFitToWidth();
-            boolean wasFitToHeight = scrollPane.isFitToHeight();
-            boolean setFitToWidth = textArea.isWrapText() || computePrefWidth(-1) <= viewportBounds.getWidth();
-            boolean setFitToHeight = computePrefHeight(width) <= viewportBounds.getHeight();
-            if (wasFitToWidth != setFitToWidth || wasFitToHeight != setFitToHeight) {
-                Platform.runLater(() -> {
-                    scrollPane.setFitToWidth(setFitToWidth);
-                    scrollPane.setFitToHeight(setFitToHeight);
-                });
-                getParent().requestLayout();
-            }
-        }
-    }
-
-    private ContentView contentView = new ContentView();
-    private Group paragraphNodes = new Group();
-
-    private Text promptNode;
-    private ObservableBooleanValue usePromptText;
-
-    private ObservableIntegerValue caretPosition;
-    private Group selectionHighlightGroup = new Group();
-
-    private ScrollPane scrollPane;
-    private Bounds oldViewportBounds;
-
-    private VerticalDirection scrollDirection = null;
-
-    private Path characterBoundingPath = new Path();
-
-    private Timeline scrollSelectionTimeline = new Timeline();
-    private EventHandler<ActionEvent> scrollSelectionHandler = event -> {
-        switch (scrollDirection) {
-            case UP: {
-                // TODO Get previous offset
-                break;
-            }
-
-            case DOWN: {
-                // TODO Get next offset
-                break;
-            }
-        }
-    };
-
-    public static final int SCROLL_RATE = 30;
-
-    private double pressX, pressY; // For dragging handles on embedded
-    private boolean handlePressed;
-
-    public TextAreaSkin(final TextArea textArea) {
-        super(textArea, new TextAreaBehavior(textArea));
-        getBehavior().setTextAreaSkin(this);
-        this.textArea = textArea;
-
-        caretPosition = new IntegerBinding() {
-            { bind(textArea.caretPositionProperty()); }
-            @Override protected int computeValue() {
-                return textArea.getCaretPosition();
-            }
-        };
-        caretPosition.addListener((observable, oldValue, newValue) -> {
-            targetCaretX = -1;
-            if (newValue.intValue() > oldValue.intValue()) {
-                setForwardBias(true);
-            }
-        });
-
-        forwardBiasProperty().addListener(observable -> {
-            if (textArea.getWidth() > 0) {
-                updateTextNodeCaretPos(textArea.getCaretPosition());
-            }
-        });
-
-//        setManaged(false);
-
-        // Initialize content
-        scrollPane = new ScrollPane();
-        scrollPane.setFitToWidth(textArea.isWrapText());
-        scrollPane.setContent(contentView);
-        getChildren().add(scrollPane);
-
-        getSkinnable().addEventFilter(ScrollEvent.ANY, event -> {
-            if (event.isDirect() && handlePressed) {
-                event.consume();
-            }
-        });
-
-        // Add selection
-        selectionHighlightGroup.setManaged(false);
-        selectionHighlightGroup.setVisible(false);
-        contentView.getChildren().add(selectionHighlightGroup);
-
-        // Add content view
-        paragraphNodes.setManaged(false);
-        contentView.getChildren().add(paragraphNodes);
-
-        // Add caret
-        caretPath.setManaged(false);
-        caretPath.setStrokeWidth(1);
-        caretPath.fillProperty().bind(textFill);
-        caretPath.strokeProperty().bind(textFill);
-        // modifying visibility of the caret forces a layout-pass (RT-32373), so
-        // instead we modify the opacity.
-        caretPath.opacityProperty().bind(new DoubleBinding() {
-            { bind(caretVisible); }
-            @Override protected double computeValue() {
-                return caretVisible.get() ? 1.0 : 0.0;
-            }
-        });
-        contentView.getChildren().add(caretPath);
-
-        if (SHOW_HANDLES) {
-            contentView.getChildren().addAll(caretHandle, selectionHandle1, selectionHandle2);
-        }
-
-        scrollPane.hvalueProperty().addListener((observable, oldValue, newValue) -> {
-            getSkinnable().setScrollLeft(newValue.doubleValue() * getScrollLeftMax());
-        });
-
-        scrollPane.vvalueProperty().addListener((observable, oldValue, newValue) -> {
-            getSkinnable().setScrollTop(newValue.doubleValue() * getScrollTopMax());
-        });
-
-        // Initialize the scroll selection timeline
-        scrollSelectionTimeline.setCycleCount(Timeline.INDEFINITE);
-        List<KeyFrame> scrollSelectionFrames = scrollSelectionTimeline.getKeyFrames();
-        scrollSelectionFrames.clear();
-        scrollSelectionFrames.add(new KeyFrame(Duration.millis(350), scrollSelectionHandler));
-
-        // Add initial text content
-        for (int i = 0, n = USE_MULTIPLE_NODES ? textArea.getParagraphs().size() : 1; i < n; i++) {
-            CharSequence paragraph = (n == 1) ? textArea.textProperty().getValueSafe() : textArea.getParagraphs().get(i);
-            addParagraphNode(i, paragraph.toString());
-        }
-
-        textArea.selectionProperty().addListener((observable, oldValue, newValue) -> {
-            // TODO Why do we need two calls here?
-            textArea.requestLayout();
-            contentView.requestLayout();
-        });
-
-        textArea.wrapTextProperty().addListener((observable, oldValue, newValue) -> {
-            invalidateMetrics();
-            scrollPane.setFitToWidth(newValue);
-        });
-
-        textArea.prefColumnCountProperty().addListener((observable, oldValue, newValue) -> {
-            invalidateMetrics();
-            updatePrefViewportWidth();
-        });
-
-        textArea.prefRowCountProperty().addListener((observable, oldValue, newValue) -> {
-            invalidateMetrics();
-            updatePrefViewportHeight();
-        });
-
-        updateFontMetrics();
-        fontMetrics.addListener(valueModel -> {
-            updateFontMetrics();
-        });
-
-        contentView.paddingProperty().addListener(valueModel -> {
-            updatePrefViewportWidth();
-            updatePrefViewportHeight();
-        });
-
-        scrollPane.viewportBoundsProperty().addListener(valueModel -> {
-            if (scrollPane.getViewportBounds() != null) {
-                // ScrollPane creates a new Bounds instance for each
-                // layout pass, so we need to check if the width/height
-                // have really changed to avoid infinite layout requests.
-                Bounds newViewportBounds = scrollPane.getViewportBounds();
-                if (oldViewportBounds == null ||
-                    oldViewportBounds.getWidth() != newViewportBounds.getWidth() ||
-                    oldViewportBounds.getHeight() != newViewportBounds.getHeight()) {
-
-                    invalidateMetrics();
-                    oldViewportBounds = newViewportBounds;
-                    contentView.requestLayout();
-                }
-            }
-        });
-
-        textArea.scrollTopProperty().addListener((observable, oldValue, newValue) -> {
-            double vValue = (newValue.doubleValue() < getScrollTopMax())
-                               ? (newValue.doubleValue() / getScrollTopMax()) : 1.0;
-            scrollPane.setVvalue(vValue);
-        });
-
-        textArea.scrollLeftProperty().addListener((observable, oldValue, newValue) -> {
-            double hValue = (newValue.doubleValue() < getScrollLeftMax())
-                               ? (newValue.doubleValue() / getScrollLeftMax()) : 1.0;
-            scrollPane.setHvalue(hValue);
-        });
-
-        if (USE_MULTIPLE_NODES) {
-            textArea.getParagraphs().addListener((ListChangeListener.Change<? extends CharSequence> change) -> {
-                while (change.next()) {
-                    int from = change.getFrom();
-                    int to = change.getTo();
-                    List<? extends CharSequence> removed = change.getRemoved();
-                    if (from < to) {
-
-                        if (removed.isEmpty()) {
-                            // This is an add
-                            for (int i = from, n = to; i < n; i++) {
-                                addParagraphNode(i, change.getList().get(i).toString());
-                            }
-                        } else {
-                            // This is an update
-                            for (int i = from, n = to; i < n; i++) {
-                                Node node = paragraphNodes.getChildren().get(i);
-                                Text paragraphNode = (Text) node;
-                                paragraphNode.setText(change.getList().get(i).toString());
-                            }
-                        }
-                    } else {
-                        // This is a remove
-                        paragraphNodes.getChildren().subList(from, from + removed.size()).clear();
-                    }
-                }
-            });
-        } else {
-            textArea.textProperty().addListener(observable -> {
-                invalidateMetrics();
-                ((Text)paragraphNodes.getChildren().get(0)).setText(textArea.textProperty().getValueSafe());
-                contentView.requestLayout();
-            });
-        }
-
-        usePromptText = new BooleanBinding() {
-            { bind(textArea.textProperty(), textArea.promptTextProperty()); }
-            @Override protected boolean computeValue() {
-                String txt = textArea.getText();
-                String promptTxt = textArea.getPromptText();
-                return ((txt == null || txt.isEmpty()) &&
-                        promptTxt != null && !promptTxt.isEmpty());
-            }
-        };
-
-        if (usePromptText.get()) {
-            createPromptNode();
-        }
-
-        usePromptText.addListener(observable -> {
-            createPromptNode();
-            textArea.requestLayout();
-        });
-
-        updateHighlightFill();
-        updatePrefViewportWidth();
-        updatePrefViewportHeight();
-        if (textArea.isFocused()) setCaretAnimating(true);
-
-        if (SHOW_HANDLES) {
-            selectionHandle1.setRotate(180);
-
-            EventHandler<MouseEvent> handlePressHandler = e -> {
-                pressX = e.getX();
-                pressY = e.getY();
-                handlePressed = true;
-                e.consume();
-            };
-
-            EventHandler<MouseEvent> handleReleaseHandler = event -> {
-                handlePressed = false;
-            };
-
-            caretHandle.setOnMousePressed(handlePressHandler);
-            selectionHandle1.setOnMousePressed(handlePressHandler);
-            selectionHandle2.setOnMousePressed(handlePressHandler);
-
-            caretHandle.setOnMouseReleased(handleReleaseHandler);
-            selectionHandle1.setOnMouseReleased(handleReleaseHandler);
-            selectionHandle2.setOnMouseReleased(handleReleaseHandler);
-
-            caretHandle.setOnMouseDragged(e -> {
-                Text textNode = getTextNode();
-                Point2D tp = textNode.localToScene(0, 0);
-                Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + caretHandle.getWidth() / 2,
-                                        e.getSceneY() - tp.getY() - pressY - 6);
-                HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-                int pos = hit.getCharIndex();
-                if (pos > 0) {
-                    int oldPos = textNode.getImpl_caretPosition();
-                    textNode.setImpl_caretPosition(pos);
-                    PathElement element = textNode.getImpl_caretShape()[0];
-                    if (element instanceof MoveTo && ((MoveTo)element).getY() > e.getY() - getTextTranslateY()) {
-                        hit.setCharIndex(pos - 1);
-                    }
-                    textNode.setImpl_caretPosition(oldPos);
-                }
-                positionCaret(hit, false, false);
-                e.consume();
-            });
-
-            selectionHandle1.setOnMouseDragged(new EventHandler<MouseEvent>() {
-                @Override public void handle(MouseEvent e) {
-                    TextArea textArea = getSkinnable();
-                    Text textNode = getTextNode();
-                    Point2D tp = textNode.localToScene(0, 0);
-                    Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle1.getWidth() / 2,
-                                            e.getSceneY() - tp.getY() - pressY + selectionHandle1.getHeight() + 5);
-                    HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-                    int pos = hit.getCharIndex();
-                    if (textArea.getAnchor() < textArea.getCaretPosition()) {
-                        // Swap caret and anchor
-                        textArea.selectRange(textArea.getCaretPosition(), textArea.getAnchor());
-                    }
-                    if (pos > 0) {
-                        if (pos >= textArea.getAnchor()) {
-                            pos = textArea.getAnchor();
-                        }
-                        int oldPos = textNode.getImpl_caretPosition();
-                        textNode.setImpl_caretPosition(pos);
-                        PathElement element = textNode.getImpl_caretShape()[0];
-                        if (element instanceof MoveTo && ((MoveTo)element).getY() > e.getY() - getTextTranslateY()) {
-                            hit.setCharIndex(pos - 1);
-                        }
-                        textNode.setImpl_caretPosition(oldPos);
-                    }
-                    positionCaret(hit, true, false);
-                    e.consume();
-                }
-            });
-
-            selectionHandle2.setOnMouseDragged(new EventHandler<MouseEvent>() {
-                @Override public void handle(MouseEvent e) {
-                    TextArea textArea = getSkinnable();
-                    Text textNode = getTextNode();
-                    Point2D tp = textNode.localToScene(0, 0);
-                    Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle2.getWidth() / 2,
-                                            e.getSceneY() - tp.getY() - pressY - 6);
-                    HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-                    int pos = hit.getCharIndex();
-                    if (textArea.getAnchor() > textArea.getCaretPosition()) {
-                        // Swap caret and anchor
-                        textArea.selectRange(textArea.getCaretPosition(), textArea.getAnchor());
-                    }
-                    if (pos > 0) {
-                        if (pos <= textArea.getAnchor() + 1) {
-                            pos = Math.min(textArea.getAnchor() + 2, textArea.getLength());
-                        }
-                        int oldPos = textNode.getImpl_caretPosition();
-                        textNode.setImpl_caretPosition(pos);
-                        PathElement element = textNode.getImpl_caretShape()[0];
-                        if (element instanceof MoveTo && ((MoveTo)element).getY() > e.getY() - getTextTranslateY()) {
-                            hit.setCharIndex(pos - 1);
-                        }
-                        textNode.setImpl_caretPosition(oldPos);
-                        positionCaret(hit, true, false);
-                    }
-                    e.consume();
-                }
-            });
-        }
-    }
-
-    @Override
-    protected void layoutChildren(double contentX, double contentY, double contentWidth, double contentHeight) {
-        scrollPane.resizeRelocate(contentX, contentY, contentWidth, contentHeight);
-    }
-
-    private void createPromptNode() {
-        if (promptNode == null && usePromptText.get()) {
-            promptNode = new Text();
-            contentView.getChildren().add(0, promptNode);
-            promptNode.setManaged(false);
-            promptNode.getStyleClass().add("text");
-            promptNode.visibleProperty().bind(usePromptText);
-            promptNode.fontProperty().bind(getSkinnable().fontProperty());
-            promptNode.textProperty().bind(getSkinnable().promptTextProperty());
-            promptNode.fillProperty().bind(promptTextFill);
-        }
-    }
-
-    private void addParagraphNode(int i, String string) {
-        final TextArea textArea = getSkinnable();
-        Text paragraphNode = new Text(string);
-        paragraphNode.setTextOrigin(VPos.TOP);
-        paragraphNode.setManaged(false);
-        paragraphNode.getStyleClass().add("text");
-        paragraphNode.boundsTypeProperty().addListener((observable, oldValue, newValue) -> {
-            invalidateMetrics();
-            updateFontMetrics();
-        });
-        paragraphNodes.getChildren().add(i, paragraphNode);
-
-        paragraphNode.fontProperty().bind(textArea.fontProperty());
-        paragraphNode.fillProperty().bind(textFill);
-        paragraphNode.impl_selectionFillProperty().bind(highlightTextFill);
-    }
-
-    @Override
-    public void dispose() {
-        // TODO Unregister listeners on text editor, paragraph list
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        Text firstParagraph = (Text) paragraphNodes.getChildren().get(0);
-        return Utils.getAscent(getSkinnable().getFont(),firstParagraph.getBoundsType())
-                + contentView.snappedTopInset() + textArea.snappedTopInset();
-    }
-
-    @Override
-    public char getCharacter(int index) {
-        int n = paragraphNodes.getChildren().size();
-
-        int paragraphIndex = 0;
-        int offset = index;
-
-        String paragraph = null;
-        while (paragraphIndex < n) {
-            Text paragraphNode = (Text)paragraphNodes.getChildren().get(paragraphIndex);
-            paragraph = paragraphNode.getText();
-            int count = paragraph.length() + 1;
-
-            if (offset < count) {
-                break;
-            }
-
-            offset -= count;
-            paragraphIndex++;
-        }
-
-        return offset == paragraph.length() ? '\n' : paragraph.charAt(offset);
-    }
-
-    @Override
-    public int getInsertionPoint(double x, double y) {
-        TextArea textArea = getSkinnable();
-
-        int n = paragraphNodes.getChildren().size();
-        int index = -1;
-
-        if (n > 0) {
-            if (y < contentView.snappedTopInset()) {
-                // Select the character at x in the first row
-                Text paragraphNode = (Text)paragraphNodes.getChildren().get(0);
-                index = getNextInsertionPoint(paragraphNode, x, -1, VerticalDirection.DOWN);
-            } else if (y > contentView.snappedTopInset() + contentView.getHeight()) {
-                // Select the character at x in the last row
-                int lastParagraphIndex = n - 1;
-                Text lastParagraphView = (Text)paragraphNodes.getChildren().get(lastParagraphIndex);
-
-                index = getNextInsertionPoint(lastParagraphView, x, -1, VerticalDirection.UP)
-                    + (textArea.getLength() - lastParagraphView.getText().length());
-            } else {
-                // Select the character at x in the row at y
-                int paragraphOffset = 0;
-                for (int i = 0; i < n; i++) {
-                    Text paragraphNode = (Text)paragraphNodes.getChildren().get(i);
-
-                    Bounds bounds = paragraphNode.getBoundsInLocal();
-                    double paragraphViewY = paragraphNode.getLayoutY() + bounds.getMinY();
-                    if (y >= paragraphViewY
-                        && y < paragraphViewY + paragraphNode.getBoundsInLocal().getHeight()) {
-                        index = getInsertionPoint(paragraphNode,
-                            x - paragraphNode.getLayoutX(),
-                            y - paragraphNode.getLayoutY()) + paragraphOffset;
-                        break;
-                    }
-
-                    paragraphOffset += paragraphNode.getText().length() + 1;
-                }
-            }
-        }
-
-        return index;
-    }
-
-    public void positionCaret(HitInfo hit, boolean select, boolean extendSelection) {
-        int pos = Utils.getHitInsertionIndex(hit, getSkinnable().getText());
-        boolean isNewLine =
-               (pos > 0 &&
-                pos <= getSkinnable().getLength() &&
-                getSkinnable().getText().codePointAt(pos-1) == 0x0a);
-
-        // special handling for a new line
-        if (!hit.isLeading() && isNewLine) {
-            hit.setLeading(true);
-            pos -= 1;
-        }
-
-        if (select) {
-            if (extendSelection) {
-                getSkinnable().extendSelection(pos);
-            } else {
-                getSkinnable().selectPositionCaret(pos);
-            }
-        } else {
-            getSkinnable().positionCaret(pos);
-        }
-
-        setForwardBias(hit.isLeading());
-    }
-
-    private double getScrollTopMax() {
-        return Math.max(0, contentView.getHeight() - scrollPane.getViewportBounds().getHeight());
-    }
-
-    private double getScrollLeftMax() {
-        return Math.max(0, contentView.getWidth() - scrollPane.getViewportBounds().getWidth());
-    }
-
-    private int getInsertionPoint(Text paragraphNode, double x, double y) {
-        HitInfo hitInfo = paragraphNode.impl_hitTestChar(new Point2D(x, y));
-        return Utils.getHitInsertionIndex(hitInfo, paragraphNode.getText());
-    }
-
-    public int getNextInsertionPoint(double x, int from, VerticalDirection scrollDirection) {
-        // TODO
-        return 0;
-    }
-
-    private int getNextInsertionPoint(Text paragraphNode, double x, int from,
-        VerticalDirection scrollDirection) {
-        // TODO
-        return 0;
-    }
-
-    @Override
-    public Rectangle2D getCharacterBounds(int index) {
-        TextArea textArea = getSkinnable();
-
-        int paragraphIndex = paragraphNodes.getChildren().size();
-        int paragraphOffset = textArea.getLength() + 1;
-
-        Text paragraphNode = null;
-        do {
-            paragraphNode = (Text)paragraphNodes.getChildren().get(--paragraphIndex);
-            paragraphOffset -= paragraphNode.getText().length() + 1;
-        } while (index < paragraphOffset);
-
-        int characterIndex = index - paragraphOffset;
-        boolean terminator = false;
-
-        if (characterIndex == paragraphNode.getText().length()) {
-            characterIndex--;
-            terminator = true;
-        }
-
-        characterBoundingPath.getElements().clear();
-        characterBoundingPath.getElements().addAll(paragraphNode.impl_getRangeShape(characterIndex, characterIndex + 1));
-        characterBoundingPath.setLayoutX(paragraphNode.getLayoutX());
-        characterBoundingPath.setLayoutY(paragraphNode.getLayoutY());
-
-        Bounds bounds = characterBoundingPath.getBoundsInLocal();
-
-        double x = bounds.getMinX() + paragraphNode.getLayoutX() - textArea.getScrollLeft();
-        double y = bounds.getMinY() + paragraphNode.getLayoutY() - textArea.getScrollTop();
-
-        // Sometimes the bounds is empty, in which case we must ignore the width/height
-        double width = bounds.isEmpty() ? 0 : bounds.getWidth();
-        double height = bounds.isEmpty() ? 0 : bounds.getHeight();
-
-        if (terminator) {
-            x += width;
-            width = 0;
-        }
-
-        return new Rectangle2D(x, y, width, height);
-    }
-
-    @Override public void scrollCharacterToVisible(final int index) {
-        // TODO We queue a callback because when characters are added or
-        // removed the bounds are not immediately updated; is this really
-        // necessary?
-
-        Platform.runLater(() -> {
-            if (getSkinnable().getLength() == 0) {
-                return;
-            }
-            Rectangle2D characterBounds = getCharacterBounds(index);
-            scrollBoundsToVisible(characterBounds);
-        });
-    }
-
-    private void scrollCaretToVisible() {
-        TextArea textArea = getSkinnable();
-        Bounds bounds = caretPath.getLayoutBounds();
-        double x = bounds.getMinX() - textArea.getScrollLeft();
-        double y = bounds.getMinY() - textArea.getScrollTop();
-        double w = bounds.getWidth();
-        double h = bounds.getHeight();
-
-        if (SHOW_HANDLES) {
-            if (caretHandle.isVisible()) {
-                h += caretHandle.getHeight();
-            } else if (selectionHandle1.isVisible() && selectionHandle2.isVisible()) {
-                x -= selectionHandle1.getWidth() / 2;
-                y -= selectionHandle1.getHeight();
-                w += selectionHandle1.getWidth() / 2 + selectionHandle2.getWidth() / 2;
-                h += selectionHandle1.getHeight() + selectionHandle2.getHeight();
-            }
-        }
-
-        if (w > 0 && h > 0) {
-            scrollBoundsToVisible(new Rectangle2D(x, y, w, h));
-        }
-    }
-
-    private void scrollBoundsToVisible(Rectangle2D bounds) {
-        TextArea textArea = getSkinnable();
-        Bounds viewportBounds = scrollPane.getViewportBounds();
-
-        double viewportWidth = viewportBounds.getWidth();
-        double viewportHeight = viewportBounds.getHeight();
-        double scrollTop = textArea.getScrollTop();
-        double scrollLeft = textArea.getScrollLeft();
-        double slop = 6.0;
-
-        if (bounds.getMinY() < 0) {
-            double y = scrollTop + bounds.getMinY();
-            if (y <= contentView.snappedTopInset()) {
-                y = 0;
-            }
-            textArea.setScrollTop(y);
-        } else if (contentView.snappedTopInset() + bounds.getMaxY() > viewportHeight) {
-            double y = scrollTop + contentView.snappedTopInset() + bounds.getMaxY() - viewportHeight;
-            if (y >= getScrollTopMax() - contentView.snappedBottomInset()) {
-                y = getScrollTopMax();
-            }
-            textArea.setScrollTop(y);
-        }
-
-
-        if (bounds.getMinX() < 0) {
-            double x = scrollLeft + bounds.getMinX() - slop;
-            if (x <= contentView.snappedLeftInset() + slop) {
-                x = 0;
-            }
-            textArea.setScrollLeft(x);
-        } else if (contentView.snappedLeftInset() + bounds.getMaxX() > viewportWidth) {
-            double x = scrollLeft + contentView.snappedLeftInset() + bounds.getMaxX() - viewportWidth + slop;
-            if (x >= getScrollLeftMax() - contentView.snappedRightInset() - slop) {
-                x = getScrollLeftMax();
-            }
-            textArea.setScrollLeft(x);
-        }
-    }
-
-    private void updatePrefViewportWidth() {
-        int columnCount = getSkinnable().getPrefColumnCount();
-        scrollPane.setPrefViewportWidth(columnCount * characterWidth + contentView.snappedLeftInset() + contentView.snappedRightInset());
-        scrollPane.setMinViewportWidth(characterWidth + contentView.snappedLeftInset() + contentView.snappedRightInset());
-    }
-
-    private void updatePrefViewportHeight() {
-        int rowCount = getSkinnable().getPrefRowCount();
-        scrollPane.setPrefViewportHeight(rowCount * lineHeight + contentView.snappedTopInset() + contentView.snappedBottomInset());
-        scrollPane.setMinViewportHeight(lineHeight + contentView.snappedTopInset() + contentView.snappedBottomInset());
-    }
-
-    private void updateFontMetrics() {
-        Text firstParagraph = (Text)paragraphNodes.getChildren().get(0);
-        lineHeight = Utils.getLineHeight(getSkinnable().getFont(),firstParagraph.getBoundsType());
-        characterWidth = fontMetrics.get().computeStringWidth("W");
-    }
-
-    @Override
-    protected void updateHighlightFill() {
-       for (Node node : selectionHighlightGroup.getChildren()) {
-           Path selectionHighlightPath = (Path)node;
-           selectionHighlightPath.setFill(highlightFill.get());
-       }
-    }
-
-//     protected void handleMouseReleasedEvent(MouseEvent event) {
-// //        super.handleMouseReleasedEvent(event);
-
-//         // Stop the scroll selection timer
-//         scrollSelectionTimeline.stop();
-//         scrollDirection = null;
-
-//         // Select all if the user double-clicked
-//         if (event.getButton() == MouseButton.PRIMARY
-//             && event.getClickCount() == 3) {
-//             // TODO Select the current row
-//         }
-//     }
-
-    // Callbacks from Behavior class
-
-    private double getTextTranslateX() {
-        return contentView.snappedLeftInset();
-    }
-
-    private double getTextTranslateY() {
-        return contentView.snappedTopInset();
-    }
-
-    private double getTextLeft() {
-        return 0;
-    }
-
-    private Point2D translateCaretPosition(Point2D p) {
-        return p;
-    }
-
-    private Text getTextNode() {
-        if (USE_MULTIPLE_NODES) {
-            throw new IllegalArgumentException("Multiple node traversal is not yet implemented.");
-        }
-        return (Text)paragraphNodes.getChildren().get(0);
-    }
-
-    public HitInfo getIndex(double x, double y) {
-        // adjust the event to be in the same coordinate space as the
-        // text content of the textInputControl
-        Text textNode = getTextNode();
-        Point2D p = new Point2D(x - textNode.getLayoutX(), y - getTextTranslateY());
-        HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-        int pos = hit.getCharIndex();
-        if (pos > 0) {
-            int oldPos = textNode.getImpl_caretPosition();
-            textNode.setImpl_caretPosition(pos);
-            PathElement element = textNode.getImpl_caretShape()[0];
-            if (element instanceof MoveTo && ((MoveTo)element).getY() > y - getTextTranslateY()) {
-                hit.setCharIndex(pos - 1);
-            }
-            textNode.setImpl_caretPosition(oldPos);
-        }
-        return hit;
-    };
-
-    /**
-     * Remembers horizontal position when traversing up / down.
-     */
-    double targetCaretX = -1;
-
-    @Override public void nextCharacterVisually(boolean moveRight) {
-        if (isRTL()) {
-            // Text node is mirrored.
-            moveRight = !moveRight;
-        }
-
-        Text textNode = getTextNode();
-        Bounds caretBounds = caretPath.getLayoutBounds();
-        if (caretPath.getElements().size() == 4) {
-            // The caret is split
-            // TODO: Find a better way to get the primary caret position
-            // instead of depending on the internal implementation.
-            // See RT-25465.
-            caretBounds = new Path(caretPath.getElements().get(0), caretPath.getElements().get(1)).getLayoutBounds();
-        }
-        double hitX = moveRight ? caretBounds.getMaxX() : caretBounds.getMinX();
-        double hitY = (caretBounds.getMinY() + caretBounds.getMaxY()) / 2;
-        HitInfo hit = textNode.impl_hitTestChar(new Point2D(hitX, hitY));
-        Path charShape = new Path(textNode.impl_getRangeShape(hit.getCharIndex(), hit.getCharIndex() + 1));
-        if ((moveRight && charShape.getLayoutBounds().getMaxX() > caretBounds.getMaxX()) ||
-            (!moveRight && charShape.getLayoutBounds().getMinX() < caretBounds.getMinX())) {
-            hit.setLeading(!hit.isLeading());
-            positionCaret(hit, false, false);
-        } else {
-            // We're at beginning or end of line. Try moving up / down.
-            int dot = textArea.getCaretPosition();
-            targetCaretX = moveRight ? 0 : Double.MAX_VALUE;
-            // TODO: Use Bidi sniffing instead of assuming right means forward here?
-            downLines(moveRight ? 1 : -1, false, false);
-            targetCaretX = -1;
-            if (dot == textArea.getCaretPosition()) {
-                if (moveRight) {
-                    textArea.forward();
-                } else {
-                    textArea.backward();
-                }
-            }
-        }
-    }
-
-    /** A shared helper object, used only by downLines(). */
-    private static final Path tmpCaretPath = new Path();
-
-    protected void downLines(int nLines, boolean select, boolean extendSelection) {
-        Text textNode = getTextNode();
-        Bounds caretBounds = caretPath.getLayoutBounds();
-
-        // The middle y coordinate of the the line we want to go to.
-        double targetLineMidY = (caretBounds.getMinY() + caretBounds.getMaxY()) / 2 + nLines * lineHeight;
-        if (targetLineMidY < 0) {
-            targetLineMidY = 0;
-        }
-
-        // The target x for the caret. This may have been set during a
-        // previous call.
-        double x = (targetCaretX >= 0) ? targetCaretX : (caretBounds.getMaxX());
-
-        // Find a text position for the target x,y.
-        HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(new Point2D(x, targetLineMidY)));
-        int pos = hit.getCharIndex();
-
-        // Save the old pos temporarily while testing the new one.
-        int oldPos = textNode.getImpl_caretPosition();
-        boolean oldBias = textNode.isImpl_caretBias();
-        textNode.setImpl_caretBias(hit.isLeading());
-        textNode.setImpl_caretPosition(pos);
-        tmpCaretPath.getElements().clear();
-        tmpCaretPath.getElements().addAll(textNode.getImpl_caretShape());
-        tmpCaretPath.setLayoutX(textNode.getLayoutX());
-        tmpCaretPath.setLayoutY(textNode.getLayoutY());
-        Bounds tmpCaretBounds = tmpCaretPath.getLayoutBounds();
-        // The y for the middle of the row we found.
-        double foundLineMidY = (tmpCaretBounds.getMinY() + tmpCaretBounds.getMaxY()) / 2;
-        textNode.setImpl_caretBias(oldBias);
-        textNode.setImpl_caretPosition(oldPos);
-
-        if (pos > 0) {
-            if (nLines > 0 && foundLineMidY > targetLineMidY) {
-                // We went too far and ended up after a newline.
-                hit.setCharIndex(pos - 1);
-            }
-
-            if (pos >= textArea.getLength() && getCharacter(pos - 1) == '\n') {
-                // Special case for newline at end of text.
-                hit.setLeading(true);
-            }
-        }
-
-        // Test if the found line is in the correct direction and move
-        // the caret.
-        if (nLines == 0 ||
-            (nLines > 0 && foundLineMidY > caretBounds.getMaxY()) ||
-            (nLines < 0 && foundLineMidY < caretBounds.getMinY())) {
-
-            positionCaret(hit, select, extendSelection);
-            targetCaretX = x;
-        }
-    }
-
-    public void previousLine(boolean select) {
-        downLines(-1, select, false);
-    }
-
-    public void nextLine(boolean select) {
-        downLines(1, select, false);
-    }
-
-    public void previousPage(boolean select) {
-        downLines(-(int)(scrollPane.getViewportBounds().getHeight() / lineHeight),
-                  select, false);
-    }
-
-    public void nextPage(boolean select) {
-        downLines((int)(scrollPane.getViewportBounds().getHeight() / lineHeight),
-                  select, false);
-    }
-
-    public void lineStart(boolean select, boolean extendSelection) {
-        targetCaretX = 0;
-        downLines(0, select, extendSelection);
-        targetCaretX = -1;
-    }
-
-    public void lineEnd(boolean select, boolean extendSelection) {
-        targetCaretX = Double.MAX_VALUE;
-        downLines(0, select, extendSelection);
-        targetCaretX = -1;
-    }
-
-
-    public void paragraphStart(boolean previousIfAtStart, boolean select) {
-        TextArea textArea = getSkinnable();
-        String text = textArea.textProperty().getValueSafe();
-        int pos = textArea.getCaretPosition();
-
-        if (pos > 0) {
-            if (previousIfAtStart && text.codePointAt(pos-1) == 0x0a) {
-                // We are at the beginning of a paragraph.
-                // Back up to the previous paragraph.
-                pos--;
-            }
-            // Back up to the beginning of this paragraph
-            while (pos > 0 && text.codePointAt(pos-1) != 0x0a) {
-                pos--;
-            }
-            if (select) {
-                textArea.selectPositionCaret(pos);
-            } else {
-                textArea.positionCaret(pos);
-            }
-        }
-    }
-
-    public void paragraphEnd(boolean goPastInitialNewline, boolean goPastTrailingNewline, boolean select) {
-        TextArea textArea = getSkinnable();
-        String text = textArea.textProperty().getValueSafe();
-        int pos = textArea.getCaretPosition();
-        int len = text.length();
-        boolean wentPastInitialNewline = false;
-
-        if (pos < len) {
-            if (goPastInitialNewline && text.codePointAt(pos) == 0x0a) {
-                // We are at the end of a paragraph, start by moving to the
-                // next paragraph.
-                pos++;
-                wentPastInitialNewline = true;
-            }
-            if (!(goPastTrailingNewline && wentPastInitialNewline)) {
-                // Go to the end of this paragraph
-                while (pos < len && text.codePointAt(pos) != 0x0a) {
-                    pos++;
-                }
-                if (goPastTrailingNewline && pos < len) {
-                    // We are at the end of a paragraph, finish by moving to
-                    // the beginning of the next paragraph (Windows behavior).
-                    pos++;
-                }
-            }
-            if (select) {
-                textArea.selectPositionCaret(pos);
-            } else {
-                textArea.positionCaret(pos);
-            }
-        }
-    }
-
-    private void updateTextNodeCaretPos(int pos) {
-        Text textNode = getTextNode();
-        if (isForwardBias()) {
-            textNode.setImpl_caretPosition(pos);
-        } else {
-            textNode.setImpl_caretPosition(pos - 1);
-        }
-        textNode.impl_caretBiasProperty().set(isForwardBias());
-    }
-
-    @Override protected PathElement[] getUnderlineShape(int start, int end) {
-        int pStart = 0;
-        for (Node node : paragraphNodes.getChildren()) {
-            Text p = (Text)node;
-            int pEnd = pStart + p.textProperty().getValueSafe().length();
-            if (pEnd >= start) {
-                return p.impl_getUnderlineShape(start - pStart, end - pStart);
-            }
-            pStart = pEnd + 1;
-        }
-        return null;
-    }
-
-    @Override protected PathElement[] getRangeShape(int start, int end) {
-        int pStart = 0;
-        for (Node node : paragraphNodes.getChildren()) {
-            Text p = (Text)node;
-            int pEnd = pStart + p.textProperty().getValueSafe().length();
-            if (pEnd >= start) {
-                return p.impl_getRangeShape(start - pStart, end - pStart);
-            }
-            pStart = pEnd + 1;
-        }
-        return null;
-    }
-
-    @Override protected void addHighlight(List<? extends Node> nodes, int start) {
-        int pStart = 0;
-        Text paragraphNode = null;
-        for (Node node : paragraphNodes.getChildren()) {
-            Text p = (Text)node;
-            int pEnd = pStart + p.textProperty().getValueSafe().length();
-            if (pEnd >= start) {
-                paragraphNode = p;
-                break;
-            }
-            pStart = pEnd + 1;
-        }
-
-        if (paragraphNode != null) {
-            for (Node node : nodes) {
-                node.setLayoutX(paragraphNode.getLayoutX());
-                node.setLayoutY(paragraphNode.getLayoutY());
-            }
-        }
-        contentView.getChildren().addAll(nodes);
-    }
-
-    @Override protected void removeHighlight(List<? extends Node> nodes) {
-        contentView.getChildren().removeAll(nodes);
-    }
-
-    /**
-     * Use this implementation instead of the one provided on TextInputControl
-     * Simply calls into TextInputControl.deletePrevious/NextChar and responds appropriately
-     * based on the return value.
-     */
-    public void deleteChar(boolean previous) {
-//        final double textMaxXOld = textNode.getBoundsInParent().getMaxX();
-//        final double caretMaxXOld = caretPath.getLayoutBounds().getMaxX() + textTranslateX.get();
-        final boolean shouldBeep = previous ?
-                !getSkinnable().deletePreviousChar() :
-                !getSkinnable().deleteNextChar();
-
-        if (shouldBeep) {
-//            beep();
-        } else {
-//            scrollAfterDelete(textMaxXOld, caretMaxXOld);
-        }
-    }
-
-    @Override public Point2D getMenuPosition() {
-        contentView.layoutChildren();
-        Point2D p = super.getMenuPosition();
-        if (p != null) {
-            p = new Point2D(Math.max(0, p.getX() - contentView.snappedLeftInset() - getSkinnable().getScrollLeft()),
-                            Math.max(0, p.getY() - contentView.snappedTopInset() - getSkinnable().getScrollTop()));
-        }
-        return p;
-    }
-
-    public Bounds getCaretBounds() {
-        return getSkinnable().sceneToLocal(caretPath.localToScene(caretPath.getBoundsInLocal()));
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case LINE_FOR_OFFSET:
-            case LINE_START:
-            case LINE_END:
-            case BOUNDS_FOR_RANGE:
-            case OFFSET_AT_POINT:
-                Text text = getTextNode();
-                return text.queryAccessibleAttribute(attribute, parameters);
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:23:24.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TextAreaSkin.java	2015-09-03 15:23:22.415208200 -0700
@@ -0,0 +1,1529 @@
+/*
+ * Copyright (c) 2011, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.TextAreaBehavior;
+import com.sun.javafx.scene.control.skin.Utils;
+import com.sun.javafx.scene.text.HitInfo;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.application.Platform;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.DoubleBinding;
+import javafx.beans.binding.IntegerBinding;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.beans.value.ObservableIntegerValue;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.geometry.Bounds;
+import javafx.geometry.Orientation;
+import javafx.geometry.Point2D;
+import javafx.geometry.Rectangle2D;
+import javafx.geometry.VPos;
+import javafx.geometry.VerticalDirection;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.IndexRange;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextArea;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.shape.MoveTo;
+import javafx.scene.shape.Path;
+import javafx.scene.shape.PathElement;
+import javafx.scene.text.Text;
+import javafx.util.Duration;
+
+import java.util.List;
+
+import static com.sun.javafx.PlatformUtil.isMac;
+import static com.sun.javafx.PlatformUtil.isWindows;
+
+/**
+ * Default skin implementation for the {@link TextArea} control.
+ *
+ * @see TextArea
+ * @since 9
+ */
+public class TextAreaSkin extends TextInputControlSkin<TextArea> {
+
+    /**************************************************************************
+     *
+     * Static fields
+     *
+     **************************************************************************/
+
+    /** A shared helper object, used only by downLines(). */
+    private static final Path tmpCaretPath = new Path();
+
+
+
+    /**************************************************************************
+     *
+     * Private fields
+     *
+     **************************************************************************/
+
+    final private TextArea textArea;
+
+    // *** NOTE: Multiple node mode is not yet fully implemented *** //
+    private final boolean USE_MULTIPLE_NODES = false;
+
+    private final TextAreaBehavior behavior;
+
+    private double computedMinWidth = Double.NEGATIVE_INFINITY;
+    private double computedMinHeight = Double.NEGATIVE_INFINITY;
+    private double computedPrefWidth = Double.NEGATIVE_INFINITY;
+    private double computedPrefHeight = Double.NEGATIVE_INFINITY;
+    private double widthForComputedPrefHeight = Double.NEGATIVE_INFINITY;
+    private double characterWidth;
+    private double lineHeight;
+
+    private ContentView contentView = new ContentView();
+    private Group paragraphNodes = new Group();
+
+    private Text promptNode;
+    private ObservableBooleanValue usePromptText;
+
+    private ObservableIntegerValue caretPosition;
+    private Group selectionHighlightGroup = new Group();
+
+    private ScrollPane scrollPane;
+    private Bounds oldViewportBounds;
+
+    private VerticalDirection scrollDirection = null;
+
+    private Path characterBoundingPath = new Path();
+
+    private Timeline scrollSelectionTimeline = new Timeline();
+    private EventHandler<ActionEvent> scrollSelectionHandler = event -> {
+        switch (scrollDirection) {
+            case UP: {
+                // TODO Get previous offset
+                break;
+            }
+
+            case DOWN: {
+                // TODO Get next offset
+                break;
+            }
+        }
+    };
+
+    private double pressX, pressY; // For dragging handles on embedded
+    private boolean handlePressed;
+
+    /**
+     * Remembers horizontal position when traversing up / down.
+     */
+    double targetCaretX = -1;
+
+
+
+    /**************************************************************************
+     *
+     * Constructors
+     *
+     **************************************************************************/
+
+    /**
+     * Creates a new TextAreaSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TextAreaSkin(final TextArea control) {
+        super(control);
+
+        // install default input map for the text area control
+        this.behavior = new TextAreaBehavior(control);
+        this.behavior.setTextAreaSkin(this);
+//        control.setInputMap(behavior.getInputMap());
+
+        this.textArea = control;
+
+        caretPosition = new IntegerBinding() {
+            { bind(control.caretPositionProperty()); }
+            @Override protected int computeValue() {
+                return control.getCaretPosition();
+            }
+        };
+        caretPosition.addListener((observable, oldValue, newValue) -> {
+            targetCaretX = -1;
+            if (newValue.intValue() > oldValue.intValue()) {
+                setForwardBias(true);
+            }
+        });
+
+        forwardBiasProperty().addListener(observable -> {
+            if (control.getWidth() > 0) {
+                updateTextNodeCaretPos(control.getCaretPosition());
+            }
+        });
+
+//        setManaged(false);
+
+        // Initialize content
+        scrollPane = new ScrollPane();
+        scrollPane.setFitToWidth(control.isWrapText());
+        scrollPane.setContent(contentView);
+        getChildren().add(scrollPane);
+
+        getSkinnable().addEventFilter(ScrollEvent.ANY, event -> {
+            if (event.isDirect() && handlePressed) {
+                event.consume();
+            }
+        });
+
+        // Add selection
+        selectionHighlightGroup.setManaged(false);
+        selectionHighlightGroup.setVisible(false);
+        contentView.getChildren().add(selectionHighlightGroup);
+
+        // Add content view
+        paragraphNodes.setManaged(false);
+        contentView.getChildren().add(paragraphNodes);
+
+        // Add caret
+        caretPath.setManaged(false);
+        caretPath.setStrokeWidth(1);
+        caretPath.fillProperty().bind(textFillProperty());
+        caretPath.strokeProperty().bind(textFillProperty());
+        // modifying visibility of the caret forces a layout-pass (RT-32373), so
+        // instead we modify the opacity.
+        caretPath.opacityProperty().bind(new DoubleBinding() {
+            { bind(caretVisibleProperty()); }
+            @Override protected double computeValue() {
+                return caretVisibleProperty().get() ? 1.0 : 0.0;
+            }
+        });
+        contentView.getChildren().add(caretPath);
+
+        if (SHOW_HANDLES) {
+            contentView.getChildren().addAll(caretHandle, selectionHandle1, selectionHandle2);
+        }
+
+        scrollPane.hvalueProperty().addListener((observable, oldValue, newValue) -> {
+            getSkinnable().setScrollLeft(newValue.doubleValue() * getScrollLeftMax());
+        });
+
+        scrollPane.vvalueProperty().addListener((observable, oldValue, newValue) -> {
+            getSkinnable().setScrollTop(newValue.doubleValue() * getScrollTopMax());
+        });
+
+        // Initialize the scroll selection timeline
+        scrollSelectionTimeline.setCycleCount(Timeline.INDEFINITE);
+        List<KeyFrame> scrollSelectionFrames = scrollSelectionTimeline.getKeyFrames();
+        scrollSelectionFrames.clear();
+        scrollSelectionFrames.add(new KeyFrame(Duration.millis(350), scrollSelectionHandler));
+
+        // Add initial text content
+        for (int i = 0, n = USE_MULTIPLE_NODES ? control.getParagraphs().size() : 1; i < n; i++) {
+            CharSequence paragraph = (n == 1) ? control.textProperty().getValueSafe() : control.getParagraphs().get(i);
+            addParagraphNode(i, paragraph.toString());
+        }
+
+        control.selectionProperty().addListener((observable, oldValue, newValue) -> {
+            // TODO Why do we need two calls here?
+            control.requestLayout();
+            contentView.requestLayout();
+        });
+
+        control.wrapTextProperty().addListener((observable, oldValue, newValue) -> {
+            invalidateMetrics();
+            scrollPane.setFitToWidth(newValue);
+        });
+
+        control.prefColumnCountProperty().addListener((observable, oldValue, newValue) -> {
+            invalidateMetrics();
+            updatePrefViewportWidth();
+        });
+
+        control.prefRowCountProperty().addListener((observable, oldValue, newValue) -> {
+            invalidateMetrics();
+            updatePrefViewportHeight();
+        });
+
+        updateFontMetrics();
+        fontMetrics.addListener(valueModel -> {
+            updateFontMetrics();
+        });
+
+        contentView.paddingProperty().addListener(valueModel -> {
+            updatePrefViewportWidth();
+            updatePrefViewportHeight();
+        });
+
+        scrollPane.viewportBoundsProperty().addListener(valueModel -> {
+            if (scrollPane.getViewportBounds() != null) {
+                // ScrollPane creates a new Bounds instance for each
+                // layout pass, so we need to check if the width/height
+                // have really changed to avoid infinite layout requests.
+                Bounds newViewportBounds = scrollPane.getViewportBounds();
+                if (oldViewportBounds == null ||
+                    oldViewportBounds.getWidth() != newViewportBounds.getWidth() ||
+                    oldViewportBounds.getHeight() != newViewportBounds.getHeight()) {
+
+                    invalidateMetrics();
+                    oldViewportBounds = newViewportBounds;
+                    contentView.requestLayout();
+                }
+            }
+        });
+
+        control.scrollTopProperty().addListener((observable, oldValue, newValue) -> {
+            double vValue = (newValue.doubleValue() < getScrollTopMax())
+                               ? (newValue.doubleValue() / getScrollTopMax()) : 1.0;
+            scrollPane.setVvalue(vValue);
+        });
+
+        control.scrollLeftProperty().addListener((observable, oldValue, newValue) -> {
+            double hValue = (newValue.doubleValue() < getScrollLeftMax())
+                               ? (newValue.doubleValue() / getScrollLeftMax()) : 1.0;
+            scrollPane.setHvalue(hValue);
+        });
+
+        if (USE_MULTIPLE_NODES) {
+            control.getParagraphs().addListener((ListChangeListener.Change<? extends CharSequence> change) -> {
+                while (change.next()) {
+                    int from = change.getFrom();
+                    int to = change.getTo();
+                    List<? extends CharSequence> removed = change.getRemoved();
+                    if (from < to) {
+
+                        if (removed.isEmpty()) {
+                            // This is an add
+                            for (int i = from, n = to; i < n; i++) {
+                                addParagraphNode(i, change.getList().get(i).toString());
+                            }
+                        } else {
+                            // This is an update
+                            for (int i = from, n = to; i < n; i++) {
+                                Node node = paragraphNodes.getChildren().get(i);
+                                Text paragraphNode = (Text) node;
+                                paragraphNode.setText(change.getList().get(i).toString());
+                            }
+                        }
+                    } else {
+                        // This is a remove
+                        paragraphNodes.getChildren().subList(from, from + removed.size()).clear();
+                    }
+                }
+            });
+        } else {
+            control.textProperty().addListener(observable -> {
+                invalidateMetrics();
+                ((Text)paragraphNodes.getChildren().get(0)).setText(control.textProperty().getValueSafe());
+                contentView.requestLayout();
+            });
+        }
+
+        usePromptText = new BooleanBinding() {
+            { bind(control.textProperty(), control.promptTextProperty()); }
+            @Override protected boolean computeValue() {
+                String txt = control.getText();
+                String promptTxt = control.getPromptText();
+                return ((txt == null || txt.isEmpty()) &&
+                        promptTxt != null && !promptTxt.isEmpty());
+            }
+        };
+
+        if (usePromptText.get()) {
+            createPromptNode();
+        }
+
+        usePromptText.addListener(observable -> {
+            createPromptNode();
+            control.requestLayout();
+        });
+
+        updateHighlightFill();
+        updatePrefViewportWidth();
+        updatePrefViewportHeight();
+        if (control.isFocused()) setCaretAnimating(true);
+
+        if (SHOW_HANDLES) {
+            selectionHandle1.setRotate(180);
+
+            EventHandler<MouseEvent> handlePressHandler = e -> {
+                pressX = e.getX();
+                pressY = e.getY();
+                handlePressed = true;
+                e.consume();
+            };
+
+            EventHandler<MouseEvent> handleReleaseHandler = event -> {
+                handlePressed = false;
+            };
+
+            caretHandle.setOnMousePressed(handlePressHandler);
+            selectionHandle1.setOnMousePressed(handlePressHandler);
+            selectionHandle2.setOnMousePressed(handlePressHandler);
+
+            caretHandle.setOnMouseReleased(handleReleaseHandler);
+            selectionHandle1.setOnMouseReleased(handleReleaseHandler);
+            selectionHandle2.setOnMouseReleased(handleReleaseHandler);
+
+            caretHandle.setOnMouseDragged(e -> {
+                Text textNode = getTextNode();
+                Point2D tp = textNode.localToScene(0, 0);
+                Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + caretHandle.getWidth() / 2,
+                                        e.getSceneY() - tp.getY() - pressY - 6);
+                HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
+                int pos = hit.getCharIndex();
+                if (pos > 0) {
+                    int oldPos = textNode.getImpl_caretPosition();
+                    textNode.setImpl_caretPosition(pos);
+                    PathElement element = textNode.getImpl_caretShape()[0];
+                    if (element instanceof MoveTo && ((MoveTo)element).getY() > e.getY() - getTextTranslateY()) {
+                        hit.setCharIndex(pos - 1);
+                    }
+                    textNode.setImpl_caretPosition(oldPos);
+                }
+                positionCaret(hit, false);
+                e.consume();
+            });
+
+            selectionHandle1.setOnMouseDragged(e -> {
+                TextArea control1 = getSkinnable();
+                Text textNode = getTextNode();
+                Point2D tp = textNode.localToScene(0, 0);
+                Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle1.getWidth() / 2,
+                                        e.getSceneY() - tp.getY() - pressY + selectionHandle1.getHeight() + 5);
+                HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
+                int pos = hit.getCharIndex();
+                if (control1.getAnchor() < control1.getCaretPosition()) {
+                    // Swap caret and anchor
+                    control1.selectRange(control1.getCaretPosition(), control1.getAnchor());
+                }
+                if (pos > 0) {
+                    if (pos >= control1.getAnchor()) {
+                        pos = control1.getAnchor();
+                    }
+                    int oldPos = textNode.getImpl_caretPosition();
+                    textNode.setImpl_caretPosition(pos);
+                    PathElement element = textNode.getImpl_caretShape()[0];
+                    if (element instanceof MoveTo && ((MoveTo)element).getY() > e.getY() - getTextTranslateY()) {
+                        hit.setCharIndex(pos - 1);
+                    }
+                    textNode.setImpl_caretPosition(oldPos);
+                }
+                positionCaret(hit, true);
+                e.consume();
+            });
+
+            selectionHandle2.setOnMouseDragged(e -> {
+                TextArea control1 = getSkinnable();
+                Text textNode = getTextNode();
+                Point2D tp = textNode.localToScene(0, 0);
+                Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle2.getWidth() / 2,
+                                        e.getSceneY() - tp.getY() - pressY - 6);
+                HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
+                int pos = hit.getCharIndex();
+                if (control1.getAnchor() > control1.getCaretPosition()) {
+                    // Swap caret and anchor
+                    control1.selectRange(control1.getCaretPosition(), control1.getAnchor());
+                }
+                if (pos > 0) {
+                    if (pos <= control1.getAnchor() + 1) {
+                        pos = Math.min(control1.getAnchor() + 2, control1.getLength());
+                    }
+                    int oldPos = textNode.getImpl_caretPosition();
+                    textNode.setImpl_caretPosition(pos);
+                    PathElement element = textNode.getImpl_caretShape()[0];
+                    if (element instanceof MoveTo && ((MoveTo)element).getY() > e.getY() - getTextTranslateY()) {
+                        hit.setCharIndex(pos - 1);
+                    }
+                    textNode.setImpl_caretPosition(oldPos);
+                    positionCaret(hit, true);
+                }
+                e.consume();
+            });
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected void invalidateMetrics() {
+        computedMinWidth = Double.NEGATIVE_INFINITY;
+        computedMinHeight = Double.NEGATIVE_INFINITY;
+        computedPrefWidth = Double.NEGATIVE_INFINITY;
+        computedPrefHeight = Double.NEGATIVE_INFINITY;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(double contentX, double contentY, double contentWidth, double contentHeight) {
+        scrollPane.resizeRelocate(contentX, contentY, contentWidth, contentHeight);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void updateHighlightFill() {
+        for (Node node : selectionHighlightGroup.getChildren()) {
+            Path selectionHighlightPath = (Path)node;
+            selectionHighlightPath.setFill(highlightFillProperty().get());
+        }
+    }
+
+    // Public for behavior
+    /**
+     * Performs a hit test, mapping point to index in the content.
+     *
+     * @param x the x coordinate of the point.
+     * @param y the y coordinate of the point.
+     * @return a {@code TextPosInfo} object describing the index and forward bias.
+     */
+    public TextPosInfo getIndex(double x, double y) {
+        // adjust the event to be in the same coordinate space as the
+        // text content of the textInputControl
+        Text textNode = getTextNode();
+        Point2D p = new Point2D(x - textNode.getLayoutX(), y - getTextTranslateY());
+        HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
+        int pos = hit.getCharIndex();
+        if (pos > 0) {
+            int oldPos = textNode.getImpl_caretPosition();
+            textNode.setImpl_caretPosition(pos);
+            PathElement element = textNode.getImpl_caretShape()[0];
+            if (element instanceof MoveTo && ((MoveTo)element).getY() > y - getTextTranslateY()) {
+                hit.setCharIndex(pos - 1);
+            }
+            textNode.setImpl_caretPosition(oldPos);
+        }
+        return new TextPosInfo(hit);
+    };
+
+    /** {@inheritDoc} */
+    @Override public void moveCaret(TextUnit unit, Direction dir, boolean select) {
+        switch (unit) {
+            case CHARACTER:
+                switch (dir) {
+                    case LEFT:
+                    case RIGHT:
+                        nextCharacterVisually(dir == Direction.RIGHT);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(""+dir);
+                }
+                break;
+
+            case LINE:
+                switch (dir) {
+                    case UP:
+                        previousLine(select);
+                        break;
+                    case DOWN:
+                        nextLine(select);
+                        break;
+                    case BEGINNING:
+                        lineStart(select, select && isMac());
+                        break;
+                    case END:
+                        lineEnd(select, select && isMac());
+                        break;
+                    default:
+                        throw new IllegalArgumentException(""+dir);
+                }
+                break;
+
+            case PAGE:
+                switch (dir) {
+                    case UP:
+                        previousPage(select);
+                        break;
+                    case DOWN:
+                        nextPage(select);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(""+dir);
+                }
+                break;
+
+            case PARAGRAPH:
+                switch (dir) {
+                    case UP:
+                        paragraphStart(true, select);
+                        break;
+                    case DOWN:
+                        paragraphEnd(true, select);
+                        break;
+                    case BEGINNING:
+                        paragraphStart(false, select);
+                        break;
+                    case END:
+                        paragraphEnd(false, select);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(""+dir);
+                }
+                break;
+
+            default:
+                throw new IllegalArgumentException(""+unit);
+        }
+    }
+
+    private void nextCharacterVisually(boolean moveRight) {
+        if (isRTL()) {
+            // Text node is mirrored.
+            moveRight = !moveRight;
+        }
+
+        Text textNode = getTextNode();
+        Bounds caretBounds = caretPath.getLayoutBounds();
+        if (caretPath.getElements().size() == 4) {
+            // The caret is split
+            // TODO: Find a better way to get the primary caret position
+            // instead of depending on the internal implementation.
+            // See RT-25465.
+            caretBounds = new Path(caretPath.getElements().get(0), caretPath.getElements().get(1)).getLayoutBounds();
+        }
+        double hitX = moveRight ? caretBounds.getMaxX() : caretBounds.getMinX();
+        double hitY = (caretBounds.getMinY() + caretBounds.getMaxY()) / 2;
+        HitInfo hit = textNode.impl_hitTestChar(new Point2D(hitX, hitY));
+        Path charShape = new Path(textNode.impl_getRangeShape(hit.getCharIndex(), hit.getCharIndex() + 1));
+        if ((moveRight && charShape.getLayoutBounds().getMaxX() > caretBounds.getMaxX()) ||
+                (!moveRight && charShape.getLayoutBounds().getMinX() < caretBounds.getMinX())) {
+            hit.setLeading(!hit.isLeading());
+            positionCaret(hit, false);
+        } else {
+            // We're at beginning or end of line. Try moving up / down.
+            int dot = textArea.getCaretPosition();
+            targetCaretX = moveRight ? 0 : Double.MAX_VALUE;
+            // TODO: Use Bidi sniffing instead of assuming right means forward here?
+            downLines(moveRight ? 1 : -1, false, false);
+            targetCaretX = -1;
+            if (dot == textArea.getCaretPosition()) {
+                if (moveRight) {
+                    textArea.forward();
+                } else {
+                    textArea.backward();
+                }
+            }
+        }
+    }
+
+    private void downLines(int nLines, boolean select, boolean extendSelection) {
+        Text textNode = getTextNode();
+        Bounds caretBounds = caretPath.getLayoutBounds();
+
+        // The middle y coordinate of the the line we want to go to.
+        double targetLineMidY = (caretBounds.getMinY() + caretBounds.getMaxY()) / 2 + nLines * lineHeight;
+        if (targetLineMidY < 0) {
+            targetLineMidY = 0;
+        }
+
+        // The target x for the caret. This may have been set during a
+        // previous call.
+        double x = (targetCaretX >= 0) ? targetCaretX : (caretBounds.getMaxX());
+
+        // Find a text position for the target x,y.
+        HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(new Point2D(x, targetLineMidY)));
+        int pos = hit.getCharIndex();
+
+        // Save the old pos temporarily while testing the new one.
+        int oldPos = textNode.getImpl_caretPosition();
+        boolean oldBias = textNode.isImpl_caretBias();
+        textNode.setImpl_caretBias(hit.isLeading());
+        textNode.setImpl_caretPosition(pos);
+        tmpCaretPath.getElements().clear();
+        tmpCaretPath.getElements().addAll(textNode.getImpl_caretShape());
+        tmpCaretPath.setLayoutX(textNode.getLayoutX());
+        tmpCaretPath.setLayoutY(textNode.getLayoutY());
+        Bounds tmpCaretBounds = tmpCaretPath.getLayoutBounds();
+        // The y for the middle of the row we found.
+        double foundLineMidY = (tmpCaretBounds.getMinY() + tmpCaretBounds.getMaxY()) / 2;
+        textNode.setImpl_caretBias(oldBias);
+        textNode.setImpl_caretPosition(oldPos);
+
+        if (pos > 0) {
+            if (nLines > 0 && foundLineMidY > targetLineMidY) {
+                // We went too far and ended up after a newline.
+                hit.setCharIndex(pos - 1);
+            }
+
+            if (pos >= textArea.getLength() && getCharacter(pos - 1) == '\n') {
+                // Special case for newline at end of text.
+                hit.setLeading(true);
+            }
+        }
+
+        // Test if the found line is in the correct direction and move
+        // the caret.
+        if (nLines == 0 ||
+                (nLines > 0 && foundLineMidY > caretBounds.getMaxY()) ||
+                (nLines < 0 && foundLineMidY < caretBounds.getMinY())) {
+
+            positionCaret(hit, select, extendSelection);
+            targetCaretX = x;
+        }
+    }
+
+    private void previousLine(boolean select) {
+        downLines(-1, select, false);
+    }
+
+    private void nextLine(boolean select) {
+        downLines(1, select, false);
+    }
+
+    private void previousPage(boolean select) {
+        downLines(-(int)(scrollPane.getViewportBounds().getHeight() / lineHeight),
+                select, false);
+    }
+
+    private void nextPage(boolean select) {
+        downLines((int)(scrollPane.getViewportBounds().getHeight() / lineHeight),
+                select, false);
+    }
+
+    private void lineStart(boolean select, boolean extendSelection) {
+        targetCaretX = 0;
+        downLines(0, select, extendSelection);
+        targetCaretX = -1;
+    }
+
+    private void lineEnd(boolean select, boolean extendSelection) {
+        targetCaretX = Double.MAX_VALUE;
+        downLines(0, select, extendSelection);
+        targetCaretX = -1;
+    }
+
+
+    private void paragraphStart(boolean previousIfAtStart, boolean select) {
+        TextArea textArea = getSkinnable();
+        String text = textArea.textProperty().getValueSafe();
+        int pos = textArea.getCaretPosition();
+
+        if (pos > 0) {
+            if (previousIfAtStart && text.codePointAt(pos-1) == 0x0a) {
+                // We are at the beginning of a paragraph.
+                // Back up to the previous paragraph.
+                pos--;
+            }
+            // Back up to the beginning of this paragraph
+            while (pos > 0 && text.codePointAt(pos-1) != 0x0a) {
+                pos--;
+            }
+            if (select) {
+                textArea.selectPositionCaret(pos);
+            } else {
+                textArea.positionCaret(pos);
+            }
+        }
+    }
+
+    private void paragraphEnd(boolean goPastInitialNewline, boolean select) {
+        TextArea textArea = getSkinnable();
+        String text = textArea.textProperty().getValueSafe();
+        int pos = textArea.getCaretPosition();
+        int len = text.length();
+        boolean wentPastInitialNewline = false;
+        boolean goPastTrailingNewline = isWindows();
+
+        if (pos < len) {
+            if (goPastInitialNewline && text.codePointAt(pos) == 0x0a) {
+                // We are at the end of a paragraph, start by moving to the
+                // next paragraph.
+                pos++;
+                wentPastInitialNewline = true;
+            }
+            if (!(goPastTrailingNewline && wentPastInitialNewline)) {
+                // Go to the end of this paragraph
+                while (pos < len && text.codePointAt(pos) != 0x0a) {
+                    pos++;
+                }
+                if (goPastTrailingNewline && pos < len) {
+                    // We are at the end of a paragraph, finish by moving to
+                    // the beginning of the next paragraph (Windows behavior).
+                    pos++;
+                }
+            }
+            if (select) {
+                textArea.selectPositionCaret(pos);
+            } else {
+                textArea.positionCaret(pos);
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected PathElement[] getUnderlineShape(int start, int end) {
+        int pStart = 0;
+        for (Node node : paragraphNodes.getChildren()) {
+            Text p = (Text)node;
+            int pEnd = pStart + p.textProperty().getValueSafe().length();
+            if (pEnd >= start) {
+                return p.impl_getUnderlineShape(start - pStart, end - pStart);
+            }
+            pStart = pEnd + 1;
+        }
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected PathElement[] getRangeShape(int start, int end) {
+        int pStart = 0;
+        for (Node node : paragraphNodes.getChildren()) {
+            Text p = (Text)node;
+            int pEnd = pStart + p.textProperty().getValueSafe().length();
+            if (pEnd >= start) {
+                return p.impl_getRangeShape(start - pStart, end - pStart);
+            }
+            pStart = pEnd + 1;
+        }
+        return null;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void addHighlight(List<? extends Node> nodes, int start) {
+        int pStart = 0;
+        Text paragraphNode = null;
+        for (Node node : paragraphNodes.getChildren()) {
+            Text p = (Text)node;
+            int pEnd = pStart + p.textProperty().getValueSafe().length();
+            if (pEnd >= start) {
+                paragraphNode = p;
+                break;
+            }
+            pStart = pEnd + 1;
+        }
+
+        if (paragraphNode != null) {
+            for (Node node : nodes) {
+                node.setLayoutX(paragraphNode.getLayoutX());
+                node.setLayoutY(paragraphNode.getLayoutY());
+            }
+        }
+        contentView.getChildren().addAll(nodes);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void removeHighlight(List<? extends Node> nodes) {
+        contentView.getChildren().removeAll(nodes);
+    }
+
+    /** {@inheritDoc} */
+    @Override public Point2D getMenuPosition() {
+        contentView.layoutChildren();
+        Point2D p = super.getMenuPosition();
+        if (p != null) {
+            p = new Point2D(Math.max(0, p.getX() - contentView.snappedLeftInset() - getSkinnable().getScrollLeft()),
+                    Math.max(0, p.getY() - contentView.snappedTopInset() - getSkinnable().getScrollTop()));
+        }
+        return p;
+    }
+
+    // Public for FXVKSkin
+    /**
+     * @return the {@code Bounds} of the caret shape, relative to the {@code TextArea}.
+     */
+    public Bounds getCaretBounds() {
+        return getSkinnable().sceneToLocal(caretPath.localToScene(caretPath.getBoundsInLocal()));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case LINE_FOR_OFFSET:
+            case LINE_START:
+            case LINE_END:
+            case BOUNDS_FOR_RANGE:
+            case OFFSET_AT_POINT:
+                Text text = getTextNode();
+                return text.queryAccessibleAttribute(attribute, parameters);
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+
+        // TODO Unregister listeners on text editor, paragraph list
+        throw new UnsupportedOperationException();
+    }
+
+    /** {@inheritDoc} */
+    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        Text firstParagraph = (Text) paragraphNodes.getChildren().get(0);
+        return Utils.getAscent(getSkinnable().getFont(), firstParagraph.getBoundsType())
+                + contentView.snappedTopInset() + textArea.snappedTopInset();
+    }
+
+    private char getCharacter(int index) {
+        int n = paragraphNodes.getChildren().size();
+
+        int paragraphIndex = 0;
+        int offset = index;
+
+        String paragraph = null;
+        while (paragraphIndex < n) {
+            Text paragraphNode = (Text)paragraphNodes.getChildren().get(paragraphIndex);
+            paragraph = paragraphNode.getText();
+            int count = paragraph.length() + 1;
+
+            if (offset < count) {
+                break;
+            }
+
+            offset -= count;
+            paragraphIndex++;
+        }
+
+        return offset == paragraph.length() ? '\n' : paragraph.charAt(offset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected int getInsertionPoint(double x, double y) {
+        TextArea textArea = getSkinnable();
+
+        int n = paragraphNodes.getChildren().size();
+        int index = -1;
+
+        if (n > 0) {
+            if (y < contentView.snappedTopInset()) {
+                // Select the character at x in the first row
+                Text paragraphNode = (Text)paragraphNodes.getChildren().get(0);
+                index = getNextInsertionPoint(paragraphNode, x, -1, VerticalDirection.DOWN);
+            } else if (y > contentView.snappedTopInset() + contentView.getHeight()) {
+                // Select the character at x in the last row
+                int lastParagraphIndex = n - 1;
+                Text lastParagraphView = (Text)paragraphNodes.getChildren().get(lastParagraphIndex);
+
+                index = getNextInsertionPoint(lastParagraphView, x, -1, VerticalDirection.UP)
+                        + (textArea.getLength() - lastParagraphView.getText().length());
+            } else {
+                // Select the character at x in the row at y
+                int paragraphOffset = 0;
+                for (int i = 0; i < n; i++) {
+                    Text paragraphNode = (Text)paragraphNodes.getChildren().get(i);
+
+                    Bounds bounds = paragraphNode.getBoundsInLocal();
+                    double paragraphViewY = paragraphNode.getLayoutY() + bounds.getMinY();
+                    if (y >= paragraphViewY
+                            && y < paragraphViewY + paragraphNode.getBoundsInLocal().getHeight()) {
+                        index = getInsertionPoint(paragraphNode,
+                                x - paragraphNode.getLayoutX(),
+                                y - paragraphNode.getLayoutY()) + paragraphOffset;
+                        break;
+                    }
+
+                    paragraphOffset += paragraphNode.getText().length() + 1;
+                }
+            }
+        }
+
+        return index;
+    }
+
+    // Public for behavior
+    /**
+     * Moves the caret to the specified position.
+     *
+     * @param hit the new position and forward bias of the caret.
+     * @param select whether to extend selection to the new position.
+     */
+    public void positionCaret(TextPosInfo hit, boolean select) {
+        positionCaret(hit, select, false);
+    }
+
+    private void positionCaret(TextPosInfo hit, boolean select, boolean extendSelection) {
+        int pos = Utils.getHitInsertionIndex(hit, getSkinnable().getText());
+        boolean isNewLine =
+                (pos > 0 &&
+                        pos <= getSkinnable().getLength() &&
+                        getSkinnable().getText().codePointAt(pos-1) == 0x0a);
+
+        // special handling for a new line
+        if (!hit.isLeading() && isNewLine) {
+            hit.setLeading(true);
+            pos -= 1;
+        }
+
+        if (select) {
+            if (extendSelection) {
+                getSkinnable().extendSelection(pos);
+            } else {
+                getSkinnable().selectPositionCaret(pos);
+            }
+        } else {
+            getSkinnable().positionCaret(pos);
+        }
+
+        setForwardBias(hit.isLeading());
+    }
+
+    private void positionCaret(HitInfo hit, boolean select) {
+        positionCaret(new TextPosInfo(hit), select);
+    }
+
+    private void positionCaret(HitInfo hit, boolean select, boolean extendSelection) {
+        positionCaret(new TextPosInfo(hit), select, extendSelection);
+    }
+
+    /** {@inheritDoc} */
+    @Override public Rectangle2D getCharacterBounds(int index) {
+        TextArea textArea = getSkinnable();
+
+        int paragraphIndex = paragraphNodes.getChildren().size();
+        int paragraphOffset = textArea.getLength() + 1;
+
+        Text paragraphNode = null;
+        do {
+            paragraphNode = (Text)paragraphNodes.getChildren().get(--paragraphIndex);
+            paragraphOffset -= paragraphNode.getText().length() + 1;
+        } while (index < paragraphOffset);
+
+        int characterIndex = index - paragraphOffset;
+        boolean terminator = false;
+
+        if (characterIndex == paragraphNode.getText().length()) {
+            characterIndex--;
+            terminator = true;
+        }
+
+        characterBoundingPath.getElements().clear();
+        characterBoundingPath.getElements().addAll(paragraphNode.impl_getRangeShape(characterIndex, characterIndex + 1));
+        characterBoundingPath.setLayoutX(paragraphNode.getLayoutX());
+        characterBoundingPath.setLayoutY(paragraphNode.getLayoutY());
+
+        Bounds bounds = characterBoundingPath.getBoundsInLocal();
+
+        double x = bounds.getMinX() + paragraphNode.getLayoutX() - textArea.getScrollLeft();
+        double y = bounds.getMinY() + paragraphNode.getLayoutY() - textArea.getScrollTop();
+
+        // Sometimes the bounds is empty, in which case we must ignore the width/height
+        double width = bounds.isEmpty() ? 0 : bounds.getWidth();
+        double height = bounds.isEmpty() ? 0 : bounds.getHeight();
+
+        if (terminator) {
+            x += width;
+            width = 0;
+        }
+
+        return new Rectangle2D(x, y, width, height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void scrollCharacterToVisible(final int index) {
+        // TODO We queue a callback because when characters are added or
+        // removed the bounds are not immediately updated; is this really
+        // necessary?
+
+        Platform.runLater(() -> {
+            if (getSkinnable().getLength() == 0) {
+                return;
+            }
+            Rectangle2D characterBounds = getCharacterBounds(index);
+            scrollBoundsToVisible(characterBounds);
+        });
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Private implementation
+     *
+     **************************************************************************/
+
+    TextAreaBehavior getBehavior() {
+        return behavior;
+    }
+
+    private void createPromptNode() {
+        if (promptNode == null && usePromptText.get()) {
+            promptNode = new Text();
+            contentView.getChildren().add(0, promptNode);
+            promptNode.setManaged(false);
+            promptNode.getStyleClass().add("text");
+            promptNode.visibleProperty().bind(usePromptText);
+            promptNode.fontProperty().bind(getSkinnable().fontProperty());
+            promptNode.textProperty().bind(getSkinnable().promptTextProperty());
+            promptNode.fillProperty().bind(promptTextFillProperty());
+        }
+    }
+
+    private void addParagraphNode(int i, String string) {
+        final TextArea textArea = getSkinnable();
+        Text paragraphNode = new Text(string);
+        paragraphNode.setTextOrigin(VPos.TOP);
+        paragraphNode.setManaged(false);
+        paragraphNode.getStyleClass().add("text");
+        paragraphNode.boundsTypeProperty().addListener((observable, oldValue, newValue) -> {
+            invalidateMetrics();
+            updateFontMetrics();
+        });
+        paragraphNodes.getChildren().add(i, paragraphNode);
+
+        paragraphNode.fontProperty().bind(textArea.fontProperty());
+        paragraphNode.fillProperty().bind(textFillProperty());
+        paragraphNode.impl_selectionFillProperty().bind(highlightTextFillProperty());
+    }
+
+    private double getScrollTopMax() {
+        return Math.max(0, contentView.getHeight() - scrollPane.getViewportBounds().getHeight());
+    }
+
+    private double getScrollLeftMax() {
+        return Math.max(0, contentView.getWidth() - scrollPane.getViewportBounds().getWidth());
+    }
+
+    private int getInsertionPoint(Text paragraphNode, double x, double y) {
+        TextPosInfo hitInfo = new TextPosInfo(paragraphNode.impl_hitTestChar(new Point2D(x, y)));
+        return Utils.getHitInsertionIndex(hitInfo, paragraphNode.getText());
+    }
+
+    private int getNextInsertionPoint(Text paragraphNode, double x, int from,
+        VerticalDirection scrollDirection) {
+        // TODO
+        return 0;
+    }
+
+    private void scrollCaretToVisible() {
+        TextArea textArea = getSkinnable();
+        Bounds bounds = caretPath.getLayoutBounds();
+        double x = bounds.getMinX() - textArea.getScrollLeft();
+        double y = bounds.getMinY() - textArea.getScrollTop();
+        double w = bounds.getWidth();
+        double h = bounds.getHeight();
+
+        if (SHOW_HANDLES) {
+            if (caretHandle.isVisible()) {
+                h += caretHandle.getHeight();
+            } else if (selectionHandle1.isVisible() && selectionHandle2.isVisible()) {
+                x -= selectionHandle1.getWidth() / 2;
+                y -= selectionHandle1.getHeight();
+                w += selectionHandle1.getWidth() / 2 + selectionHandle2.getWidth() / 2;
+                h += selectionHandle1.getHeight() + selectionHandle2.getHeight();
+            }
+        }
+
+        if (w > 0 && h > 0) {
+            scrollBoundsToVisible(new Rectangle2D(x, y, w, h));
+        }
+    }
+
+    private void scrollBoundsToVisible(Rectangle2D bounds) {
+        TextArea textArea = getSkinnable();
+        Bounds viewportBounds = scrollPane.getViewportBounds();
+
+        double viewportWidth = viewportBounds.getWidth();
+        double viewportHeight = viewportBounds.getHeight();
+        double scrollTop = textArea.getScrollTop();
+        double scrollLeft = textArea.getScrollLeft();
+        double slop = 6.0;
+
+        if (bounds.getMinY() < 0) {
+            double y = scrollTop + bounds.getMinY();
+            if (y <= contentView.snappedTopInset()) {
+                y = 0;
+            }
+            textArea.setScrollTop(y);
+        } else if (contentView.snappedTopInset() + bounds.getMaxY() > viewportHeight) {
+            double y = scrollTop + contentView.snappedTopInset() + bounds.getMaxY() - viewportHeight;
+            if (y >= getScrollTopMax() - contentView.snappedBottomInset()) {
+                y = getScrollTopMax();
+            }
+            textArea.setScrollTop(y);
+        }
+
+
+        if (bounds.getMinX() < 0) {
+            double x = scrollLeft + bounds.getMinX() - slop;
+            if (x <= contentView.snappedLeftInset() + slop) {
+                x = 0;
+            }
+            textArea.setScrollLeft(x);
+        } else if (contentView.snappedLeftInset() + bounds.getMaxX() > viewportWidth) {
+            double x = scrollLeft + contentView.snappedLeftInset() + bounds.getMaxX() - viewportWidth + slop;
+            if (x >= getScrollLeftMax() - contentView.snappedRightInset() - slop) {
+                x = getScrollLeftMax();
+            }
+            textArea.setScrollLeft(x);
+        }
+    }
+
+    private void updatePrefViewportWidth() {
+        int columnCount = getSkinnable().getPrefColumnCount();
+        scrollPane.setPrefViewportWidth(columnCount * characterWidth + contentView.snappedLeftInset() + contentView.snappedRightInset());
+        scrollPane.setMinViewportWidth(characterWidth + contentView.snappedLeftInset() + contentView.snappedRightInset());
+    }
+
+    private void updatePrefViewportHeight() {
+        int rowCount = getSkinnable().getPrefRowCount();
+        scrollPane.setPrefViewportHeight(rowCount * lineHeight + contentView.snappedTopInset() + contentView.snappedBottomInset());
+        scrollPane.setMinViewportHeight(lineHeight + contentView.snappedTopInset() + contentView.snappedBottomInset());
+    }
+
+    private void updateFontMetrics() {
+        Text firstParagraph = (Text)paragraphNodes.getChildren().get(0);
+        lineHeight = Utils.getLineHeight(getSkinnable().getFont(), firstParagraph.getBoundsType());
+        characterWidth = fontMetrics.get().computeStringWidth("W");
+    }
+
+    private double getTextTranslateX() {
+        return contentView.snappedLeftInset();
+    }
+
+    private double getTextTranslateY() {
+        return contentView.snappedTopInset();
+    }
+
+    private double getTextLeft() {
+        return 0;
+    }
+
+    private Point2D translateCaretPosition(Point2D p) {
+        return p;
+    }
+
+    private Text getTextNode() {
+        if (USE_MULTIPLE_NODES) {
+            throw new IllegalArgumentException("Multiple node traversal is not yet implemented.");
+        }
+        return (Text)paragraphNodes.getChildren().get(0);
+    }
+
+    private void updateTextNodeCaretPos(int pos) {
+        Text textNode = getTextNode();
+        if (isForwardBias()) {
+            textNode.setImpl_caretPosition(pos);
+        } else {
+            textNode.setImpl_caretPosition(pos - 1);
+        }
+        textNode.impl_caretBiasProperty().set(isForwardBias());
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Support classes
+     *
+     **************************************************************************/
+
+    private class ContentView extends Region {
+        {
+            getStyleClass().add("content");
+
+            addEventHandler(MouseEvent.MOUSE_PRESSED, event -> {
+                behavior.mousePressed(event);
+                event.consume();
+            });
+
+            addEventHandler(MouseEvent.MOUSE_RELEASED, event -> {
+                behavior.mouseReleased(event);
+                event.consume();
+            });
+
+            addEventHandler(MouseEvent.MOUSE_DRAGGED, event -> {
+                behavior.mouseDragged(event);
+                event.consume();
+            });
+        }
+
+        @Override protected ObservableList<Node> getChildren() {
+            return super.getChildren();
+        }
+
+        @Override public Orientation getContentBias() {
+            return Orientation.HORIZONTAL;
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            if (computedPrefWidth < 0) {
+                double prefWidth = 0;
+
+                for (Node node : paragraphNodes.getChildren()) {
+                    Text paragraphNode = (Text)node;
+                    prefWidth = Math.max(prefWidth,
+                            Utils.computeTextWidth(paragraphNode.getFont(),
+                                    paragraphNode.getText(), 0));
+                }
+
+                prefWidth += snappedLeftInset() + snappedRightInset();
+
+                Bounds viewPortBounds = scrollPane.getViewportBounds();
+                computedPrefWidth = Math.max(prefWidth, (viewPortBounds != null) ? viewPortBounds.getWidth() : 0);
+            }
+            return computedPrefWidth;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            if (width != widthForComputedPrefHeight) {
+                invalidateMetrics();
+                widthForComputedPrefHeight = width;
+            }
+
+            if (computedPrefHeight < 0) {
+                double wrappingWidth;
+                if (width == -1) {
+                    wrappingWidth = 0;
+                } else {
+                    wrappingWidth = Math.max(width - (snappedLeftInset() + snappedRightInset()), 0);
+                }
+
+                double prefHeight = 0;
+
+                for (Node node : paragraphNodes.getChildren()) {
+                    Text paragraphNode = (Text)node;
+                    prefHeight += Utils.computeTextHeight(
+                            paragraphNode.getFont(),
+                            paragraphNode.getText(),
+                            wrappingWidth,
+                            paragraphNode.getBoundsType());
+                }
+
+                prefHeight += snappedTopInset() + snappedBottomInset();
+
+                Bounds viewPortBounds = scrollPane.getViewportBounds();
+                computedPrefHeight = Math.max(prefHeight, (viewPortBounds != null) ? viewPortBounds.getHeight() : 0);
+            }
+            return computedPrefHeight;
+        }
+
+        @Override protected double computeMinWidth(double height) {
+            if (computedMinWidth < 0) {
+                double hInsets = snappedLeftInset() + snappedRightInset();
+                computedMinWidth = Math.min(characterWidth + hInsets, computePrefWidth(height));
+            }
+            return computedMinWidth;
+        }
+
+        @Override protected double computeMinHeight(double width) {
+            if (computedMinHeight < 0) {
+                double vInsets = snappedTopInset() + snappedBottomInset();
+                computedMinHeight = Math.min(lineHeight + vInsets, computePrefHeight(width));
+            }
+            return computedMinHeight;
+        }
+
+        @Override public void layoutChildren() {
+            TextArea textArea = getSkinnable();
+            double width = getWidth();
+
+            // Lay out paragraphs
+            final double topPadding = snappedTopInset();
+            final double leftPadding = snappedLeftInset();
+
+            double wrappingWidth = Math.max(width - (leftPadding + snappedRightInset()), 0);
+
+            double y = topPadding;
+
+            final List<Node> paragraphNodesChildren = paragraphNodes.getChildren();
+
+            for (int i = 0; i < paragraphNodesChildren.size(); i++) {
+                Node node = paragraphNodesChildren.get(i);
+                Text paragraphNode = (Text)node;
+                paragraphNode.setWrappingWidth(wrappingWidth);
+
+                Bounds bounds = paragraphNode.getBoundsInLocal();
+                paragraphNode.setLayoutX(leftPadding);
+                paragraphNode.setLayoutY(y);
+
+                y += bounds.getHeight();
+            }
+
+            if (promptNode != null) {
+                promptNode.setLayoutX(leftPadding);
+                promptNode.setLayoutY(topPadding + promptNode.getBaselineOffset());
+                promptNode.setWrappingWidth(wrappingWidth);
+            }
+
+            // Update the selection
+            IndexRange selection = textArea.getSelection();
+            Bounds oldCaretBounds = caretPath.getBoundsInParent();
+
+            selectionHighlightGroup.getChildren().clear();
+
+            int caretPos = textArea.getCaretPosition();
+            int anchorPos = textArea.getAnchor();
+
+            if (SHOW_HANDLES) {
+                // Install and resize the handles for caret and anchor.
+                if (selection.getLength() > 0) {
+                    selectionHandle1.resize(selectionHandle1.prefWidth(-1),
+                            selectionHandle1.prefHeight(-1));
+                    selectionHandle2.resize(selectionHandle2.prefWidth(-1),
+                            selectionHandle2.prefHeight(-1));
+                } else {
+                    caretHandle.resize(caretHandle.prefWidth(-1),
+                            caretHandle.prefHeight(-1));
+                }
+
+                // Position the handle for the anchor. This could be handle1 or handle2.
+                // Do this before positioning the actual caret.
+                if (selection.getLength() > 0) {
+                    int paragraphIndex = paragraphNodesChildren.size();
+                    int paragraphOffset = textArea.getLength() + 1;
+                    Text paragraphNode = null;
+                    do {
+                        paragraphNode = (Text)paragraphNodesChildren.get(--paragraphIndex);
+                        paragraphOffset -= paragraphNode.getText().length() + 1;
+                    } while (anchorPos < paragraphOffset);
+
+                    updateTextNodeCaretPos(anchorPos - paragraphOffset);
+                    caretPath.getElements().clear();
+                    caretPath.getElements().addAll(paragraphNode.getImpl_caretShape());
+                    caretPath.setLayoutX(paragraphNode.getLayoutX());
+                    caretPath.setLayoutY(paragraphNode.getLayoutY());
+
+                    Bounds b = caretPath.getBoundsInParent();
+                    if (caretPos < anchorPos) {
+                        selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
+                        selectionHandle2.setLayoutY(b.getMaxY() - 1);
+                    } else {
+                        selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
+                        selectionHandle1.setLayoutY(b.getMinY() - selectionHandle1.getHeight() + 1);
+                    }
+                }
+            }
+
+            {
+                // Position caret
+                int paragraphIndex = paragraphNodesChildren.size();
+                int paragraphOffset = textArea.getLength() + 1;
+
+                Text paragraphNode = null;
+                do {
+                    paragraphNode = (Text)paragraphNodesChildren.get(--paragraphIndex);
+                    paragraphOffset -= paragraphNode.getText().length() + 1;
+                } while (caretPos < paragraphOffset);
+
+                updateTextNodeCaretPos(caretPos - paragraphOffset);
+
+                caretPath.getElements().clear();
+                caretPath.getElements().addAll(paragraphNode.getImpl_caretShape());
+
+                caretPath.setLayoutX(paragraphNode.getLayoutX());
+
+                // TODO: Remove this temporary workaround for RT-27533
+                paragraphNode.setLayoutX(2 * paragraphNode.getLayoutX() - paragraphNode.getBoundsInParent().getMinX());
+
+                caretPath.setLayoutY(paragraphNode.getLayoutY());
+                if (oldCaretBounds == null || !oldCaretBounds.equals(caretPath.getBoundsInParent())) {
+                    scrollCaretToVisible();
+                }
+            }
+
+            // Update selection fg and bg
+            int start = selection.getStart();
+            int end = selection.getEnd();
+            for (int i = 0, max = paragraphNodesChildren.size(); i < max; i++) {
+                Node paragraphNode = paragraphNodesChildren.get(i);
+                Text textNode = (Text)paragraphNode;
+                int paragraphLength = textNode.getText().length() + 1;
+                if (end > start && start < paragraphLength) {
+                    textNode.setImpl_selectionStart(start);
+                    textNode.setImpl_selectionEnd(Math.min(end, paragraphLength));
+
+                    Path selectionHighlightPath = new Path();
+                    selectionHighlightPath.setManaged(false);
+                    selectionHighlightPath.setStroke(null);
+                    PathElement[] selectionShape = textNode.getImpl_selectionShape();
+                    if (selectionShape != null) {
+                        selectionHighlightPath.getElements().addAll(selectionShape);
+                    }
+                    selectionHighlightGroup.getChildren().add(selectionHighlightPath);
+                    selectionHighlightGroup.setVisible(true);
+                    selectionHighlightPath.setLayoutX(textNode.getLayoutX());
+                    selectionHighlightPath.setLayoutY(textNode.getLayoutY());
+                    updateHighlightFill();
+                } else {
+                    textNode.setImpl_selectionStart(-1);
+                    textNode.setImpl_selectionEnd(-1);
+                    selectionHighlightGroup.setVisible(false);
+                }
+                start = Math.max(0, start - paragraphLength);
+                end   = Math.max(0, end   - paragraphLength);
+            }
+
+            if (SHOW_HANDLES) {
+                // Position handle for the caret. This could be handle1 or handle2 when
+                // a selection is active.
+                Bounds b = caretPath.getBoundsInParent();
+                if (selection.getLength() > 0) {
+                    if (caretPos < anchorPos) {
+                        selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
+                        selectionHandle1.setLayoutY(b.getMinY() - selectionHandle1.getHeight() + 1);
+                    } else {
+                        selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
+                        selectionHandle2.setLayoutY(b.getMaxY() - 1);
+                    }
+                } else {
+                    caretHandle.setLayoutX(b.getMinX() - caretHandle.getWidth() / 2 + 1);
+                    caretHandle.setLayoutY(b.getMaxY());
+                }
+            }
+
+            if (scrollPane.getPrefViewportWidth() == 0
+                    || scrollPane.getPrefViewportHeight() == 0) {
+                updatePrefViewportWidth();
+                updatePrefViewportHeight();
+                if (getParent() != null && scrollPane.getPrefViewportWidth() > 0
+                        || scrollPane.getPrefViewportHeight() > 0) {
+                    // Force layout of viewRect in ScrollPaneSkin
+                    getParent().requestLayout();
+                }
+            }
+
+            // RT-36454: Fit to width/height only if smaller than viewport.
+            // That is, grow to fit but don't shrink to fit.
+            Bounds viewportBounds = scrollPane.getViewportBounds();
+            boolean wasFitToWidth = scrollPane.isFitToWidth();
+            boolean wasFitToHeight = scrollPane.isFitToHeight();
+            boolean setFitToWidth = textArea.isWrapText() || computePrefWidth(-1) <= viewportBounds.getWidth();
+            boolean setFitToHeight = computePrefHeight(width) <= viewportBounds.getHeight();
+            if (wasFitToWidth != setFitToWidth || wasFitToHeight != setFitToHeight) {
+                Platform.runLater(() -> {
+                    scrollPane.setFitToWidth(setFitToWidth);
+                    scrollPane.setFitToHeight(setFitToHeight);
+                });
+                getParent().requestLayout();
+            }
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TextFieldSkin.java	2015-09-03 15:23:30.861691300 -0700
+++ /dev/null	2015-09-03 15:23:31.000000000 -0700
@@ -1,828 +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.beans.binding.BooleanBinding;
-import javafx.beans.binding.DoubleBinding;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.value.ObservableBooleanValue;
-import javafx.beans.value.ObservableDoubleValue;
-import javafx.event.EventHandler;
-import javafx.geometry.Bounds;
-import javafx.geometry.HPos;
-import javafx.geometry.Point2D;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.control.IndexRange;
-import javafx.scene.control.PasswordField;
-import javafx.scene.control.TextField;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Pane;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Path;
-import javafx.scene.shape.PathElement;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Text;
-import java.util.List;
-import com.sun.javafx.scene.control.behavior.TextFieldBehavior;
-import com.sun.javafx.scene.control.behavior.PasswordFieldBehavior;
-import com.sun.javafx.scene.text.HitInfo;
-
-/**
- * Text field skin.
- */
-public class TextFieldSkin extends TextInputControlSkin<TextField, TextFieldBehavior> {
-    /**
-     * This group contains the text, caret, and selection rectangle.
-     * It is clipped. The textNode, selectionHighlightPath, and
-     * caret are each translated individually when horizontal
-     * translation is needed to keep the caretPosition visible.
-     */
-    private Pane textGroup = new Pane();
-    private Group handleGroup;
-
-    /**
-     * The clip, applied to the textGroup. This makes sure that any
-     * text / selection wandering off the text box is clipped
-     */
-    private Rectangle clip = new Rectangle();
-    /**
-     * The node actually displaying the text. Note that it has the
-     * ability to render both the normal fill as well as the highlight
-     * fill, to perform hit testing, fetching of the selection
-     * highlight, and other such duties.
-     */
-    private Text textNode = new Text();
-    /**
-     *
-     * The node used for showing the prompt text.
-     */
-    private Text promptNode;
-    /**
-     * A path, provided by the textNode, which represents the area
-     * which is selected. The path elements which make up the
-     * selection must be updated whenever the selection changes. We
-     * don't need to keep track of text changes because those will
-     * force the selection to be updated.
-     */
-    private Path selectionHighlightPath = new Path();
-
-    private Path characterBoundingPath = new Path();
-    private ObservableBooleanValue usePromptText;
-    private DoubleProperty textTranslateX = new SimpleDoubleProperty(this, "textTranslateX");
-    private double caretWidth;
-
-    /**
-     * Function to translate the text control's "dot" into the caret
-     * position in the Text node.  This is possibly only meaningful for
-     * the PasswordField where the echoChar could be more than one
-     * character.
-     */
-    protected int translateCaretPosition(int cp) { return cp; }
-    protected Point2D translateCaretPosition(Point2D p) { return p; }
-
-    /**
-     * Right edge of the text region sans padding
-     */
-    protected ObservableDoubleValue textRight;
-
-    private double pressX, pressY; // For dragging handles on embedded
-
-    // For use with PasswordField
-    public static final char BULLET = '\u25cf';
-
-    /**
-     * Create a new TextFieldSkin.
-     * @param textField not null
-     */
-    public TextFieldSkin(final TextField textField) {
-        this(textField, (textField instanceof PasswordField)
-                                     ? new PasswordFieldBehavior((PasswordField)textField)
-                                     : new TextFieldBehavior(textField));
-    }
-
-    public TextFieldSkin(final TextField textField, final TextFieldBehavior behavior) {
-        super(textField, behavior);
-        behavior.setTextFieldSkin(this);
-
-
-        textField.caretPositionProperty().addListener((observable, oldValue, newValue) -> {
-            if (textField.getWidth() > 0) {
-                updateTextNodeCaretPos(textField.getCaretPosition());
-                if (!isForwardBias()) {
-                    setForwardBias(true);
-                }
-                updateCaretOff();
-            }
-        });
-
-        forwardBiasProperty().addListener(observable -> {
-            if (textField.getWidth() > 0) {
-                updateTextNodeCaretPos(textField.getCaretPosition());
-                updateCaretOff();
-            }
-        });
-
-        textRight = new DoubleBinding() {
-            { bind(textGroup.widthProperty()); }
-            @Override protected double computeValue() {
-                return textGroup.getWidth();
-            }
-        };
-
-        // Once this was crucial for performance, not sure now.
-        clip.setSmooth(false);
-        clip.setX(0);
-        clip.widthProperty().bind(textGroup.widthProperty());
-        clip.heightProperty().bind(textGroup.heightProperty());
-
-        // Add content
-        textGroup.setClip(clip);
-        // Hack to defeat the fact that otherwise when the caret blinks the parent group
-        // bounds are completely invalidated and therefore the dirty region is much
-        // larger than necessary.
-        textGroup.getChildren().addAll(selectionHighlightPath, textNode, new Group(caretPath));
-        getChildren().add(textGroup);
-        if (SHOW_HANDLES) {
-            handleGroup = new Group();
-            handleGroup.setManaged(false);
-            handleGroup.getChildren().addAll(caretHandle, selectionHandle1, selectionHandle2);
-            getChildren().add(handleGroup);
-        }
-
-        // Add text
-        textNode.setManaged(false);
-        textNode.getStyleClass().add("text");
-        textNode.fontProperty().bind(textField.fontProperty());
-
-        textNode.layoutXProperty().bind(textTranslateX);
-        textNode.textProperty().bind(new StringBinding() {
-            { bind(textField.textProperty()); }
-            @Override protected String computeValue() {
-                return maskText(textField.textProperty().getValueSafe());
-            }
-        });
-        textNode.fillProperty().bind(textFill);
-        textNode.impl_selectionFillProperty().bind(new ObjectBinding<Paint>() {
-            { bind(highlightTextFill, textFill, textField.focusedProperty()); }
-            @Override protected Paint computeValue() {
-                return textField.isFocused() ? highlightTextFill.get() : textFill.get();
-            }
-        });
-        // updated by listener on caretPosition to ensure order
-        updateTextNodeCaretPos(textField.getCaretPosition());
-        textField.selectionProperty().addListener(observable -> {
-            updateSelection();
-        });
-
-        // Add selection
-        selectionHighlightPath.setManaged(false);
-        selectionHighlightPath.setStroke(null);
-        selectionHighlightPath.layoutXProperty().bind(textTranslateX);
-        selectionHighlightPath.visibleProperty().bind(textField.anchorProperty().isNotEqualTo(textField.caretPositionProperty()).and(textField.focusedProperty()));
-        selectionHighlightPath.fillProperty().bind(highlightFill);
-        textNode.impl_selectionShapeProperty().addListener(observable -> {
-            updateSelection();
-        });
-
-        // Add caret
-        caretPath.setManaged(false);
-        caretPath.setStrokeWidth(1);
-        caretPath.fillProperty().bind(textFill);
-        caretPath.strokeProperty().bind(textFill);
-        
-        // modifying visibility of the caret forces a layout-pass (RT-32373), so
-        // instead we modify the opacity.
-        caretPath.opacityProperty().bind(new DoubleBinding() {
-            { bind(caretVisible); }
-            @Override protected double computeValue() {
-                return caretVisible.get() ? 1.0 : 0.0;
-            }
-        });
-        caretPath.layoutXProperty().bind(textTranslateX);
-        textNode.impl_caretShapeProperty().addListener(observable -> {
-            caretPath.getElements().setAll(textNode.impl_caretShapeProperty().get());
-            if (caretPath.getElements().size() == 0) {
-                // The caret pos is invalid.
-                updateTextNodeCaretPos(textField.getCaretPosition());
-            } else if (caretPath.getElements().size() == 4) {
-                // The caret is split. Ignore and keep the previous width value.
-            } else {
-                caretWidth = Math.round(caretPath.getLayoutBounds().getWidth());
-            }
-        });
-
-        // Be sure to get the control to request layout when the font changes,
-        // since this will affect the pref height and pref width.
-        textField.fontProperty().addListener(observable -> {
-            // I do both so that any cached values for prefWidth/height are cleared.
-            // The problem is that the skin is unmanaged and so calling request layout
-            // doesn't walk up the tree all the way. I think....
-            textField.requestLayout();
-            getSkinnable().requestLayout();
-        });
-
-        registerChangeListener(textField.prefColumnCountProperty(), "prefColumnCount");
-        if (textField.isFocused()) setCaretAnimating(true);
-
-        textField.alignmentProperty().addListener(observable -> {
-            if (textField.getWidth() > 0) {
-                updateTextPos();
-                updateCaretOff();
-                textField.requestLayout();
-            }
-        });
-
-        usePromptText = new BooleanBinding() {
-            { bind(textField.textProperty(),
-                   textField.promptTextProperty(),
-                   promptTextFill); }
-            @Override protected boolean computeValue() {
-                String txt = textField.getText();
-                String promptTxt = textField.getPromptText();
-                return ((txt == null || txt.isEmpty()) &&
-                        promptTxt != null && !promptTxt.isEmpty() &&
-                        !promptTextFill.get().equals(Color.TRANSPARENT));
-            }
-        };
-
-        promptTextFill.addListener(observable -> {
-            updateTextPos();
-        });
-
-        textField.textProperty().addListener(observable -> {
-            if (!getBehavior().isEditing()) {
-                // Text changed, but not by user action
-                updateTextPos();
-            }
-        });
-
-        if (usePromptText.get()) {
-            createPromptNode();
-        }
-
-        usePromptText.addListener(observable -> {
-            createPromptNode();
-            textField.requestLayout();
-        });
-
-        if (SHOW_HANDLES) {
-            selectionHandle1.setRotate(180);
-
-            EventHandler<MouseEvent> handlePressHandler = e -> {
-                pressX = e.getX();
-                pressY = e.getY();
-                e.consume();
-            };
-
-            caretHandle.setOnMousePressed(handlePressHandler);
-            selectionHandle1.setOnMousePressed(handlePressHandler);
-            selectionHandle2.setOnMousePressed(handlePressHandler);
-
-            caretHandle.setOnMouseDragged(e -> {
-                Point2D p = new Point2D(caretHandle.getLayoutX() + e.getX() + pressX - textNode.getLayoutX(),
-                                        caretHandle.getLayoutY() + e.getY() - pressY - 6);
-                HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-                positionCaret(hit, false);
-                e.consume();
-            });
-
-            selectionHandle1.setOnMouseDragged(new EventHandler<MouseEvent>() {
-                @Override public void handle(MouseEvent e) {
-                    TextField textField = getSkinnable();
-                    Point2D tp = textNode.localToScene(0, 0);
-                    Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle1.getWidth() / 2,
-                                            e.getSceneY() - tp.getY() - pressY - 6);
-                    HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-                    int pos = hit.getCharIndex();
-                    if (textField.getAnchor() < textField.getCaretPosition()) {
-                        // Swap caret and anchor
-                        textField.selectRange(textField.getCaretPosition(), textField.getAnchor());
-                    }
-                    if (pos >= 0) {
-                        if (pos >= textField.getAnchor() - 1) {
-                            hit.setCharIndex(Math.max(0, textField.getAnchor() - 1));
-                        }
-                        positionCaret(hit, true);
-                    }
-                    e.consume();
-                }
-            });
-
-            selectionHandle2.setOnMouseDragged(new EventHandler<MouseEvent>() {
-                @Override public void handle(MouseEvent e) {
-                    TextField textField = getSkinnable();
-                    Point2D tp = textNode.localToScene(0, 0);
-                    Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle2.getWidth() / 2,
-                                            e.getSceneY() - tp.getY() - pressY - 6);
-                    HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(p));
-                    int pos = hit.getCharIndex();
-                    if (textField.getAnchor() > textField.getCaretPosition()) {
-                        // Swap caret and anchor
-                        textField.selectRange(textField.getCaretPosition(), textField.getAnchor());
-                    }
-                    if (pos > 0) {
-                        if (pos <= textField.getAnchor()) {
-                            hit.setCharIndex(Math.min(textField.getAnchor() + 1, textField.getLength()));
-                        }
-                        positionCaret(hit, true);
-                    }
-                    e.consume();
-                }
-            });
-        }
-    }
-
-    private void updateTextNodeCaretPos(int pos) {
-        if (pos == 0 || isForwardBias()) {
-            textNode.setImpl_caretPosition(pos);
-        } else {
-            textNode.setImpl_caretPosition(pos - 1);
-        }
-        textNode.impl_caretBiasProperty().set(isForwardBias());
-    }
-
-    private void createPromptNode() {
-        if (promptNode != null || !usePromptText.get()) return;
-
-        promptNode = new Text();
-        textGroup.getChildren().add(0, promptNode);
-        promptNode.setManaged(false);
-        promptNode.getStyleClass().add("text");
-        promptNode.visibleProperty().bind(usePromptText);
-        promptNode.fontProperty().bind(getSkinnable().fontProperty());
-
-        promptNode.textProperty().bind(getSkinnable().promptTextProperty());
-        promptNode.fillProperty().bind(promptTextFill);
-        updateSelection();
-    }
-
-    private void updateSelection() {
-        TextField textField = getSkinnable();
-        IndexRange newValue = textField.getSelection();
-
-        if (newValue == null || newValue.getLength() == 0) {
-            textNode.impl_selectionStartProperty().set(-1);
-            textNode.impl_selectionEndProperty().set(-1);
-        } else {
-            textNode.impl_selectionStartProperty().set(newValue.getStart());
-            // This intermediate value is needed to force selection shape layout.
-            textNode.impl_selectionEndProperty().set(newValue.getStart());
-            textNode.impl_selectionEndProperty().set(newValue.getEnd());
-        }
-
-        PathElement[] elements = textNode.impl_selectionShapeProperty().get();
-        if (elements == null) {
-            selectionHighlightPath.getElements().clear();
-        } else {
-            selectionHighlightPath.getElements().setAll(elements);
-        }
-
-        if (SHOW_HANDLES && newValue != null && newValue.getLength() > 0) {
-            int caretPos = textField.getCaretPosition();
-            int anchorPos = textField.getAnchor();
-
-            {
-                // Position the handle for the anchor. This could be handle1 or handle2.
-                // Do this before positioning the handle for the caret.
-                updateTextNodeCaretPos(anchorPos);
-                Bounds b = caretPath.getBoundsInParent();
-                if (caretPos < anchorPos) {
-                    selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
-                } else {
-                    selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
-                }
-            }
-
-            {
-                // Position handle for the caret. This could be handle1 or handle2.
-                updateTextNodeCaretPos(caretPos);
-                Bounds b = caretPath.getBoundsInParent();
-                if (caretPos < anchorPos) {
-                    selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
-                } else {
-                    selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
-                }
-            }
-        }
-    }
-
-    @Override protected void handleControlPropertyChanged(String propertyReference) {
-        if ("prefColumnCount".equals(propertyReference)) {
-            getSkinnable().requestLayout();
-        } else {
-            super.handleControlPropertyChanged(propertyReference);
-        }
-    }
-
-    @Override
-    protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        TextField textField = getSkinnable();
-
-        double characterWidth = fontMetrics.get().computeStringWidth("W");
-
-        int columnCount = textField.getPrefColumnCount();
-
-        return columnCount * characterWidth + leftInset + rightInset;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return topInset + textNode.getLayoutBounds().getHeight() + bottomInset;
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().prefHeight(width);
-    }
-
-    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
-        return topInset + textNode.getBaselineOffset();
-    }
-
-    /**
-     * Updates the textTranslateX value for the Text node position. This is
-     * done for general layout, but care is taken to avoid resetting the
-     * position when there's a need to scroll the text due to caret movement,
-     * or when editing text that overflows on either side.
-     */
-    private void updateTextPos() {
-        double oldX = textTranslateX.get();
-        double newX;
-        double textNodeWidth = textNode.getLayoutBounds().getWidth();
-
-        switch (getHAlignment()) {
-          case CENTER:
-            double midPoint = textRight.get() / 2;
-            if (usePromptText.get()) {
-                // If a prompt is shown (which implies that the text is
-                // empty), then we align the Text node so that the caret will
-                // appear at the left of the centered prompt.
-                newX = midPoint - promptNode.getLayoutBounds().getWidth() / 2;
-                promptNode.setLayoutX(newX);
-            } else {
-                newX = midPoint - textNodeWidth / 2;
-            }
-            // Update if there is space on the right
-            if (newX + textNodeWidth <= textRight.get()) {
-                textTranslateX.set(newX);
-            }
-            break;
-
-          case RIGHT:
-            newX = textRight.get() - textNodeWidth - caretWidth / 2;
-            // Update if there is space on the right
-            if (newX > oldX || newX > 0) {
-                textTranslateX.set(newX);
-            }
-            if (usePromptText.get()) {
-                promptNode.setLayoutX(textRight.get() - promptNode.getLayoutBounds().getWidth() -
-                                      caretWidth / 2);
-            }
-            break;
-
-          case LEFT:
-          default:
-            newX = caretWidth / 2;
-            // Update if there is space on either side.
-            if (newX < oldX || newX + textNodeWidth <= textRight.get()) {
-                textTranslateX.set(newX);
-            }
-            if (usePromptText.get()) {
-                promptNode.layoutXProperty().set(newX);
-            }
-        }
-    }
-
-    // should be called when the padding changes, or the text box width, or
-    // the dot moves
-    protected void updateCaretOff() {
-        double delta = 0.0;
-        double caretX = caretPath.getLayoutBounds().getMinX() + textTranslateX.get();
-        // If the caret position is less than or equal to the left edge of the
-        // clip then the caret will be clipped. We want the caret to end up
-        // being positioned one pixel right of the clip's left edge. The same
-        // applies on the right edge (but going the other direction of course).
-        if (caretX < 0) {
-            // I'll end up with a negative number
-            delta = caretX;
-        } else if (caretX > (textRight.get() - caretWidth)) {
-            // I'll end up with a positive number
-            delta = caretX - (textRight.get() - caretWidth);
-        }
-
-        // If delta is negative, then translate in the negative direction
-        // to cause the text to scroll to the right. Vice-versa for positive.
-        switch (getHAlignment()) {
-          case CENTER:
-            textTranslateX.set(textTranslateX.get() - delta);
-            break;
-
-          case RIGHT:
-            textTranslateX.set(Math.max(textTranslateX.get() - delta,
-                                        textRight.get() - textNode.getLayoutBounds().getWidth() -
-                                        caretWidth / 2));
-            break;
-
-          case LEFT:
-          default:
-            textTranslateX.set(Math.min(textTranslateX.get() - delta,
-                                        caretWidth / 2));
-        }
-        if (SHOW_HANDLES) {
-            caretHandle.setLayoutX(caretX - caretHandle.getWidth() / 2 + 1);
-        }
-    }
-
-    /**
-     * Use this implementation instead of the one provided on TextInputControl.
-     * updateCaretOff would get called to position the caret, but the text needs
-     * to be scrolled appropriately.
-     */
-    public void replaceText(int start, int end, String txt) {
-        final double textMaxXOld = textNode.getBoundsInParent().getMaxX();
-        final double caretMaxXOld = caretPath.getLayoutBounds().getMaxX() + textTranslateX.get();
-        getSkinnable().replaceText(start, end, txt);
-        scrollAfterDelete(textMaxXOld, caretMaxXOld);
-    }
-
-    /**
-     * Use this implementation instead of the one provided on TextInputControl
-     * Simply calls into TextInputControl.deletePrevious/NextChar and responds appropriately
-     * based on the return value.
-     */
-    public void deleteChar(boolean previous) {
-        final double textMaxXOld = textNode.getBoundsInParent().getMaxX();
-        final double caretMaxXOld = caretPath.getLayoutBounds().getMaxX() + textTranslateX.get();
-        final boolean shouldBeep = previous ?
-                !getSkinnable().deletePreviousChar() :
-                !getSkinnable().deleteNextChar();
-
-        if (shouldBeep) {
-//            beep();
-        } else {
-            scrollAfterDelete(textMaxXOld, caretMaxXOld);
-        }
-    }
-
-    public void scrollAfterDelete(double textMaxXOld, double caretMaxXOld) {
-        final Bounds textLayoutBounds = textNode.getLayoutBounds();
-        final Bounds textBounds = textNode.localToParent(textLayoutBounds);
-        final Bounds clipBounds = clip.getBoundsInParent();
-        final Bounds caretBounds = caretPath.getLayoutBounds();
-
-        switch (getHAlignment()) {
-          case RIGHT:
-            if (textBounds.getMaxX() > clipBounds.getMaxX()) {
-                double delta = caretMaxXOld - caretBounds.getMaxX() - textTranslateX.get();
-                if (textBounds.getMaxX() + delta < clipBounds.getMaxX()) {
-                    if (textMaxXOld <= clipBounds.getMaxX()) {
-                        delta = textMaxXOld - textBounds.getMaxX();
-                    } else {
-                        delta = clipBounds.getMaxX() - textBounds.getMaxX();
-                    }
-                }
-                textTranslateX.set(textTranslateX.get() + delta);
-            } else {
-                updateTextPos();
-            }
-            break;
-
-          case LEFT:
-          case CENTER:
-          default:
-            if (textBounds.getMinX() < clipBounds.getMinX() + caretWidth / 2 &&
-                textBounds.getMaxX() <= clipBounds.getMaxX()) {
-                double delta = caretMaxXOld - caretBounds.getMaxX() - textTranslateX.get();
-                if (textBounds.getMaxX() + delta < clipBounds.getMaxX()) {
-                    if (textMaxXOld <= clipBounds.getMaxX()) {
-                        delta = textMaxXOld - textBounds.getMaxX();
-                    } else {
-                        delta = clipBounds.getMaxX() - textBounds.getMaxX();
-                    }
-                }
-                textTranslateX.set(textTranslateX.get() + delta);
-            }
-        }
-
-        updateCaretOff();
-    }
-
-    public HitInfo getIndex(double x, double y) {
-        // adjust the event to be in the same coordinate space as the
-        // text content of the textInputControl
-        Point2D p;
-
-        p = new Point2D(x - textTranslateX.get() - snappedLeftInset(),
-                        y - snappedTopInset());
-        return textNode.impl_hitTestChar(translateCaretPosition(p));
-    }
-
-    public void positionCaret(HitInfo hit, boolean select) {
-        TextField textField = getSkinnable();
-        int pos = Utils.getHitInsertionIndex(hit, textField.textProperty().getValueSafe());
-
-        if (select) {
-            textField.selectPositionCaret(pos);
-        } else {
-            textField.positionCaret(pos);
-        }
-
-        setForwardBias(hit.isLeading());
-    }
-
-    @Override public Rectangle2D getCharacterBounds(int index) {
-        double x, y;
-        double width, height;
-        if (index == textNode.getText().length()) {
-            Bounds textNodeBounds = textNode.getBoundsInLocal();
-            x = textNodeBounds.getMaxX();
-            y = 0;
-            width = 0;
-            height = textNodeBounds.getMaxY();
-        } else {
-            characterBoundingPath.getElements().clear();
-            characterBoundingPath.getElements().addAll(textNode.impl_getRangeShape(index, index + 1));
-            characterBoundingPath.setLayoutX(textNode.getLayoutX());
-            characterBoundingPath.setLayoutY(textNode.getLayoutY());
-
-            Bounds bounds = characterBoundingPath.getBoundsInLocal();
-
-            x = bounds.getMinX();
-            y = bounds.getMinY();
-            // Sometimes the bounds is empty, in which case we must ignore the width/height
-            width  = bounds.isEmpty() ? 0 : bounds.getWidth();
-            height = bounds.isEmpty() ? 0 : bounds.getHeight();
-        }
-
-        Bounds textBounds = textGroup.getBoundsInParent();
-
-        return new Rectangle2D(x + textBounds.getMinX() + textTranslateX.get(),
-                               y + textBounds.getMinY(), width, height);
-    }
-
-    @Override protected PathElement[] getUnderlineShape(int start, int end) {
-        return textNode.impl_getUnderlineShape(start, end);
-    }
-
-    @Override protected PathElement[] getRangeShape(int start, int end) {
-        return textNode.impl_getRangeShape(start, end);
-    }
-
-    @Override protected void addHighlight(List<? extends Node> nodes, int start) {
-        textGroup.getChildren().addAll(nodes);
-    }
-
-    @Override protected void removeHighlight(List<? extends Node> nodes) {
-        textGroup.getChildren().removeAll(nodes);
-    }
-
-    @Override public void nextCharacterVisually(boolean moveRight) {
-        if (isRTL()) {
-            // Text node is mirrored.
-            moveRight = !moveRight;
-        }
-
-        Bounds caretBounds = caretPath.getLayoutBounds();
-        if (caretPath.getElements().size() == 4) {
-            // The caret is split
-            // TODO: Find a better way to get the primary caret position
-            // instead of depending on the internal implementation.
-            // See RT-25465.
-            caretBounds = new Path(caretPath.getElements().get(0), caretPath.getElements().get(1)).getLayoutBounds();
-        }
-        double hitX = moveRight ? caretBounds.getMaxX() : caretBounds.getMinX();
-        double hitY = (caretBounds.getMinY() + caretBounds.getMaxY()) / 2;
-        HitInfo hit = textNode.impl_hitTestChar(translateCaretPosition(new Point2D(hitX, hitY)));
-        Path charShape = new Path(textNode.impl_getRangeShape(hit.getCharIndex(), hit.getCharIndex() + 1));
-        if ((moveRight && charShape.getLayoutBounds().getMaxX() > caretBounds.getMaxX()) ||
-            (!moveRight && charShape.getLayoutBounds().getMinX() < caretBounds.getMinX())) {
-            hit.setLeading(!hit.isLeading());
-        }
-        positionCaret(hit, false);
-    }
-
-    @Override protected void layoutChildren(final double x, final double y,
-                                            final double w, final double h) {
-        super.layoutChildren(x, y, w, h);
-
-        if (textNode != null) {
-            double textY;
-            final Bounds textNodeBounds = textNode.getLayoutBounds();
-            final double ascent = textNode.getBaselineOffset();
-            final double descent = textNodeBounds.getHeight() - ascent;
-
-            switch (getSkinnable().getAlignment().getVpos()) {
-                case TOP:
-                textY = ascent;
-                break;
-
-              case CENTER:
-                textY = (ascent + textGroup.getHeight() - descent) / 2;
-                break;
-
-              case BOTTOM:
-              default:
-                textY = textGroup.getHeight() - descent;
-            }
-            textNode.setY(textY);
-            if (promptNode != null) {
-                promptNode.setY(textY);
-            }
-
-            if (getSkinnable().getWidth() > 0) {
-                updateTextPos();
-                updateCaretOff();
-            }
-        }
-
-        if (SHOW_HANDLES) {
-            handleGroup.setLayoutX(x + textTranslateX.get());
-            handleGroup.setLayoutY(y);
-
-            // Resize handles for caret and anchor.
-//            IndexRange selection = textField.getSelection();
-            selectionHandle1.resize(selectionHandle1.prefWidth(-1),
-                                    selectionHandle1.prefHeight(-1));
-            selectionHandle2.resize(selectionHandle2.prefWidth(-1),
-                                    selectionHandle2.prefHeight(-1));
-            caretHandle.resize(caretHandle.prefWidth(-1),
-                               caretHandle.prefHeight(-1));
-
-            Bounds b = caretPath.getBoundsInParent();
-            caretHandle.setLayoutY(b.getMaxY() - 1);
-            //selectionHandle1.setLayoutY(b.getMaxY() - 1);
-            selectionHandle1.setLayoutY(b.getMinY() - selectionHandle1.getHeight() + 1);
-            selectionHandle2.setLayoutY(b.getMaxY() - 1);
-        }
-    }
-
-    protected HPos getHAlignment() {
-        HPos hPos = getSkinnable().getAlignment().getHpos();
-        return hPos;
-    }
-
-    @Override public Point2D getMenuPosition() {
-        Point2D p = super.getMenuPosition();
-        if (p != null) {
-            p = new Point2D(Math.max(0, p.getX() - textNode.getLayoutX() - snappedLeftInset() + textTranslateX.get()),
-                            Math.max(0, p.getY() - textNode.getLayoutY() - snappedTopInset()));
-        }
-        return p;
-    }
-
-    @Override protected String maskText(String txt) {
-        if (getSkinnable() instanceof PasswordField) {
-            int n = txt.length();
-            StringBuilder passwordBuilder = new StringBuilder(n);
-            for (int i = 0; i < n; i++) {
-                passwordBuilder.append(BULLET);
-            }
-
-            return passwordBuilder.toString();
-        } else {
-            return txt;
-        }
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case BOUNDS_FOR_RANGE:
-            case OFFSET_AT_POINT:
-                return textNode.queryAccessibleAttribute(attribute, parameters);
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:23:32.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TextFieldSkin.java	2015-09-03 15:23:29.995641700 -0700
@@ -0,0 +1,927 @@
+/*
+ * 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.TextAreaBehavior;
+import com.sun.javafx.scene.control.behavior.TextInputControlBehavior;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.DoubleBinding;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.beans.value.ObservableDoubleValue;
+import javafx.event.EventHandler;
+import javafx.geometry.Bounds;
+import javafx.geometry.HPos;
+import javafx.geometry.Point2D;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.IndexRange;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Path;
+import javafx.scene.shape.PathElement;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Text;
+import java.util.List;
+import com.sun.javafx.scene.control.behavior.TextFieldBehavior;
+import com.sun.javafx.scene.control.behavior.PasswordFieldBehavior;
+import com.sun.javafx.scene.text.HitInfo;
+
+/**
+ * Default skin implementation for the {@link TextField} control.
+ *
+ * @see TextField
+ * @since 9
+ */
+public class TextFieldSkin extends TextInputControlSkin<TextField> {
+
+    /**************************************************************************
+     *
+     * Private fields
+     *
+     **************************************************************************/
+
+    private final TextFieldBehavior behavior;
+
+    /**
+     * This group contains the text, caret, and selection rectangle.
+     * It is clipped. The textNode, selectionHighlightPath, and
+     * caret are each translated individually when horizontal
+     * translation is needed to keep the caretPosition visible.
+     */
+    private Pane textGroup = new Pane();
+    private Group handleGroup;
+
+    /**
+     * The clip, applied to the textGroup. This makes sure that any
+     * text / selection wandering off the text box is clipped
+     */
+    private Rectangle clip = new Rectangle();
+    /**
+     * The node actually displaying the text. Note that it has the
+     * ability to render both the normal fill as well as the highlight
+     * fill, to perform hit testing, fetching of the selection
+     * highlight, and other such duties.
+     */
+    private Text textNode = new Text();
+    /**
+     *
+     * The node used for showing the prompt text.
+     */
+    private Text promptNode;
+    /**
+     * A path, provided by the textNode, which represents the area
+     * which is selected. The path elements which make up the
+     * selection must be updated whenever the selection changes. We
+     * don't need to keep track of text changes because those will
+     * force the selection to be updated.
+     */
+    private Path selectionHighlightPath = new Path();
+
+    private Path characterBoundingPath = new Path();
+    private ObservableBooleanValue usePromptText;
+    private DoubleProperty textTranslateX = new SimpleDoubleProperty(this, "textTranslateX");
+    private double caretWidth;
+
+    /**
+     * Right edge of the text region sans padding
+     */
+    private ObservableDoubleValue textRight;
+
+    private double pressX, pressY; // For dragging handles on embedded
+
+    // For use with PasswordField
+    static final char BULLET = '\u25cf';
+
+
+
+    /**************************************************************************
+     *
+     * Constructors
+     *
+     **************************************************************************/
+
+    /**
+     * Creates a new TextFieldSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TextFieldSkin(final TextField control) {
+        super(control);
+
+        // install default input map for the text field control
+        this.behavior = (control instanceof PasswordField)
+                ? new PasswordFieldBehavior((PasswordField)control)
+                : new TextFieldBehavior(control);
+        this.behavior.setTextFieldSkin(this);
+//        control.setInputMap(behavior.getInputMap());
+
+        control.caretPositionProperty().addListener((observable, oldValue, newValue) -> {
+            if (control.getWidth() > 0) {
+                updateTextNodeCaretPos(control.getCaretPosition());
+                if (!isForwardBias()) {
+                    setForwardBias(true);
+                }
+                updateCaretOff();
+            }
+        });
+
+        forwardBiasProperty().addListener(observable -> {
+            if (control.getWidth() > 0) {
+                updateTextNodeCaretPos(control.getCaretPosition());
+                updateCaretOff();
+            }
+        });
+
+        textRight = new DoubleBinding() {
+            { bind(textGroup.widthProperty()); }
+            @Override protected double computeValue() {
+                return textGroup.getWidth();
+            }
+        };
+
+        // Once this was crucial for performance, not sure now.
+        clip.setSmooth(false);
+        clip.setX(0);
+        clip.widthProperty().bind(textGroup.widthProperty());
+        clip.heightProperty().bind(textGroup.heightProperty());
+
+        // Add content
+        textGroup.setClip(clip);
+        // Hack to defeat the fact that otherwise when the caret blinks the parent group
+        // bounds are completely invalidated and therefore the dirty region is much
+        // larger than necessary.
+        textGroup.getChildren().addAll(selectionHighlightPath, textNode, new Group(caretPath));
+        getChildren().add(textGroup);
+        if (SHOW_HANDLES) {
+            handleGroup = new Group();
+            handleGroup.setManaged(false);
+            handleGroup.getChildren().addAll(caretHandle, selectionHandle1, selectionHandle2);
+            getChildren().add(handleGroup);
+        }
+
+        // Add text
+        textNode.setManaged(false);
+        textNode.getStyleClass().add("text");
+        textNode.fontProperty().bind(control.fontProperty());
+
+        textNode.layoutXProperty().bind(textTranslateX);
+        textNode.textProperty().bind(new StringBinding() {
+            { bind(control.textProperty()); }
+            @Override protected String computeValue() {
+                return maskText(control.textProperty().getValueSafe());
+            }
+        });
+        textNode.fillProperty().bind(textFillProperty());
+        textNode.impl_selectionFillProperty().bind(new ObjectBinding<Paint>() {
+            { bind(highlightTextFillProperty(), textFillProperty(), control.focusedProperty()); }
+            @Override protected Paint computeValue() {
+                return control.isFocused() ? highlightTextFillProperty().get() : textFillProperty().get();
+            }
+        });
+        // updated by listener on caretPosition to ensure order
+        updateTextNodeCaretPos(control.getCaretPosition());
+        control.selectionProperty().addListener(observable -> {
+            updateSelection();
+        });
+
+        // Add selection
+        selectionHighlightPath.setManaged(false);
+        selectionHighlightPath.setStroke(null);
+        selectionHighlightPath.layoutXProperty().bind(textTranslateX);
+        selectionHighlightPath.visibleProperty().bind(control.anchorProperty().isNotEqualTo(control.caretPositionProperty()).and(control.focusedProperty()));
+        selectionHighlightPath.fillProperty().bind(highlightFillProperty());
+        textNode.impl_selectionShapeProperty().addListener(observable -> {
+            updateSelection();
+        });
+
+        // Add caret
+        caretPath.setManaged(false);
+        caretPath.setStrokeWidth(1);
+        caretPath.fillProperty().bind(textFillProperty());
+        caretPath.strokeProperty().bind(textFillProperty());
+        
+        // modifying visibility of the caret forces a layout-pass (RT-32373), so
+        // instead we modify the opacity.
+        caretPath.opacityProperty().bind(new DoubleBinding() {
+            { bind(caretVisibleProperty()); }
+            @Override protected double computeValue() {
+                return caretVisibleProperty().get() ? 1.0 : 0.0;
+            }
+        });
+        caretPath.layoutXProperty().bind(textTranslateX);
+        textNode.impl_caretShapeProperty().addListener(observable -> {
+            caretPath.getElements().setAll(textNode.impl_caretShapeProperty().get());
+            if (caretPath.getElements().size() == 0) {
+                // The caret pos is invalid.
+                updateTextNodeCaretPos(control.getCaretPosition());
+            } else if (caretPath.getElements().size() == 4) {
+                // The caret is split. Ignore and keep the previous width value.
+            } else {
+                caretWidth = Math.round(caretPath.getLayoutBounds().getWidth());
+            }
+        });
+
+        // Be sure to get the control to request layout when the font changes,
+        // since this will affect the pref height and pref width.
+        control.fontProperty().addListener(observable -> {
+            // I do both so that any cached values for prefWidth/height are cleared.
+            // The problem is that the skin is unmanaged and so calling request layout
+            // doesn't walk up the tree all the way. I think....
+            control.requestLayout();
+            getSkinnable().requestLayout();
+        });
+
+        registerChangeListener(control.prefColumnCountProperty(), e -> getSkinnable().requestLayout());
+        if (control.isFocused()) setCaretAnimating(true);
+
+        control.alignmentProperty().addListener(observable -> {
+            if (control.getWidth() > 0) {
+                updateTextPos();
+                updateCaretOff();
+                control.requestLayout();
+            }
+        });
+
+        usePromptText = new BooleanBinding() {
+            { bind(control.textProperty(),
+                   control.promptTextProperty(),
+                   promptTextFillProperty()); }
+            @Override protected boolean computeValue() {
+                String txt = control.getText();
+                String promptTxt = control.getPromptText();
+                return ((txt == null || txt.isEmpty()) &&
+                        promptTxt != null && !promptTxt.isEmpty() &&
+                        !getPromptTextFill().equals(Color.TRANSPARENT));
+            }
+        };
+
+        promptTextFillProperty().addListener(observable -> {
+            updateTextPos();
+        });
+
+        control.textProperty().addListener(observable -> {
+            if (!behavior.isEditing()) {
+                // Text changed, but not by user action
+                updateTextPos();
+            }
+        });
+
+        if (usePromptText.get()) {
+            createPromptNode();
+        }
+
+        usePromptText.addListener(observable -> {
+            createPromptNode();
+            control.requestLayout();
+        });
+
+        if (SHOW_HANDLES) {
+            selectionHandle1.setRotate(180);
+
+            EventHandler<MouseEvent> handlePressHandler = e -> {
+                pressX = e.getX();
+                pressY = e.getY();
+                e.consume();
+            };
+
+            caretHandle.setOnMousePressed(handlePressHandler);
+            selectionHandle1.setOnMousePressed(handlePressHandler);
+            selectionHandle2.setOnMousePressed(handlePressHandler);
+
+            caretHandle.setOnMouseDragged(e -> {
+                Point2D p = new Point2D(caretHandle.getLayoutX() + e.getX() + pressX - textNode.getLayoutX(),
+                                        caretHandle.getLayoutY() + e.getY() - pressY - 6);
+                HitInfo hit = textNode.impl_hitTestChar(p);
+                positionCaret(hit, false);
+                e.consume();
+            });
+
+            selectionHandle1.setOnMouseDragged(new EventHandler<MouseEvent>() {
+                @Override public void handle(MouseEvent e) {
+                    TextField control = getSkinnable();
+                    Point2D tp = textNode.localToScene(0, 0);
+                    Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle1.getWidth() / 2,
+                                            e.getSceneY() - tp.getY() - pressY - 6);
+                    HitInfo hit = textNode.impl_hitTestChar(p);
+                    int pos = hit.getCharIndex();
+                    if (control.getAnchor() < control.getCaretPosition()) {
+                        // Swap caret and anchor
+                        control.selectRange(control.getCaretPosition(), control.getAnchor());
+                    }
+                    if (pos >= 0) {
+                        if (pos >= control.getAnchor() - 1) {
+                            hit.setCharIndex(Math.max(0, control.getAnchor() - 1));
+                        }
+                        positionCaret(hit, true);
+                    }
+                    e.consume();
+                }
+            });
+
+            selectionHandle2.setOnMouseDragged(new EventHandler<MouseEvent>() {
+                @Override public void handle(MouseEvent e) {
+                    TextField control = getSkinnable();
+                    Point2D tp = textNode.localToScene(0, 0);
+                    Point2D p = new Point2D(e.getSceneX() - tp.getX() + 10/*??*/ - pressX + selectionHandle2.getWidth() / 2,
+                                            e.getSceneY() - tp.getY() - pressY - 6);
+                    HitInfo hit = textNode.impl_hitTestChar(p);
+                    int pos = hit.getCharIndex();
+                    if (control.getAnchor() > control.getCaretPosition()) {
+                        // Swap caret and anchor
+                        control.selectRange(control.getCaretPosition(), control.getAnchor());
+                    }
+                    if (pos > 0) {
+                        if (pos <= control.getAnchor()) {
+                            hit.setCharIndex(Math.min(control.getAnchor() + 1, control.getLength()));
+                        }
+                        positionCaret(hit, true);
+                    }
+                    e.consume();
+                }
+            });
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        TextField textField = getSkinnable();
+
+        double characterWidth = fontMetrics.get().computeStringWidth("W");
+
+        int columnCount = textField.getPrefColumnCount();
+
+        return columnCount * characterWidth + leftInset + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return topInset + textNode.getLayoutBounds().getHeight() + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().prefHeight(width);
+    }
+
+    /** {@inheritDoc} */
+    @Override public double computeBaselineOffset(double topInset, double rightInset, double bottomInset, double leftInset) {
+        return topInset + textNode.getBaselineOffset();
+    }
+
+    // Public for behavior
+    /**
+     * Replaces a range of characters with the given text.
+     *
+     * Call this implementation from behavior classes instead of the
+     * one provided on TextInputControl to ensure that the text
+     * scrolls as needed.
+     *
+     * @param start The starting index in the range, inclusive. This must be &gt;= 0 and &lt; the end.
+     * @param end The ending index in the range, exclusive. This is one-past the last character to
+     *            delete (consistent with the String manipulation methods). This must be &gt; the start,
+     *            and &lt;= the length of the text.
+     * @param text The text that is to replace the range. This must not be null.
+     * @see TextField#replaceText(int, int, String)
+     */
+    public void replaceText(int start, int end, String txt) {
+        final double textMaxXOld = textNode.getBoundsInParent().getMaxX();
+        final double caretMaxXOld = caretPath.getLayoutBounds().getMaxX() + textTranslateX.get();
+        getSkinnable().replaceText(start, end, txt);
+        scrollAfterDelete(textMaxXOld, caretMaxXOld);
+    }
+
+    // Public for behavior
+    /**
+     * Deletes the character that follows or precedes the current
+     * caret position from the text if there is no selection, or
+     * deletes the selection if there is one.
+     *
+     * Call this implementation from behavior classes instead of the
+     * one provided on TextInputControl to ensure that the text
+     * scrolls as needed.
+     *
+     * @param previous whether to delete the preceding character.
+     */
+    public void deleteChar(boolean previous) {
+        final double textMaxXOld = textNode.getBoundsInParent().getMaxX();
+        final double caretMaxXOld = caretPath.getLayoutBounds().getMaxX() + textTranslateX.get();
+        if (previous ? getSkinnable().deletePreviousChar() : getSkinnable().deleteNextChar()) {
+            scrollAfterDelete(textMaxXOld, caretMaxXOld);
+        }
+    }
+
+    // Public for behavior
+    /**
+     * Performs a hit test, mapping point to index in the content.
+     *
+     * @param x the x coordinate of the point.
+     * @param y the y coordinate of the point.
+     * @return a {@code TextPosInfo} object describing the index and forward bias.
+     */
+    public TextPosInfo getIndex(double x, double y) {
+        // adjust the event to be in the same coordinate space as the
+        // text content of the textInputControl
+        Point2D p = new Point2D(x - textTranslateX.get() - snappedLeftInset(),
+                                y - snappedTopInset());
+        return new TextPosInfo(textNode.impl_hitTestChar(p));
+    }
+
+    // Public for behavior
+    /**
+     * Moves the caret to the specified position.
+     *
+     * @param hit the new position and forward bias of the caret.
+     * @param select whether to extend selection to the new position.
+     */
+    public void positionCaret(TextPosInfo hit, boolean select) {
+        TextField textField = getSkinnable();
+        int pos = Utils.getHitInsertionIndex(hit, textField.textProperty().getValueSafe());
+
+        if (select) {
+            textField.selectPositionCaret(pos);
+        } else {
+            textField.positionCaret(pos);
+        }
+
+        setForwardBias(hit.isLeading());
+    }
+
+    private void positionCaret(HitInfo hit, boolean select) {
+        positionCaret(new TextPosInfo(hit), select);
+    }
+
+    /** {@inheritDoc} */
+    @Override public Rectangle2D getCharacterBounds(int index) {
+        double x, y;
+        double width, height;
+        if (index == textNode.getText().length()) {
+            Bounds textNodeBounds = textNode.getBoundsInLocal();
+            x = textNodeBounds.getMaxX();
+            y = 0;
+            width = 0;
+            height = textNodeBounds.getMaxY();
+        } else {
+            characterBoundingPath.getElements().clear();
+            characterBoundingPath.getElements().addAll(textNode.impl_getRangeShape(index, index + 1));
+            characterBoundingPath.setLayoutX(textNode.getLayoutX());
+            characterBoundingPath.setLayoutY(textNode.getLayoutY());
+
+            Bounds bounds = characterBoundingPath.getBoundsInLocal();
+
+            x = bounds.getMinX();
+            y = bounds.getMinY();
+            // Sometimes the bounds is empty, in which case we must ignore the width/height
+            width  = bounds.isEmpty() ? 0 : bounds.getWidth();
+            height = bounds.isEmpty() ? 0 : bounds.getHeight();
+        }
+
+        Bounds textBounds = textGroup.getBoundsInParent();
+
+        return new Rectangle2D(x + textBounds.getMinX() + textTranslateX.get(),
+                y + textBounds.getMinY(), width, height);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected PathElement[] getUnderlineShape(int start, int end) {
+        return textNode.impl_getUnderlineShape(start, end);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected PathElement[] getRangeShape(int start, int end) {
+        return textNode.impl_getRangeShape(start, end);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void addHighlight(List<? extends Node> nodes, int start) {
+        textGroup.getChildren().addAll(nodes);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void removeHighlight(List<? extends Node> nodes) {
+        textGroup.getChildren().removeAll(nodes);
+    }
+
+    /** {@inheritDoc} */
+    @Override public void moveCaret(TextUnit unit, Direction dir, boolean select) {
+        switch (unit) {
+            case CHARACTER:
+                switch (dir) {
+                    case LEFT:
+                    case RIGHT:
+                        nextCharacterVisually(dir == Direction.RIGHT);
+                        break;
+                    default:
+                        throw new IllegalArgumentException(""+dir);
+                }
+                break;
+            default:
+                throw new IllegalArgumentException(""+unit);
+        }
+    }
+
+    private void nextCharacterVisually(boolean moveRight) {
+        if (isRTL()) {
+            // Text node is mirrored.
+            moveRight = !moveRight;
+        }
+
+        Bounds caretBounds = caretPath.getLayoutBounds();
+        if (caretPath.getElements().size() == 4) {
+            // The caret is split
+            // TODO: Find a better way to get the primary caret position
+            // instead of depending on the internal implementation.
+            // See RT-25465.
+            caretBounds = new Path(caretPath.getElements().get(0), caretPath.getElements().get(1)).getLayoutBounds();
+        }
+        double hitX = moveRight ? caretBounds.getMaxX() : caretBounds.getMinX();
+        double hitY = (caretBounds.getMinY() + caretBounds.getMaxY()) / 2;
+        HitInfo hit = textNode.impl_hitTestChar(new Point2D(hitX, hitY));
+        Path charShape = new Path(textNode.impl_getRangeShape(hit.getCharIndex(), hit.getCharIndex() + 1));
+        if ((moveRight && charShape.getLayoutBounds().getMaxX() > caretBounds.getMaxX()) ||
+                (!moveRight && charShape.getLayoutBounds().getMinX() < caretBounds.getMinX())) {
+            hit.setLeading(!hit.isLeading());
+        }
+        positionCaret(hit, false);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                            final double w, final double h) {
+        super.layoutChildren(x, y, w, h);
+
+        if (textNode != null) {
+            double textY;
+            final Bounds textNodeBounds = textNode.getLayoutBounds();
+            final double ascent = textNode.getBaselineOffset();
+            final double descent = textNodeBounds.getHeight() - ascent;
+
+            switch (getSkinnable().getAlignment().getVpos()) {
+                case TOP:
+                    textY = ascent;
+                    break;
+
+                case CENTER:
+                    textY = (ascent + textGroup.getHeight() - descent) / 2;
+                    break;
+
+                case BOTTOM:
+                default:
+                    textY = textGroup.getHeight() - descent;
+            }
+            textNode.setY(textY);
+            if (promptNode != null) {
+                promptNode.setY(textY);
+            }
+
+            if (getSkinnable().getWidth() > 0) {
+                updateTextPos();
+                updateCaretOff();
+            }
+        }
+
+        if (SHOW_HANDLES) {
+            handleGroup.setLayoutX(x + textTranslateX.get());
+            handleGroup.setLayoutY(y);
+
+            // Resize handles for caret and anchor.
+//            IndexRange selection = textField.getSelection();
+            selectionHandle1.resize(selectionHandle1.prefWidth(-1),
+                    selectionHandle1.prefHeight(-1));
+            selectionHandle2.resize(selectionHandle2.prefWidth(-1),
+                    selectionHandle2.prefHeight(-1));
+            caretHandle.resize(caretHandle.prefWidth(-1),
+                    caretHandle.prefHeight(-1));
+
+            Bounds b = caretPath.getBoundsInParent();
+            caretHandle.setLayoutY(b.getMaxY() - 1);
+            //selectionHandle1.setLayoutY(b.getMaxY() - 1);
+            selectionHandle1.setLayoutY(b.getMinY() - selectionHandle1.getHeight() + 1);
+            selectionHandle2.setLayoutY(b.getMaxY() - 1);
+        }
+    }
+
+    private HPos getHAlignment() {
+        HPos hPos = getSkinnable().getAlignment().getHpos();
+        return hPos;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Point2D getMenuPosition() {
+        Point2D p = super.getMenuPosition();
+        if (p != null) {
+            p = new Point2D(Math.max(0, p.getX() - textNode.getLayoutX() - snappedLeftInset() + textTranslateX.get()),
+                    Math.max(0, p.getY() - textNode.getLayoutY() - snappedTopInset()));
+        }
+        return p;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected String maskText(String txt) {
+        if (getSkinnable() instanceof PasswordField) {
+            int n = txt.length();
+            StringBuilder passwordBuilder = new StringBuilder(n);
+            for (int i = 0; i < n; i++) {
+                passwordBuilder.append(BULLET);
+            }
+
+            return passwordBuilder.toString();
+        } else {
+            return txt;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case BOUNDS_FOR_RANGE:
+            case OFFSET_AT_POINT:
+                return textNode.queryAccessibleAttribute(attribute, parameters);
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Private implementation
+     *
+     **************************************************************************/
+
+    TextInputControlBehavior getBehavior() {
+        return behavior;
+    }
+
+    private void updateTextNodeCaretPos(int pos) {
+        if (pos == 0 || isForwardBias()) {
+            textNode.setImpl_caretPosition(pos);
+        } else {
+            textNode.setImpl_caretPosition(pos - 1);
+        }
+        textNode.impl_caretBiasProperty().set(isForwardBias());
+    }
+
+    private void createPromptNode() {
+        if (promptNode != null || !usePromptText.get()) return;
+
+        promptNode = new Text();
+        textGroup.getChildren().add(0, promptNode);
+        promptNode.setManaged(false);
+        promptNode.getStyleClass().add("text");
+        promptNode.visibleProperty().bind(usePromptText);
+        promptNode.fontProperty().bind(getSkinnable().fontProperty());
+
+        promptNode.textProperty().bind(getSkinnable().promptTextProperty());
+        promptNode.fillProperty().bind(promptTextFillProperty());
+        updateSelection();
+    }
+
+    private void updateSelection() {
+        TextField textField = getSkinnable();
+        IndexRange newValue = textField.getSelection();
+
+        if (newValue == null || newValue.getLength() == 0) {
+            textNode.impl_selectionStartProperty().set(-1);
+            textNode.impl_selectionEndProperty().set(-1);
+        } else {
+            textNode.impl_selectionStartProperty().set(newValue.getStart());
+            // This intermediate value is needed to force selection shape layout.
+            textNode.impl_selectionEndProperty().set(newValue.getStart());
+            textNode.impl_selectionEndProperty().set(newValue.getEnd());
+        }
+
+        PathElement[] elements = textNode.impl_selectionShapeProperty().get();
+        if (elements == null) {
+            selectionHighlightPath.getElements().clear();
+        } else {
+            selectionHighlightPath.getElements().setAll(elements);
+        }
+
+        if (SHOW_HANDLES && newValue != null && newValue.getLength() > 0) {
+            int caretPos = textField.getCaretPosition();
+            int anchorPos = textField.getAnchor();
+
+            {
+                // Position the handle for the anchor. This could be handle1 or handle2.
+                // Do this before positioning the handle for the caret.
+                updateTextNodeCaretPos(anchorPos);
+                Bounds b = caretPath.getBoundsInParent();
+                if (caretPos < anchorPos) {
+                    selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
+                } else {
+                    selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
+                }
+            }
+
+            {
+                // Position handle for the caret. This could be handle1 or handle2.
+                updateTextNodeCaretPos(caretPos);
+                Bounds b = caretPath.getBoundsInParent();
+                if (caretPos < anchorPos) {
+                    selectionHandle1.setLayoutX(b.getMinX() - selectionHandle1.getWidth() / 2);
+                } else {
+                    selectionHandle2.setLayoutX(b.getMinX() - selectionHandle2.getWidth() / 2);
+                }
+            }
+        }
+    }
+
+    /**
+     * Updates the textTranslateX value for the Text node position. This is
+     * done for general layout, but care is taken to avoid resetting the
+     * position when there's a need to scroll the text due to caret movement,
+     * or when editing text that overflows on either side.
+     */
+    private void updateTextPos() {
+        double oldX = textTranslateX.get();
+        double newX;
+        double textNodeWidth = textNode.getLayoutBounds().getWidth();
+
+        switch (getHAlignment()) {
+          case CENTER:
+            double midPoint = textRight.get() / 2;
+            if (usePromptText.get()) {
+                // If a prompt is shown (which implies that the text is
+                // empty), then we align the Text node so that the caret will
+                // appear at the left of the centered prompt.
+                newX = midPoint - promptNode.getLayoutBounds().getWidth() / 2;
+                promptNode.setLayoutX(newX);
+            } else {
+                newX = midPoint - textNodeWidth / 2;
+            }
+            // Update if there is space on the right
+            if (newX + textNodeWidth <= textRight.get()) {
+                textTranslateX.set(newX);
+            }
+            break;
+
+          case RIGHT:
+            newX = textRight.get() - textNodeWidth - caretWidth / 2;
+            // Update if there is space on the right
+            if (newX > oldX || newX > 0) {
+                textTranslateX.set(newX);
+            }
+            if (usePromptText.get()) {
+                promptNode.setLayoutX(textRight.get() - promptNode.getLayoutBounds().getWidth() -
+                                      caretWidth / 2);
+            }
+            break;
+
+          case LEFT:
+          default:
+            newX = caretWidth / 2;
+            // Update if there is space on either side.
+            if (newX < oldX || newX + textNodeWidth <= textRight.get()) {
+                textTranslateX.set(newX);
+            }
+            if (usePromptText.get()) {
+                promptNode.layoutXProperty().set(newX);
+            }
+        }
+    }
+
+    // should be called when the padding changes, or the text box width, or
+    // the dot moves
+    private void updateCaretOff() {
+        double delta = 0.0;
+        double caretX = caretPath.getLayoutBounds().getMinX() + textTranslateX.get();
+        // If the caret position is less than or equal to the left edge of the
+        // clip then the caret will be clipped. We want the caret to end up
+        // being positioned one pixel right of the clip's left edge. The same
+        // applies on the right edge (but going the other direction of course).
+        if (caretX < 0) {
+            // I'll end up with a negative number
+            delta = caretX;
+        } else if (caretX > (textRight.get() - caretWidth)) {
+            // I'll end up with a positive number
+            delta = caretX - (textRight.get() - caretWidth);
+        }
+
+        // If delta is negative, then translate in the negative direction
+        // to cause the text to scroll to the right. Vice-versa for positive.
+        switch (getHAlignment()) {
+          case CENTER:
+            textTranslateX.set(textTranslateX.get() - delta);
+            break;
+
+          case RIGHT:
+            textTranslateX.set(Math.max(textTranslateX.get() - delta,
+                                        textRight.get() - textNode.getLayoutBounds().getWidth() -
+                                        caretWidth / 2));
+            break;
+
+          case LEFT:
+          default:
+            textTranslateX.set(Math.min(textTranslateX.get() - delta,
+                                        caretWidth / 2));
+        }
+        if (SHOW_HANDLES) {
+            caretHandle.setLayoutX(caretX - caretHandle.getWidth() / 2 + 1);
+        }
+    }
+
+    private void scrollAfterDelete(double textMaxXOld, double caretMaxXOld) {
+        final Bounds textLayoutBounds = textNode.getLayoutBounds();
+        final Bounds textBounds = textNode.localToParent(textLayoutBounds);
+        final Bounds clipBounds = clip.getBoundsInParent();
+        final Bounds caretBounds = caretPath.getLayoutBounds();
+
+        switch (getHAlignment()) {
+          case RIGHT:
+            if (textBounds.getMaxX() > clipBounds.getMaxX()) {
+                double delta = caretMaxXOld - caretBounds.getMaxX() - textTranslateX.get();
+                if (textBounds.getMaxX() + delta < clipBounds.getMaxX()) {
+                    if (textMaxXOld <= clipBounds.getMaxX()) {
+                        delta = textMaxXOld - textBounds.getMaxX();
+                    } else {
+                        delta = clipBounds.getMaxX() - textBounds.getMaxX();
+                    }
+                }
+                textTranslateX.set(textTranslateX.get() + delta);
+            } else {
+                updateTextPos();
+            }
+            break;
+
+          case LEFT:
+          case CENTER:
+          default:
+            if (textBounds.getMinX() < clipBounds.getMinX() + caretWidth / 2 &&
+                textBounds.getMaxX() <= clipBounds.getMaxX()) {
+                double delta = caretMaxXOld - caretBounds.getMaxX() - textTranslateX.get();
+                if (textBounds.getMaxX() + delta < clipBounds.getMaxX()) {
+                    if (textMaxXOld <= clipBounds.getMaxX()) {
+                        delta = textMaxXOld - textBounds.getMaxX();
+                    } else {
+                        delta = clipBounds.getMaxX() - textBounds.getMaxX();
+                    }
+                }
+                textTranslateX.set(textTranslateX.get() + delta);
+            }
+        }
+
+        updateCaretOff();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TextInputControlSkin.java	2015-09-03 15:23:38.907151400 -0700
+++ /dev/null	2015-09-03 15:23:39.000000000 -0700
@@ -1,859 +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 com.sun.javafx.scene.input.ExtendedInputMethodRequests;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.application.ConditionalFeature;
-import javafx.application.Platform;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.value.ObservableBooleanValue;
-import javafx.beans.value.ObservableObjectValue;
-import javafx.collections.ObservableList;
-import javafx.css.CssMetaData;
-import javafx.css.Styleable;
-import javafx.css.StyleableBooleanProperty;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.Point2D;
-import javafx.geometry.Rectangle2D;
-import javafx.scene.AccessibleAction;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.IndexRange;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.SkinBase;
-import javafx.scene.control.TextInputControl;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.InputMethodEvent;
-import javafx.scene.input.InputMethodHighlight;
-import javafx.scene.input.InputMethodTextRun;
-import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.ClosePath;
-import javafx.scene.shape.HLineTo;
-import javafx.scene.shape.Line;
-import javafx.scene.shape.LineTo;
-import javafx.scene.shape.MoveTo;
-import javafx.scene.shape.Path;
-import javafx.scene.shape.PathElement;
-import javafx.scene.shape.Shape;
-import javafx.scene.shape.VLineTo;
-import javafx.stage.Window;
-import javafx.util.Duration;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import com.sun.javafx.PlatformUtil;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.scene.control.behavior.TextInputControlBehavior;
-import com.sun.javafx.tk.FontMetrics;
-import com.sun.javafx.tk.Toolkit;
-import static com.sun.javafx.PlatformUtil.isWindows;
-import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-/**
- * Abstract base class for text input skins.
- */
-public abstract class TextInputControlSkin<T extends TextInputControl, B extends TextInputControlBehavior<T>> extends BehaviorSkinBase<T, B> {
-
-    static boolean preload = false;
-    static {
-        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
-            String s = System.getProperty("com.sun.javafx.virtualKeyboard.preload");
-            if (s != null) {
-                if (s.equalsIgnoreCase("PRERENDER")) {
-                    preload = true;
-                }
-            }
-            return null;
-        });
-    }    
-
-    /**
-     * Specifies whether we ought to show handles. We should do it on touch platforms, but not
-     * iOS (and maybe not Android either?)
-     */
-    protected static final boolean SHOW_HANDLES = IS_TOUCH_SUPPORTED && !PlatformUtil.isIOS();
-
-    protected final ObservableObjectValue<FontMetrics> fontMetrics;
-
-    /**
-     * The fill to use for the text under normal conditions
-     */
-    protected final ObjectProperty<Paint> textFill = new StyleableObjectProperty<Paint>(Color.BLACK) {
-        @Override public Object getBean() {
-            return TextInputControlSkin.this;
-        }
-
-        @Override public String getName() {
-            return "textFill";
-        }
-
-        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
-            return StyleableProperties.TEXT_FILL;
-        }
-    };
-    
-    protected final ObjectProperty<Paint> promptTextFill = new StyleableObjectProperty<Paint>(Color.GRAY) {
-        @Override public Object getBean() {
-            return TextInputControlSkin.this;
-        }
-
-        @Override public String getName() {
-            return "promptTextFill";
-        }
-
-        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
-            return StyleableProperties.PROMPT_TEXT_FILL;
-        }
-    };
-    
-    /**
-     * The fill to use for the text when highlighted.
-     */
-    protected final ObjectProperty<Paint> highlightFill = new StyleableObjectProperty<Paint>(Color.DODGERBLUE) {
-        @Override protected void invalidated() {
-            updateHighlightFill();
-        }
-
-        @Override public Object getBean() {
-            return TextInputControlSkin.this;
-        }
-
-        @Override public String getName() {
-            return "highlightFill";
-        }
-
-        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
-            return StyleableProperties.HIGHLIGHT_FILL;
-        }
-    };
-    
-    protected final ObjectProperty<Paint> highlightTextFill = new StyleableObjectProperty<Paint>(Color.WHITE) {
-        @Override protected void invalidated() {
-            updateHighlightTextFill();
-        }
-
-        @Override public Object getBean() {
-            return TextInputControlSkin.this;
-        }
-
-        @Override public String getName() {
-            return "highlightTextFill";
-        }
-
-        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
-            return StyleableProperties.HIGHLIGHT_TEXT_FILL;
-        }
-    };
-    
-    protected final BooleanProperty displayCaret = new StyleableBooleanProperty(true) {
-        @Override public Object getBean() {
-            return TextInputControlSkin.this;
-        }
-
-        @Override public String getName() {
-            return "displayCaret";
-        }
-
-        @Override public CssMetaData<TextInputControl,Boolean> getCssMetaData() {
-            return StyleableProperties.DISPLAY_CARET;
-        }
-    };
-
-    private BooleanProperty forwardBias = new SimpleBooleanProperty(this, "forwardBias", true);
-    public BooleanProperty forwardBiasProperty() {
-        return forwardBias;
-    }
-    public void setForwardBias(boolean isLeading) {
-        forwardBias.set(isLeading);
-    }
-    public boolean isForwardBias() {
-        return forwardBias.get();
-    }
-
-    private BooleanProperty blink = new SimpleBooleanProperty(this, "blink", true);
-    protected ObservableBooleanValue caretVisible;
-    private CaretBlinking caretBlinking = new CaretBlinking(blink);
-
-    /**
-     * A path, provided by the textNode, which represents the caret.
-     * I assume this has to be updated whenever the caretPosition
-     * changes. Perhaps more frequently (including text changes),
-     * but I'm not sure.
-     */
-    protected final Path caretPath = new Path();
-
-    protected StackPane caretHandle = null;
-    protected StackPane selectionHandle1 = null;
-    protected StackPane selectionHandle2 = null;
-
-    public Point2D getMenuPosition() {
-        if (SHOW_HANDLES) {
-            if (caretHandle.isVisible()) {
-                return new Point2D(caretHandle.getLayoutX() + caretHandle.getWidth() / 2,
-                                   caretHandle.getLayoutY());
-            } else if (selectionHandle1.isVisible() && selectionHandle2.isVisible()) {
-                return new Point2D((selectionHandle1.getLayoutX() + selectionHandle1.getWidth() / 2 +
-                                    selectionHandle2.getLayoutX() + selectionHandle2.getWidth() / 2) / 2,
-                                   selectionHandle2.getLayoutY() + selectionHandle2.getHeight() / 2);
-            } else {
-                return null;
-            }
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-
-    private final static boolean IS_FXVK_SUPPORTED = Platform.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD);
-    private static boolean USE_FXVK = IS_FXVK_SUPPORTED;
-
-    /* For testing only */
-    static int vkType = -1;
-    public void toggleUseVK() {
-        vkType++;
-        if (vkType < 4) {
-            USE_FXVK = true;
-            getSkinnable().getProperties().put(FXVK.VK_TYPE_PROP_KEY, FXVK.VK_TYPE_NAMES[vkType]);
-            FXVK.attach(getSkinnable());
-        } else {
-            FXVK.detach();
-            vkType = -1;
-            USE_FXVK = false;
-        }
-    }
-
-
-    public TextInputControlSkin(final T textInput, final B behavior) {
-        super(textInput, behavior);
-
-        fontMetrics = new ObjectBinding<FontMetrics>() {
-            { bind(textInput.fontProperty()); }
-            @Override protected FontMetrics computeValue() {
-                invalidateMetrics();
-                return Toolkit.getToolkit().getFontLoader().getFontMetrics(textInput.getFont());
-            }
-        };
-
-        /**
-         * The caret is visible when the text box is focused AND when the selection
-         * is empty. If the selection is non empty or the text box is not focused
-         * then we don't want to show the caret. Also, we show the caret while
-         * performing some operations such as most key strokes. In that case we
-         * simply toggle its opacity.
-         * <p>
-         */
-        caretVisible = new BooleanBinding() {
-            { bind(textInput.focusedProperty(), textInput.anchorProperty(), textInput.caretPositionProperty(),
-                    textInput.disabledProperty(), textInput.editableProperty(), displayCaret, blink);}
-            @Override protected boolean computeValue() {
-                // RT-10682: On Windows, we show the caret during selection, but on others we hide it
-                return !blink.get() && displayCaret.get() && textInput.isFocused() &&
-                        (isWindows() || (textInput.getCaretPosition() == textInput.getAnchor())) &&
-                        !textInput.isDisabled() &&
-                        textInput.isEditable();
-            }
-        };
-
-        if (SHOW_HANDLES) {
-            caretHandle      = new StackPane();
-            selectionHandle1 = new StackPane();
-            selectionHandle2 = new StackPane();
-
-            caretHandle.setManaged(false);
-            selectionHandle1.setManaged(false);
-            selectionHandle2.setManaged(false);
-
-            caretHandle.visibleProperty().bind(new BooleanBinding() {
-                { bind(textInput.focusedProperty(), textInput.anchorProperty(),
-                       textInput.caretPositionProperty(), textInput.disabledProperty(),
-                       textInput.editableProperty(), textInput.lengthProperty(), displayCaret);}
-                @Override protected boolean computeValue() {
-                    return (displayCaret.get() && textInput.isFocused() &&
-                            textInput.getCaretPosition() == textInput.getAnchor() &&
-                            !textInput.isDisabled() && textInput.isEditable() &&
-                            textInput.getLength() > 0);
-                }
-            });
-
-
-            selectionHandle1.visibleProperty().bind(new BooleanBinding() {
-                { bind(textInput.focusedProperty(), textInput.anchorProperty(), textInput.caretPositionProperty(),
-                       textInput.disabledProperty(), displayCaret);}
-                @Override protected boolean computeValue() {
-                    return (displayCaret.get() && textInput.isFocused() &&
-                            textInput.getCaretPosition() != textInput.getAnchor() &&
-                            !textInput.isDisabled());
-                }
-            });
-
-
-            selectionHandle2.visibleProperty().bind(new BooleanBinding() {
-                { bind(textInput.focusedProperty(), textInput.anchorProperty(), textInput.caretPositionProperty(),
-                       textInput.disabledProperty(), displayCaret);}
-                @Override protected boolean computeValue() {
-                    return (displayCaret.get() && textInput.isFocused() &&
-                            textInput.getCaretPosition() != textInput.getAnchor() &&
-                            !textInput.isDisabled());
-                }
-            });
-
-
-            caretHandle.getStyleClass().setAll("caret-handle");
-            selectionHandle1.getStyleClass().setAll("selection-handle");
-            selectionHandle2.getStyleClass().setAll("selection-handle");
-
-            selectionHandle1.setId("selection-handle-1");
-            selectionHandle2.setId("selection-handle-2");
-        }
-
-        if (IS_FXVK_SUPPORTED) {
-            if (preload) {
-                Scene scene = textInput.getScene();
-                if (scene != null) {
-                    Window window = scene.getWindow();
-                    if (window != null) {
-                        FXVK.init(textInput);
-                    }
-                }
-            }
-            textInput.focusedProperty().addListener(observable -> {
-                if (USE_FXVK) {
-                    Scene scene = getSkinnable().getScene();
-                    if (textInput.isEditable() && textInput.isFocused()) {
-                        FXVK.attach(textInput);
-                    } else if (scene == null ||
-                               scene.getWindow() == null ||
-                               !scene.getWindow().isFocused() ||
-                               !(scene.getFocusOwner() instanceof TextInputControl &&
-                                 ((TextInputControl)scene.getFocusOwner()).isEditable())) {
-                        FXVK.detach();
-                    }
-                }
-            });
-        }
-
-        if (textInput.getOnInputMethodTextChanged() == null) {
-            textInput.setOnInputMethodTextChanged(event -> {
-                handleInputMethodEvent(event);
-            });
-        }
-
-        textInput.setInputMethodRequests(new ExtendedInputMethodRequests() {
-            @Override public Point2D getTextLocation(int offset) {
-                Scene scene = getSkinnable().getScene();
-                Window window = scene.getWindow();
-                // Don't use imstart here because it isn't initialized yet.
-                Rectangle2D characterBounds = getCharacterBounds(textInput.getSelection().getStart() + offset);
-                Point2D p = getSkinnable().localToScene(characterBounds.getMinX(), characterBounds.getMaxY());
-                Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
-                                               window.getY() + scene.getY() + p.getY());
-                return location;
-            }
-
-            @Override
-            public int getLocationOffset(int x, int y) {
-                return getInsertionPoint(x, y);
-            }
-
-            @Override
-            public void cancelLatestCommittedText() {
-                // TODO
-            }
-
-            @Override
-            public String getSelectedText() {
-                TextInputControl textInput = getSkinnable();
-                IndexRange selection = textInput.getSelection();
-
-                return textInput.getText(selection.getStart(), selection.getEnd());
-            }
-
-            @Override
-            public int getInsertPositionOffset() {
-                int caretPosition = getSkinnable().getCaretPosition();
-                if (caretPosition < imstart) {
-                    return caretPosition;
-                } else if (caretPosition < imstart + imlength) {
-                    return imstart;
-                } else {
-                    return caretPosition - imlength;
-                }
-            }
-
-            @Override
-            public String getCommittedText(int begin, int end) {
-                TextInputControl textInput = getSkinnable();
-                if (begin < imstart) {
-                    if (end <= imstart) {
-                        return textInput.getText(begin, end);
-                    } else {
-                        return textInput.getText(begin, imstart) + textInput.getText(imstart + imlength, end + imlength);
-                    }
-                } else {
-                    return textInput.getText(begin + imlength, end + imlength);
-                }
-            }
-
-            @Override
-            public int getCommittedTextLength() {
-                return getSkinnable().getText().length() - imlength;
-            }
-        });
-    }
-
-    // For use with PasswordField in TextFieldSkin
-    protected String maskText(String txt) {
-        return txt;
-    }
-
- 
-    /**
-     * Returns the character at a given offset.
-     *
-     * @param index
-     */
-    public char getCharacter(int index) { return '\0'; }
-
-    /**
-     * Returns the insertion point for a given location.
-     *
-     * @param x
-     * @param y
-     */
-    public int getInsertionPoint(double x, double y) { return 0; }
-
-    /**
-     * Returns the bounds of the character at a given index.
-     *
-     * @param index
-     */
-    public Rectangle2D getCharacterBounds(int index) { return null; }
-
-    /**
-     * Ensures that the character at a given index is visible.
-     *
-     * @param index
-     */
-    public void scrollCharacterToVisible(int index) {}
-
-    protected void invalidateMetrics() {
-    }
-
-    protected void updateTextFill() {};
-    protected void updateHighlightFill() {};
-    protected void updateHighlightTextFill() {};
-
-    // Start/Length of the text under input method composition
-    private int imstart;
-    private int imlength;
-    // Holds concrete attributes for the composition runs
-    private List<Shape> imattrs = new java.util.ArrayList<Shape>();
-
-    protected void handleInputMethodEvent(InputMethodEvent event) {
-        final TextInputControl textInput = getSkinnable();
-        if (textInput.isEditable() && !textInput.textProperty().isBound() && !textInput.isDisabled()) {
-
-            // just replace the text on iOS
-            if (PlatformUtil.isIOS()) {
-               textInput.setText(event.getCommitted());
-               return;
-            }
-            
-            // remove previous input method text (if any) or selected text
-            if (imlength != 0) {
-                removeHighlight(imattrs);
-                imattrs.clear();
-                textInput.selectRange(imstart, imstart + imlength);
-            }
-
-            // Insert committed text
-            if (event.getCommitted().length() != 0) {
-                String committed = event.getCommitted();
-                textInput.replaceText(textInput.getSelection(), committed);
-            }
-
-            // Replace composed text
-            imstart = textInput.getSelection().getStart();
-            StringBuilder composed = new StringBuilder();
-            for (InputMethodTextRun run : event.getComposed()) {
-                composed.append(run.getText());
-            }
-            textInput.replaceText(textInput.getSelection(), composed.toString());
-            imlength = composed.length();
-            if (imlength != 0) {
-                int pos = imstart;
-                for (InputMethodTextRun run : event.getComposed()) {
-                    int endPos = pos + run.getText().length();
-                    createInputMethodAttributes(run.getHighlight(), pos, endPos);
-                    pos = endPos;
-                }
-                addHighlight(imattrs, imstart);
-
-                // Set caret position in composed text
-                int caretPos = event.getCaretPosition();
-                if (caretPos >= 0 && caretPos < imlength) {
-                    textInput.selectRange(imstart + caretPos, imstart + caretPos);
-                }
-            }
-        }
-    }
-
-    protected abstract PathElement[] getUnderlineShape(int start, int end);
-    protected abstract PathElement[] getRangeShape(int start, int end);
-    protected abstract void addHighlight(List<? extends Node> nodes, int start);
-    protected abstract void removeHighlight(List<? extends Node> nodes);
-    public abstract void nextCharacterVisually(boolean moveRight);
-
-    private void createInputMethodAttributes(InputMethodHighlight highlight, int start, int end) {
-        double minX = 0f;
-        double maxX = 0f;
-        double minY = 0f;
-        double maxY = 0f;
-
-        PathElement elements[] = getUnderlineShape(start, end);
-        for (int i = 0; i < elements.length; i++) {
-            PathElement pe = elements[i];
-            if (pe instanceof MoveTo) {
-                minX = maxX = ((MoveTo)pe).getX();
-                minY = maxY = ((MoveTo)pe).getY();
-            } else if (pe instanceof LineTo) {
-                minX = (minX < ((LineTo)pe).getX() ? minX : ((LineTo)pe).getX());
-                maxX = (maxX > ((LineTo)pe).getX() ? maxX : ((LineTo)pe).getX());
-                minY = (minY < ((LineTo)pe).getY() ? minY : ((LineTo)pe).getY());
-                maxY = (maxY > ((LineTo)pe).getY() ? maxY : ((LineTo)pe).getY());
-            } else if (pe instanceof HLineTo) {
-                minX = (minX < ((HLineTo)pe).getX() ? minX : ((HLineTo)pe).getX());
-                maxX = (maxX > ((HLineTo)pe).getX() ? maxX : ((HLineTo)pe).getX());
-            } else if (pe instanceof VLineTo) {
-                minY = (minY < ((VLineTo)pe).getY() ? minY : ((VLineTo)pe).getY());
-                maxY = (maxY > ((VLineTo)pe).getY() ? maxY : ((VLineTo)pe).getY());
-            }
-            // Don't assume that shapes are ended with ClosePath.
-            if (pe instanceof ClosePath ||
-                i == elements.length - 1 ||
-                (i < elements.length - 1 && elements[i+1] instanceof MoveTo)) {
-                // Now, create the attribute.
-                Shape attr = null;
-                if (highlight == InputMethodHighlight.SELECTED_RAW) {
-                    // blue background
-                    attr = new Path();
-                    ((Path)attr).getElements().addAll(getRangeShape(start, end));
-                    attr.setFill(Color.BLUE);
-                    attr.setOpacity(0.3f);
-                } else if (highlight == InputMethodHighlight.UNSELECTED_RAW) {
-                    // dash underline.
-                    attr = new Line(minX + 2, maxY + 1, maxX - 2, maxY + 1);
-                    attr.setStroke(textFill.get());
-                    attr.setStrokeWidth(maxY - minY);
-                    ObservableList<Double> dashArray = attr.getStrokeDashArray();
-                    dashArray.add(Double.valueOf(2f));
-                    dashArray.add(Double.valueOf(2f));
-                } else if (highlight == InputMethodHighlight.SELECTED_CONVERTED) {
-                    // thick underline.
-                    attr = new Line(minX + 2, maxY + 1, maxX - 2, maxY + 1);
-                    attr.setStroke(textFill.get());
-                    attr.setStrokeWidth((maxY - minY) * 3);
-                } else if (highlight == InputMethodHighlight.UNSELECTED_CONVERTED) {
-                    // single underline.
-                    attr = new Line(minX + 2, maxY + 1, maxX - 2, maxY + 1);
-                    attr.setStroke(textFill.get());
-                    attr.setStrokeWidth(maxY - minY);
-                }
-                
-                if (attr != null) {
-                    attr.setManaged(false);
-                    imattrs.add(attr);
-                }
-            }
-        }
-    }
-
-    protected boolean isRTL() {
-        return (getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
-    };
-
-    public void setCaretAnimating(boolean value) {
-        if (value) {
-            caretBlinking.start();
-        } else {
-            caretBlinking.stop();
-            blink.set(true);
-        }
-    }
-
-    private static final class CaretBlinking {
-        private final Timeline caretTimeline;
-        private final WeakReference<BooleanProperty> blinkPropertyRef;
-
-        public CaretBlinking(final BooleanProperty blinkProperty) {
-            blinkPropertyRef =
-                    new WeakReference<BooleanProperty>(blinkProperty);
-
-            caretTimeline = new Timeline();
-            caretTimeline.setCycleCount(Timeline.INDEFINITE);
-            caretTimeline.getKeyFrames().addAll(
-                new KeyFrame(Duration.ZERO,
-                        event -> {
-                            setBlink(false);
-                        }
-                ),
-                new KeyFrame(Duration.seconds(.5),
-                        event -> {
-                            setBlink(true);
-                        }
-                ),
-                new KeyFrame(Duration.seconds(1)));
-        }
-
-        public void start() {
-            caretTimeline.play();
-        }
-
-        public void stop() {
-            caretTimeline.stop();
-        }
-
-        private void setBlink(final boolean value) {
-            final BooleanProperty blinkProperty = blinkPropertyRef.get();
-            if (blinkProperty == null) {
-                caretTimeline.stop();
-                return;
-            }
-
-            blinkProperty.set(value);
-        }
-    }
-
-    class ContextMenuItem extends MenuItem {
-        ContextMenuItem(final String action) {
-            super(getString("TextInputControl.menu." + action));
-            setOnAction(e -> {
-                getBehavior().callAction(action);
-            });
-        }
-    }
-
-    final MenuItem undoMI   = new ContextMenuItem("Undo");
-    final MenuItem redoMI   = new ContextMenuItem("Redo");
-    final MenuItem cutMI    = new ContextMenuItem("Cut");
-    final MenuItem copyMI   = new ContextMenuItem("Copy");
-    final MenuItem pasteMI  = new ContextMenuItem("Paste");
-    final MenuItem deleteMI = new ContextMenuItem("DeleteSelection");
-    final MenuItem selectWordMI = new ContextMenuItem("SelectWord");
-    final MenuItem selectAllMI = new ContextMenuItem("SelectAll");
-    final MenuItem separatorMI = new SeparatorMenuItem();
-
-    public void populateContextMenu(ContextMenu contextMenu) {
-        TextInputControl textInputControl = getSkinnable();
-        boolean editable = textInputControl.isEditable();
-        boolean hasText = (textInputControl.getLength() > 0);
-        boolean hasSelection = (textInputControl.getSelection().getLength() > 0);
-        boolean maskText = (maskText("A") != "A");
-        ObservableList<MenuItem> items = contextMenu.getItems();
-
-        if (SHOW_HANDLES) {
-            items.clear();
-            if (!maskText && hasSelection) {
-                if (editable) {
-                    items.add(cutMI);
-                }
-                items.add(copyMI);
-            }
-            if (editable && Clipboard.getSystemClipboard().hasString()) {
-                items.add(pasteMI);
-            }
-            if (hasText) {
-                if (!hasSelection) {
-                    items.add(selectWordMI);
-                }
-                items.add(selectAllMI);
-            }
-            selectWordMI.getProperties().put("refreshMenu", Boolean.TRUE);
-            selectAllMI.getProperties().put("refreshMenu", Boolean.TRUE);
-        } else {
-            if (editable) {
-                items.setAll(undoMI, redoMI, cutMI, copyMI, pasteMI, deleteMI,
-                             separatorMI, selectAllMI);
-            } else {
-                items.setAll(copyMI, separatorMI, selectAllMI);
-            }
-            undoMI.setDisable(!getSkinnable().isUndoable());
-            redoMI.setDisable(!getSkinnable().isRedoable());
-            cutMI.setDisable(maskText || !hasSelection);
-            copyMI.setDisable(maskText || !hasSelection);
-            pasteMI.setDisable(!Clipboard.getSystemClipboard().hasString());
-            deleteMI.setDisable(!hasSelection);
-        }
-    }
-
-    private static class StyleableProperties {
-        private static final CssMetaData<TextInputControl,Paint> TEXT_FILL =
-            new CssMetaData<TextInputControl,Paint>("-fx-text-fill",
-                PaintConverter.getInstance(), Color.BLACK) {
-
-            @Override
-            public boolean isSettable(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return skin.textFill == null || !skin.textFill.isBound();
-            }
-
-            @Override @SuppressWarnings("unchecked") 
-            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();                
-                return (StyleableProperty<Paint>)skin.textFill;
-            }
-        };
-       
-        private static final CssMetaData<TextInputControl,Paint> PROMPT_TEXT_FILL =
-            new CssMetaData<TextInputControl,Paint>("-fx-prompt-text-fill",
-                PaintConverter.getInstance(), Color.GRAY) {
-
-            @Override
-            public boolean isSettable(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return skin.promptTextFill == null || !skin.promptTextFill.isBound();
-            }
-
-            @Override @SuppressWarnings("unchecked") 
-            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return (StyleableProperty<Paint>)skin.promptTextFill;
-            }
-        };
-        
-        private static final CssMetaData<TextInputControl,Paint> HIGHLIGHT_FILL =
-            new CssMetaData<TextInputControl,Paint>("-fx-highlight-fill",
-                PaintConverter.getInstance(), Color.DODGERBLUE) {
-
-            @Override
-            public boolean isSettable(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return skin.highlightFill == null || !skin.highlightFill.isBound();
-            }
-
-            @Override @SuppressWarnings("unchecked") 
-            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return (StyleableProperty<Paint>)skin.highlightFill;
-            }
-        };
-        
-        private static final CssMetaData<TextInputControl,Paint> HIGHLIGHT_TEXT_FILL =
-            new CssMetaData<TextInputControl,Paint>("-fx-highlight-text-fill",
-                PaintConverter.getInstance(), Color.WHITE) {
-
-            @Override
-            public boolean isSettable(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return skin.highlightTextFill == null || !skin.highlightTextFill.isBound();
-            }
-
-            @Override @SuppressWarnings("unchecked") 
-            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return (StyleableProperty<Paint>)skin.highlightTextFill;
-            }
-        };
-        
-        private static final CssMetaData<TextInputControl,Boolean> DISPLAY_CARET =
-            new CssMetaData<TextInputControl,Boolean>("-fx-display-caret",
-                BooleanConverter.getInstance(), Boolean.TRUE) {
-
-            @Override
-            public boolean isSettable(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return skin.displayCaret == null || !skin.displayCaret.isBound();
-            }
-
-            @Override @SuppressWarnings("unchecked") 
-            public StyleableProperty<Boolean> getStyleableProperty(TextInputControl n) {
-                final TextInputControlSkin<?,?> skin = (TextInputControlSkin<?,?>) n.getSkin();
-                return (StyleableProperty<Boolean>)skin.displayCaret;
-            }
-        };
-
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-            List<CssMetaData<? extends Styleable, ?>> styleables = 
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-            styleables.add(TEXT_FILL);
-            styleables.add(PROMPT_TEXT_FILL);
-            styleables.add(HIGHLIGHT_FILL);
-            styleables.add(HIGHLIGHT_TEXT_FILL);
-            styleables.add(DISPLAY_CARET);
-
-            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();
-    }
-
-    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-        switch (action) {
-            case SHOW_TEXT_RANGE: {
-                Integer start = (Integer)parameters[0];
-                Integer end = (Integer)parameters[1];
-                if (start != null && end != null) {
-                    scrollCharacterToVisible(end);
-                    scrollCharacterToVisible(start);
-                    scrollCharacterToVisible(end);
-                }
-                break;
-            } 
-            default: super.executeAccessibleAction(action, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:23:40.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TextInputControlSkin.java	2015-09-03 15:23:38.163108900 -0700
@@ -0,0 +1,1036 @@
+/*
+ * Copyright (c) 2011, 2015, 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 com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.skin.FXVK;
+import com.sun.javafx.scene.input.ExtendedInputMethodRequests;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ObservableBooleanValue;
+import javafx.beans.value.ObservableObjectValue;
+import javafx.collections.ObservableList;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleableBooleanProperty;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Point2D;
+import javafx.geometry.Rectangle2D;
+import javafx.scene.AccessibleAction;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.control.IndexRange;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.TextInputControl;
+import javafx.scene.input.InputMethodEvent;
+import javafx.scene.input.InputMethodHighlight;
+import javafx.scene.input.InputMethodTextRun;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.ClosePath;
+import javafx.scene.shape.HLineTo;
+import javafx.scene.shape.Line;
+import javafx.scene.shape.LineTo;
+import javafx.scene.shape.MoveTo;
+import javafx.scene.shape.Path;
+import javafx.scene.shape.PathElement;
+import javafx.scene.shape.Shape;
+import javafx.scene.shape.VLineTo;
+import javafx.stage.Window;
+import javafx.util.Duration;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import com.sun.javafx.PlatformUtil;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.PaintConverter;
+import com.sun.javafx.scene.control.behavior.TextInputControlBehavior;
+import com.sun.javafx.scene.text.HitInfo;
+import com.sun.javafx.tk.FontMetrics;
+import com.sun.javafx.tk.Toolkit;
+import static com.sun.javafx.PlatformUtil.isWindows;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Abstract base class for text input skins.
+ *
+ * @since 9
+ * @see TextFieldSkin
+ * @see TextAreaSkin
+ */
+public abstract class TextInputControlSkin<T extends TextInputControl> extends SkinBase<T> {
+    
+    /**************************************************************************
+     *
+     * Static fields / blocks
+     *
+     **************************************************************************/
+
+    /**
+     * Unit names for caret movement.
+     *
+     * @see #moveCaret(TextUnit, Direction, boolean)
+     */
+    public static enum TextUnit { CHARACTER, WORD, LINE, PARAGRAPH, PAGE };
+
+    /**
+     * Direction names for caret movement.
+     *
+     * @see #moveCaret(TextUnit, Direction, boolean)
+     */
+    public static enum Direction { LEFT, RIGHT, UP, DOWN, BEGINNING, END };
+
+    static boolean preload = false;
+    static {
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            String s = System.getProperty("com.sun.javafx.virtualKeyboard.preload");
+            if (s != null) {
+                if (s.equalsIgnoreCase("PRERENDER")) {
+                    preload = true;
+                }
+            }
+            return null;
+        });
+    }    
+
+    /**
+     * Specifies whether we ought to show handles. We should do it on touch platforms, but not
+     * iOS (and maybe not Android either?)
+     */
+    static final boolean SHOW_HANDLES = Properties.IS_TOUCH_SUPPORTED && !PlatformUtil.isIOS();
+
+    private final static boolean IS_FXVK_SUPPORTED = Platform.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD);
+
+    /**************************************************************************
+     *
+     * Private fields
+     *
+     **************************************************************************/
+
+    final ObservableObjectValue<FontMetrics> fontMetrics;
+    private ObservableBooleanValue caretVisible;
+    private CaretBlinking caretBlinking = new CaretBlinking(blinkProperty());
+
+    /**
+     * A path, provided by the textNode, which represents the caret.
+     * I assume this has to be updated whenever the caretPosition
+     * changes. Perhaps more frequently (including text changes),
+     * but I'm not sure.
+     */
+    final Path caretPath = new Path();
+
+    StackPane caretHandle = null;
+    StackPane selectionHandle1 = null;
+    StackPane selectionHandle2 = null;
+
+    // Start/Length of the text under input method composition
+    private int imstart;
+    private int imlength;
+    // Holds concrete attributes for the composition runs
+    private List<Shape> imattrs = new java.util.ArrayList<Shape>();
+
+
+
+    /**************************************************************************
+     *
+     * Constructors
+     *
+     **************************************************************************/
+
+    /**
+     * Creates a new instance of TextInputControlSkin, although note that this
+     * instance does not handle any behavior / input mappings - this needs to be
+     * handled appropriately by subclasses.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TextInputControlSkin(final T control) {
+        super(control);
+
+        fontMetrics = new ObjectBinding<FontMetrics>() {
+            { bind(control.fontProperty()); }
+            @Override protected FontMetrics computeValue() {
+                invalidateMetrics();
+                return Toolkit.getToolkit().getFontLoader().getFontMetrics(control.getFont());
+            }
+        };
+
+        /**
+         * The caret is visible when the text box is focused AND when the selection
+         * is empty. If the selection is non empty or the text box is not focused
+         * then we don't want to show the caret. Also, we show the caret while
+         * performing some operations such as most key strokes. In that case we
+         * simply toggle its opacity.
+         * <p>
+         */
+        caretVisible = new BooleanBinding() {
+            { bind(control.focusedProperty(), control.anchorProperty(), control.caretPositionProperty(),
+                    control.disabledProperty(), control.editableProperty(), displayCaret, blinkProperty());}
+            @Override protected boolean computeValue() {
+                // RT-10682: On Windows, we show the caret during selection, but on others we hide it
+                return !blinkProperty().get() && displayCaret.get() && control.isFocused() &&
+                        (isWindows() || (control.getCaretPosition() == control.getAnchor())) &&
+                        !control.isDisabled() &&
+                        control.isEditable();
+            }
+        };
+
+        if (SHOW_HANDLES) {
+            caretHandle      = new StackPane();
+            selectionHandle1 = new StackPane();
+            selectionHandle2 = new StackPane();
+
+            caretHandle.setManaged(false);
+            selectionHandle1.setManaged(false);
+            selectionHandle2.setManaged(false);
+
+            caretHandle.visibleProperty().bind(new BooleanBinding() {
+                { bind(control.focusedProperty(), control.anchorProperty(),
+                        control.caretPositionProperty(), control.disabledProperty(),
+                        control.editableProperty(), control.lengthProperty(), displayCaret);}
+                @Override protected boolean computeValue() {
+                    return (displayCaret.get() && control.isFocused() &&
+                            control.getCaretPosition() == control.getAnchor() &&
+                            !control.isDisabled() && control.isEditable() &&
+                            control.getLength() > 0);
+                }
+            });
+
+
+            selectionHandle1.visibleProperty().bind(new BooleanBinding() {
+                { bind(control.focusedProperty(), control.anchorProperty(), control.caretPositionProperty(),
+                        control.disabledProperty(), displayCaret);}
+                @Override protected boolean computeValue() {
+                    return (displayCaret.get() && control.isFocused() &&
+                            control.getCaretPosition() != control.getAnchor() &&
+                            !control.isDisabled());
+                }
+            });
+
+
+            selectionHandle2.visibleProperty().bind(new BooleanBinding() {
+                { bind(control.focusedProperty(), control.anchorProperty(), control.caretPositionProperty(),
+                        control.disabledProperty(), displayCaret);}
+                @Override protected boolean computeValue() {
+                    return (displayCaret.get() && control.isFocused() &&
+                            control.getCaretPosition() != control.getAnchor() &&
+                            !control.isDisabled());
+                }
+            });
+
+
+            caretHandle.getStyleClass().setAll("caret-handle");
+            selectionHandle1.getStyleClass().setAll("selection-handle");
+            selectionHandle2.getStyleClass().setAll("selection-handle");
+
+            selectionHandle1.setId("selection-handle-1");
+            selectionHandle2.setId("selection-handle-2");
+        }
+
+        if (IS_FXVK_SUPPORTED) {
+            if (preload) {
+                Scene scene = control.getScene();
+                if (scene != null) {
+                    Window window = scene.getWindow();
+                    if (window != null) {
+                        FXVK.init(control);
+                    }
+                }
+            }
+            control.focusedProperty().addListener(observable -> {
+                if (FXVK.useFXVK()) {
+                    Scene scene = getSkinnable().getScene();
+                    if (control.isEditable() && control.isFocused()) {
+                        FXVK.attach(control);
+                    } else if (scene == null ||
+                            scene.getWindow() == null ||
+                            !scene.getWindow().isFocused() ||
+                            !(scene.getFocusOwner() instanceof TextInputControl &&
+                                    ((TextInputControl)scene.getFocusOwner()).isEditable())) {
+                        FXVK.detach();
+                    }
+                }
+            });
+        }
+
+        if (control.getOnInputMethodTextChanged() == null) {
+            control.setOnInputMethodTextChanged(event -> {
+                handleInputMethodEvent(event);
+            });
+        }
+
+        control.setInputMethodRequests(new ExtendedInputMethodRequests() {
+            @Override public Point2D getTextLocation(int offset) {
+                Scene scene = getSkinnable().getScene();
+                Window window = scene.getWindow();
+                // Don't use imstart here because it isn't initialized yet.
+                Rectangle2D characterBounds = getCharacterBounds(control.getSelection().getStart() + offset);
+                Point2D p = getSkinnable().localToScene(characterBounds.getMinX(), characterBounds.getMaxY());
+                Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
+                        window.getY() + scene.getY() + p.getY());
+                return location;
+            }
+
+            @Override public int getLocationOffset(int x, int y) {
+                return getInsertionPoint(x, y);
+            }
+
+            @Override public void cancelLatestCommittedText() {
+                // TODO
+            }
+
+            @Override public String getSelectedText() {
+                TextInputControl control = getSkinnable();
+                IndexRange selection = control.getSelection();
+
+                return control.getText(selection.getStart(), selection.getEnd());
+            }
+
+            @Override public int getInsertPositionOffset() {
+                int caretPosition = getSkinnable().getCaretPosition();
+                if (caretPosition < imstart) {
+                    return caretPosition;
+                } else if (caretPosition < imstart + imlength) {
+                    return imstart;
+                } else {
+                    return caretPosition - imlength;
+                }
+            }
+
+            @Override public String getCommittedText(int begin, int end) {
+                TextInputControl control = getSkinnable();
+                if (begin < imstart) {
+                    if (end <= imstart) {
+                        return control.getText(begin, end);
+                    } else {
+                        return control.getText(begin, imstart) + control.getText(imstart + imlength, end + imlength);
+                    }
+                } else {
+                    return control.getText(begin + imlength, end + imlength);
+                }
+            }
+
+            @Override public int getCommittedTextLength() {
+                return getSkinnable().getText().length() - imlength;
+            }
+        });
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Properties
+     *
+     **************************************************************************/
+
+    // --- blink
+    private BooleanProperty blink;
+    private final void setBlink(boolean value) {
+        blinkProperty().set(value);
+    }
+    private final boolean isBlink() {
+        return blinkProperty().get();
+    }
+    private final BooleanProperty blinkProperty() {
+        if (blink == null) {
+            blink = new SimpleBooleanProperty(this, "blink", true);
+        }
+        return blink;
+    }
+
+    // --- text fill
+    /**
+     * The fill to use for the text under normal conditions
+     */
+    private final ObjectProperty<Paint> textFill = new StyleableObjectProperty<Paint>(Color.BLACK) {
+        @Override protected void invalidated() {
+            updateTextFill();
+        }
+
+        @Override public Object getBean() {
+            return TextInputControlSkin.this;
+        }
+
+        @Override public String getName() {
+            return "textFill";
+        }
+
+        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
+            return StyleableProperties.TEXT_FILL;
+        }
+    };
+
+    /**
+     * The fill {@code Paint} used for the foreground text color.
+     */
+    protected final void setTextFill(Paint value) {
+        textFill.set(value);
+    }
+    protected final Paint getTextFill() {
+        return textFill.get();
+    }
+    protected final ObjectProperty<Paint> textFillProperty() {
+        return textFill;
+    }
+
+    // --- prompt text fill
+    private final ObjectProperty<Paint> promptTextFill = new StyleableObjectProperty<Paint>(Color.GRAY) {
+        @Override public Object getBean() {
+            return TextInputControlSkin.this;
+        }
+
+        @Override public String getName() {
+            return "promptTextFill";
+        }
+
+        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
+            return StyleableProperties.PROMPT_TEXT_FILL;
+        }
+    };
+
+    /**
+     * The fill {@code Paint} used for the foreground prompt text color.
+     */
+    protected final void setPromptTextFill(Paint value) {
+        promptTextFill.set(value);
+    }
+    protected final Paint getPromptTextFill() {
+        return promptTextFill.get();
+    }
+    protected final ObjectProperty<Paint> promptTextFillProperty() {
+        return promptTextFill;
+    }
+
+    // --- hightlight fill
+    /**
+     * The fill to use for the text when highlighted.
+     */
+    private final ObjectProperty<Paint> highlightFill = new StyleableObjectProperty<Paint>(Color.DODGERBLUE) {
+        @Override protected void invalidated() {
+            updateHighlightFill();
+        }
+
+        @Override public Object getBean() {
+            return TextInputControlSkin.this;
+        }
+
+        @Override public String getName() {
+            return "highlightFill";
+        }
+
+        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
+            return StyleableProperties.HIGHLIGHT_FILL;
+        }
+    };
+
+    /**
+     * The fill {@code Paint} used for the background of selected text.
+     */
+    protected final void setHighlightFill(Paint value) {
+        highlightFill.set(value);
+    }
+    protected final Paint getHighlightFill() {
+        return highlightFill.get();
+    }
+    protected final ObjectProperty<Paint> highlightFillProperty() {
+        return highlightFill;
+    }
+
+    // --- highlight text fill
+    private final ObjectProperty<Paint> highlightTextFill = new StyleableObjectProperty<Paint>(Color.WHITE) {
+        @Override protected void invalidated() {
+            updateHighlightTextFill();
+        }
+
+        @Override public Object getBean() {
+            return TextInputControlSkin.this;
+        }
+
+        @Override public String getName() {
+            return "highlightTextFill";
+        }
+
+        @Override public CssMetaData<TextInputControl,Paint> getCssMetaData() {
+            return StyleableProperties.HIGHLIGHT_TEXT_FILL;
+        }
+    };
+
+    /**
+     * The fill {@code Paint} used for the foreground of selected text.
+     */
+    protected final void setHighlightTextFill(Paint value) {
+        highlightTextFill.set(value);
+    }
+    protected final Paint getHighlightTextFill() {
+        return highlightTextFill.get();
+    }
+    protected final ObjectProperty<Paint> highlightTextFillProperty() {
+        return highlightTextFill;
+    }
+
+    // --- display caret
+    private final BooleanProperty displayCaret = new StyleableBooleanProperty(true) {
+        @Override public Object getBean() {
+            return TextInputControlSkin.this;
+        }
+
+        @Override public String getName() {
+            return "displayCaret";
+        }
+
+        @Override public CssMetaData<TextInputControl,Boolean> getCssMetaData() {
+            return StyleableProperties.DISPLAY_CARET;
+        }
+    };
+
+    private final void setDisplayCaret(boolean value) {
+        displayCaret.set(value);
+    }
+    private final boolean isDisplayCaret() {
+        return displayCaret.get();
+    }
+    private final BooleanProperty displayCaretProperty() {
+        return displayCaret;
+    }
+
+
+    /**
+     * Caret bias in the content. true means a bias towards forward character
+     * (true=leading/false=trailing)
+     */
+    private BooleanProperty forwardBias = new SimpleBooleanProperty(this, "forwardBias", true);
+    protected final BooleanProperty forwardBiasProperty() {
+        return forwardBias;
+    }
+    // Public for behavior
+    public final void setForwardBias(boolean isLeading) {
+        forwardBias.set(isLeading);
+    }
+    protected final boolean isForwardBias() {
+        return forwardBias.get();
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Abstract API
+     *
+     **************************************************************************/
+
+    /**
+     * @return the path elements describing the shape of the underline for the given range.
+     */
+    protected abstract PathElement[] getUnderlineShape(int start, int end);
+    /**
+     * @return the path elements describing the bounding rectangles for the given range of text.
+     */
+    protected abstract PathElement[] getRangeShape(int start, int end);
+    /**
+     * Adds highlight for composed text from Input Method.
+     */
+    protected abstract void addHighlight(List<? extends Node> nodes, int start);
+    /**
+     * Removes highlight for composed text from Input Method.
+     */
+    protected abstract void removeHighlight(List<? extends Node> nodes);
+
+    // Public for behavior
+    /**
+     * Moves the caret by one of the given text unit, in the given
+     * direction. Note that only certain combinations are valid,
+     * depending on the implementing subclass.
+     *
+     * @param unit the unit of text to move by.
+     * @param dir the direction of movement.
+     * @param select whether to extends the selection to the new posititon.
+     */
+    public abstract void moveCaret(TextUnit unit, Direction dir, boolean select);
+
+    /**************************************************************************
+     *
+     * Public API
+     *
+     **************************************************************************/
+
+
+    // Public for behavior
+    /**
+     * Returns the position to be used for a context menu, based on the location
+     * of the caret handle or selection handles. This is supported only on touch
+     * displays and does not use the location of the mouse.
+     */
+    public Point2D getMenuPosition() {
+        if (SHOW_HANDLES) {
+            if (caretHandle.isVisible()) {
+                return new Point2D(caretHandle.getLayoutX() + caretHandle.getWidth() / 2,
+                                   caretHandle.getLayoutY());
+            } else if (selectionHandle1.isVisible() && selectionHandle2.isVisible()) {
+                return new Point2D((selectionHandle1.getLayoutX() + selectionHandle1.getWidth() / 2 +
+                                    selectionHandle2.getLayoutX() + selectionHandle2.getWidth() / 2) / 2,
+                                   selectionHandle2.getLayoutY() + selectionHandle2.getHeight() / 2);
+            } else {
+                return null;
+            }
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    // For use with PasswordField in TextFieldSkin
+    /**
+     * This method may be overridden by subclasses to replace the displayed
+     * characters without affecting the actual text content. This is used to
+     * display bullet characters in PasswordField.
+     *
+     * @param txt the content that may need to be masked.
+     * @return the replacement string. This may just be the input string, or may be a string of replacement characters with the same length as the input string.
+     */
+    protected String maskText(String txt) {
+        return txt;
+    }
+
+    /**
+     * Returns the insertion point for a given location.
+     *
+     * @param x
+     * @param y
+     */
+    protected int getInsertionPoint(double x, double y) { return 0; }
+
+    /**
+     * Returns the bounds of the character at a given index.
+     *
+     * @param index
+     */
+    public Rectangle2D getCharacterBounds(int index) { return null; }
+
+    /**
+     * Ensures that the character at a given index is visible.
+     *
+     * @param index
+     */
+    protected void scrollCharacterToVisible(int index) {}
+
+    /**
+     * Invalidates cached min and pref sizes for the TextInputControl.
+     */
+    protected void invalidateMetrics() {
+    }
+
+    /**
+     * Called when textFill property changes.
+     */
+    protected void updateTextFill() {};
+
+    /**
+     * Called when highlightFill property changes.
+     */
+    protected void updateHighlightFill() {};
+
+    /**
+     * Called when highlightTextFill property changes.
+     */
+    protected void updateHighlightTextFill() {};
+
+    protected void handleInputMethodEvent(InputMethodEvent event) {
+        final TextInputControl textInput = getSkinnable();
+        if (textInput.isEditable() && !textInput.textProperty().isBound() && !textInput.isDisabled()) {
+
+            // just replace the text on iOS
+            if (PlatformUtil.isIOS()) {
+               textInput.setText(event.getCommitted());
+               return;
+            }
+            
+            // remove previous input method text (if any) or selected text
+            if (imlength != 0) {
+                removeHighlight(imattrs);
+                imattrs.clear();
+                textInput.selectRange(imstart, imstart + imlength);
+            }
+
+            // Insert committed text
+            if (event.getCommitted().length() != 0) {
+                String committed = event.getCommitted();
+                textInput.replaceText(textInput.getSelection(), committed);
+            }
+
+            // Replace composed text
+            imstart = textInput.getSelection().getStart();
+            StringBuilder composed = new StringBuilder();
+            for (InputMethodTextRun run : event.getComposed()) {
+                composed.append(run.getText());
+            }
+            textInput.replaceText(textInput.getSelection(), composed.toString());
+            imlength = composed.length();
+            if (imlength != 0) {
+                int pos = imstart;
+                for (InputMethodTextRun run : event.getComposed()) {
+                    int endPos = pos + run.getText().length();
+                    createInputMethodAttributes(run.getHighlight(), pos, endPos);
+                    pos = endPos;
+                }
+                addHighlight(imattrs, imstart);
+
+                // Set caret position in composed text
+                int caretPos = event.getCaretPosition();
+                if (caretPos >= 0 && caretPos < imlength) {
+                    textInput.selectRange(imstart + caretPos, imstart + caretPos);
+                }
+            }
+        }
+    }
+
+    // Public for behavior
+    /**
+     * Starts or stops caret blinking. The behavior classes use this to temporarily
+     * pause blinking while user is typing or otherwise moving the caret.
+     *
+     * @param value whether caret should be blinking.
+     */
+    public void setCaretAnimating(boolean value) {
+        if (value) {
+            caretBlinking.start();
+        } else {
+            caretBlinking.stop();
+            blinkProperty().set(true);
+        }
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Private implementation
+     *
+     **************************************************************************/
+
+    TextInputControlBehavior getBehavior() {
+        return null;
+    }
+
+    ObservableBooleanValue caretVisibleProperty() {
+        return caretVisible;
+    }
+
+    boolean isRTL() {
+        return (getSkinnable().getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT);
+    };
+
+    private void createInputMethodAttributes(InputMethodHighlight highlight, int start, int end) {
+        double minX = 0f;
+        double maxX = 0f;
+        double minY = 0f;
+        double maxY = 0f;
+
+        PathElement elements[] = getUnderlineShape(start, end);
+        for (int i = 0; i < elements.length; i++) {
+            PathElement pe = elements[i];
+            if (pe instanceof MoveTo) {
+                minX = maxX = ((MoveTo)pe).getX();
+                minY = maxY = ((MoveTo)pe).getY();
+            } else if (pe instanceof LineTo) {
+                minX = (minX < ((LineTo)pe).getX() ? minX : ((LineTo)pe).getX());
+                maxX = (maxX > ((LineTo)pe).getX() ? maxX : ((LineTo)pe).getX());
+                minY = (minY < ((LineTo)pe).getY() ? minY : ((LineTo)pe).getY());
+                maxY = (maxY > ((LineTo)pe).getY() ? maxY : ((LineTo)pe).getY());
+            } else if (pe instanceof HLineTo) {
+                minX = (minX < ((HLineTo)pe).getX() ? minX : ((HLineTo)pe).getX());
+                maxX = (maxX > ((HLineTo)pe).getX() ? maxX : ((HLineTo)pe).getX());
+            } else if (pe instanceof VLineTo) {
+                minY = (minY < ((VLineTo)pe).getY() ? minY : ((VLineTo)pe).getY());
+                maxY = (maxY > ((VLineTo)pe).getY() ? maxY : ((VLineTo)pe).getY());
+            }
+            // Don't assume that shapes are ended with ClosePath.
+            if (pe instanceof ClosePath ||
+                    i == elements.length - 1 ||
+                    (i < elements.length - 1 && elements[i+1] instanceof MoveTo)) {
+                // Now, create the attribute.
+                Shape attr = null;
+                if (highlight == InputMethodHighlight.SELECTED_RAW) {
+                    // blue background
+                    attr = new Path();
+                    ((Path)attr).getElements().addAll(getRangeShape(start, end));
+                    attr.setFill(Color.BLUE);
+                    attr.setOpacity(0.3f);
+                } else if (highlight == InputMethodHighlight.UNSELECTED_RAW) {
+                    // dash underline.
+                    attr = new Line(minX + 2, maxY + 1, maxX - 2, maxY + 1);
+                    attr.setStroke(textFill.get());
+                    attr.setStrokeWidth(maxY - minY);
+                    ObservableList<Double> dashArray = attr.getStrokeDashArray();
+                    dashArray.add(Double.valueOf(2f));
+                    dashArray.add(Double.valueOf(2f));
+                } else if (highlight == InputMethodHighlight.SELECTED_CONVERTED) {
+                    // thick underline.
+                    attr = new Line(minX + 2, maxY + 1, maxX - 2, maxY + 1);
+                    attr.setStroke(textFill.get());
+                    attr.setStrokeWidth((maxY - minY) * 3);
+                } else if (highlight == InputMethodHighlight.UNSELECTED_CONVERTED) {
+                    // single underline.
+                    attr = new Line(minX + 2, maxY + 1, maxX - 2, maxY + 1);
+                    attr.setStroke(textFill.get());
+                    attr.setStrokeWidth(maxY - minY);
+                }
+
+                if (attr != null) {
+                    attr.setManaged(false);
+                    imattrs.add(attr);
+                }
+            }
+        }
+    }
+
+
+
+    /**************************************************************************
+     *
+     * Support classes
+     *
+     **************************************************************************/
+
+    private static final class CaretBlinking {
+        private final Timeline caretTimeline;
+        private final WeakReference<BooleanProperty> blinkPropertyRef;
+
+        public CaretBlinking(final BooleanProperty blinkProperty) {
+            blinkPropertyRef = new WeakReference<>(blinkProperty);
+
+            caretTimeline = new Timeline();
+            caretTimeline.setCycleCount(Timeline.INDEFINITE);
+            caretTimeline.getKeyFrames().addAll(
+                new KeyFrame(Duration.ZERO, e -> setBlink(false)),
+                new KeyFrame(Duration.seconds(.5), e -> setBlink(true)),
+                new KeyFrame(Duration.seconds(1)));
+        }
+
+        public void start() {
+            caretTimeline.play();
+        }
+
+        public void stop() {
+            caretTimeline.stop();
+        }
+
+        private void setBlink(final boolean value) {
+            final BooleanProperty blinkProperty = blinkPropertyRef.get();
+            if (blinkProperty == null) {
+                caretTimeline.stop();
+                return;
+            }
+
+            blinkProperty.set(value);
+        }
+    }
+
+
+    private static class StyleableProperties {
+        private static final CssMetaData<TextInputControl,Paint> TEXT_FILL =
+            new CssMetaData<TextInputControl,Paint>("-fx-text-fill",
+                PaintConverter.getInstance(), Color.BLACK) {
+
+            @Override public boolean isSettable(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return skin.textFill == null || !skin.textFill.isBound();
+            }
+
+            @Override @SuppressWarnings("unchecked") 
+            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();                
+                return (StyleableProperty<Paint>)skin.textFill;
+            }
+        };
+       
+        private static final CssMetaData<TextInputControl,Paint> PROMPT_TEXT_FILL =
+            new CssMetaData<TextInputControl,Paint>("-fx-prompt-text-fill",
+                PaintConverter.getInstance(), Color.GRAY) {
+
+            @Override public boolean isSettable(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return skin.promptTextFill == null || !skin.promptTextFill.isBound();
+            }
+
+            @Override @SuppressWarnings("unchecked") 
+            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return (StyleableProperty<Paint>)skin.promptTextFill;
+            }
+        };
+        
+        private static final CssMetaData<TextInputControl,Paint> HIGHLIGHT_FILL =
+            new CssMetaData<TextInputControl,Paint>("-fx-highlight-fill",
+                PaintConverter.getInstance(), Color.DODGERBLUE) {
+
+            @Override public boolean isSettable(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return skin.highlightFill == null || !skin.highlightFill.isBound();
+            }
+
+            @Override @SuppressWarnings("unchecked") 
+            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return (StyleableProperty<Paint>)skin.highlightFill;
+            }
+        };
+        
+        private static final CssMetaData<TextInputControl,Paint> HIGHLIGHT_TEXT_FILL =
+            new CssMetaData<TextInputControl,Paint>("-fx-highlight-text-fill",
+                PaintConverter.getInstance(), Color.WHITE) {
+
+            @Override public boolean isSettable(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return skin.highlightTextFill == null || !skin.highlightTextFill.isBound();
+            }
+
+            @Override @SuppressWarnings("unchecked") 
+            public StyleableProperty<Paint> getStyleableProperty(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return (StyleableProperty<Paint>)skin.highlightTextFill;
+            }
+        };
+        
+        private static final CssMetaData<TextInputControl,Boolean> DISPLAY_CARET =
+            new CssMetaData<TextInputControl,Boolean>("-fx-display-caret",
+                BooleanConverter.getInstance(), Boolean.TRUE) {
+
+            @Override public boolean isSettable(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return skin.displayCaret == null || !skin.displayCaret.isBound();
+            }
+
+            @Override @SuppressWarnings("unchecked") 
+            public StyleableProperty<Boolean> getStyleableProperty(TextInputControl n) {
+                final TextInputControlSkin<?> skin = (TextInputControlSkin<?>) n.getSkin();
+                return (StyleableProperty<Boolean>)skin.displayCaret;
+            }
+        };
+
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+            List<CssMetaData<? extends Styleable, ?>> styleables = 
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+            styleables.add(TEXT_FILL);
+            styleables.add(PROMPT_TEXT_FILL);
+            styleables.add(HIGHLIGHT_FILL);
+            styleables.add(HIGHLIGHT_TEXT_FILL);
+            styleables.add(DISPLAY_CARET);
+
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+    @Override protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+        switch (action) {
+            case SHOW_TEXT_RANGE: {
+                Integer start = (Integer)parameters[0];
+                Integer end = (Integer)parameters[1];
+                if (start != null && end != null) {
+                    scrollCharacterToVisible(end);
+                    scrollCharacterToVisible(start);
+                    scrollCharacterToVisible(end);
+                }
+                break;
+            } 
+            default: super.executeAccessibleAction(action, parameters);
+        }
+    }
+
+    /**
+     * This class represents the hit information for a Text node.
+     */
+    public static class TextPosInfo {
+
+        TextPosInfo(HitInfo hit) {
+            this(hit.getCharIndex(), hit.isLeading());
+        }
+
+        /**
+         * Create a TextPosInfo object representing a text index and forward bias.
+         *
+         * @param charIndex the character index.
+         * @param leading whether the hit is on the leading edge of the character. If it is false, it represents the trailing edge.
+         */
+        public TextPosInfo(int charIndex, boolean leading) {
+            setCharIndex(charIndex);
+            setLeading(leading);
+        }
+
+        /**
+         * The index of the character which this hit information refers to.
+         */
+        private int charIndex;
+        public int getCharIndex() { return charIndex; }
+        void setCharIndex(int charIndex) { this.charIndex = charIndex; }
+
+        /**
+         * Indicates whether the hit is on the leading edge of the character.
+         * If it is false, it represents the trailing edge.
+         */
+        private boolean leading;
+        public boolean isLeading() { return leading; }
+        void setLeading(boolean leading) { this.leading = leading; }
+
+        /**
+         * Returns the index of the insertion position.
+         */
+        public int getInsertionIndex() {
+            return leading ? charIndex : charIndex + 1;
+        }
+
+        @Override public String toString() {
+            return "charIndex: " + charIndex + ", isLeading: " + leading;
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TitledPaneSkin.java	2015-09-03 15:23:47.062617900 -0700
+++ /dev/null	2015-09-03 15:23:48.000000000 -0700
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.PlatformUtil;
-import javafx.animation.Animation.Status;
-import javafx.animation.Interpolator;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.geometry.HPos;
-import javafx.geometry.Pos;
-import javafx.geometry.VPos;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.TitledPane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Duration;
-
-import com.sun.javafx.scene.control.behavior.TitledPaneBehavior;
-import javafx.beans.binding.DoubleBinding;
-import javafx.geometry.Insets;
-import javafx.scene.control.Accordion;
-import javafx.scene.control.Labeled;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.input.MouseButton;
-import javafx.scene.text.Font;
-
-public class TitledPaneSkin extends LabeledSkinBase<TitledPane, TitledPaneBehavior>  {
-
-    public static final Duration TRANSITION_DURATION = new Duration(350.0);
-
-    // caching results in poorer looking text (it is blurry), so we don't do it
-    // unless on a low powered device (admittedly the test below isn't a great
-    // indicator of power, but it'll do for now).
-    private static final boolean CACHE_ANIMATION = PlatformUtil.isEmbedded();
-
-    private final TitleRegion titleRegion;
-    private final StackPane contentContainer;
-    private Node content;
-    private Timeline timeline;
-    private double transitionStartValue;
-    private Rectangle clipRect;
-    private Pos pos;
-    private HPos hpos;
-    private VPos vpos;
-
-    public TitledPaneSkin(final TitledPane titledPane) {
-        super(titledPane, new TitledPaneBehavior(titledPane));
-
-        clipRect = new Rectangle();
-
-        transitionStartValue = 0;
-        titleRegion = new TitleRegion();
-
-        content = getSkinnable().getContent();
-        contentContainer = new StackPane() {
-            {
-                getStyleClass().setAll("content");
-
-                if (content != null) {
-                    getChildren().setAll(content);
-                }
-            }
-        };
-        contentContainer.setClip(clipRect);
-
-        if (titledPane.isExpanded()) {
-            setTransition(1.0f);
-            setExpanded(titledPane.isExpanded());
-        } else {
-            setTransition(0.0f);
-            if (content != null) {
-                content.setVisible(false);
-            }
-        }
-
-        getChildren().setAll(contentContainer, titleRegion);
-
-        registerChangeListener(titledPane.contentProperty(), "CONTENT");
-        registerChangeListener(titledPane.expandedProperty(), "EXPANDED");
-        registerChangeListener(titledPane.collapsibleProperty(), "COLLAPSIBLE");
-        registerChangeListener(titledPane.alignmentProperty(), "ALIGNMENT");
-        registerChangeListener(titledPane.widthProperty(), "WIDTH");
-        registerChangeListener(titledPane.heightProperty(), "HEIGHT");
-        registerChangeListener(titleRegion.alignmentProperty(), "TITLE_REGION_ALIGNMENT");
-
-        pos = titledPane.getAlignment();
-        hpos = pos == null ? HPos.LEFT   : pos.getHpos();
-        vpos = pos == null ? VPos.CENTER : pos.getVpos();
-    }
-
-    public StackPane getContentContainer() {
-        return contentContainer;
-    }
-
-    @Override
-    protected void handleControlPropertyChanged(String property) {
-        super.handleControlPropertyChanged(property);
-        if ("CONTENT".equals(property)) {
-            content = getSkinnable().getContent();
-            if (content == null) {
-                contentContainer.getChildren().clear();
-            } else {
-                contentContainer.getChildren().setAll(content);
-            }
-        } else if ("EXPANDED".equals(property)) {
-            setExpanded(getSkinnable().isExpanded());
-        } else if ("COLLAPSIBLE".equals(property)) {
-            titleRegion.update();
-        } else if ("ALIGNMENT".equals(property)) {
-            pos = getSkinnable().getAlignment();
-            hpos = pos.getHpos();
-            vpos = pos.getVpos();
-        } else if ("TITLE_REGION_ALIGNMENT".equals(property)) {
-            pos = titleRegion.getAlignment();
-            hpos = pos.getHpos();
-            vpos = pos.getVpos();
-        } else if ("WIDTH".equals(property)) {
-            clipRect.setWidth(getSkinnable().getWidth());
-        } else if ("HEIGHT".equals(property)) {
-            clipRect.setHeight(contentContainer.getHeight());
-        } else if ("GRAPHIC_TEXT_GAP".equals(property)) {
-            titleRegion.requestLayout();            
-        }
-    }
-
-    // Override LabeledSkinBase updateChildren because
-    // it removes all the children.  The update() in TitleRegion
-    // will replace this method.
-    @Override protected void updateChildren() {
-        if (titleRegion != null) {
-            titleRegion.update();
-        }
-    }
-
-    private void setExpanded(boolean expanded) {
-        if (! getSkinnable().isCollapsible()) {
-            setTransition(1.0f);
-            return;
-        }
-
-        // we need to perform the transition between expanded / hidden
-        if (getSkinnable().isAnimated()) {
-            transitionStartValue = getTransition();
-            doAnimationTransition();
-        } else {
-            if (expanded) {
-                setTransition(1.0f);
-            } else {
-                setTransition(0.0f);
-            }
-            if (content != null) {
-                content.setVisible(expanded);
-             }
-            getSkinnable().requestLayout();
-        }
-    }
-
-    private DoubleProperty transition;
-    private void setTransition(double value) { transitionProperty().set(value); }
-    private double getTransition() { return transition == null ? 0.0 : transition.get(); }
-    private DoubleProperty transitionProperty() {
-        if (transition == null) {
-            transition = new SimpleDoubleProperty(this, "transition", 0.0) {
-                @Override protected void invalidated() {
-                    contentContainer.requestLayout();
-                }
-            };
-        }
-        return transition;
-    }
-
-    private boolean isInsideAccordion() {
-        return getSkinnable().getParent() != null && getSkinnable().getParent() instanceof Accordion;
-    }
-
-    @Override protected void layoutChildren(final double x, double y,
-            final double w, final double h) {
-        
-        // header
-        double headerHeight = snapSize(titleRegion.prefHeight(-1));
-
-        titleRegion.resize(w, headerHeight);
-        positionInArea(titleRegion, x, y,
-            w, headerHeight, 0, HPos.LEFT, VPos.CENTER);
-
-        // content
-        double contentHeight = (h - headerHeight) * getTransition();
-        if (isInsideAccordion()) {
-            if (prefHeightFromAccordion != 0) {
-                contentHeight = (prefHeightFromAccordion - headerHeight) * getTransition();
-            }
-        }
-        contentHeight = snapSize(contentHeight);
-
-        y += snapSize(headerHeight);
-        contentContainer.resize(w, contentHeight);
-        clipRect.setHeight(contentHeight);
-        positionInArea(contentContainer, x, y,
-            w, contentHeight, /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double titleWidth = snapSize(titleRegion.prefWidth(height));
-        double contentWidth = snapSize(contentContainer.minWidth(height));
-        return Math.max(titleWidth, contentWidth) + leftInset + rightInset;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double headerHeight = snapSize(titleRegion.prefHeight(width));
-        double contentHeight = contentContainer.minHeight(width) * getTransition();
-        return headerHeight + snapSize(contentHeight) + topInset + bottomInset;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double titleWidth = snapSize(titleRegion.prefWidth(height));
-        double contentWidth = snapSize(contentContainer.prefWidth(height));
-        return Math.max(titleWidth, contentWidth) + leftInset + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double headerHeight = snapSize(titleRegion.prefHeight(width));
-        double contentHeight = contentContainer.prefHeight(width) * getTransition();
-        return headerHeight + snapSize(contentHeight) + topInset + bottomInset;
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return Double.MAX_VALUE;
-    }
-
-    double getTitleRegionSize(double width) {
-        return snapSize(titleRegion.prefHeight(width)) + snappedTopInset() + snappedBottomInset();
-    }
-
-    private double prefHeightFromAccordion = 0;
-    void setMaxTitledPaneHeightForAccordion(double height) {
-        this.prefHeightFromAccordion = height;
-    }
-
-    double getTitledPaneHeightForAccordion() {
-        double headerHeight = snapSize(titleRegion.prefHeight(-1));
-        double contentHeight = (prefHeightFromAccordion - headerHeight) * getTransition();
-        return headerHeight + snapSize(contentHeight) + snappedTopInset() + snappedBottomInset();
-    }
-
-    private void doAnimationTransition() {
-        if (content == null) {
-            return;
-        }
-
-        Duration duration;
-        if (timeline != null && (timeline.getStatus() != Status.STOPPED)) {
-            duration = timeline.getCurrentTime();
-            timeline.stop();
-        } else {
-            duration = TRANSITION_DURATION;
-        }
-
-        timeline = new Timeline();
-        timeline.setCycleCount(1);
-
-        KeyFrame k1, k2;
-
-        if (getSkinnable().isExpanded()) {
-            k1 = new KeyFrame(
-                Duration.ZERO,
-                    event -> {
-                        // start expand
-                        if (CACHE_ANIMATION) content.setCache(true);
-                        content.setVisible(true);
-                    },
-                new KeyValue(transitionProperty(), transitionStartValue)
-            );
-
-            k2 = new KeyFrame(
-                duration,
-                    event -> {
-                        // end expand
-                        if (CACHE_ANIMATION) content.setCache(false);
-                    },
-                new KeyValue(transitionProperty(), 1, Interpolator.LINEAR)
-
-            );
-        } else {
-            k1 = new KeyFrame(
-                Duration.ZERO,
-                    event -> {
-                        // Start collapse
-                        if (CACHE_ANIMATION) content.setCache(true);
-                    },
-                new KeyValue(transitionProperty(), transitionStartValue)
-            );
-
-            k2 = new KeyFrame(
-                duration,
-                    event -> {
-                        // end collapse
-                        content.setVisible(false);
-                        if (CACHE_ANIMATION) content.setCache(false);
-                    },
-                new KeyValue(transitionProperty(), 0, Interpolator.LINEAR)
-            );
-        }
-
-        timeline.getKeyFrames().setAll(k1, k2);
-        timeline.play();
-    }
-
-    class TitleRegion extends StackPane {
-        private final StackPane arrowRegion;
-
-        public TitleRegion() {
-            getStyleClass().setAll("title");
-            arrowRegion = new StackPane();
-            arrowRegion.setId("arrowRegion");
-            arrowRegion.getStyleClass().setAll("arrow-button");
-
-            StackPane arrow = new StackPane();
-            arrow.setId("arrow");
-            arrow.getStyleClass().setAll("arrow");
-            arrowRegion.getChildren().setAll(arrow);
-            
-            // RT-13294: TitledPane : add animation to the title arrow
-            arrow.rotateProperty().bind(new DoubleBinding() {
-                { bind(transitionProperty()); }
-
-                @Override protected double computeValue() {
-                    return -90 * (1.0 - getTransition());
-                }
-            });
-
-            setAlignment(Pos.CENTER_LEFT);
-
-            setOnMouseReleased(e -> {
-                if( e.getButton() != MouseButton.PRIMARY ) return;
-                ContextMenu contextMenu = getSkinnable().getContextMenu() ;
-                if (contextMenu != null) {
-                    contextMenu.hide() ;
-                }
-                if (getSkinnable().isCollapsible() && getSkinnable().isFocused()) {
-                    getBehavior().toggle();
-                }
-            });
-
-            // title region consists of the title and the arrow regions
-            update();
-        }
-
-        private void update() {
-            getChildren().clear();
-            final TitledPane titledPane = getSkinnable();
-
-            if (titledPane.isCollapsible()) {
-                getChildren().add(arrowRegion);
-            }
-
-            // Only in some situations do we want to have the graphicPropertyChangedListener
-            // installed. Since updateChildren() is not called much, we'll just remove it always
-            // and reinstall it later if it is necessary to do so.
-            if (graphic != null) {
-                graphic.layoutBoundsProperty().removeListener(graphicPropertyChangedListener);
-            }
-            // Now update the graphic (since it may have changed)
-            graphic = titledPane.getGraphic();
-            // Now update the children (and add the graphicPropertyChangedListener as necessary)
-            if (isIgnoreGraphic()) {
-                if (titledPane.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) {
-                    getChildren().clear();
-                    getChildren().add(arrowRegion);
-                } else {
-                    getChildren().add(text);
-                }
-            } else {
-                graphic.layoutBoundsProperty().addListener(graphicPropertyChangedListener);
-                if (isIgnoreText()) {
-                    getChildren().add(graphic);
-                } else {
-                    getChildren().addAll(graphic, text);
-                }
-            }
-            setCursor(getSkinnable().isCollapsible() ? Cursor.HAND : Cursor.DEFAULT);
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            double left = snappedLeftInset();
-            double right = snappedRightInset();
-            double arrowWidth = 0;
-            double labelPrefWidth = labelPrefWidth(height);
-
-            if (arrowRegion != null) {
-                arrowWidth = snapSize(arrowRegion.prefWidth(height));
-            }
-
-            return left + arrowWidth + labelPrefWidth + right;
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            double top = snappedTopInset();
-            double bottom = snappedBottomInset();
-            double arrowHeight = 0;
-            double labelPrefHeight = labelPrefHeight(width);
-
-            if (arrowRegion != null) {
-                arrowHeight = snapSize(arrowRegion.prefHeight(width));
-            }
-
-            return top + Math.max(arrowHeight, labelPrefHeight) + bottom;
-        }
-
-        @Override protected void layoutChildren() {
-            final double top = snappedTopInset();
-            final double bottom = snappedBottomInset();
-            final double left = snappedLeftInset();
-            final double right = snappedRightInset();
-            double width = getWidth() - (left + right);
-            double height = getHeight() - (top + bottom);
-            double arrowWidth = snapSize(arrowRegion.prefWidth(-1));
-            double arrowHeight = snapSize(arrowRegion.prefHeight(-1));
-            double labelWidth = snapSize(Math.min(width - arrowWidth / 2.0, labelPrefWidth(-1)));
-            double labelHeight = snapSize(labelPrefHeight(-1));
-
-            double x = left + arrowWidth + Utils.computeXOffset(width - arrowWidth, labelWidth, hpos);
-            if (HPos.CENTER == hpos) {
-                // We want to center the region based on the entire width of the TitledPane.
-                x = left + Utils.computeXOffset(width, labelWidth, hpos);
-            }
-            double y = top + Utils.computeYOffset(height, Math.max(arrowHeight, labelHeight), vpos);
-
-            arrowRegion.resize(arrowWidth, arrowHeight);
-            positionInArea(arrowRegion, left, top, arrowWidth, height,
-                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-
-            layoutLabelInArea(x, y, labelWidth, height, pos);
-        }
-
-        // Copied from LabeledSkinBase because the padding from TitledPane was being
-        // applied to the Label when it should not be.
-        private double labelPrefWidth(double height) {
-            // Get the preferred width of the text
-            final Labeled labeled = getSkinnable();
-            final Font font = text.getFont();
-            final String string = labeled.getText();
-            boolean emptyText = string == null || string.isEmpty();
-            Insets labelPadding = labeled.getLabelPadding();
-            double widthPadding = labelPadding.getLeft() + labelPadding.getRight();
-            double textWidth = emptyText ? 0 : Utils.computeTextWidth(font, string, 0);
-
-            // Now add on the graphic, gap, and padding as appropriate
-            final Node graphic = labeled.getGraphic();
-            if (isIgnoreGraphic()) {
-                return textWidth + widthPadding;
-            } else if (isIgnoreText()) {
-                return graphic.prefWidth(-1) + widthPadding;
-            } else if (labeled.getContentDisplay() == ContentDisplay.LEFT
-                    || labeled.getContentDisplay() == ContentDisplay.RIGHT) {
-                return textWidth + labeled.getGraphicTextGap() + graphic.prefWidth(-1) + widthPadding;
-            } else {
-                return Math.max(textWidth, graphic.prefWidth(-1)) + widthPadding;
-            }
-        }
-
-        // Copied from LabeledSkinBase because the padding from TitledPane was being
-        // applied to the Label when it should not be.
-        private double labelPrefHeight(double width) {
-            final Labeled labeled = getSkinnable();
-            final Font font = text.getFont();
-            final ContentDisplay contentDisplay = labeled.getContentDisplay();
-            final double gap = labeled.getGraphicTextGap();
-            final Insets labelPadding = labeled.getLabelPadding();
-            final double widthPadding = snappedLeftInset() + snappedRightInset() + labelPadding.getLeft() + labelPadding.getRight();
-
-            String str = labeled.getText();
-            if (str != null && str.endsWith("\n")) {
-                // Strip ending newline so we don't count another row.
-                str = str.substring(0, str.length() - 1);
-            }
-
-            if (!isIgnoreGraphic() &&
-                (contentDisplay == ContentDisplay.LEFT || contentDisplay == ContentDisplay.RIGHT)) {
-                width -= (graphic.prefWidth(-1) + gap);
-            }
-
-            width -= widthPadding;
-
-            // TODO figure out how to cache this effectively.
-            final double textHeight = Utils.computeTextHeight(font, str,
-                                                            labeled.isWrapText() ? width : 0, text.getBoundsType());
-
-            // Now we want to add on the graphic if necessary!
-            double h = textHeight;
-            if (!isIgnoreGraphic()) {
-                final Node graphic = labeled.getGraphic();
-                if (contentDisplay == ContentDisplay.TOP || contentDisplay == ContentDisplay.BOTTOM) {
-                    h = graphic.prefHeight(-1) + gap + textHeight;
-                } else {
-                    h = Math.max(textHeight, graphic.prefHeight(-1));
-                }
-            }
-
-            return h + labelPadding.getTop() + labelPadding.getBottom();
-        }
-    }
-}
--- /dev/null	2015-09-03 15:23:49.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TitledPaneSkin.java	2015-09-03 15:23:46.270572600 -0700
@@ -0,0 +1,604 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.PlatformUtil;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.animation.Animation.Status;
+import javafx.animation.Interpolator;
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.geometry.HPos;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Control;
+import javafx.scene.control.TitledPane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Duration;
+
+import com.sun.javafx.scene.control.behavior.TitledPaneBehavior;
+import javafx.beans.binding.DoubleBinding;
+import javafx.geometry.Insets;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.input.MouseButton;
+import javafx.scene.text.Font;
+
+/**
+ * Default skin implementation for the {@link TitledPane} control.
+ *
+ * @see TitledPane
+ * @since 9
+ */
+public class TitledPaneSkin extends LabeledSkinBase<TitledPane>  {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    private static final Duration TRANSITION_DURATION = new Duration(350.0);
+
+    // caching results in poorer looking text (it is blurry), so we don't do it
+    // unless on a low powered device (admittedly the test below isn't a great
+    // indicator of power, but it'll do for now).
+    private static final boolean CACHE_ANIMATION = PlatformUtil.isEmbedded();
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final TitledPaneBehavior behavior;
+
+    private final TitleRegion titleRegion;
+    private final StackPane contentContainer;
+    private Node content;
+    private Timeline timeline;
+    private double transitionStartValue;
+    private Rectangle clipRect;
+    private Pos pos;
+    private HPos hpos;
+    private VPos vpos;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TitledPaneSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TitledPaneSkin(final TitledPane control) {
+        super(control);
+
+        // install default input map for the TitledPane control
+        this.behavior = new TitledPaneBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        clipRect = new Rectangle();
+
+        transitionStartValue = 0;
+        titleRegion = new TitleRegion();
+
+        content = getSkinnable().getContent();
+        contentContainer = new StackPane() {
+            {
+                getStyleClass().setAll("content");
+
+                if (content != null) {
+                    getChildren().setAll(content);
+                }
+            }
+        };
+        contentContainer.setClip(clipRect);
+
+        if (control.isExpanded()) {
+            setTransition(1.0f);
+            setExpanded(control.isExpanded());
+        } else {
+            setTransition(0.0f);
+            if (content != null) {
+                content.setVisible(false);
+            }
+        }
+
+        getChildren().setAll(contentContainer, titleRegion);
+
+        registerChangeListener(control.contentProperty(), e -> {
+            content = getSkinnable().getContent();
+            if (content == null) {
+                contentContainer.getChildren().clear();
+            } else {
+                contentContainer.getChildren().setAll(content);
+            }
+        });
+        registerChangeListener(control.expandedProperty(), e -> setExpanded(getSkinnable().isExpanded()));
+        registerChangeListener(control.collapsibleProperty(), e -> titleRegion.update());
+        registerChangeListener(control.alignmentProperty(), e -> {
+            pos = getSkinnable().getAlignment();
+            hpos = pos.getHpos();
+            vpos = pos.getVpos();
+        });
+        registerChangeListener(control.widthProperty(), e -> clipRect.setWidth(getSkinnable().getWidth()));
+        registerChangeListener(control.heightProperty(), e -> clipRect.setHeight(contentContainer.getHeight()));
+        registerChangeListener(titleRegion.alignmentProperty(), e -> {
+            pos = titleRegion.getAlignment();
+            hpos = pos.getHpos();
+            vpos = pos.getVpos();
+        });
+
+        pos = control.getAlignment();
+        hpos = pos == null ? HPos.LEFT   : pos.getHpos();
+        vpos = pos == null ? VPos.CENTER : pos.getVpos();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    private DoubleProperty transition;
+    private final void setTransition(double value) { transitionProperty().set(value); }
+    private final double getTransition() { return transition == null ? 0.0 : transition.get(); }
+    private final DoubleProperty transitionProperty() {
+        if (transition == null) {
+            transition = new SimpleDoubleProperty(this, "transition", 0.0) {
+                @Override protected void invalidated() {
+                    contentContainer.requestLayout();
+                }
+            };
+        }
+        return transition;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    // Override LabeledSkinBase updateChildren because
+    // it removes all the children.  The update() in TitleRegion
+    // will replace this method.
+    /** {@inheritDoc} */
+    @Override protected void updateChildren() {
+        if (titleRegion != null) {
+            titleRegion.update();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, double y,
+                                            final double w, final double h) {
+
+        // header
+        double headerHeight = snapSize(titleRegion.prefHeight(-1));
+
+        titleRegion.resize(w, headerHeight);
+        positionInArea(titleRegion, x, y,
+                w, headerHeight, 0, HPos.LEFT, VPos.CENTER);
+
+        // content
+        double contentHeight = (h - headerHeight) * getTransition();
+        if (isInsideAccordion()) {
+            if (prefHeightFromAccordion != 0) {
+                contentHeight = (prefHeightFromAccordion - headerHeight) * getTransition();
+            }
+        }
+        contentHeight = snapSize(contentHeight);
+
+        y += snapSize(headerHeight);
+        contentContainer.resize(w, contentHeight);
+        clipRect.setHeight(contentHeight);
+        positionInArea(contentContainer, x, y,
+                w, contentHeight, /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double titleWidth = snapSize(titleRegion.prefWidth(height));
+        double contentWidth = snapSize(contentContainer.minWidth(height));
+        return Math.max(titleWidth, contentWidth) + leftInset + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double headerHeight = snapSize(titleRegion.prefHeight(width));
+        double contentHeight = contentContainer.minHeight(width) * getTransition();
+        return headerHeight + snapSize(contentHeight) + topInset + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double titleWidth = snapSize(titleRegion.prefWidth(height));
+        double contentWidth = snapSize(contentContainer.prefWidth(height));
+        return Math.max(titleWidth, contentWidth) + leftInset + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double headerHeight = snapSize(titleRegion.prefHeight(width));
+        double contentHeight = contentContainer.prefHeight(width) * getTransition();
+        return headerHeight + snapSize(contentHeight) + topInset + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return Double.MAX_VALUE;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void setExpanded(boolean expanded) {
+        if (! getSkinnable().isCollapsible()) {
+            setTransition(1.0f);
+            return;
+        }
+
+        // we need to perform the transition between expanded / hidden
+        if (getSkinnable().isAnimated()) {
+            transitionStartValue = getTransition();
+            doAnimationTransition();
+        } else {
+            if (expanded) {
+                setTransition(1.0f);
+            } else {
+                setTransition(0.0f);
+            }
+            if (content != null) {
+                content.setVisible(expanded);
+             }
+            getSkinnable().requestLayout();
+        }
+    }
+
+    private boolean isInsideAccordion() {
+        return getSkinnable().getParent() != null && getSkinnable().getParent() instanceof Accordion;
+    }
+
+    double getTitleRegionSize(double width) {
+        return snapSize(titleRegion.prefHeight(width)) + snappedTopInset() + snappedBottomInset();
+    }
+
+    private double prefHeightFromAccordion = 0;
+    void setMaxTitledPaneHeightForAccordion(double height) {
+        this.prefHeightFromAccordion = height;
+    }
+
+    double getTitledPaneHeightForAccordion() {
+        double headerHeight = snapSize(titleRegion.prefHeight(-1));
+        double contentHeight = (prefHeightFromAccordion - headerHeight) * getTransition();
+        return headerHeight + snapSize(contentHeight) + snappedTopInset() + snappedBottomInset();
+    }
+
+    private void doAnimationTransition() {
+        if (content == null) {
+            return;
+        }
+
+        Duration duration;
+        if (timeline != null && (timeline.getStatus() != Status.STOPPED)) {
+            duration = timeline.getCurrentTime();
+            timeline.stop();
+        } else {
+            duration = TRANSITION_DURATION;
+        }
+
+        timeline = new Timeline();
+        timeline.setCycleCount(1);
+
+        KeyFrame k1, k2;
+
+        if (getSkinnable().isExpanded()) {
+            k1 = new KeyFrame(
+                Duration.ZERO,
+                    event -> {
+                        // start expand
+                        if (CACHE_ANIMATION) content.setCache(true);
+                        content.setVisible(true);
+                    },
+                new KeyValue(transitionProperty(), transitionStartValue)
+            );
+
+            k2 = new KeyFrame(
+                duration,
+                    event -> {
+                        // end expand
+                        if (CACHE_ANIMATION) content.setCache(false);
+                    },
+                new KeyValue(transitionProperty(), 1, Interpolator.LINEAR)
+
+            );
+        } else {
+            k1 = new KeyFrame(
+                Duration.ZERO,
+                    event -> {
+                        // Start collapse
+                        if (CACHE_ANIMATION) content.setCache(true);
+                    },
+                new KeyValue(transitionProperty(), transitionStartValue)
+            );
+
+            k2 = new KeyFrame(
+                duration,
+                    event -> {
+                        // end collapse
+                        content.setVisible(false);
+                        if (CACHE_ANIMATION) content.setCache(false);
+                    },
+                new KeyValue(transitionProperty(), 0, Interpolator.LINEAR)
+            );
+        }
+
+        timeline.getKeyFrames().setAll(k1, k2);
+        timeline.play();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    class TitleRegion extends StackPane {
+        private final StackPane arrowRegion;
+
+        public TitleRegion() {
+            getStyleClass().setAll("title");
+            arrowRegion = new StackPane();
+            arrowRegion.setId("arrowRegion");
+            arrowRegion.getStyleClass().setAll("arrow-button");
+
+            StackPane arrow = new StackPane();
+            arrow.setId("arrow");
+            arrow.getStyleClass().setAll("arrow");
+            arrowRegion.getChildren().setAll(arrow);
+            
+            // RT-13294: TitledPane : add animation to the title arrow
+            arrow.rotateProperty().bind(new DoubleBinding() {
+                { bind(transitionProperty()); }
+
+                @Override protected double computeValue() {
+                    return -90 * (1.0 - getTransition());
+                }
+            });
+
+            setAlignment(Pos.CENTER_LEFT);
+
+            setOnMouseReleased(e -> {
+                if( e.getButton() != MouseButton.PRIMARY ) return;
+                ContextMenu contextMenu = getSkinnable().getContextMenu() ;
+                if (contextMenu != null) {
+                    contextMenu.hide() ;
+                }
+                if (getSkinnable().isCollapsible() && getSkinnable().isFocused()) {
+                    behavior.toggle();
+                }
+            });
+
+            // title region consists of the title and the arrow regions
+            update();
+        }
+
+        private void update() {
+            getChildren().clear();
+            final TitledPane titledPane = getSkinnable();
+
+            if (titledPane.isCollapsible()) {
+                getChildren().add(arrowRegion);
+            }
+
+            // Only in some situations do we want to have the graphicPropertyChangedListener
+            // installed. Since updateChildren() is not called much, we'll just remove it always
+            // and reinstall it later if it is necessary to do so.
+            if (graphic != null) {
+                graphic.layoutBoundsProperty().removeListener(graphicPropertyChangedListener);
+            }
+            // Now update the graphic (since it may have changed)
+            graphic = titledPane.getGraphic();
+            // Now update the children (and add the graphicPropertyChangedListener as necessary)
+            if (isIgnoreGraphic()) {
+                if (titledPane.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) {
+                    getChildren().clear();
+                    getChildren().add(arrowRegion);
+                } else {
+                    getChildren().add(text);
+                }
+            } else {
+                graphic.layoutBoundsProperty().addListener(graphicPropertyChangedListener);
+                if (isIgnoreText()) {
+                    getChildren().add(graphic);
+                } else {
+                    getChildren().addAll(graphic, text);
+                }
+            }
+            setCursor(getSkinnable().isCollapsible() ? Cursor.HAND : Cursor.DEFAULT);
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            double left = snappedLeftInset();
+            double right = snappedRightInset();
+            double arrowWidth = 0;
+            double labelPrefWidth = labelPrefWidth(height);
+
+            if (arrowRegion != null) {
+                arrowWidth = snapSize(arrowRegion.prefWidth(height));
+            }
+
+            return left + arrowWidth + labelPrefWidth + right;
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            double top = snappedTopInset();
+            double bottom = snappedBottomInset();
+            double arrowHeight = 0;
+            double labelPrefHeight = labelPrefHeight(width);
+
+            if (arrowRegion != null) {
+                arrowHeight = snapSize(arrowRegion.prefHeight(width));
+            }
+
+            return top + Math.max(arrowHeight, labelPrefHeight) + bottom;
+        }
+
+        @Override protected void layoutChildren() {
+            final double top = snappedTopInset();
+            final double bottom = snappedBottomInset();
+            final double left = snappedLeftInset();
+            final double right = snappedRightInset();
+            double width = getWidth() - (left + right);
+            double height = getHeight() - (top + bottom);
+            double arrowWidth = snapSize(arrowRegion.prefWidth(-1));
+            double arrowHeight = snapSize(arrowRegion.prefHeight(-1));
+            double labelWidth = snapSize(Math.min(width - arrowWidth / 2.0, labelPrefWidth(-1)));
+            double labelHeight = snapSize(labelPrefHeight(-1));
+
+            double x = left + arrowWidth + Utils.computeXOffset(width - arrowWidth, labelWidth, hpos);
+            if (HPos.CENTER == hpos) {
+                // We want to center the region based on the entire width of the TitledPane.
+                x = left + Utils.computeXOffset(width, labelWidth, hpos);
+            }
+            double y = top + Utils.computeYOffset(height, Math.max(arrowHeight, labelHeight), vpos);
+
+            arrowRegion.resize(arrowWidth, arrowHeight);
+            positionInArea(arrowRegion, left, top, arrowWidth, height,
+                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+
+            layoutLabelInArea(x, y, labelWidth, height, pos);
+        }
+
+        // Copied from LabeledSkinBase because the padding from TitledPane was being
+        // applied to the Label when it should not be.
+        private double labelPrefWidth(double height) {
+            // Get the preferred width of the text
+            final Labeled labeled = getSkinnable();
+            final Font font = text.getFont();
+            final String string = labeled.getText();
+            boolean emptyText = string == null || string.isEmpty();
+            Insets labelPadding = labeled.getLabelPadding();
+            double widthPadding = labelPadding.getLeft() + labelPadding.getRight();
+            double textWidth = emptyText ? 0 : Utils.computeTextWidth(font, string, 0);
+
+            // Now add on the graphic, gap, and padding as appropriate
+            final Node graphic = labeled.getGraphic();
+            if (isIgnoreGraphic()) {
+                return textWidth + widthPadding;
+            } else if (isIgnoreText()) {
+                return graphic.prefWidth(-1) + widthPadding;
+            } else if (labeled.getContentDisplay() == ContentDisplay.LEFT
+                    || labeled.getContentDisplay() == ContentDisplay.RIGHT) {
+                return textWidth + labeled.getGraphicTextGap() + graphic.prefWidth(-1) + widthPadding;
+            } else {
+                return Math.max(textWidth, graphic.prefWidth(-1)) + widthPadding;
+            }
+        }
+
+        // Copied from LabeledSkinBase because the padding from TitledPane was being
+        // applied to the Label when it should not be.
+        private double labelPrefHeight(double width) {
+            final Labeled labeled = getSkinnable();
+            final Font font = text.getFont();
+            final ContentDisplay contentDisplay = labeled.getContentDisplay();
+            final double gap = labeled.getGraphicTextGap();
+            final Insets labelPadding = labeled.getLabelPadding();
+            final double widthPadding = snappedLeftInset() + snappedRightInset() + labelPadding.getLeft() + labelPadding.getRight();
+
+            String str = labeled.getText();
+            if (str != null && str.endsWith("\n")) {
+                // Strip ending newline so we don't count another row.
+                str = str.substring(0, str.length() - 1);
+            }
+
+            if (!isIgnoreGraphic() &&
+                (contentDisplay == ContentDisplay.LEFT || contentDisplay == ContentDisplay.RIGHT)) {
+                width -= (graphic.prefWidth(-1) + gap);
+            }
+
+            width -= widthPadding;
+
+            // TODO figure out how to cache this effectively.
+            final double textHeight = Utils.computeTextHeight(font, str,
+                    labeled.isWrapText() ? width : 0, text.getBoundsType());
+
+            // Now we want to add on the graphic if necessary!
+            double h = textHeight;
+            if (!isIgnoreGraphic()) {
+                final Node graphic = labeled.getGraphic();
+                if (contentDisplay == ContentDisplay.TOP || contentDisplay == ContentDisplay.BOTTOM) {
+                    h = graphic.prefHeight(-1) + gap + textHeight;
+                } else {
+                    h = Math.max(textHeight, graphic.prefHeight(-1));
+                }
+            }
+
+            return h + labelPadding.getTop() + labelPadding.getBottom();
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ToggleButtonSkin.java	2015-09-03 15:23:56.068133000 -0700
+++ /dev/null	2015-09-03 15:23:57.000000000 -0700
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2010, 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 com.sun.javafx.scene.control.behavior.ToggleButtonBehavior;
-import javafx.scene.control.ToggleButton;
-
-public class ToggleButtonSkin extends LabeledSkinBase<ToggleButton, ToggleButtonBehavior<ToggleButton>> {
-
-    public ToggleButtonSkin(ToggleButton toggleButton) {
-        super(toggleButton, new ToggleButtonBehavior<>(toggleButton));
-    }
-}
--- /dev/null	2015-09-03 15:23:57.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ToggleButtonSkin.java	2015-09-03 15:23:55.271087400 -0700
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.ToggleButtonBehavior;
+import javafx.scene.Node;
+import javafx.scene.control.Accordion;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.ToggleButton;
+
+/**
+ * Default skin implementation for the {@link ToggleButton} control.
+ *
+ * @see ToggleButton
+ * @since 9
+ */
+public class ToggleButtonSkin extends LabeledSkinBase<ToggleButton> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final BehaviorBase<ToggleButton> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ToggleButtonSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ToggleButtonSkin(ToggleButton control) {
+        super(control);
+
+        // install default input map for the ToggleButton control
+        behavior = new ToggleButtonBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ToolBarSkin.java	2015-09-03 15:24:04.314604700 -0700
+++ /dev/null	2015-09-03 15:24:05.000000000 -0700
@@ -1,793 +0,0 @@
-/*
- * Copyright (c) 2010, 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.sun.javafx.scene.traversal.Algorithm;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import com.sun.javafx.scene.traversal.TraversalContext;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.value.WritableValue;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.geometry.HPos;
-import javafx.geometry.Orientation;
-import javafx.geometry.Pos;
-import javafx.geometry.Side;
-import javafx.geometry.VPos;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.CustomMenuItem;
-import javafx.scene.control.Separator;
-import javafx.scene.control.SeparatorMenuItem;
-import javafx.scene.control.SkinBase;
-import javafx.scene.control.ToolBar;
-import javafx.scene.input.KeyCode;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableObjectProperty;
-import javafx.css.StyleableProperty;
-import javafx.css.CssMetaData;
-
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.behavior.ToolBarBehavior;
-import com.sun.javafx.scene.traversal.Direction;
-
-import javafx.css.Styleable;
-
-import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
-
-public class ToolBarSkin extends BehaviorSkinBase<ToolBar, ToolBarBehavior> {
-
-    private Pane box;
-    private ToolBarOverflowMenu overflowMenu;
-    private boolean overflow = false;
-    private double previousWidth = 0;
-    private double previousHeight = 0;
-    private double savedPrefWidth = 0;
-    private double savedPrefHeight = 0;
-    private ObservableList<MenuItem> overflowMenuItems;
-    private boolean needsUpdate = false;
-    private final ParentTraversalEngine engine;
-
-    public ToolBarSkin(ToolBar toolbar) {
-        super(toolbar, new ToolBarBehavior(toolbar));
-        overflowMenuItems = FXCollections.observableArrayList();
-        initialize();
-        registerChangeListener(toolbar.orientationProperty(), "ORIENTATION");
-
-        engine = new ParentTraversalEngine(getSkinnable(), new Algorithm() {
-
-            private Node selectPrev(int from, TraversalContext context) {
-                for (int i = from; i >= 0; --i) {
-                    Node n = box.getChildren().get(i);
-                    if (n.isDisabled() || !n.impl_isTreeVisible()) continue;
-                    if (n instanceof Parent) {
-                        Node selected = context.selectLastInParent((Parent)n);
-                        if (selected != null) return selected;
-                    }
-                    if (n.isFocusTraversable() ) {
-                        return n;
-                    }
-                }
-                return null;
-            }
-
-            private Node selectNext(int from, TraversalContext context) {
-                for (int i = from, max = box.getChildren().size(); i < max; ++i) {
-                    Node n = box.getChildren().get(i);
-                    if (n.isDisabled() || !n.impl_isTreeVisible()) continue;
-                    if (n.isFocusTraversable()) {
-                        return n;
-                    }
-                    if (n instanceof Parent) {
-                        Node selected = context.selectFirstInParent((Parent)n);
-                        if (selected != null) return selected;
-                    }
-                }
-                return null;
-            }
-
-            @Override
-            public Node select(Node owner, Direction dir, TraversalContext context) {
-                final ObservableList<Node> boxChildren = box.getChildren();
-                if (owner == overflowMenu) {
-                    if (dir.isForward()) {
-                        return null;
-                    } else {
-                        Node selected = selectPrev(boxChildren.size() - 1, context);
-                        if (selected != null) return selected;
-                    }
-                }
-
-                int idx = boxChildren.indexOf(owner);
-
-                if (idx < 0) {
-                    // The current focus owner is a child of some Toolbar's item
-                    Parent item = owner.getParent();
-                    while (!boxChildren.contains(item)) {
-                        item = item.getParent();
-                    }
-                    Node selected = context.selectInSubtree(item, owner, dir);
-                    if (selected != null) return selected;
-                    idx = boxChildren.indexOf(owner);
-                    if (dir == Direction.NEXT) dir = Direction.NEXT_IN_LINE;
-                }
-
-                if (idx >= 0) {
-                    if (dir.isForward()) {
-                        Node selected = selectNext(idx + 1, context);
-                        if (selected != null) return selected;
-                        if (overflow) {
-                            overflowMenu.requestFocus();
-                            return overflowMenu;
-                        }
-                    } else {
-                        Node selected = selectPrev(idx - 1, context);
-                        if (selected != null) return selected;
-                    }
-                }
-                return null;
-            }
-
-            @Override
-            public Node selectFirst(TraversalContext context) {
-                Node selected = selectNext(0, context);
-                if (selected != null) return selected;
-                if (overflow) {
-                    return overflowMenu;
-                }
-                return null;
-            }
-
-            @Override
-            public Node selectLast(TraversalContext context) {
-                if (overflow) {
-                    return overflowMenu;
-                }
-                return selectPrev(box.getChildren().size() - 1, context);
-            }
-        });
-        getSkinnable().setImpl_traversalEngine(engine);
-
-        toolbar.focusedProperty().addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                // TODO need to detect the focus direction
-                // to selected the first control in the toolbar when TAB is pressed
-                // or select the last control in the toolbar when SHIFT TAB is pressed.
-                if (!box.getChildren().isEmpty()) {
-                    box.getChildren().get(0).requestFocus();
-                } else {
-                    overflowMenu.requestFocus();
-                }
-            }
-        });
-
-        toolbar.getItems().addListener((ListChangeListener<Node>) c -> {
-            while (c.next()) {
-                for (Node n: c.getRemoved()) {
-                    box.getChildren().remove(n);
-                }
-                box.getChildren().addAll(c.getAddedSubList());
-            }
-            needsUpdate = true;
-            getSkinnable().requestLayout();
-        });
-    }
-
-    private DoubleProperty spacing;
-    public final void setSpacing(double value) {
-        spacingProperty().set(snapSpace(value));
-    }
-
-    public final double getSpacing() {
-        return spacing == null ? 0.0 : snapSpace(spacing.get());
-    }
-
-    public final DoubleProperty spacingProperty() {
-        if (spacing == null) {
-            spacing = new StyleableDoubleProperty() {
-
-                @Override
-                protected void invalidated() {
-                    final double value = get();
-                    if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                        ((VBox)box).setSpacing(value);
-                    } else {
-                        ((HBox)box).setSpacing(value);
-                    }
-                }
-
-                @Override
-                public Object getBean() {
-                    return ToolBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "spacing";
-                }
-
-                @Override
-                public CssMetaData<ToolBar,Number> getCssMetaData() {
-                    return StyleableProperties.SPACING;
-                }
-            };
-        }
-        return spacing;
-    }
-
-    private ObjectProperty<Pos> boxAlignment;
-    public final void setBoxAlignment(Pos value) {
-        boxAlignmentProperty().set(value);
-    }
-
-    public final Pos getBoxAlignment() {
-        return boxAlignment == null ? Pos.TOP_LEFT : boxAlignment.get();
-    }
-
-    public final ObjectProperty<Pos> boxAlignmentProperty() {
-        if (boxAlignment == null) {
-            boxAlignment = new StyleableObjectProperty<Pos>(Pos.TOP_LEFT) {
-
-                @Override
-                public void invalidated() {
-                    final Pos value = get();
-                    if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                        ((VBox)box).setAlignment(value);
-                    } else {
-                        ((HBox)box).setAlignment(value);
-                    }
-                }
-
-                @Override
-                public Object getBean() {
-                    return ToolBarSkin.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "boxAlignment";
-                }
-
-                @Override
-                public CssMetaData<ToolBar,Pos> getCssMetaData() {
-                    return StyleableProperties.ALIGNMENT;
-                }
-            };
-        }
-        return boxAlignment;
-    }
-
-    @Override protected void handleControlPropertyChanged(String property) {
-        super.handleControlPropertyChanged(property);
-        if ("ORIENTATION".equals(property)) {
-            initialize();
-        }
-    }
-
-    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ToolBar toolbar = getSkinnable();
-        return toolbar.getOrientation() == Orientation.VERTICAL ?
-            computePrefWidth(-1, topInset, rightInset, bottomInset, leftInset) :
-            snapSize(overflowMenu.prefWidth(-1)) + leftInset + rightInset;
-    }
-
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        final ToolBar toolbar = getSkinnable();
-        return toolbar.getOrientation() == Orientation.VERTICAL?
-            snapSize(overflowMenu.prefHeight(-1)) + topInset + bottomInset :
-            computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset);
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double prefWidth = 0;
-        final ToolBar toolbar = getSkinnable();
-
-        if (toolbar.getOrientation() == Orientation.HORIZONTAL) {
-            for (Node node : toolbar.getItems()) {
-                prefWidth += snapSize(node.prefWidth(-1)) + getSpacing();
-            }
-            prefWidth -= getSpacing();
-        } else {
-            for (Node node : toolbar.getItems()) {
-                prefWidth = Math.max(prefWidth, snapSize(node.prefWidth(-1)));
-            }
-            if (toolbar.getItems().size() > 0) {
-                savedPrefWidth = prefWidth;
-            } else {
-                prefWidth = savedPrefWidth;
-            }
-        }
-        return leftInset + prefWidth + rightInset;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double prefHeight = 0;
-        final ToolBar toolbar = getSkinnable();
-        
-        if(toolbar.getOrientation() == Orientation.VERTICAL) {
-            for (Node node: toolbar.getItems()) {
-                prefHeight += snapSize(node.prefHeight(-1)) + getSpacing();
-            }
-            prefHeight -= getSpacing();
-        } else {
-            for (Node node : toolbar.getItems()) {
-                prefHeight = Math.max(prefHeight, snapSize(node.prefHeight(-1)));
-            }
-            if (toolbar.getItems().size() > 0) {
-                savedPrefHeight = prefHeight;
-            } else {
-                prefHeight = savedPrefHeight;
-            }
-        }
-        return topInset + prefHeight + bottomInset;
-    }
-
-    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().getOrientation() == Orientation.VERTICAL ?
-                snapSize(getSkinnable().prefWidth(-1)) : Double.MAX_VALUE;
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return getSkinnable().getOrientation() == Orientation.VERTICAL ?
-                Double.MAX_VALUE : snapSize(getSkinnable().prefHeight(-1));
-    }
-
-    @Override protected void layoutChildren(final double x,final double y,
-            final double w, final double h) {
-//        super.layoutChildren();
-        final ToolBar toolbar = getSkinnable();
-
-        if (toolbar.getOrientation() == Orientation.VERTICAL) {
-            if (snapSize(toolbar.getHeight()) != previousHeight || needsUpdate) {
-                ((VBox)box).setSpacing(getSpacing());
-                ((VBox)box).setAlignment(getBoxAlignment());
-                previousHeight = snapSize(toolbar.getHeight());
-                addNodesToToolBar();
-            }
-        } else {
-            if (snapSize(toolbar.getWidth()) != previousWidth || needsUpdate) {
-                ((HBox)box).setSpacing(getSpacing());
-                ((HBox)box).setAlignment(getBoxAlignment());
-                previousWidth = snapSize(toolbar.getWidth());
-                addNodesToToolBar();
-            }
-        }
-        needsUpdate = false;
-
-        double toolbarWidth = w;
-        double toolbarHeight = h;
-
-        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-            toolbarHeight -= (overflow ? snapSize(overflowMenu.prefHeight(-1)) : 0);
-        } else {
-            toolbarWidth -= (overflow ? snapSize(overflowMenu.prefWidth(-1)) : 0);
-        }
-
-        box.resize(toolbarWidth, toolbarHeight);
-        positionInArea(box, x, y,
-                toolbarWidth, toolbarHeight, /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-
-        // If popup menu is not null show the overflowControl
-        if (overflow) {
-            double overflowMenuWidth = snapSize(overflowMenu.prefWidth(-1));
-            double overflowMenuHeight = snapSize(overflowMenu.prefHeight(-1));
-            double overflowX = x;
-            double overflowY = x;
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                // This is to prevent the overflow menu from moving when there
-                // are no items in the toolbar.
-                if (toolbarWidth == 0) {
-                    toolbarWidth = savedPrefWidth;
-                }
-                HPos pos = ((VBox)box).getAlignment().getHpos();
-                if (HPos.LEFT.equals(pos)) {
-                    overflowX = x + Math.abs((toolbarWidth - overflowMenuWidth)/2);
-                } else if (HPos.RIGHT.equals(pos)) {
-                    overflowX = (snapSize(toolbar.getWidth()) - snappedRightInset() - toolbarWidth) +
-                        Math.abs((toolbarWidth - overflowMenuWidth)/2);
-                } else {
-                    overflowX = x +
-                        Math.abs((snapSize(toolbar.getWidth()) - (x) +
-                        snappedRightInset() - overflowMenuWidth)/2);
-                }
-                overflowY = snapSize(toolbar.getHeight()) - overflowMenuHeight - y;
-            } else {
-                // This is to prevent the overflow menu from moving when there
-                // are no items in the toolbar.
-                if (toolbarHeight == 0) {
-                    toolbarHeight = savedPrefHeight;
-                }
-                VPos pos = ((HBox)box).getAlignment().getVpos();
-                if (VPos.TOP.equals(pos)) {
-                    overflowY = y +
-                        Math.abs((toolbarHeight - overflowMenuHeight)/2);
-                } else if (VPos.BOTTOM.equals(pos)) {
-                    overflowY = (snapSize(toolbar.getHeight()) - snappedBottomInset() - toolbarHeight) +
-                        Math.abs((toolbarHeight - overflowMenuHeight)/2);
-                } else {
-                    overflowY = y + Math.abs((toolbarHeight - overflowMenuHeight)/2);
-                }
-               overflowX = snapSize(toolbar.getWidth()) - overflowMenuWidth - snappedRightInset();
-            }
-            overflowMenu.resize(overflowMenuWidth, overflowMenuHeight);
-            positionInArea(overflowMenu, overflowX, overflowY, overflowMenuWidth, overflowMenuHeight, /*baseline ignored*/0,
-                    HPos.CENTER, VPos.CENTER);
-        }
-    }
-
-    private void initialize() {
-        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-            box = new VBox();
-        } else {
-            box = new HBox();
-        }
-        box.getStyleClass().add("container");
-        box.getChildren().addAll(getSkinnable().getItems());
-        overflowMenu = new ToolBarOverflowMenu(overflowMenuItems);
-        overflowMenu.setVisible(false);
-        overflowMenu.setManaged(false);
-
-        getChildren().clear();
-        getChildren().add(box);
-        getChildren().add(overflowMenu);
-
-        previousWidth = 0;
-        previousHeight = 0;
-        savedPrefWidth = 0;
-        savedPrefHeight = 0;
-        needsUpdate = true;
-        getSkinnable().requestLayout();
-    }
-
-    private void addNodesToToolBar() {
-        final ToolBar toolbar = getSkinnable();
-        double length = 0;
-        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-            length = snapSize(toolbar.getHeight()) - snappedTopInset() - snappedBottomInset() + getSpacing();
-        } else {
-            length = snapSize(toolbar.getWidth()) - snappedLeftInset() - snappedRightInset() + getSpacing();
-        }
-
-        // Is there overflow ?
-        double x = 0;
-        boolean hasOverflow = false;
-        for (Node node : getSkinnable().getItems()) {
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                x += snapSize(node.prefHeight(-1)) + getSpacing();
-            } else {
-                x += snapSize(node.prefWidth(-1)) + getSpacing();
-            }
-            if (x > length) {
-                hasOverflow = true;
-                break;
-            }
-        }
-
-        if (hasOverflow) {
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                length -= snapSize(overflowMenu.prefHeight(-1));
-            } else {
-                length -= snapSize(overflowMenu.prefWidth(-1));
-            }
-            length -= getSpacing();
-        }
-
-        // Determine which node goes to the toolbar and which goes to the overflow.
-        x = 0;
-        overflowMenuItems.clear();
-        box.getChildren().clear();
-        for (Node node : getSkinnable().getItems()) {
-            node.getStyleClass().remove("menu-item");
-            node.getStyleClass().remove("custom-menu-item");
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                x += snapSize(node.prefHeight(-1)) + getSpacing();
-            } else {
-                x += snapSize(node.prefWidth(-1)) + getSpacing();
-            }
-            if (x <= length) {
-                box.getChildren().add(node);
-            } else {
-                if (node.isFocused()) {
-                    if (!box.getChildren().isEmpty()) {
-                        Node last = engine.selectLast();
-                        if (last != null) {
-                            last.requestFocus();
-                        }
-                    } else {
-                        overflowMenu.requestFocus();                        
-                    }
-                }
-                if (node instanceof Separator) {
-                    overflowMenuItems.add(new SeparatorMenuItem());
-                } else {
-                    CustomMenuItem customMenuItem = new CustomMenuItem(node);
-
-                    // RT-36455:
-                    // We can't be totally certain of all nodes, but for the
-                    // most common nodes we can check to see whether we should
-                    // hide the menu when the node is clicked on. The common
-                    // case is for TextField or Slider.
-                    // This list won't be exhaustive (there is no point really
-                    // considering the ListView case), but it should try to
-                    // include most common control types that find themselves
-                    // placed in menus.
-                    final String nodeType = node.getTypeSelector();
-                    switch (nodeType) {
-                        case "Button":
-                        case "Hyperlink":
-                        case "Label":
-                            customMenuItem.setHideOnClick(true);
-                            break;
-                        case "CheckBox":
-                        case "ChoiceBox":
-                        case "ColorPicker":
-                        case "ComboBox":
-                        case "DatePicker":
-                        case "MenuButton":
-                        case "PasswordField":
-                        case "RadioButton":
-                        case "ScrollBar":
-                        case "ScrollPane":
-                        case "Slider":
-                        case "SplitMenuButton":
-                        case "SplitPane":
-                        case "TextArea":
-                        case "TextField":
-                        case "ToggleButton":
-                        case "ToolBar":
-                            customMenuItem.setHideOnClick(false);
-                            break;
-                    }
-
-                    overflowMenuItems.add(customMenuItem);
-                }
-            }
-        }
-
-        // Check if we overflowed.
-        overflow = overflowMenuItems.size() > 0;
-        if (!overflow && overflowMenu.isFocused()) {
-            Node last = engine.selectLast();
-            if (last != null) {
-                last.requestFocus();
-            }
-        }
-        overflowMenu.setVisible(overflow);
-        overflowMenu.setManaged(overflow);
-    }
-
-    class ToolBarOverflowMenu extends StackPane {
-        private StackPane downArrow;
-        private ContextMenu popup;
-        private ObservableList<MenuItem> menuItems;
-
-        public ToolBarOverflowMenu(ObservableList<MenuItem> items) {
-            getStyleClass().setAll("tool-bar-overflow-button");
-            setAccessibleRole(AccessibleRole.BUTTON);
-            setAccessibleText(getString("Accessibility.title.ToolBar.OverflowButton"));
-            setFocusTraversable(true);
-            this.menuItems = items;
-            downArrow = new StackPane();
-            downArrow.getStyleClass().setAll("arrow");
-            downArrow.setOnMousePressed(me -> {
-                fire();
-            });
-
-            setOnKeyPressed(ke -> {
-                if (KeyCode.SPACE.equals(ke.getCode())) {
-                    if (!popup.isShowing()) {
-                        popup.getItems().clear();
-                        popup.getItems().addAll(menuItems);
-                        popup.show(downArrow, Side.BOTTOM, 0, 0);
-                    }
-                    ke.consume();
-                } else if (KeyCode.ESCAPE.equals(ke.getCode())) {
-                    if (popup.isShowing()) {
-                        popup.hide();
-                    }
-                    ke.consume();
-                } else if (KeyCode.ENTER.equals(ke.getCode())) {
-                    fire();
-                    ke.consume();
-                }
-            });
-
-            visibleProperty().addListener((observable, oldValue, newValue) -> {
-                    if (newValue) {
-                        if (box.getChildren().isEmpty()) {
-                            setFocusTraversable(true);
-                        }
-                    }
-            });
-            popup = new ContextMenu();
-            setVisible(false);
-            setManaged(false);            
-            getChildren().add(downArrow);            
-        }
-
-        private void fire() {
-            if (popup.isShowing()) {
-                popup.hide();
-            } else {
-                popup.getItems().clear();
-                popup.getItems().addAll(menuItems);
-                popup.show(downArrow, Side.BOTTOM, 0, 0);
-            }
-        }
-
-        @Override protected double computePrefWidth(double height) {
-            return snappedLeftInset() + snappedRightInset();
-        }
-
-        @Override protected double computePrefHeight(double width) {
-            return snappedTopInset() + snappedBottomInset();
-        }
-
-        @Override protected void layoutChildren() {
-            double w = snapSize(downArrow.prefWidth(-1));
-            double h = snapSize(downArrow.prefHeight(-1));
-            double x = (snapSize(getWidth()) - w)/2;
-            double y = (snapSize(getHeight()) - h)/2;
-
-            // TODO need to provide support for when the toolbar is on the right
-            // or bottom
-            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
-                downArrow.setRotate(0);
-            }
-
-            downArrow.resize(w, h);
-            positionInArea(downArrow, x, y, w, h,
-                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
-        }
-
-        @Override
-        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-            switch (action) {
-                case FIRE: fire(); break;
-                default: super.executeAccessibleAction(action); break;
-            }
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                         Stylesheet Handling                             *
-     *                                                                         *
-     **************************************************************************/
-
-     /**
-      * Super-lazy instantiation pattern from Bill Pugh.
-      * @treatAsPrivate implementation detail
-      */
-     private static class StyleableProperties {
-         private static final CssMetaData<ToolBar,Number> SPACING =
-             new CssMetaData<ToolBar,Number>("-fx-spacing",
-                 SizeConverter.getInstance(), 0.0) {
-
-            @Override
-            public boolean isSettable(ToolBar n) {
-                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
-                return skin.spacing == null || !skin.spacing.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Number> getStyleableProperty(ToolBar n) {
-                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
-                return (StyleableProperty<Number>)(WritableValue<Number>)skin.spacingProperty();
-            }
-        };
-         
-        private static final CssMetaData<ToolBar,Pos>ALIGNMENT =
-                new CssMetaData<ToolBar,Pos>("-fx-alignment",
-                new EnumConverter<Pos>(Pos.class), Pos.TOP_LEFT ) {
-
-            @Override
-            public boolean isSettable(ToolBar n) {
-                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
-                return skin.boxAlignment == null || !skin.boxAlignment.isBound();
-            }
-
-            @Override
-            public StyleableProperty<Pos> getStyleableProperty(ToolBar n) {
-                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
-                return (StyleableProperty<Pos>)(WritableValue<Pos>)skin.boxAlignmentProperty();
-            }
-        };
-
-         
-         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-         static {
-
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
-            
-            // StackPane also has -fx-alignment. Replace it with 
-            // ToolBarSkin's. 
-            // TODO: Really should be able to reference StackPane.StyleableProperties.ALIGNMENT
-            final String alignmentProperty = ALIGNMENT.getProperty();
-            for (int n=0, nMax=styleables.size(); n<nMax; n++) {
-                final CssMetaData<?,?> prop = styleables.get(n);
-                if (alignmentProperty.equals(prop.getProperty())) styleables.remove(prop);
-            }
-            
-            styleables.add(SPACING);
-            styleables.add(ALIGNMENT);
-            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();
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case OVERFLOW_BUTTON: return overflowMenu;
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-    @Override
-    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-        switch (action) {
-            case SHOW_MENU: 
-                overflowMenu.fire();
-                break;
-            default: super.executeAccessibleAction(action, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:24:05.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/ToolBarSkin.java	2015-09-03 15:24:03.527559600 -0700
@@ -0,0 +1,871 @@
+/*
+ * Copyright (c) 2010, 2015 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.traversal.Algorithm;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalContext;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.value.WritableValue;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.HPos;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.geometry.Side;
+import javafx.geometry.VPos;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Control;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.CustomMenuItem;
+import javafx.scene.control.Separator;
+import javafx.scene.control.SeparatorMenuItem;
+import javafx.scene.control.SkinBase;
+import javafx.scene.control.ToolBar;
+import javafx.scene.input.KeyCode;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
+import javafx.css.CssMetaData;
+
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.behavior.ToolBarBehavior;
+import com.sun.javafx.scene.traversal.Direction;
+
+import javafx.css.Styleable;
+
+import static com.sun.javafx.scene.control.skin.resources.ControlResources.getString;
+
+/**
+ * Default skin implementation for the {@link ToolBar} control.
+ *
+ * @see ToolBar
+ * @since 9
+ */
+public class ToolBarSkin extends SkinBase<ToolBar> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private Pane box;
+    private ToolBarOverflowMenu overflowMenu;
+    private boolean overflow = false;
+    private double previousWidth = 0;
+    private double previousHeight = 0;
+    private double savedPrefWidth = 0;
+    private double savedPrefHeight = 0;
+    private ObservableList<MenuItem> overflowMenuItems;
+    private boolean needsUpdate = false;
+    private final ParentTraversalEngine engine;
+    private final BehaviorBase<ToolBar> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new ToolBarSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public ToolBarSkin(ToolBar control) {
+        super(control);
+
+        // install default input map for the ToolBar control
+        behavior = new ToolBarBehavior(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        overflowMenuItems = FXCollections.observableArrayList();
+        initialize();
+        registerChangeListener(control.orientationProperty(), e -> initialize());
+
+        engine = new ParentTraversalEngine(getSkinnable(), new Algorithm() {
+
+            private Node selectPrev(int from, TraversalContext context) {
+                for (int i = from; i >= 0; --i) {
+                    Node n = box.getChildren().get(i);
+                    if (n.isDisabled() || !n.impl_isTreeVisible()) continue;
+                    if (n instanceof Parent) {
+                        Node selected = context.selectLastInParent((Parent)n);
+                        if (selected != null) return selected;
+                    }
+                    if (n.isFocusTraversable() ) {
+                        return n;
+                    }
+                }
+                return null;
+            }
+
+            private Node selectNext(int from, TraversalContext context) {
+                for (int i = from, max = box.getChildren().size(); i < max; ++i) {
+                    Node n = box.getChildren().get(i);
+                    if (n.isDisabled() || !n.impl_isTreeVisible()) continue;
+                    if (n.isFocusTraversable()) {
+                        return n;
+                    }
+                    if (n instanceof Parent) {
+                        Node selected = context.selectFirstInParent((Parent)n);
+                        if (selected != null) return selected;
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            public Node select(Node owner, Direction dir, TraversalContext context) {
+                final ObservableList<Node> boxChildren = box.getChildren();
+                if (owner == overflowMenu) {
+                    if (dir.isForward()) {
+                        return null;
+                    } else {
+                        Node selected = selectPrev(boxChildren.size() - 1, context);
+                        if (selected != null) return selected;
+                    }
+                }
+
+                int idx = boxChildren.indexOf(owner);
+
+                if (idx < 0) {
+                    // The current focus owner is a child of some Toolbar's item
+                    Parent item = owner.getParent();
+                    while (!boxChildren.contains(item)) {
+                        item = item.getParent();
+                    }
+                    Node selected = context.selectInSubtree(item, owner, dir);
+                    if (selected != null) return selected;
+                    idx = boxChildren.indexOf(owner);
+                    if (dir == Direction.NEXT) dir = Direction.NEXT_IN_LINE;
+                }
+
+                if (idx >= 0) {
+                    if (dir.isForward()) {
+                        Node selected = selectNext(idx + 1, context);
+                        if (selected != null) return selected;
+                        if (overflow) {
+                            overflowMenu.requestFocus();
+                            return overflowMenu;
+                        }
+                    } else {
+                        Node selected = selectPrev(idx - 1, context);
+                        if (selected != null) return selected;
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            public Node selectFirst(TraversalContext context) {
+                Node selected = selectNext(0, context);
+                if (selected != null) return selected;
+                if (overflow) {
+                    return overflowMenu;
+                }
+                return null;
+            }
+
+            @Override
+            public Node selectLast(TraversalContext context) {
+                if (overflow) {
+                    return overflowMenu;
+                }
+                return selectPrev(box.getChildren().size() - 1, context);
+            }
+        });
+        getSkinnable().setImpl_traversalEngine(engine);
+
+        control.focusedProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                // TODO need to detect the focus direction
+                // to selected the first control in the toolbar when TAB is pressed
+                // or select the last control in the toolbar when SHIFT TAB is pressed.
+                if (!box.getChildren().isEmpty()) {
+                    box.getChildren().get(0).requestFocus();
+                } else {
+                    overflowMenu.requestFocus();
+                }
+            }
+        });
+
+        control.getItems().addListener((ListChangeListener<Node>) c -> {
+            while (c.next()) {
+                for (Node n: c.getRemoved()) {
+                    box.getChildren().remove(n);
+                }
+                box.getChildren().addAll(c.getAddedSubList());
+            }
+            needsUpdate = true;
+            getSkinnable().requestLayout();
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    // --- spacing
+    private DoubleProperty spacing;
+    private final void setSpacing(double value) {
+        spacingProperty().set(snapSpace(value));
+    }
+
+    private final double getSpacing() {
+        return spacing == null ? 0.0 : snapSpace(spacing.get());
+    }
+
+    private final DoubleProperty spacingProperty() {
+        if (spacing == null) {
+            spacing = new StyleableDoubleProperty() {
+
+                @Override
+                protected void invalidated() {
+                    final double value = get();
+                    if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                        ((VBox)box).setSpacing(value);
+                    } else {
+                        ((HBox)box).setSpacing(value);
+                    }
+                }
+
+                @Override
+                public Object getBean() {
+                    return ToolBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "spacing";
+                }
+
+                @Override
+                public CssMetaData<ToolBar,Number> getCssMetaData() {
+                    return StyleableProperties.SPACING;
+                }
+            };
+        }
+        return spacing;
+    }
+
+    // --- box alignment
+    private ObjectProperty<Pos> boxAlignment;
+    private final void setBoxAlignment(Pos value) {
+        boxAlignmentProperty().set(value);
+    }
+
+    private final Pos getBoxAlignment() {
+        return boxAlignment == null ? Pos.TOP_LEFT : boxAlignment.get();
+    }
+
+    private final ObjectProperty<Pos> boxAlignmentProperty() {
+        if (boxAlignment == null) {
+            boxAlignment = new StyleableObjectProperty<Pos>(Pos.TOP_LEFT) {
+
+                @Override
+                public void invalidated() {
+                    final Pos value = get();
+                    if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                        ((VBox)box).setAlignment(value);
+                    } else {
+                        ((HBox)box).setAlignment(value);
+                    }
+                }
+
+                @Override
+                public Object getBean() {
+                    return ToolBarSkin.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "boxAlignment";
+                }
+
+                @Override
+                public CssMetaData<ToolBar,Pos> getCssMetaData() {
+                    return StyleableProperties.ALIGNMENT;
+                }
+            };
+        }
+        return boxAlignment;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ToolBar toolbar = getSkinnable();
+        return toolbar.getOrientation() == Orientation.VERTICAL ?
+            computePrefWidth(-1, topInset, rightInset, bottomInset, leftInset) :
+            snapSize(overflowMenu.prefWidth(-1)) + leftInset + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        final ToolBar toolbar = getSkinnable();
+        return toolbar.getOrientation() == Orientation.VERTICAL?
+            snapSize(overflowMenu.prefHeight(-1)) + topInset + bottomInset :
+            computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double prefWidth = 0;
+        final ToolBar toolbar = getSkinnable();
+
+        if (toolbar.getOrientation() == Orientation.HORIZONTAL) {
+            for (Node node : toolbar.getItems()) {
+                prefWidth += snapSize(node.prefWidth(-1)) + getSpacing();
+            }
+            prefWidth -= getSpacing();
+        } else {
+            for (Node node : toolbar.getItems()) {
+                prefWidth = Math.max(prefWidth, snapSize(node.prefWidth(-1)));
+            }
+            if (toolbar.getItems().size() > 0) {
+                savedPrefWidth = prefWidth;
+            } else {
+                prefWidth = savedPrefWidth;
+            }
+        }
+        return leftInset + prefWidth + rightInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double prefHeight = 0;
+        final ToolBar toolbar = getSkinnable();
+        
+        if(toolbar.getOrientation() == Orientation.VERTICAL) {
+            for (Node node: toolbar.getItems()) {
+                prefHeight += snapSize(node.prefHeight(-1)) + getSpacing();
+            }
+            prefHeight -= getSpacing();
+        } else {
+            for (Node node : toolbar.getItems()) {
+                prefHeight = Math.max(prefHeight, snapSize(node.prefHeight(-1)));
+            }
+            if (toolbar.getItems().size() > 0) {
+                savedPrefHeight = prefHeight;
+            } else {
+                prefHeight = savedPrefHeight;
+            }
+        }
+        return topInset + prefHeight + bottomInset;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().getOrientation() == Orientation.VERTICAL ?
+                snapSize(getSkinnable().prefWidth(-1)) : Double.MAX_VALUE;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return getSkinnable().getOrientation() == Orientation.VERTICAL ?
+                Double.MAX_VALUE : snapSize(getSkinnable().prefHeight(-1));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x,final double y,
+            final double w, final double h) {
+//        super.layoutChildren();
+        final ToolBar toolbar = getSkinnable();
+
+        if (toolbar.getOrientation() == Orientation.VERTICAL) {
+            if (snapSize(toolbar.getHeight()) != previousHeight || needsUpdate) {
+                ((VBox)box).setSpacing(getSpacing());
+                ((VBox)box).setAlignment(getBoxAlignment());
+                previousHeight = snapSize(toolbar.getHeight());
+                addNodesToToolBar();
+            }
+        } else {
+            if (snapSize(toolbar.getWidth()) != previousWidth || needsUpdate) {
+                ((HBox)box).setSpacing(getSpacing());
+                ((HBox)box).setAlignment(getBoxAlignment());
+                previousWidth = snapSize(toolbar.getWidth());
+                addNodesToToolBar();
+            }
+        }
+        needsUpdate = false;
+
+        double toolbarWidth = w;
+        double toolbarHeight = h;
+
+        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+            toolbarHeight -= (overflow ? snapSize(overflowMenu.prefHeight(-1)) : 0);
+        } else {
+            toolbarWidth -= (overflow ? snapSize(overflowMenu.prefWidth(-1)) : 0);
+        }
+
+        box.resize(toolbarWidth, toolbarHeight);
+        positionInArea(box, x, y,
+                toolbarWidth, toolbarHeight, /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+
+        // If popup menu is not null show the overflowControl
+        if (overflow) {
+            double overflowMenuWidth = snapSize(overflowMenu.prefWidth(-1));
+            double overflowMenuHeight = snapSize(overflowMenu.prefHeight(-1));
+            double overflowX = x;
+            double overflowY = x;
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                // This is to prevent the overflow menu from moving when there
+                // are no items in the toolbar.
+                if (toolbarWidth == 0) {
+                    toolbarWidth = savedPrefWidth;
+                }
+                HPos pos = ((VBox)box).getAlignment().getHpos();
+                if (HPos.LEFT.equals(pos)) {
+                    overflowX = x + Math.abs((toolbarWidth - overflowMenuWidth)/2);
+                } else if (HPos.RIGHT.equals(pos)) {
+                    overflowX = (snapSize(toolbar.getWidth()) - snappedRightInset() - toolbarWidth) +
+                        Math.abs((toolbarWidth - overflowMenuWidth)/2);
+                } else {
+                    overflowX = x +
+                        Math.abs((snapSize(toolbar.getWidth()) - (x) +
+                        snappedRightInset() - overflowMenuWidth)/2);
+                }
+                overflowY = snapSize(toolbar.getHeight()) - overflowMenuHeight - y;
+            } else {
+                // This is to prevent the overflow menu from moving when there
+                // are no items in the toolbar.
+                if (toolbarHeight == 0) {
+                    toolbarHeight = savedPrefHeight;
+                }
+                VPos pos = ((HBox)box).getAlignment().getVpos();
+                if (VPos.TOP.equals(pos)) {
+                    overflowY = y +
+                        Math.abs((toolbarHeight - overflowMenuHeight)/2);
+                } else if (VPos.BOTTOM.equals(pos)) {
+                    overflowY = (snapSize(toolbar.getHeight()) - snappedBottomInset() - toolbarHeight) +
+                        Math.abs((toolbarHeight - overflowMenuHeight)/2);
+                } else {
+                    overflowY = y + Math.abs((toolbarHeight - overflowMenuHeight)/2);
+                }
+               overflowX = snapSize(toolbar.getWidth()) - overflowMenuWidth - snappedRightInset();
+            }
+            overflowMenu.resize(overflowMenuWidth, overflowMenuHeight);
+            positionInArea(overflowMenu, overflowX, overflowY, overflowMenuWidth, overflowMenuHeight, /*baseline ignored*/0,
+                    HPos.CENTER, VPos.CENTER);
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void initialize() {
+        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+            box = new VBox();
+        } else {
+            box = new HBox();
+        }
+        box.getStyleClass().add("container");
+        box.getChildren().addAll(getSkinnable().getItems());
+        overflowMenu = new ToolBarOverflowMenu(overflowMenuItems);
+        overflowMenu.setVisible(false);
+        overflowMenu.setManaged(false);
+
+        getChildren().clear();
+        getChildren().add(box);
+        getChildren().add(overflowMenu);
+
+        previousWidth = 0;
+        previousHeight = 0;
+        savedPrefWidth = 0;
+        savedPrefHeight = 0;
+        needsUpdate = true;
+        getSkinnable().requestLayout();
+    }
+
+    private void addNodesToToolBar() {
+        final ToolBar toolbar = getSkinnable();
+        double length = 0;
+        if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+            length = snapSize(toolbar.getHeight()) - snappedTopInset() - snappedBottomInset() + getSpacing();
+        } else {
+            length = snapSize(toolbar.getWidth()) - snappedLeftInset() - snappedRightInset() + getSpacing();
+        }
+
+        // Is there overflow ?
+        double x = 0;
+        boolean hasOverflow = false;
+        for (Node node : getSkinnable().getItems()) {
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                x += snapSize(node.prefHeight(-1)) + getSpacing();
+            } else {
+                x += snapSize(node.prefWidth(-1)) + getSpacing();
+            }
+            if (x > length) {
+                hasOverflow = true;
+                break;
+            }
+        }
+
+        if (hasOverflow) {
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                length -= snapSize(overflowMenu.prefHeight(-1));
+            } else {
+                length -= snapSize(overflowMenu.prefWidth(-1));
+            }
+            length -= getSpacing();
+        }
+
+        // Determine which node goes to the toolbar and which goes to the overflow.
+        x = 0;
+        overflowMenuItems.clear();
+        box.getChildren().clear();
+        for (Node node : getSkinnable().getItems()) {
+            node.getStyleClass().remove("menu-item");
+            node.getStyleClass().remove("custom-menu-item");
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                x += snapSize(node.prefHeight(-1)) + getSpacing();
+            } else {
+                x += snapSize(node.prefWidth(-1)) + getSpacing();
+            }
+            if (x <= length) {
+                box.getChildren().add(node);
+            } else {
+                if (node.isFocused()) {
+                    if (!box.getChildren().isEmpty()) {
+                        Node last = engine.selectLast();
+                        if (last != null) {
+                            last.requestFocus();
+                        }
+                    } else {
+                        overflowMenu.requestFocus();                        
+                    }
+                }
+                if (node instanceof Separator) {
+                    overflowMenuItems.add(new SeparatorMenuItem());
+                } else {
+                    CustomMenuItem customMenuItem = new CustomMenuItem(node);
+
+                    // RT-36455:
+                    // We can't be totally certain of all nodes, but for the
+                    // most common nodes we can check to see whether we should
+                    // hide the menu when the node is clicked on. The common
+                    // case is for TextField or Slider.
+                    // This list won't be exhaustive (there is no point really
+                    // considering the ListView case), but it should try to
+                    // include most common control types that find themselves
+                    // placed in menus.
+                    final String nodeType = node.getTypeSelector();
+                    switch (nodeType) {
+                        case "Button":
+                        case "Hyperlink":
+                        case "Label":
+                            customMenuItem.setHideOnClick(true);
+                            break;
+                        case "CheckBox":
+                        case "ChoiceBox":
+                        case "ColorPicker":
+                        case "ComboBox":
+                        case "DatePicker":
+                        case "MenuButton":
+                        case "PasswordField":
+                        case "RadioButton":
+                        case "ScrollBar":
+                        case "ScrollPane":
+                        case "Slider":
+                        case "SplitMenuButton":
+                        case "SplitPane":
+                        case "TextArea":
+                        case "TextField":
+                        case "ToggleButton":
+                        case "ToolBar":
+                            customMenuItem.setHideOnClick(false);
+                            break;
+                    }
+
+                    overflowMenuItems.add(customMenuItem);
+                }
+            }
+        }
+
+        // Check if we overflowed.
+        overflow = overflowMenuItems.size() > 0;
+        if (!overflow && overflowMenu.isFocused()) {
+            Node last = engine.selectLast();
+            if (last != null) {
+                last.requestFocus();
+            }
+        }
+        overflowMenu.setVisible(overflow);
+        overflowMenu.setManaged(overflow);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    class ToolBarOverflowMenu extends StackPane {
+        private StackPane downArrow;
+        private ContextMenu popup;
+        private ObservableList<MenuItem> menuItems;
+
+        public ToolBarOverflowMenu(ObservableList<MenuItem> items) {
+            getStyleClass().setAll("tool-bar-overflow-button");
+            setAccessibleRole(AccessibleRole.BUTTON);
+            setAccessibleText(getString("Accessibility.title.ToolBar.OverflowButton"));
+            setFocusTraversable(true);
+            this.menuItems = items;
+            downArrow = new StackPane();
+            downArrow.getStyleClass().setAll("arrow");
+            downArrow.setOnMousePressed(me -> {
+                fire();
+            });
+
+            setOnKeyPressed(ke -> {
+                if (KeyCode.SPACE.equals(ke.getCode())) {
+                    if (!popup.isShowing()) {
+                        popup.getItems().clear();
+                        popup.getItems().addAll(menuItems);
+                        popup.show(downArrow, Side.BOTTOM, 0, 0);
+                    }
+                    ke.consume();
+                } else if (KeyCode.ESCAPE.equals(ke.getCode())) {
+                    if (popup.isShowing()) {
+                        popup.hide();
+                    }
+                    ke.consume();
+                } else if (KeyCode.ENTER.equals(ke.getCode())) {
+                    fire();
+                    ke.consume();
+                }
+            });
+
+            visibleProperty().addListener((observable, oldValue, newValue) -> {
+                    if (newValue) {
+                        if (box.getChildren().isEmpty()) {
+                            setFocusTraversable(true);
+                        }
+                    }
+            });
+            popup = new ContextMenu();
+            setVisible(false);
+            setManaged(false);            
+            getChildren().add(downArrow);            
+        }
+
+        private void fire() {
+            if (popup.isShowing()) {
+                popup.hide();
+            } else {
+                popup.getItems().clear();
+                popup.getItems().addAll(menuItems);
+                popup.show(downArrow, Side.BOTTOM, 0, 0);
+            }
+        }
+
+        @Override protected double computePrefWidth(double height) {
+            return snappedLeftInset() + snappedRightInset();
+        }
+
+        @Override protected double computePrefHeight(double width) {
+            return snappedTopInset() + snappedBottomInset();
+        }
+
+        @Override protected void layoutChildren() {
+            double w = snapSize(downArrow.prefWidth(-1));
+            double h = snapSize(downArrow.prefHeight(-1));
+            double x = (snapSize(getWidth()) - w)/2;
+            double y = (snapSize(getHeight()) - h)/2;
+
+            // TODO need to provide support for when the toolbar is on the right
+            // or bottom
+            if (getSkinnable().getOrientation() == Orientation.VERTICAL) {
+                downArrow.setRotate(0);
+            }
+
+            downArrow.resize(w, h);
+            positionInArea(downArrow, x, y, w, h,
+                    /*baseline ignored*/0, HPos.CENTER, VPos.CENTER);
+        }
+
+        @Override
+        public void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+            switch (action) {
+                case FIRE: fire(); break;
+                default: super.executeAccessibleAction(action); break;
+            }
+        }
+    }
+
+    /***************************************************************************
+     *                                                                         *
+     *                         Stylesheet Handling                             *
+     *                                                                         *
+     **************************************************************************/
+
+     /**
+      * Super-lazy instantiation pattern from Bill Pugh.
+      * @treatAsPrivate implementation detail
+      */
+     private static class StyleableProperties {
+         private static final CssMetaData<ToolBar,Number> SPACING =
+             new CssMetaData<ToolBar,Number>("-fx-spacing",
+                 SizeConverter.getInstance(), 0.0) {
+
+            @Override
+            public boolean isSettable(ToolBar n) {
+                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
+                return skin.spacing == null || !skin.spacing.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Number> getStyleableProperty(ToolBar n) {
+                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
+                return (StyleableProperty<Number>)(WritableValue<Number>)skin.spacingProperty();
+            }
+        };
+         
+        private static final CssMetaData<ToolBar,Pos>ALIGNMENT =
+                new CssMetaData<ToolBar,Pos>("-fx-alignment",
+                new EnumConverter<Pos>(Pos.class), Pos.TOP_LEFT ) {
+
+            @Override
+            public boolean isSettable(ToolBar n) {
+                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
+                return skin.boxAlignment == null || !skin.boxAlignment.isBound();
+            }
+
+            @Override
+            public StyleableProperty<Pos> getStyleableProperty(ToolBar n) {
+                final ToolBarSkin skin = (ToolBarSkin) n.getSkin();
+                return (StyleableProperty<Pos>)(WritableValue<Pos>)skin.boxAlignmentProperty();
+            }
+        };
+
+         
+         private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+         static {
+
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(SkinBase.getClassCssMetaData());
+            
+            // StackPane also has -fx-alignment. Replace it with 
+            // ToolBarSkin's. 
+            // TODO: Really should be able to reference StackPane.StyleableProperties.ALIGNMENT
+            final String alignmentProperty = ALIGNMENT.getProperty();
+            for (int n=0, nMax=styleables.size(); n<nMax; n++) {
+                final CssMetaData<?,?> prop = styleables.get(n);
+                if (alignmentProperty.equals(prop.getProperty())) styleables.remove(prop);
+            }
+            
+            styleables.add(SPACING);
+            styleables.add(ALIGNMENT);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+
+         }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+    @Override
+    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case OVERFLOW_BUTTON: return overflowMenu;
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    @Override
+    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+        switch (action) {
+            case SHOW_MENU: 
+                overflowMenu.fire();
+                break;
+            default: super.executeAccessibleAction(action, parameters);
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TooltipSkin.java	2015-09-03 15:24:12.381066000 -0700
+++ /dev/null	2015-09-03 15:24:13.000000000 -0700
@@ -1,83 +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.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.Skin;
-import javafx.scene.control.Tooltip;
-
-/**
- * CSS based skin for Tooltip. It deals mostly with show hide logic for
- * Popup based controls, and specifically in this case for tooltip. It also
- * implements some of the Skin interface methods.
- *
- * TooltipContent class is the actual skin implementation of the tooltip.
- */
-public class TooltipSkin implements Skin<Tooltip> { 
-    private Label tipLabel;
-
-    private Tooltip tooltip;
-
-    public TooltipSkin(Tooltip t) {
-        this.tooltip = t;
-        tipLabel = new Label();
-        tipLabel.contentDisplayProperty().bind(t.contentDisplayProperty());
-        tipLabel.fontProperty().bind(t.fontProperty());
-        tipLabel.graphicProperty().bind(t.graphicProperty());
-        tipLabel.graphicTextGapProperty().bind(t.graphicTextGapProperty());
-        tipLabel.textAlignmentProperty().bind(t.textAlignmentProperty());
-        tipLabel.textOverrunProperty().bind(t.textOverrunProperty());
-        tipLabel.textProperty().bind(t.textProperty());
-        tipLabel.wrapTextProperty().bind(t.wrapTextProperty());
-        tipLabel.minWidthProperty().bind(t.minWidthProperty());
-        tipLabel.prefWidthProperty().bind(t.prefWidthProperty());
-        tipLabel.maxWidthProperty().bind(t.maxWidthProperty());
-        tipLabel.minHeightProperty().bind(t.minHeightProperty());
-        tipLabel.prefHeightProperty().bind(t.prefHeightProperty());
-        tipLabel.maxHeightProperty().bind(t.maxHeightProperty());
-
-        // RT-7512 - skin needs to have styleClass of the control
-        // TODO - This needs to be bound together, not just set! Probably should
-        // do the same for id and style as well.
-        tipLabel.getStyleClass().setAll(t.getStyleClass());
-        tipLabel.setStyle(t.getStyle());
-        tipLabel.setId(t.getId());
-    }
-    
-    @Override public Tooltip getSkinnable() {
-        return tooltip;
-    }
-
-    @Override public Node getNode() {
-        return tipLabel;
-    }
-
-    @Override public void dispose() {
-        tooltip = null;
-        tipLabel = null;
-    }
-}
--- /dev/null	2015-09-03 15:24:13.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TooltipSkin.java	2015-09-03 15:24:11.612022000 -0700
@@ -0,0 +1,112 @@
+/*
+ * 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.Node;
+import javafx.scene.control.Label;
+import javafx.scene.control.Skin;
+import javafx.scene.control.Tooltip;
+
+/**
+ * CSS based skin for Tooltip. It deals mostly with show hide logic for
+ * Popup based controls, and specifically in this case for tooltip. It also
+ * implements some of the Skin interface methods.
+ *
+ * TooltipContent class is the actual skin implementation of the tooltip.
+ */
+public class TooltipSkin implements Skin<Tooltip> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private Label tipLabel;
+
+    private Tooltip tooltip;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TooltipSkin instance for the given {@link Tooltip}.
+     */
+    public TooltipSkin(Tooltip t) {
+        this.tooltip = t;
+        tipLabel = new Label();
+        tipLabel.contentDisplayProperty().bind(t.contentDisplayProperty());
+        tipLabel.fontProperty().bind(t.fontProperty());
+        tipLabel.graphicProperty().bind(t.graphicProperty());
+        tipLabel.graphicTextGapProperty().bind(t.graphicTextGapProperty());
+        tipLabel.textAlignmentProperty().bind(t.textAlignmentProperty());
+        tipLabel.textOverrunProperty().bind(t.textOverrunProperty());
+        tipLabel.textProperty().bind(t.textProperty());
+        tipLabel.wrapTextProperty().bind(t.wrapTextProperty());
+        tipLabel.minWidthProperty().bind(t.minWidthProperty());
+        tipLabel.prefWidthProperty().bind(t.prefWidthProperty());
+        tipLabel.maxWidthProperty().bind(t.maxWidthProperty());
+        tipLabel.minHeightProperty().bind(t.minHeightProperty());
+        tipLabel.prefHeightProperty().bind(t.prefHeightProperty());
+        tipLabel.maxHeightProperty().bind(t.maxHeightProperty());
+
+        // RT-7512 - skin needs to have styleClass of the control
+        // TODO - This needs to be bound together, not just set! Probably should
+        // do the same for id and style as well.
+        tipLabel.getStyleClass().setAll(t.getStyleClass());
+        tipLabel.setStyle(t.getStyle());
+        tipLabel.setId(t.getId());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public Tooltip getSkinnable() {
+        return tooltip;
+    }
+
+    /** {@inheritDoc} */
+    @Override public Node getNode() {
+        return tipLabel;
+    }
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        tooltip = null;
+        tipLabel = null;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeCellSkin.java	2015-09-03 15:24:20.334520900 -0700
+++ /dev/null	2015-09-03 15:24:21.000000000 -0700
@@ -1,375 +0,0 @@
-/*
- * Copyright (c) 2010, 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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.value.WritableValue;
-import javafx.geometry.HPos;
-import javafx.geometry.VPos;
-import javafx.scene.Node;
-import javafx.scene.control.TreeCell;
-import javafx.scene.control.TreeItem;
-import javafx.scene.control.TreeView;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.StyleableProperty;
-import javafx.css.CssMetaData;
-
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.MultiplePropertyChangeListenerHandler;
-import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
-
-import javafx.css.Styleable;
-
-public class TreeCellSkin<T> extends CellSkinBase<TreeCell<T>, TreeCellBehavior<T>> {
-
-    /*
-     * This is rather hacky - but it is a quick workaround to resolve the
-     * issue that we don't know maximum width of a disclosure node for a given
-     * TreeView. If we don't know the maximum width, we have no way to ensure
-     * consistent indentation for a given TreeView.
-     *
-     * To work around this, we create a single WeakHashMap to store a max
-     * disclosureNode width per TreeView. We use WeakHashMap to help prevent
-     * any memory leaks.
-     * 
-     * RT-19656 identifies a related issue, which is that we may not provide
-     * indentation to any TreeItems because we have not yet encountered a cell
-     * which has a disclosureNode. Once we scroll and encounter one, indentation
-     * happens in a displeasing way.
-     */
-    private static final Map<TreeView<?>, Double> maxDisclosureWidthMap = new WeakHashMap<TreeView<?>, Double>();
-
-    /**
-     * The amount of space to multiply by the treeItem.level to get the left
-     * margin for this tree cell. This is settable from CSS
-     */
-    private DoubleProperty indent = null;
-    public final void setIndent(double value) { indentProperty().set(value); }
-    public final double getIndent() { return indent == null ? 10.0 : indent.get(); }
-    public final DoubleProperty indentProperty() { 
-        if (indent == null) {
-            indent = new StyleableDoubleProperty(10.0) {
-                @Override public Object getBean() {
-                    return TreeCellSkin.this;
-                }
-
-                @Override public String getName() {
-                    return "indent";
-                }
-
-                @Override public CssMetaData<TreeCell<?>,Number> getCssMetaData() {
-                    return StyleableProperties.INDENT;
-                }
-            };
-        }
-        return indent; 
-    }
-    
-    private boolean disclosureNodeDirty = true;
-    private TreeItem<?> treeItem;
-
-    private double fixedCellSize;
-    private boolean fixedCellSizeEnabled;
-    
-    private MultiplePropertyChangeListenerHandler treeItemListener = new MultiplePropertyChangeListenerHandler(p -> {
-        if ("EXPANDED".equals(p)) {
-            updateDisclosureNodeRotation(true);
-        }
-        return null;
-    });
-    
-    public TreeCellSkin(TreeCell<T> control) {
-        super(control, new TreeCellBehavior<T>(control));
-
-        this.fixedCellSize = control.getTreeView().getFixedCellSize();
-        this.fixedCellSizeEnabled = fixedCellSize > 0;
-        
-        updateTreeItem();
-        updateDisclosureNodeRotation(false);
-        
-        registerChangeListener(control.treeItemProperty(), "TREE_ITEM");
-        registerChangeListener(control.textProperty(), "TEXT");
-        registerChangeListener(control.getTreeView().fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-    }
-    
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        if ("TREE_ITEM".equals(p)) {
-            updateTreeItem();
-            disclosureNodeDirty = true;
-            getSkinnable().requestLayout();
-        } else if ("TEXT".equals(p)) {
-            getSkinnable().requestLayout();
-        } else if ("FIXED_CELL_SIZE".equals(p)) {
-            this.fixedCellSize = getSkinnable().getTreeView().getFixedCellSize();
-            this.fixedCellSizeEnabled = fixedCellSize > 0;
-        }
-    }
-    
-    private void updateDisclosureNodeRotation(boolean animate) {
-        // no-op, this is now handled in CSS (although we no longer animate)
-//        if (treeItem == null || treeItem.isLeaf()) return;
-//        
-//        Node disclosureNode = getSkinnable().getDisclosureNode();
-//        if (disclosureNode == null) return;
-//        
-//        final boolean isExpanded = treeItem.isExpanded();
-//        int fromAngle = isExpanded ? 0 : 90;
-//        int toAngle = isExpanded ? 90 : 0;
-// 
-//        if (animate) {
-//            RotateTransition rt = new RotateTransition(Duration.millis(200), disclosureNode);
-//            rt.setFromAngle(fromAngle);
-//            rt.setToAngle(toAngle);
-//            rt.play();
-//        } else {
-//            disclosureNode.setRotate(toAngle);
-//        }
-    }
-    
-    private void updateTreeItem() {
-        if (treeItem != null) {
-            treeItemListener.unregisterChangeListener(treeItem.expandedProperty());
-        }
-        treeItem = getSkinnable().getTreeItem();
-        if (treeItem != null) {
-            treeItemListener.registerChangeListener(treeItem.expandedProperty(), "EXPANDED");
-        }
-        
-        updateDisclosureNodeRotation(false);
-    }
-    
-    private void updateDisclosureNode() {
-        if (getSkinnable().isEmpty()) return;
-
-        Node disclosureNode = getSkinnable().getDisclosureNode();
-        if (disclosureNode == null) return;
-        
-        boolean disclosureVisible = treeItem != null && ! treeItem.isLeaf();
-        disclosureNode.setVisible(disclosureVisible);
-            
-        if (! disclosureVisible) {
-            getChildren().remove(disclosureNode);
-        } else if (disclosureNode.getParent() == null) {
-            getChildren().add(disclosureNode);
-            disclosureNode.toFront();
-        } else {
-            disclosureNode.toBack();
-        }
-        
-        // RT-26625: [TreeView, TreeTableView] can lose arrows while scrolling
-        // RT-28668: Ensemble tree arrow disappears
-        if (disclosureNode.getScene() != null) {
-            disclosureNode.applyCss();
-        }
-    }
-
-    @Override protected void updateChildren() {
-        super.updateChildren();
-        updateDisclosureNode();
-    }
-    
-    @Override protected void layoutChildren(double x, final double y,
-            double w, final double h) {
-        // RT-25876: can not null-check here as this prevents empty rows from
-        // being cleaned out.
-        // if (treeItem == null) return;
-        
-        TreeView<T> tree = getSkinnable().getTreeView();
-        if (tree == null) return;
-        
-        if (disclosureNodeDirty) {
-            updateDisclosureNode();
-            disclosureNodeDirty = false;
-        }
-        
-        Node disclosureNode = getSkinnable().getDisclosureNode();
-        
-        int level = tree.getTreeItemLevel(treeItem);
-        if (! tree.isShowRoot()) level--;
-        double leftMargin = getIndent() * level;
-
-        x += leftMargin;
-
-        // position the disclosure node so that it is at the proper indent
-        boolean disclosureVisible = disclosureNode != null && treeItem != null && ! treeItem.isLeaf();
-
-        final double defaultDisclosureWidth = maxDisclosureWidthMap.containsKey(tree) ?
-            maxDisclosureWidthMap.get(tree) : 18;   // RT-19656: default width of default disclosure node
-        double disclosureWidth = defaultDisclosureWidth;
-
-        if (disclosureVisible) {
-            if (disclosureNode == null || disclosureNode.getScene() == null) {
-                updateChildren();
-            }
-            
-            if (disclosureNode != null) {
-                disclosureWidth = disclosureNode.prefWidth(h);
-                if (disclosureWidth > defaultDisclosureWidth) {
-                    maxDisclosureWidthMap.put(tree, disclosureWidth);
-                }
-
-                double ph = disclosureNode.prefHeight(disclosureWidth);
-                
-                disclosureNode.resize(disclosureWidth, ph);
-                positionInArea(disclosureNode, x, y,
-                        disclosureWidth, ph, /*baseline ignored*/0,
-                        HPos.CENTER, VPos.CENTER);
-            }
-        }
-
-        // determine starting point of the graphic or cell node, and the
-        // remaining width available to them
-        final int padding = treeItem != null && treeItem.getGraphic() == null ? 0 : 3;
-        x += disclosureWidth + padding;
-        w -= (leftMargin + disclosureWidth + padding);
-
-        // Rather ugly fix for RT-38519, where graphics are disappearing in
-        // certain circumstances
-        Node graphic = getSkinnable().getGraphic();
-        if (graphic != null && !getChildren().contains(graphic)) {
-            getChildren().add(graphic);
-        }
-
-        layoutLabelInArea(x, y, w, h);
-    }
-    
-    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        double pref = super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset);
-        Node d = getSkinnable().getDisclosureNode();
-        return (d == null) ? pref : Math.max(d.minHeight(-1), pref);
-    }
-    
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        final TreeCell<T> cell = getSkinnable();
-        
-        final double pref = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
-        final Node d = cell.getDisclosureNode();
-        final double prefHeight = (d == null) ? pref : Math.max(d.prefHeight(-1), pref);
-        
-        // RT-30212: TreeCell does not honor minSize of cells.
-        // snapSize for RT-36460
-        return snapSize(Math.max(cell.getMinHeight(), prefHeight));
-    }
-
-    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (fixedCellSizeEnabled) {
-            return fixedCellSize;
-        }
-
-        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
-    }
-    
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        double labelWidth = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-
-        double pw = snappedLeftInset() + snappedRightInset();
-
-        TreeView<T> tree = getSkinnable().getTreeView();
-        if (tree == null) return pw;
-        
-        if (treeItem == null) return pw;
-        
-        pw = labelWidth;
-
-        // determine the amount of indentation
-        int level = tree.getTreeItemLevel(treeItem);
-        if (! tree.isShowRoot()) level--;
-        pw += getIndent() * level;
-
-        // include the disclosure node width
-        Node disclosureNode = getSkinnable().getDisclosureNode();
-        double disclosureNodePrefWidth = disclosureNode == null ? 0 : disclosureNode.prefWidth(-1);
-        final double defaultDisclosureWidth = maxDisclosureWidthMap.containsKey(tree) ?
-                maxDisclosureWidthMap.get(tree) : 0;
-        pw += Math.max(defaultDisclosureWidth, disclosureNodePrefWidth);
-
-        return pw;
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                         Stylesheet Handling                             *
-     *                                                                         *
-     **************************************************************************/
-
-    /** @treatAsPrivate */
-    private static class StyleableProperties {
-        
-        private static final CssMetaData<TreeCell<?>,Number> INDENT = 
-            new CssMetaData<TreeCell<?>,Number>("-fx-indent",
-                SizeConverter.getInstance(), 10.0) {
-                    
-            @Override public boolean isSettable(TreeCell<?> n) {
-                DoubleProperty p = ((TreeCellSkin<?>) n.getSkin()).indentProperty();
-                return p == null || !p.isBound();
-            }
-
-            @Override public StyleableProperty<Number> getStyleableProperty(TreeCell<?> n) {
-                final TreeCellSkin<?> skin = (TreeCellSkin<?>) n.getSkin();
-                return (StyleableProperty<Number>)(WritableValue<Number>)skin.indentProperty();
-            }
-        };
-        
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(CellSkinBase.getClassCssMetaData());
-            styleables.add(INDENT);
-            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-03 15:24:21.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TreeCellSkin.java	2015-09-03 15:24:19.538475400 -0700
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2010, 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 java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.InvalidationListener;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.value.WritableValue;
+import javafx.geometry.HPos;
+import javafx.geometry.VPos;
+import javafx.scene.Node;
+import javafx.scene.control.Control;
+import javafx.scene.control.TreeCell;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeView;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.StyleableProperty;
+import javafx.css.CssMetaData;
+
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.behavior.TreeCellBehavior;
+
+import javafx.css.Styleable;
+
+/**
+ * Default skin implementation for the {@link TreeCell} control.
+ *
+ * @see TreeCell
+ * @since 9
+ */
+public class TreeCellSkin<T> extends CellSkinBase<TreeCell<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    /*
+     * This is rather hacky - but it is a quick workaround to resolve the
+     * issue that we don't know maximum width of a disclosure node for a given
+     * TreeView. If we don't know the maximum width, we have no way to ensure
+     * consistent indentation for a given TreeView.
+     *
+     * To work around this, we create a single WeakHashMap to store a max
+     * disclosureNode width per TreeView. We use WeakHashMap to help prevent
+     * any memory leaks.
+     * 
+     * RT-19656 identifies a related issue, which is that we may not provide
+     * indentation to any TreeItems because we have not yet encountered a cell
+     * which has a disclosureNode. Once we scroll and encounter one, indentation
+     * happens in a displeasing way.
+     */
+    private static final Map<TreeView<?>, Double> maxDisclosureWidthMap = new WeakHashMap<TreeView<?>, Double>();
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+    
+    private boolean disclosureNodeDirty = true;
+    private TreeItem<?> treeItem;
+    private final BehaviorBase<TreeCell<T>> behavior;
+
+    private double fixedCellSize;
+    private boolean fixedCellSizeEnabled;
+    
+    private InvalidationListener expandedListener = o -> updateDisclosureNodeRotation(true);
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TreeCellSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TreeCellSkin(TreeCell<T> control) {
+        super(control);
+
+        // install default input map for the TreeCell control
+        behavior = new TreeCellBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        this.fixedCellSize = control.getTreeView().getFixedCellSize();
+        this.fixedCellSizeEnabled = fixedCellSize > 0;
+        
+        updateTreeItem();
+        updateDisclosureNodeRotation(false);
+        
+        registerChangeListener(control.treeItemProperty(), e -> {
+            updateTreeItem();
+            disclosureNodeDirty = true;
+            getSkinnable().requestLayout();
+        });
+        registerChangeListener(control.textProperty(), e -> getSkinnable().requestLayout());
+        registerChangeListener(control.getTreeView().fixedCellSizeProperty(), e -> {
+            this.fixedCellSize = getSkinnable().getTreeView().getFixedCellSize();
+            this.fixedCellSizeEnabled = fixedCellSize > 0;
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The amount of space to multiply by the treeItem.level to get the left
+     * margin for this tree cell. This is settable from CSS
+     */
+    private DoubleProperty indent = null;
+    public final void setIndent(double value) { indentProperty().set(value); }
+    public final double getIndent() { return indent == null ? 10.0 : indent.get(); }
+    public final DoubleProperty indentProperty() {
+        if (indent == null) {
+            indent = new StyleableDoubleProperty(10.0) {
+                @Override public Object getBean() {
+                    return TreeCellSkin.this;
+                }
+
+                @Override public String getName() {
+                    return "indent";
+                }
+
+                @Override public CssMetaData<TreeCell<?>,Number> getCssMetaData() {
+                    return StyleableProperties.INDENT;
+                }
+            };
+        }
+        return indent;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void updateChildren() {
+        super.updateChildren();
+        updateDisclosureNode();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(double x, final double y,
+                                            double w, final double h) {
+        // RT-25876: can not null-check here as this prevents empty rows from
+        // being cleaned out.
+        // if (treeItem == null) return;
+
+        TreeView<T> tree = getSkinnable().getTreeView();
+        if (tree == null) return;
+
+        if (disclosureNodeDirty) {
+            updateDisclosureNode();
+            disclosureNodeDirty = false;
+        }
+
+        Node disclosureNode = getSkinnable().getDisclosureNode();
+
+        int level = tree.getTreeItemLevel(treeItem);
+        if (! tree.isShowRoot()) level--;
+        double leftMargin = getIndent() * level;
+
+        x += leftMargin;
+
+        // position the disclosure node so that it is at the proper indent
+        boolean disclosureVisible = disclosureNode != null && treeItem != null && ! treeItem.isLeaf();
+
+        final double defaultDisclosureWidth = maxDisclosureWidthMap.containsKey(tree) ?
+                maxDisclosureWidthMap.get(tree) : 18;   // RT-19656: default width of default disclosure node
+        double disclosureWidth = defaultDisclosureWidth;
+
+        if (disclosureVisible) {
+            if (disclosureNode == null || disclosureNode.getScene() == null) {
+                updateChildren();
+            }
+
+            if (disclosureNode != null) {
+                disclosureWidth = disclosureNode.prefWidth(h);
+                if (disclosureWidth > defaultDisclosureWidth) {
+                    maxDisclosureWidthMap.put(tree, disclosureWidth);
+                }
+
+                double ph = disclosureNode.prefHeight(disclosureWidth);
+
+                disclosureNode.resize(disclosureWidth, ph);
+                positionInArea(disclosureNode, x, y,
+                        disclosureWidth, ph, /*baseline ignored*/0,
+                        HPos.CENTER, VPos.CENTER);
+            }
+        }
+
+        // determine starting point of the graphic or cell node, and the
+        // remaining width available to them
+        final int padding = treeItem != null && treeItem.getGraphic() == null ? 0 : 3;
+        x += disclosureWidth + padding;
+        w -= (leftMargin + disclosureWidth + padding);
+
+        // Rather ugly fix for RT-38519, where graphics are disappearing in
+        // certain circumstances
+        Node graphic = getSkinnable().getGraphic();
+        if (graphic != null && !getChildren().contains(graphic)) {
+            getChildren().add(graphic);
+        }
+
+        layoutLabelInArea(x, y, w, h);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMinHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        double pref = super.computeMinHeight(width, topInset, rightInset, bottomInset, leftInset);
+        Node d = getSkinnable().getDisclosureNode();
+        return (d == null) ? pref : Math.max(d.minHeight(-1), pref);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        final TreeCell<T> cell = getSkinnable();
+
+        final double pref = super.computePrefHeight(width, topInset, rightInset, bottomInset, leftInset);
+        final Node d = cell.getDisclosureNode();
+        final double prefHeight = (d == null) ? pref : Math.max(d.prefHeight(-1), pref);
+
+        // RT-30212: TreeCell does not honor minSize of cells.
+        // snapSize for RT-36460
+        return snapSize(Math.max(cell.getMinHeight(), prefHeight));
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computeMaxHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (fixedCellSizeEnabled) {
+            return fixedCellSize;
+        }
+
+        return super.computeMaxHeight(width, topInset, rightInset, bottomInset, leftInset);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        double labelWidth = super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+
+        double pw = snappedLeftInset() + snappedRightInset();
+
+        TreeView<T> tree = getSkinnable().getTreeView();
+        if (tree == null) return pw;
+
+        if (treeItem == null) return pw;
+
+        pw = labelWidth;
+
+        // determine the amount of indentation
+        int level = tree.getTreeItemLevel(treeItem);
+        if (! tree.isShowRoot()) level--;
+        pw += getIndent() * level;
+
+        // include the disclosure node width
+        Node disclosureNode = getSkinnable().getDisclosureNode();
+        double disclosureNodePrefWidth = disclosureNode == null ? 0 : disclosureNode.prefWidth(-1);
+        final double defaultDisclosureWidth = maxDisclosureWidthMap.containsKey(tree) ?
+                maxDisclosureWidthMap.get(tree) : 0;
+        pw += Math.max(defaultDisclosureWidth, disclosureNodePrefWidth);
+
+        return pw;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    private void updateDisclosureNodeRotation(boolean animate) {
+        // no-op, this is now handled in CSS (although we no longer animate)
+//        if (treeItem == null || treeItem.isLeaf()) return;
+//        
+//        Node disclosureNode = getSkinnable().getDisclosureNode();
+//        if (disclosureNode == null) return;
+//        
+//        final boolean isExpanded = treeItem.isExpanded();
+//        int fromAngle = isExpanded ? 0 : 90;
+//        int toAngle = isExpanded ? 90 : 0;
+// 
+//        if (animate) {
+//            RotateTransition rt = new RotateTransition(Duration.millis(200), disclosureNode);
+//            rt.setFromAngle(fromAngle);
+//            rt.setToAngle(toAngle);
+//            rt.play();
+//        } else {
+//            disclosureNode.setRotate(toAngle);
+//        }
+    }
+    
+    private void updateTreeItem() {
+        if (treeItem != null) {
+            treeItem.expandedProperty().removeListener(expandedListener);
+        }
+        treeItem = getSkinnable().getTreeItem();
+        if (treeItem != null) {
+            treeItem.expandedProperty().addListener(expandedListener);
+        }
+
+        updateDisclosureNodeRotation(false);
+    }
+    
+    private void updateDisclosureNode() {
+        if (getSkinnable().isEmpty()) return;
+
+        Node disclosureNode = getSkinnable().getDisclosureNode();
+        if (disclosureNode == null) return;
+        
+        boolean disclosureVisible = treeItem != null && ! treeItem.isLeaf();
+        disclosureNode.setVisible(disclosureVisible);
+            
+        if (! disclosureVisible) {
+            getChildren().remove(disclosureNode);
+        } else if (disclosureNode.getParent() == null) {
+            getChildren().add(disclosureNode);
+            disclosureNode.toFront();
+        } else {
+            disclosureNode.toBack();
+        }
+        
+        // RT-26625: [TreeView, TreeTableView] can lose arrows while scrolling
+        // RT-28668: Ensemble tree arrow disappears
+        if (disclosureNode.getScene() != null) {
+            disclosureNode.applyCss();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     *                         Stylesheet Handling                             *
+     *                                                                         *
+     **************************************************************************/
+
+    /** @treatAsPrivate */
+    private static class StyleableProperties {
+        
+        private static final CssMetaData<TreeCell<?>,Number> INDENT = 
+            new CssMetaData<TreeCell<?>,Number>("-fx-indent",
+                SizeConverter.getInstance(), 10.0) {
+                    
+            @Override public boolean isSettable(TreeCell<?> n) {
+                DoubleProperty p = ((TreeCellSkin<?>) n.getSkin()).indentProperty();
+                return p == null || !p.isBound();
+            }
+
+            @Override public StyleableProperty<Number> getStyleableProperty(TreeCell<?> n) {
+                final TreeCellSkin<?> skin = (TreeCellSkin<?>) n.getSkin();
+                return (StyleableProperty<Number>)(WritableValue<Number>)skin.indentProperty();
+            }
+        };
+        
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(CellSkinBase.getClassCssMetaData());
+            styleables.add(INDENT);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableCellSkin.java	2015-09-03 15:24:28.337978700 -0700
+++ /dev/null	2015-09-03 15:24:29.000000000 -0700
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2012, 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 com.sun.javafx.scene.control.behavior.TreeTableCellBehavior;
-import java.util.Map;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.scene.Node;
-import javafx.scene.control.Control;
-import javafx.scene.control.TreeItem;
-import javafx.scene.control.TreeTableCell;
-import javafx.scene.control.TreeTableColumn;
-import javafx.scene.control.TreeTableRow;
-import javafx.scene.control.TreeTableView;
-
-/**
- */
-public class TreeTableCellSkin<S,T> extends TableCellSkinBase<TreeTableCell<S,T>, TreeTableCellBehavior<S,T>> {
-    
-    private final TreeTableCell<S,T> treeTableCell;
-    private final TreeTableColumn<S,T> tableColumn;
-    
-    public TreeTableCellSkin(TreeTableCell<S,T> treeTableCell) {
-        super(treeTableCell, new TreeTableCellBehavior<S,T>(treeTableCell));
-        
-        this.treeTableCell = treeTableCell;
-        this.tableColumn = treeTableCell.getTableColumn();
-        
-        super.init(treeTableCell);
-    }
-
-    @Override protected BooleanProperty columnVisibleProperty() {
-        return tableColumn.visibleProperty();
-    }
-
-    @Override protected ReadOnlyDoubleProperty columnWidthProperty() {
-        return tableColumn.widthProperty();
-    }
-
-    @Override protected double leftLabelPadding() {
-        double leftPadding = super.leftLabelPadding();
-        
-        // RT-27167: we must take into account the disclosure node and the
-        // indentation (which is not taken into account by the LabeledSkinBase.
-        final double height = getCellSize();
-
-        TreeTableCell<S,T> cell = getSkinnable();
-
-        TreeTableColumn<S,T> tableColumn = cell.getTableColumn();
-        if (tableColumn == null) return leftPadding;
-
-        // check if this column is the TreeTableView treeColumn (i.e. the 
-        // column showing the disclosure node and graphic).
-        TreeTableView<S> treeTable = cell.getTreeTableView();
-        if (treeTable == null) return leftPadding;
-
-        int columnIndex = treeTable.getVisibleLeafIndex(tableColumn);
-
-        TreeTableColumn<S,?> treeColumn = treeTable.getTreeColumn();
-        if ((treeColumn == null && columnIndex != 0) || (treeColumn != null && ! tableColumn.equals(treeColumn))) {
-            return leftPadding;
-        }
-
-        TreeTableRow<S> treeTableRow = cell.getTreeTableRow();
-        if (treeTableRow == null) return leftPadding;
-
-        TreeItem<S> treeItem = treeTableRow.getTreeItem();
-        if (treeItem == null) return leftPadding;
-        
-        int nodeLevel = treeTable.getTreeItemLevel(treeItem);
-        if (! treeTable.isShowRoot()) nodeLevel--;
-
-        double indentPerLevel = 10;
-        if (treeTableRow.getSkin() instanceof TreeTableRowSkin) {
-            indentPerLevel = ((TreeTableRowSkin<?>)treeTableRow.getSkin()).getIndentationPerLevel();
-        }
-        leftPadding += nodeLevel * indentPerLevel;
-
-        // add in the width of the disclosure node, if one exists
-        Map<Control, Double> mdwp = TableRowSkinBase.maxDisclosureWidthMap;
-        leftPadding += mdwp.containsKey(treeTable) ? mdwp.get(treeTable) : 0;
-
-        // adding in the width of the graphic on the tree item
-        Node graphic = treeItem.getGraphic();
-        leftPadding += graphic == null ? 0 : graphic.prefWidth(height);
-        
-        return leftPadding;
-    }
-
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        if (isDeferToParentForPrefWidth) {
-            // RT-27167: we must take into account the disclosure node and the
-            // indentation (which is not taken into account by the LabeledSkinBase.
-            return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
-        }
-        return columnWidthProperty().get();
-    }
-}
--- /dev/null	2015-09-03 15:24:29.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableCellSkin.java	2015-09-03 15:24:27.644939100 -0700
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2012, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.behavior.TreeTableCellBehavior;
+import java.util.Map;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.Control;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTableRow;
+import javafx.scene.control.TreeTableView;
+
+/**
+ * Default skin implementation for the {@link TreeTableCell} control.
+ *
+ * @see TreeTableCell
+ * @since 9
+ */
+public class TreeTableCellSkin<S,T> extends TableCellSkinBase<TreeTableCell<S,T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final BehaviorBase<TreeTableCell<S,T>> behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TreeTableCellSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TreeTableCellSkin(TreeTableCell<S,T> control) {
+        super(control);
+
+        // install default input map for the TreeTableCell control
+        behavior = new TreeTableCellBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override BooleanProperty columnVisibleProperty() {
+        return getSkinnable().getTableColumn().visibleProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ReadOnlyDoubleProperty columnWidthProperty() {
+        return getSkinnable().getTableColumn().widthProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override double leftLabelPadding() {
+        double leftPadding = super.leftLabelPadding();
+        
+        // RT-27167: we must take into account the disclosure node and the
+        // indentation (which is not taken into account by the LabeledSkinBase.
+        final double height = getCellSize();
+
+        TreeTableCell<S,T> cell = getSkinnable();
+
+        TreeTableColumn<S,T> tableColumn = cell.getTableColumn();
+        if (tableColumn == null) return leftPadding;
+
+        // check if this column is the TreeTableView treeColumn (i.e. the 
+        // column showing the disclosure node and graphic).
+        TreeTableView<S> treeTable = cell.getTreeTableView();
+        if (treeTable == null) return leftPadding;
+
+        int columnIndex = treeTable.getVisibleLeafIndex(tableColumn);
+
+        TreeTableColumn<S,?> treeColumn = treeTable.getTreeColumn();
+        if ((treeColumn == null && columnIndex != 0) || (treeColumn != null && ! tableColumn.equals(treeColumn))) {
+            return leftPadding;
+        }
+
+        TreeTableRow<S> treeTableRow = cell.getTreeTableRow();
+        if (treeTableRow == null) return leftPadding;
+
+        TreeItem<S> treeItem = treeTableRow.getTreeItem();
+        if (treeItem == null) return leftPadding;
+        
+        int nodeLevel = treeTable.getTreeItemLevel(treeItem);
+        if (! treeTable.isShowRoot()) nodeLevel--;
+
+        double indentPerLevel = 10;
+        if (treeTableRow.getSkin() instanceof TreeTableRowSkin) {
+            indentPerLevel = ((TreeTableRowSkin<?>)treeTableRow.getSkin()).getIndentationPerLevel();
+        }
+        leftPadding += nodeLevel * indentPerLevel;
+
+        // add in the width of the disclosure node, if one exists
+        Map<Control, Double> mdwp = TableRowSkinBase.maxDisclosureWidthMap;
+        leftPadding += mdwp.containsKey(treeTable) ? mdwp.get(treeTable) : 0;
+
+        // adding in the width of the graphic on the tree item
+        Node graphic = treeItem.getGraphic();
+        leftPadding += graphic == null ? 0 : graphic.prefWidth(height);
+        
+        return leftPadding;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        if (isDeferToParentForPrefWidth) {
+            // RT-27167: we must take into account the disclosure node and the
+            // indentation (which is not taken into account by the LabeledSkinBase.
+            return super.computePrefWidth(height, topInset, rightInset, bottomInset, leftInset);
+        }
+        return columnWidthProperty().get();
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableRowSkin.java	2015-09-03 15:24:35.986416200 -0700
+++ /dev/null	2015-09-03 15:24:37.000000000 -0700
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.collections.FXCollections;
-import javafx.scene.control.Control;
-import javafx.scene.control.TableColumnBase;
-import javafx.scene.control.TreeItem;
-import javafx.scene.control.TreeTableCell;
-import javafx.scene.control.TreeTableColumn;
-import javafx.scene.control.TreeTablePosition;
-import javafx.scene.control.TreeTableRow;
-import javafx.scene.control.TreeTableView;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javafx.beans.property.DoubleProperty;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.css.StyleableDoubleProperty;
-import javafx.css.CssMetaData;
-
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.scene.control.MultiplePropertyChangeListenerHandler;
-import com.sun.javafx.scene.control.behavior.TreeTableRowBehavior;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.WritableValue;
-import javafx.collections.ObservableList;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-
-public class TreeTableRowSkin<T> extends TableRowSkinBase<TreeItem<T>, TreeTableRow<T>, TreeTableRowBehavior<T>, TreeTableCell<T,?>> {
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    // maps into the TreeTableViewSkin items property via
-    // TreeTableViewSkin.treeItemToListMap
-    private SimpleObjectProperty<ObservableList<TreeItem<T>>> itemsProperty;
-    private TreeItem<?> treeItem;
-    private boolean disclosureNodeDirty = true;
-    private Node graphic;
-
-    private TreeTableViewSkin treeTableViewSkin;
-
-    private boolean childrenDirty = false;
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Constructors                                                            *
-     *                                                                         *
-     **************************************************************************/
-    
-    public TreeTableRowSkin(TreeTableRow<T> control) {
-        super(control, new TreeTableRowBehavior<T>(control));
-        
-        super.init(control);
-        
-        updateTreeItem();
-        updateTableViewSkin();
-
-        registerChangeListener(control.treeTableViewProperty(), "TREE_TABLE_VIEW");
-        registerChangeListener(control.indexProperty(), "INDEX");
-        registerChangeListener(control.treeItemProperty(), "TREE_ITEM");
-        registerChangeListener(control.getTreeTableView().treeColumnProperty(), "TREE_COLUMN");
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-
-    private MultiplePropertyChangeListenerHandler treeItemListener = new MultiplePropertyChangeListenerHandler(p -> {
-        if ("GRAPHIC".equals(p)) {
-            disclosureNodeDirty = true;
-            getSkinnable().requestLayout();
-        }
-        return null;
-    });
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Properties                                                              *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * The amount of space to multiply by the treeItem.level to get the left
-     * margin for this tree cell. This is settable from CSS
-     */
-    private DoubleProperty indent = null;
-    public final void setIndent(double value) { indentProperty().set(value); }
-    public final double getIndent() { return indent == null ? 10.0 : indent.get(); }
-    public final DoubleProperty indentProperty() { 
-        if (indent == null) {
-            indent = new StyleableDoubleProperty(10.0) {
-                @Override public Object getBean() {
-                    return TreeTableRowSkin.this;
-                }
-
-                @Override public String getName() {
-                    return "indent";
-                }
-
-                @Override public CssMetaData<TreeTableRow<?>,Number> getCssMetaData() {
-                    return TreeTableRowSkin.StyleableProperties.INDENT;
-                }
-            };
-        }
-        return indent; 
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Public Methods                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-
-        if ("TREE_ABLE_VIEW".equals(p)) {
-            updateTableViewSkin();
-        } else if ("INDEX".equals(p)) {
-            updateCells = true;
-        } else if ("TREE_ITEM".equals(p)) {
-            updateTreeItem();
-            isDirty = true;
-        } else if ("TREE_COLUMN".equals(p)) {
-            // Fix for RT-27782: Need to set isDirty to true, rather than the
-            // cheaper updateCells, as otherwise the text indentation will not
-            // be recalculated in TreeTableCellSkin.leftLabelPadding()
-            isDirty = true;
-            getSkinnable().requestLayout();
-        }
-    }
-
-    @Override protected void updateChildren() {
-        super.updateChildren();
-
-        updateDisclosureNodeAndGraphic();
-
-        if (childrenDirty) {
-            childrenDirty = false;
-            if (cells.isEmpty()) {
-                getChildren().clear();
-            } else {
-                // TODO we can optimise this by only showing cells that are
-                // visible based on the table width and the amount of horizontal
-                // scrolling.
-                getChildren().addAll(cells);
-            }
-        }
-    }
-
-    @Override protected void layoutChildren(double x, double y, double w, double h) {
-        if (disclosureNodeDirty) {
-            updateDisclosureNodeAndGraphic();
-            disclosureNodeDirty = false;
-        }
-
-        Node disclosureNode = getDisclosureNode();
-        if (disclosureNode != null && disclosureNode.getScene() == null) {
-            updateDisclosureNodeAndGraphic();
-        }
-
-        super.layoutChildren(x, y, w, h);
-    }
-
-    @Override protected TreeTableCell<T, ?> getCell(TableColumnBase tcb) {
-        TreeTableColumn tableColumn = (TreeTableColumn<T,?>) tcb;
-        TreeTableCell cell = (TreeTableCell) tableColumn.getCellFactory().call(tableColumn);
-
-        cell.updateTreeTableColumn(tableColumn);
-        cell.updateTreeTableView(tableColumn.getTreeTableView());
-
-        return cell;
-    }
-
-    @Override protected void updateCells(boolean resetChildren) {
-        super.updateCells(resetChildren);
-
-        if (resetChildren) {
-            childrenDirty = true;
-            updateChildren();
-        }
-    }
-
-    @Override protected boolean isIndentationRequired() {
-        return true;
-    }
-
-    @Override protected TableColumnBase getTreeColumn() {
-        return getSkinnable().getTreeTableView().getTreeColumn();
-    }
-
-    @Override protected int getIndentationLevel(TreeTableRow<T> control) {
-        return control.getTreeTableView().getTreeItemLevel(control.getTreeItem());
-    }
-
-    @Override protected double getIndentationPerLevel() {
-        return getIndent();
-    }
-
-    @Override protected Node getDisclosureNode() {
-        return getSkinnable().getDisclosureNode();
-    }
-
-    @Override protected boolean isDisclosureNodeVisible() {
-        return getDisclosureNode() != null && treeItem != null && ! treeItem.isLeaf();
-    }
-
-    @Override protected boolean isShowRoot() {
-        return getSkinnable().getTreeTableView().isShowRoot();
-    }
-
-    @Override protected ObservableList<TreeTableColumn<T, ?>> getVisibleLeafColumns() {
-        return getSkinnable().getTreeTableView().getVisibleLeafColumns();
-    }
-
-    @Override protected void updateCell(TreeTableCell<T, ?> cell, TreeTableRow<T> row) {
-        cell.updateTreeTableRow(row);
-    }
-
-    @Override protected boolean isColumnPartiallyOrFullyVisible(TableColumnBase tc) {
-        return treeTableViewSkin == null ? false : treeTableViewSkin.isColumnPartiallyOrFullyVisible(tc);
-    }
-
-    @Override protected TreeTableColumn<T, ?> getTableColumnBase(TreeTableCell cell) {
-        return cell.getTableColumn();
-    }
-
-    @Override protected ObjectProperty<Node> graphicProperty() {
-        TreeTableRow<T> treeTableRow = getSkinnable();
-        if (treeTableRow == null) return null;
-        if (treeItem == null) return null;
-
-        return treeItem.graphicProperty();
-    }
-
-    @Override protected Control getVirtualFlowOwner() {
-        return getSkinnable().getTreeTableView();
-    }
-
-    @Override protected DoubleProperty fixedCellSizeProperty() {
-        return getSkinnable().getTreeTableView().fixedCellSizeProperty();
-    }
-
-
-
-    /***************************************************************************
-     *                                                                         *
-     * Private Implementation                                                  *
-     *                                                                         *
-     **************************************************************************/
-
-    private void updateTreeItem() {
-        if (treeItem != null) {
-            treeItemListener.unregisterChangeListener(treeItem.expandedProperty());
-            treeItemListener.unregisterChangeListener(treeItem.graphicProperty());
-        }
-        treeItem = getSkinnable().getTreeItem();
-        if (treeItem != null) {
-            treeItemListener.registerChangeListener(treeItem.graphicProperty(), "GRAPHIC");
-        }
-    }
-    
-    private void updateDisclosureNodeAndGraphic() {
-        if (getSkinnable().isEmpty()) return;
-        
-        // check for graphic missing
-        ObjectProperty<Node> graphicProperty = graphicProperty();
-        Node newGraphic = graphicProperty == null ? null : graphicProperty.get();
-        if (newGraphic != null) {
-            // RT-30466: remove the old graphic
-            if (newGraphic != graphic) {
-                getChildren().remove(graphic);
-            }
-
-            if (! getChildren().contains(newGraphic)) {
-                getChildren().add(newGraphic);
-                graphic = newGraphic;
-            }
-        }
-        
-        // check disclosure node
-        Node disclosureNode = getSkinnable().getDisclosureNode();
-        if (disclosureNode != null) {
-            boolean disclosureVisible = treeItem != null && ! treeItem.isLeaf();
-            disclosureNode.setVisible(disclosureVisible);
-                
-            if (! disclosureVisible) {
-                getChildren().remove(disclosureNode);
-            } else if (disclosureNode.getParent() == null) {
-                getChildren().add(disclosureNode);
-                disclosureNode.toFront();
-            } else {
-                disclosureNode.toBack();
-            }
-            
-            // RT-26625: [TreeView, TreeTableView] can lose arrows while scrolling
-            // RT-28668: Ensemble tree arrow disappears
-            if (disclosureNode.getScene() != null) {
-                disclosureNode.applyCss();
-            }
-        }
-    }
-
-    private void updateTableViewSkin() {
-        TreeTableView<T> tableView = getSkinnable().getTreeTableView();
-        if (tableView.getSkin() instanceof TreeTableViewSkin) {
-            treeTableViewSkin = (TreeTableViewSkin)tableView.getSkin();
-        }
-    }
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     *                         Stylesheet Handling                             *
-     *                                                                         *
-     **************************************************************************/
-
-    /** @treatAsPrivate */
-    private static class StyleableProperties {
-        
-        private static final CssMetaData<TreeTableRow<?>,Number> INDENT = 
-            new CssMetaData<TreeTableRow<?>,Number>("-fx-indent",
-                SizeConverter.getInstance(), 10.0) {
-                    
-            @Override public boolean isSettable(TreeTableRow<?> n) {
-                DoubleProperty p = ((TreeTableRowSkin<?>) n.getSkin()).indentProperty();
-                return p == null || !p.isBound();
-            }
-
-            @Override public StyleableProperty<Number> getStyleableProperty(TreeTableRow<?> n) {
-                final TreeTableRowSkin<?> skin = (TreeTableRowSkin<?>) n.getSkin();
-                return (StyleableProperty<Number>)(WritableValue<Number>)skin.indentProperty();
-            }
-        };
-        
-        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
-        static {
-            final List<CssMetaData<? extends Styleable, ?>> styleables =
-                new ArrayList<CssMetaData<? extends Styleable, ?>>(CellSkinBase.getClassCssMetaData());
-            styleables.add(INDENT);
-            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();
-    }
-
-
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        final TreeTableView<T> treeTableView = getSkinnable().getTreeTableView();
-        switch (attribute) {
-            case SELECTED_ITEMS: {
-                // FIXME this could be optimised to iterate over cellsMap only
-                // (selectedCells could be big, cellsMap is much smaller)
-                List<Node> selection = new ArrayList<>();
-                int index = getSkinnable().getIndex();
-                for (TreeTablePosition<T,?> pos : treeTableView.getSelectionModel().getSelectedCells()) {
-                    if (pos.getRow() == index) {
-                        TreeTableColumn<T,?> column = pos.getTableColumn();
-                        if (column == null) {
-                            /* This is the row-based case */
-                            column = treeTableView.getVisibleLeafColumn(0);
-                        }
-                        TreeTableCell<T,?> cell = cellsMap.get(column).get();
-                        if (cell != null) selection.add(cell);
-                    }
-                    return FXCollections.observableArrayList(selection);
-                }
-            }
-            case CELL_AT_ROW_COLUMN: {
-                int colIndex = (Integer)parameters[1];
-                TreeTableColumn<T,?> column = treeTableView.getVisibleLeafColumn(colIndex);
-                if (cellsMap.containsKey(column)) {
-                    return cellsMap.get(column).get();
-                }
-                return null;
-            }
-            case FOCUS_ITEM: {
-                TreeTableView.TreeTableViewFocusModel<T> fm = treeTableView.getFocusModel();
-                TreeTablePosition<T,?> focusedCell = fm.getFocusedCell();
-                TreeTableColumn<T,?> column = focusedCell.getTableColumn();
-                if (column == null) {
-                    /* This is the row-based case */
-                    column = treeTableView.getVisibleLeafColumn(0);
-                }
-                if (cellsMap.containsKey(column)) {
-                    return cellsMap.get(column).get();
-                }
-                return null;
-            }
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:24:37.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableRowSkin.java	2015-09-03 15:24:35.266375000 -0700
@@ -0,0 +1,475 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.InvalidationListener;
+import javafx.collections.FXCollections;
+import javafx.scene.control.Control;
+import javafx.scene.control.TableColumnBase;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.control.TreeTableColumn;
+import javafx.scene.control.TreeTablePosition;
+import javafx.scene.control.TreeTableRow;
+import javafx.scene.control.TreeTableView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.css.StyleableDoubleProperty;
+import javafx.css.CssMetaData;
+
+import javafx.css.converter.SizeConverter;
+import com.sun.javafx.scene.control.behavior.TreeTableRowBehavior;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.WritableValue;
+import javafx.collections.ObservableList;
+import javafx.css.Styleable;
+import javafx.css.StyleableProperty;
+
+/**
+ * Default skin implementation for the {@link TreeTableRow} control.
+ *
+ * @see TreeTableRow
+ * @since 9
+ */
+public class TreeTableRowSkin<T> extends TableRowSkinBase<TreeItem<T>, TreeTableRow<T>, TreeTableCell<T,?>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    // maps into the TreeTableViewSkin items property via
+    // TreeTableViewSkin.treeItemToListMap
+    private TreeItem<?> treeItem;
+    private boolean disclosureNodeDirty = true;
+    private Node graphic;
+    private final BehaviorBase<TreeTableRow<T>> behavior;
+
+    private TreeTableViewSkin treeTableViewSkin;
+
+    private boolean childrenDirty = false;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TreeTableRowSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TreeTableRowSkin(TreeTableRow<T> control) {
+        super(control);
+
+        // install default input map for the TreeTableRow control
+        behavior = new TreeTableRowBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        updateTreeItem();
+        updateTableViewSkin();
+
+        registerChangeListener(control.treeTableViewProperty(), e -> updateTableViewSkin());
+        registerChangeListener(control.indexProperty(), e -> updateCells = true);
+        registerChangeListener(control.treeItemProperty(), e -> {
+            updateTreeItem();
+            isDirty = true;
+        });
+        registerChangeListener(control.getTreeTableView().treeColumnProperty(), e -> {
+            // Fix for RT-27782: Need to set isDirty to true, rather than the
+            // cheaper updateCells, as otherwise the text indentation will not
+            // be recalculated in TreeTableCellSkin.leftLabelPadding()
+            isDirty = true;
+            getSkinnable().requestLayout();
+        });
+    }
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private final InvalidationListener graphicListener = o -> {
+        disclosureNodeDirty = true;
+        getSkinnable().requestLayout();
+    };
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * The amount of space to multiply by the treeItem.level to get the left
+     * margin for this tree cell. This is settable from CSS
+     */
+    private DoubleProperty indent = null;
+    public final void setIndent(double value) { indentProperty().set(value); }
+    public final double getIndent() { return indent == null ? 10.0 : indent.get(); }
+    public final DoubleProperty indentProperty() { 
+        if (indent == null) {
+            indent = new StyleableDoubleProperty(10.0) {
+                @Override public Object getBean() {
+                    return TreeTableRowSkin.this;
+                }
+
+                @Override public String getName() {
+                    return "indent";
+                }
+
+                @Override public CssMetaData<TreeTableRow<?>,Number> getCssMetaData() {
+                    return TreeTableRowSkin.StyleableProperties.INDENT;
+                }
+            };
+        }
+        return indent; 
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void updateChildren() {
+        super.updateChildren();
+
+        updateDisclosureNodeAndGraphic();
+
+        if (childrenDirty) {
+            childrenDirty = false;
+            if (cells.isEmpty()) {
+                getChildren().clear();
+            } else {
+                // TODO we can optimise this by only showing cells that are
+                // visible based on the table width and the amount of horizontal
+                // scrolling.
+                getChildren().addAll(cells);
+            }
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(double x, double y, double w, double h) {
+        if (disclosureNodeDirty) {
+            updateDisclosureNodeAndGraphic();
+            disclosureNodeDirty = false;
+        }
+
+        Node disclosureNode = getDisclosureNode();
+        if (disclosureNode != null && disclosureNode.getScene() == null) {
+            updateDisclosureNodeAndGraphic();
+        }
+
+        super.layoutChildren(x, y, w, h);
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override TreeTableCell<T, ?> getCell(TableColumnBase tcb) {
+        TreeTableColumn tableColumn = (TreeTableColumn<T,?>) tcb;
+        TreeTableCell cell = (TreeTableCell) tableColumn.getCellFactory().call(tableColumn);
+
+        cell.updateTreeTableColumn(tableColumn);
+        cell.updateTreeTableView(tableColumn.getTreeTableView());
+
+        return cell;
+    }
+
+    /** {@inheritDoc} */
+    @Override void updateCells(boolean resetChildren) {
+        super.updateCells(resetChildren);
+
+        if (resetChildren) {
+            childrenDirty = true;
+            updateChildren();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override boolean isIndentationRequired() {
+        return true;
+    }
+
+    /** {@inheritDoc} */
+    @Override TableColumnBase getTreeColumn() {
+        return getSkinnable().getTreeTableView().getTreeColumn();
+    }
+
+    /** {@inheritDoc} */
+    @Override int getIndentationLevel(TreeTableRow<T> control) {
+        return control.getTreeTableView().getTreeItemLevel(control.getTreeItem());
+    }
+
+    /** {@inheritDoc} */
+    @Override double getIndentationPerLevel() {
+        return getIndent();
+    }
+
+    /** {@inheritDoc} */
+    @Override Node getDisclosureNode() {
+        return getSkinnable().getDisclosureNode();
+    }
+
+    @Override boolean isDisclosureNodeVisible() {
+        return getDisclosureNode() != null && treeItem != null && ! treeItem.isLeaf();
+    }
+
+    @Override boolean isShowRoot() {
+        return getSkinnable().getTreeTableView().isShowRoot();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TreeTableColumn<T, ?>> getVisibleLeafColumns() {
+        return getSkinnable().getTreeTableView().getVisibleLeafColumns();
+    }
+
+    /** {@inheritDoc} */
+    @Override void updateCell(TreeTableCell<T, ?> cell, TreeTableRow<T> row) {
+        cell.updateTreeTableRow(row);
+    }
+
+    /** {@inheritDoc} */
+    @Override boolean isColumnPartiallyOrFullyVisible(TableColumnBase tc) {
+        return treeTableViewSkin == null ? false : treeTableViewSkin.isColumnPartiallyOrFullyVisible(tc);
+    }
+
+    /** {@inheritDoc} */
+    @Override TreeTableColumn<T, ?> getTableColumnBase(TreeTableCell cell) {
+        return cell.getTableColumn();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Node> graphicProperty() {
+        TreeTableRow<T> treeTableRow = getSkinnable();
+        if (treeTableRow == null) return null;
+        if (treeItem == null) return null;
+
+        return treeItem.graphicProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override Control getVirtualFlowOwner() {
+        return getSkinnable().getTreeTableView();
+    }
+
+    /** {@inheritDoc} */
+    @Override DoubleProperty fixedCellSizeProperty() {
+        return getSkinnable().getTreeTableView().fixedCellSizeProperty();
+    }
+
+    private void updateTreeItem() {
+        if (treeItem != null) {
+            treeItem.graphicProperty().removeListener(graphicListener);
+        }
+        treeItem = getSkinnable().getTreeItem();
+        if (treeItem != null) {
+            treeItem.graphicProperty().addListener(graphicListener);
+        }
+    }
+    
+    private void updateDisclosureNodeAndGraphic() {
+        if (getSkinnable().isEmpty()) return;
+        
+        // check for graphic missing
+        ObjectProperty<Node> graphicProperty = graphicProperty();
+        Node newGraphic = graphicProperty == null ? null : graphicProperty.get();
+        if (newGraphic != null) {
+            // RT-30466: remove the old graphic
+            if (newGraphic != graphic) {
+                getChildren().remove(graphic);
+            }
+
+            if (! getChildren().contains(newGraphic)) {
+                getChildren().add(newGraphic);
+                graphic = newGraphic;
+            }
+        }
+        
+        // check disclosure node
+        Node disclosureNode = getSkinnable().getDisclosureNode();
+        if (disclosureNode != null) {
+            boolean disclosureVisible = treeItem != null && ! treeItem.isLeaf();
+            disclosureNode.setVisible(disclosureVisible);
+                
+            if (! disclosureVisible) {
+                getChildren().remove(disclosureNode);
+            } else if (disclosureNode.getParent() == null) {
+                getChildren().add(disclosureNode);
+                disclosureNode.toFront();
+            } else {
+                disclosureNode.toBack();
+            }
+            
+            // RT-26625: [TreeView, TreeTableView] can lose arrows while scrolling
+            // RT-28668: Ensemble tree arrow disappears
+            if (disclosureNode.getScene() != null) {
+                disclosureNode.applyCss();
+            }
+        }
+    }
+
+    private void updateTableViewSkin() {
+        TreeTableView<T> tableView = getSkinnable().getTreeTableView();
+        if (tableView.getSkin() instanceof TreeTableViewSkin) {
+            treeTableViewSkin = (TreeTableViewSkin)tableView.getSkin();
+        }
+    }
+    
+    
+    /***************************************************************************
+     *                                                                         *
+     *                         Stylesheet Handling                             *
+     *                                                                         *
+     **************************************************************************/
+
+    /** @treatAsPrivate */
+    private static class StyleableProperties {
+        
+        private static final CssMetaData<TreeTableRow<?>,Number> INDENT = 
+            new CssMetaData<TreeTableRow<?>,Number>("-fx-indent",
+                SizeConverter.getInstance(), 10.0) {
+                    
+            @Override public boolean isSettable(TreeTableRow<?> n) {
+                DoubleProperty p = ((TreeTableRowSkin<?>) n.getSkin()).indentProperty();
+                return p == null || !p.isBound();
+            }
+
+            @Override public StyleableProperty<Number> getStyleableProperty(TreeTableRow<?> n) {
+                final TreeTableRowSkin<?> skin = (TreeTableRowSkin<?>) n.getSkin();
+                return (StyleableProperty<Number>)(WritableValue<Number>)skin.indentProperty();
+            }
+        };
+        
+        private static final List<CssMetaData<? extends Styleable, ?>> STYLEABLES;
+        static {
+            final List<CssMetaData<? extends Styleable, ?>> styleables =
+                new ArrayList<CssMetaData<? extends Styleable, ?>>(CellSkinBase.getClassCssMetaData());
+            styleables.add(INDENT);
+            STYLEABLES = Collections.unmodifiableList(styleables);
+        }
+    }
+
+    /**
+     * Returns 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();
+    }
+
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        final TreeTableView<T> treeTableView = getSkinnable().getTreeTableView();
+        switch (attribute) {
+            case SELECTED_ITEMS: {
+                // FIXME this could be optimised to iterate over cellsMap only
+                // (selectedCells could be big, cellsMap is much smaller)
+                List<Node> selection = new ArrayList<>();
+                int index = getSkinnable().getIndex();
+                for (TreeTablePosition<T,?> pos : treeTableView.getSelectionModel().getSelectedCells()) {
+                    if (pos.getRow() == index) {
+                        TreeTableColumn<T,?> column = pos.getTableColumn();
+                        if (column == null) {
+                            /* This is the row-based case */
+                            column = treeTableView.getVisibleLeafColumn(0);
+                        }
+                        TreeTableCell<T,?> cell = cellsMap.get(column).get();
+                        if (cell != null) selection.add(cell);
+                    }
+                    return FXCollections.observableArrayList(selection);
+                }
+            }
+            case CELL_AT_ROW_COLUMN: {
+                int colIndex = (Integer)parameters[1];
+                TreeTableColumn<T,?> column = treeTableView.getVisibleLeafColumn(colIndex);
+                if (cellsMap.containsKey(column)) {
+                    return cellsMap.get(column).get();
+                }
+                return null;
+            }
+            case FOCUS_ITEM: {
+                TreeTableView.TreeTableViewFocusModel<T> fm = treeTableView.getFocusModel();
+                TreeTablePosition<T,?> focusedCell = fm.getFocusedCell();
+                TreeTableColumn<T,?> column = focusedCell.getTableColumn();
+                if (column == null) {
+                    /* This is the row-based case */
+                    column = treeTableView.getVisibleLeafColumn(0);
+                }
+                if (cellsMap.containsKey(column)) {
+                    return cellsMap.get(column).get();
+                }
+                return null;
+            }
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeTableViewSkin.java	2015-09-03 15:24:44.481902100 -0700
+++ /dev/null	2015-09-03 15:24:45.000000000 -0700
@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 2012, 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 com.sun.javafx.collections.NonIterableChange;
-import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
-
-import javafx.event.WeakEventHandler;
-import javafx.scene.control.*;
-
-import com.sun.javafx.scene.control.behavior.TreeTableViewBehavior;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.TreeItem.TreeModificationEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.util.Callback;
-
-public class TreeTableViewSkin<S> extends TableViewSkinBase<S, TreeItem<S>, TreeTableView<S>, TreeTableViewBehavior<S>, TreeTableRow<S>, TreeTableColumn<S,?>> {
-    
-    public TreeTableViewSkin(final TreeTableView<S> treeTableView) {
-        super(treeTableView, new TreeTableViewBehavior<S>(treeTableView));
-        
-        this.treeTableView = treeTableView;
-        this.tableBackingList = new TreeTableViewBackingList<S>(treeTableView);
-        this.tableBackingListProperty = new SimpleObjectProperty<ObservableList<TreeItem<S>>>(tableBackingList);
-        
-        flow.setFixedCellSize(treeTableView.getFixedCellSize());
-        
-        super.init(treeTableView);
-        
-        setRoot(getSkinnable().getRoot());
-
-        EventHandler<MouseEvent> ml = event -> {
-            // RT-15127: cancel editing on scroll. This is a bit extreme
-            // (we are cancelling editing on touching the scrollbars).
-            // This can be improved at a later date.
-            if (treeTableView.getEditingCell() != null) {
-                treeTableView.edit(-1, null);
-            }
-
-            // This ensures that the table maintains the focus, even when the vbar
-            // and hbar controls inside the flow are clicked. Without this, the
-            // focus border will not be shown when the user interacts with the
-            // scrollbars, and more importantly, keyboard navigation won't be
-            // available to the user.
-            if (treeTableView.isFocusTraversable()) {
-                treeTableView.requestFocus();
-            }
-        };
-        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-
-        // init the behavior 'closures'
-        TreeTableViewBehavior<S> behavior = getBehavior();
-        behavior.setOnFocusPreviousRow(() -> { onFocusPreviousCell(); });
-        behavior.setOnFocusNextRow(() -> { onFocusNextCell(); });
-        behavior.setOnMoveToFirstCell(() -> { onMoveToFirstCell(); });
-        behavior.setOnMoveToLastCell(() -> { onMoveToLastCell(); });
-        behavior.setOnScrollPageDown(isFocusDriven -> onScrollPageDown(isFocusDriven));
-        behavior.setOnScrollPageUp(isFocusDriven -> onScrollPageUp(isFocusDriven));
-        behavior.setOnSelectPreviousRow(() -> { onSelectPreviousCell(); });
-        behavior.setOnSelectNextRow(() -> { onSelectNextCell(); });
-        behavior.setOnSelectLeftCell(() -> { onSelectLeftCell(); });
-        behavior.setOnSelectRightCell(() -> { onSelectRightCell(); });
-        
-        registerChangeListener(treeTableView.rootProperty(), "ROOT");
-        registerChangeListener(treeTableView.showRootProperty(), "SHOW_ROOT");
-        registerChangeListener(treeTableView.rowFactoryProperty(), "ROW_FACTORY");
-        registerChangeListener(treeTableView.expandedItemCountProperty(), "TREE_ITEM_COUNT");
-        registerChangeListener(treeTableView.fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-    }
-
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        
-        if ("ROOT".equals(p)) {
-            // fix for RT-37853
-            getSkinnable().edit(-1, null);
-
-            setRoot(getSkinnable().getRoot());
-        } else if ("SHOW_ROOT".equals(p)) {
-            // if we turn off showing the root, then we must ensure the root
-            // is expanded - otherwise we end up with no visible items in
-            // the tree.
-            if (! getSkinnable().isShowRoot() && getRoot() != null) {
-                 getRoot().setExpanded(true);
-            }
-            // update the item count in the flow and behavior instances
-            updateRowCount();
-        } else if ("ROW_FACTORY".equals(p)) {
-            flow.recreateCells();
-        } else if ("TREE_ITEM_COUNT".equals(p)) {
-            rowCountDirty = true;
-        } else if ("FIXED_CELL_SIZE".equals(p)) {
-            flow.setFixedCellSize(getSkinnable().getFixedCellSize());
-        }
-    }
-    
-    /***************************************************************************
-     *                                                                         *
-     * Listeners                                                               *
-     *                                                                         *
-     **************************************************************************/
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Internal Fields                                                         *
-     *                                                                         *
-     **************************************************************************/
-
-    private TreeTableViewBackingList<S> tableBackingList;
-    private ObjectProperty<ObservableList<TreeItem<S>>> tableBackingListProperty;
-    private TreeTableView<S> treeTableView;
-    private WeakReference<TreeItem<S>> weakRootRef;
-    
-    private EventHandler<TreeItem.TreeModificationEvent<S>> rootListener = e -> {
-        if (e.wasAdded() && e.wasRemoved() && e.getAddedSize() == e.getRemovedSize()) {
-            // Fix for RT-14842, where the children of a TreeItem were changing,
-            // but because the overall item count was staying the same, there was
-            // no event being fired to the skin to be informed that the items
-            // had changed. So, here we just watch for the case where the number
-            // of items being added is equal to the number of items being removed.
-            rowCountDirty = true;
-            getSkinnable().requestLayout();
-        } else if (e.getEventType().equals(TreeItem.valueChangedEvent())) {
-            // Fix for RT-14971 and RT-15338.
-            needCellsRebuilt = true;
-            getSkinnable().requestLayout();
-        } else {
-            // Fix for RT-20090. We are checking to see if the event coming
-            // from the TreeItem root is an event where the count has changed.
-            EventType<?> eventType = e.getEventType();
-            while (eventType != null) {
-                if (eventType.equals(TreeItem.<S>expandedItemCountChangeEvent())) {
-                    rowCountDirty = true;
-                    getSkinnable().requestLayout();
-                    break;
-                }
-                eventType = eventType.getSuperType();
-            }
-        }
-
-        // fix for RT-37853
-        getSkinnable().edit(-1, null);
-    };
-    
-    private WeakEventHandler<TreeModificationEvent<S>> weakRootListener;
-            
-    
-//    private WeakReference<TreeItem> weakRoot;
-    private TreeItem<S> getRoot() {
-        return weakRootRef == null ? null : weakRootRef.get();
-    }
-    private void setRoot(TreeItem<S> newRoot) {
-        if (getRoot() != null && weakRootListener != null) {
-            getRoot().removeEventHandler(TreeItem.<S>treeNotificationEvent(), weakRootListener);
-        }
-        weakRootRef = new WeakReference<>(newRoot);
-        if (getRoot() != null) {
-            weakRootListener = new WeakEventHandler<>(rootListener);
-            getRoot().addEventHandler(TreeItem.<S>treeNotificationEvent(), weakRootListener);
-        }
-        
-        updateRowCount();
-    }
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/  
-    
-    /** {@inheritDoc} */
-    @Override protected ObservableList<TreeTableColumn<S, ?>> getVisibleLeafColumns() {
-        return treeTableView.getVisibleLeafColumns();
-    }
-    
-    @Override protected int getVisibleLeafIndex(TreeTableColumn<S,?> tc) {
-        return treeTableView.getVisibleLeafIndex(tc);
-    }
-
-    @Override protected TreeTableColumn<S,?> getVisibleLeafColumn(int col) {
-        return treeTableView.getVisibleLeafColumn(col);
-    }
-
-    /** {@inheritDoc} */
-    @Override protected TreeTableView.TreeTableViewFocusModel<S> getFocusModel() {
-        return treeTableView.getFocusModel();
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected TreeTablePosition<S, ?> getFocusedCell() {
-        return treeTableView.getFocusModel().getFocusedCell();
-    }
-
-    /** {@inheritDoc} */
-	@Override protected TableSelectionModel<TreeItem<S>> getSelectionModel() {
-        return treeTableView.getSelectionModel();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<Callback<TreeTableView<S>, TreeTableRow<S>>> rowFactoryProperty() {
-        return treeTableView.rowFactoryProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<Node> placeholderProperty() {
-        return treeTableView.placeholderProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<ObservableList<TreeItem<S>>> itemsProperty() {
-        return tableBackingListProperty;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObservableList<TreeTableColumn<S,?>> getColumns() {
-        return treeTableView.getColumns();
-    }
-    
-    /** {@inheritDoc} */
-    @Override protected BooleanProperty tableMenuButtonVisibleProperty() {
-        return treeTableView.tableMenuButtonVisibleProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObjectProperty<Callback<ResizeFeaturesBase, Boolean>> columnResizePolicyProperty() {
-        // TODO Ugly!
-        return (ObjectProperty<Callback<ResizeFeaturesBase, Boolean>>) (Object) treeTableView.columnResizePolicyProperty();
-    }
-
-    /** {@inheritDoc} */
-    @Override protected ObservableList<TreeTableColumn<S,?>> getSortOrder() {
-        return treeTableView.getSortOrder();
-    }
-    
-    @Override protected boolean resizeColumn(TreeTableColumn<S,?> tc, double delta) {
-        return treeTableView.resizeColumn(tc, delta);
-    }
-
-    @Override protected void edit(int index, TreeTableColumn<S, ?> column) {
-        treeTableView.edit(index, column);
-    }
-
-    /*
-     * FIXME: Naive implementation ahead
-     * Attempts to resize column based on the pref width of all items contained
-     * in this column. This can be potentially very expensive if the number of
-     * rows is large.
-     */
-    @Override protected void resizeColumnToFitContent(TreeTableColumn<S,?> tc, int maxRows) {
-        final TreeTableColumn col = tc;
-        List<?> items = itemsProperty().get();
-        if (items == null || items.isEmpty()) return;
-    
-        Callback cellFactory = col.getCellFactory();
-        if (cellFactory == null) return;
-    
-        TreeTableCell<S,?> cell = (TreeTableCell) cellFactory.call(col);
-        if (cell == null) return;
-        
-        // set this property to tell the TableCell we want to know its actual
-        // preferred width, not the width of the associated TableColumnBase
-        cell.getProperties().put(TableCellSkin.DEFER_TO_PARENT_PREF_WIDTH, Boolean.TRUE);
-        
-        // determine cell padding
-        double padding = 10;
-        Node n = cell.getSkin() == null ? null : cell.getSkin().getNode();
-        if (n instanceof Region) {
-            Region r = (Region) n;
-            padding = r.snappedLeftInset() + r.snappedRightInset();
-        } 
-        
-        TreeTableRow<S> treeTableRow = new TreeTableRow<>();
-        treeTableRow.updateTreeTableView(treeTableView);
-        
-        int rows = maxRows == -1 ? items.size() : Math.min(items.size(), maxRows);
-        double maxWidth = 0;
-        for (int row = 0; row < rows; row++) {
-            treeTableRow.updateIndex(row);
-            treeTableRow.updateTreeItem(treeTableView.getTreeItem(row));
-            
-            cell.updateTreeTableColumn(col);
-            cell.updateTreeTableView(treeTableView);
-            cell.updateTreeTableRow(treeTableRow);
-            cell.updateIndex(row);
-            
-            if ((cell.getText() != null && !cell.getText().isEmpty()) || cell.getGraphic() != null) {
-                getChildren().add(cell);
-                cell.applyCss();
-                
-                double w = cell.prefWidth(-1);
-                
-                maxWidth = Math.max(maxWidth, w);
-                getChildren().remove(cell);
-            }
-        }
-
-        // dispose of the cell to prevent it retaining listeners (see RT-31015)
-        cell.updateIndex(-1);
-
-        // RT-36855 - take into account the column header text / graphic widths.
-        // Magic 10 is to allow for sort arrow to appear without text truncation.
-        TableColumnHeader header = getTableHeaderRow().getColumnHeaderFor(tc);
-        double headerTextWidth = Utils.computeTextWidth(header.label.getFont(), tc.getText(), -1);
-        Node graphic = header.label.getGraphic();
-        double headerGraphicWidth = graphic == null ? 0 : graphic.prefWidth(-1) + header.label.getGraphicTextGap();
-        double headerWidth = headerTextWidth + headerGraphicWidth + 10 + header.snappedLeftInset() + header.snappedRightInset();
-        maxWidth = Math.max(maxWidth, headerWidth);
-        
-        // RT-23486
-        maxWidth += padding;
-        if(treeTableView.getColumnResizePolicy() == TreeTableView.CONSTRAINED_RESIZE_POLICY) {
-            maxWidth = Math.max(maxWidth, col.getWidth());
-        }
-
-        col.impl_setWidth(maxWidth);
-    }
-    
-    /** {@inheritDoc} */
-    @Override public int getItemCount() {
-        return treeTableView.getExpandedItemCount();
-    }
-    
-    /** {@inheritDoc} */
-    @Override public TreeTableRow<S> createCell() {
-        TreeTableRow<S> cell;
-
-        if (treeTableView.getRowFactory() != null) {
-            cell = treeTableView.getRowFactory().call(treeTableView);
-        } else {
-            cell = new TreeTableRow<S>();
-        }
-
-        // If there is no disclosure node, then add one of my own
-        if (cell.getDisclosureNode() == null) {
-            final StackPane disclosureNode = new StackPane();
-            disclosureNode.getStyleClass().setAll("tree-disclosure-node");
-            disclosureNode.setMouseTransparent(true);
-
-            final StackPane disclosureNodeArrow = new StackPane();
-            disclosureNodeArrow.getStyleClass().setAll("arrow");
-            disclosureNode.getChildren().add(disclosureNodeArrow);
-
-            cell.setDisclosureNode(disclosureNode);
-        }
-
-        cell.updateTreeTableView(treeTableView);
-        return cell;
-    }
-
-    @Override protected void horizontalScroll() {
-        super.horizontalScroll();
-        if (getSkinnable().getFixedCellSize() > 0) {
-            flow.requestCellLayout();
-        }
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case ROW_AT_INDEX: {
-                final int rowIndex = (Integer)parameters[0];
-                return rowIndex < 0 ? null : flow.getPrivateCell(rowIndex);
-            }
-            case SELECTED_ITEMS: {
-                List<Node> selection = new ArrayList<>();
-                TreeTableView.TreeTableViewSelectionModel<S> sm = getSkinnable().getSelectionModel();
-                for (TreeTablePosition<S,?> pos : sm.getSelectedCells()) {
-                    TreeTableRow<S> row = flow.getPrivateCell(pos.getRow());
-                    if (row != null) selection.add(row);
-                }
-                return FXCollections.observableArrayList(selection);
-            }
-            case FOCUS_ITEM: // TableViewSkinBase
-            case CELL_AT_ROW_COLUMN: // TableViewSkinBase
-            case COLUMN_AT_INDEX: // TableViewSkinBase
-            case HEADER: // TableViewSkinBase
-            case VERTICAL_SCROLLBAR: // TableViewSkinBase
-            case HORIZONTAL_SCROLLBAR: // TableViewSkinBase
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-    @Override
-    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-        switch (action) {
-            case SHOW_ITEM: {
-                Node item = (Node)parameters[0];
-                if (item instanceof TreeTableCell) {
-                    @SuppressWarnings("unchecked")
-                    TreeTableCell<S, ?> cell = (TreeTableCell<S, ?>)item;
-                    flow.show(cell.getIndex());
-                }
-                break;
-            }
-            case SET_SELECTED_ITEMS: {
-                @SuppressWarnings("unchecked")
-                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
-                if (items != null) {
-                    TreeTableView.TreeTableViewSelectionModel<S> sm = getSkinnable().getSelectionModel();
-                    if (sm != null) {
-                        sm.clearSelection();
-                        for (Node item : items) {
-                            if (item instanceof TreeTableCell) {
-                                @SuppressWarnings("unchecked")
-                                TreeTableCell<S, ?> cell = (TreeTableCell<S, ?>)item;
-                                sm.select(cell.getIndex(), cell.getTableColumn());
-                            }
-                        }
-                    }
-                }
-                break;
-            }
-            default: super.executeAccessibleAction(action, parameters);
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     * Layout                                                                  *
-     *                                                                         *
-     **************************************************************************/    
-    
-
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Private methods                                                         *
-     *                                                                         *
-     **************************************************************************/
-    
-    @Override protected void updateRowCount() {
-        updatePlaceholderRegionVisibility();
-
-        tableBackingList.resetSize();
-        
-        int oldCount = flow.getCellCount();
-        int newCount = getItemCount();
-        
-        // if this is not called even when the count is the same, we get a 
-        // memory leak in VirtualFlow.sheet.children. This can probably be 
-        // optimised in the future when time permits.
-        flow.setCellCount(newCount);
-        
-        if (forceCellRecreate) {
-            needCellsRecreated = true;
-            forceCellRecreate = false;
-        } else if (newCount != oldCount) {
-            needCellsRebuilt = true;
-        } else {
-            needCellsReconfigured = true;
-        }
-    }
-
-    /**
-     * A simple read only list structure that maps into the TreeTableView tree
-     * structure.
-     */
-    private static class TreeTableViewBackingList<S> extends ReadOnlyUnbackedObservableList<TreeItem<S>> {
-        private final TreeTableView<S> treeTable;
-        
-        private int size = -1;
-        
-        TreeTableViewBackingList(TreeTableView<S> treeTable) {
-            this.treeTable = treeTable;
-        }
-        
-        void resetSize() {
-            int oldSize = size;
-            size = -1;
-            
-            // TODO we can certainly make this better....but it may not really matter
-            callObservers(new NonIterableChange.GenericAddRemoveChange<TreeItem<S>>(
-                    0, oldSize, FXCollections.<TreeItem<S>>emptyObservableList(), this));
-        }
-        
-        @Override public TreeItem<S> get(int i) {
-            return treeTable.getTreeItem(i);
-        }
-
-        @Override public int size() {
-            if (size == -1) {
-                size = treeTable.getExpandedItemCount();
-            }
-            return size;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:24:45.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TreeTableViewSkin.java	2015-09-03 15:24:43.631853500 -0700
@@ -0,0 +1,554 @@
+/*
+ * Copyright (c) 2012, 2015, 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 com.sun.javafx.collections.NonIterableChange;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.ReadOnlyUnbackedObservableList;
+
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.event.WeakEventHandler;
+import javafx.scene.control.*;
+
+import com.sun.javafx.scene.control.behavior.TreeTableViewBehavior;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.TreeItem.TreeModificationEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.util.Callback;
+
+/**
+ * Default skin implementation for the {@link TreeTableView} control.
+ *
+ * @see TreeTableView
+ * @since 9
+ */
+public class TreeTableViewSkin<T> extends TableViewSkinBase<T, TreeItem<T>, TreeTableView<T>, TreeTableRow<T>, TreeTableColumn<T,?>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private Fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private TreeTableViewBackingList<T> tableBackingList;
+    private ObjectProperty<ObservableList<TreeItem<T>>> tableBackingListProperty;
+    private WeakReference<TreeItem<T>> weakRootRef;
+    private final TreeTableViewBehavior<T>  behavior;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private EventHandler<TreeItem.TreeModificationEvent<T>> rootListener = e -> {
+        if (e.wasAdded() && e.wasRemoved() && e.getAddedSize() == e.getRemovedSize()) {
+            // Fix for RT-14842, where the children of a TreeItem were changing,
+            // but because the overall item count was staying the same, there was
+            // no event being fired to the skin to be informed that the items
+            // had changed. So, here we just watch for the case where the number
+            // of items being added is equal to the number of items being removed.
+            rowCountDirty = true;
+            getSkinnable().requestLayout();
+        } else if (e.getEventType().equals(TreeItem.valueChangedEvent())) {
+            // Fix for RT-14971 and RT-15338.
+            needCellsRebuilt = true;
+            getSkinnable().requestLayout();
+        } else {
+            // Fix for RT-20090. We are checking to see if the event coming
+            // from the TreeItem root is an event where the count has changed.
+            EventType<?> eventType = e.getEventType();
+            while (eventType != null) {
+                if (eventType.equals(TreeItem.<T>expandedItemCountChangeEvent())) {
+                    rowCountDirty = true;
+                    getSkinnable().requestLayout();
+                    break;
+                }
+                eventType = eventType.getSuperType();
+            }
+        }
+
+        // fix for RT-37853
+        getSkinnable().edit(-1, null);
+    };
+
+    private WeakEventHandler<TreeModificationEvent<T>> weakRootListener;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TreeTableViewSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TreeTableViewSkin(final TreeTableView<T> control) {
+        super(control);
+
+        // install default input map for the TreeTableView control
+        behavior = new TreeTableViewBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+        
+        flow.setFixedCellSize(control.getFixedCellSize());
+        flow.setCellFactory(flow -> createCell());
+        
+        setRoot(getSkinnable().getRoot());
+
+        EventHandler<MouseEvent> ml = event -> {
+            // RT-15127: cancel editing on scroll. This is a bit extreme
+            // (we are cancelling editing on touching the scrollbars).
+            // This can be improved at a later date.
+            if (control.getEditingCell() != null) {
+                control.edit(-1, null);
+            }
+
+            // This ensures that the table maintains the focus, even when the vbar
+            // and hbar controls inside the flow are clicked. Without this, the
+            // focus border will not be shown when the user interacts with the
+            // scrollbars, and more importantly, keyboard navigation won't be
+            // available to the user.
+            if (control.isFocusTraversable()) {
+                control.requestFocus();
+            }
+        };
+        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+
+        // init the behavior 'closures'
+        behavior.setOnFocusPreviousRow(() -> onFocusPreviousCell());
+        behavior.setOnFocusNextRow(() -> onFocusNextCell());
+        behavior.setOnMoveToFirstCell(() -> onMoveToFirstCell());
+        behavior.setOnMoveToLastCell(() -> onMoveToLastCell());
+        behavior.setOnScrollPageDown(isFocusDriven -> onScrollPageDown(isFocusDriven));
+        behavior.setOnScrollPageUp(isFocusDriven -> onScrollPageUp(isFocusDriven));
+        behavior.setOnSelectPreviousRow(() -> onSelectPreviousCell());
+        behavior.setOnSelectNextRow(() -> onSelectNextCell());
+        behavior.setOnSelectLeftCell(() -> onSelectLeftCell());
+        behavior.setOnSelectRightCell(() -> onSelectRightCell());
+        
+        registerChangeListener(control.rootProperty(), e -> {
+            // fix for RT-37853
+            getSkinnable().edit(-1, null);
+
+            setRoot(getSkinnable().getRoot());
+        });
+        registerChangeListener(control.showRootProperty(), e -> {
+            // if we turn off showing the root, then we must ensure the root
+            // is expanded - otherwise we end up with no visible items in
+            // the tree.
+            if (! getSkinnable().isShowRoot() && getRoot() != null) {
+                getRoot().setExpanded(true);
+            }
+            // update the item count in the flow and behavior instances
+            updateRowCount();
+        });
+        registerChangeListener(control.rowFactoryProperty(), e -> flow.recreateCells());
+        registerChangeListener(control.expandedItemCountProperty(), e -> rowCountDirty = true);
+        registerChangeListener(control.fixedCellSizeProperty(), e -> flow.setFixedCellSize(getSkinnable().getFixedCellSize()));
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case ROW_AT_INDEX: {
+                final int rowIndex = (Integer)parameters[0];
+                return rowIndex < 0 ? null : flow.getPrivateCell(rowIndex);
+            }
+            case SELECTED_ITEMS: {
+                List<Node> selection = new ArrayList<>();
+                TreeTableView.TreeTableViewSelectionModel<T> sm = getSkinnable().getSelectionModel();
+                for (TreeTablePosition<T,?> pos : sm.getSelectedCells()) {
+                    TreeTableRow<T> row = flow.getPrivateCell(pos.getRow());
+                    if (row != null) selection.add(row);
+                }
+                return FXCollections.observableArrayList(selection);
+            }
+            case FOCUS_ITEM: // TableViewSkinBase
+            case CELL_AT_ROW_COLUMN: // TableViewSkinBase
+            case COLUMN_AT_INDEX: // TableViewSkinBase
+            case HEADER: // TableViewSkinBase
+            case VERTICAL_SCROLLBAR: // TableViewSkinBase
+            case HORIZONTAL_SCROLLBAR: // TableViewSkinBase
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    @Override
+    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+        switch (action) {
+            case SHOW_ITEM: {
+                Node item = (Node)parameters[0];
+                if (item instanceof TreeTableCell) {
+                    @SuppressWarnings("unchecked")
+                    TreeTableCell<T, ?> cell = (TreeTableCell<T, ?>)item;
+                    flow.scrollTo(cell.getIndex());
+                }
+                break;
+            }
+            case SET_SELECTED_ITEMS: {
+                @SuppressWarnings("unchecked")
+                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
+                if (items != null) {
+                    TreeTableView.TreeTableViewSelectionModel<T> sm = getSkinnable().getSelectionModel();
+                    if (sm != null) {
+                        sm.clearSelection();
+                        for (Node item : items) {
+                            if (item instanceof TreeTableCell) {
+                                @SuppressWarnings("unchecked")
+                                TreeTableCell<T, ?> cell = (TreeTableCell<T, ?>)item;
+                                sm.select(cell.getIndex(), cell.getTableColumn());
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+            default: super.executeAccessibleAction(action, parameters);
+        }
+    }
+
+
+    
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    private TreeTableRow<T> createCell() {
+        TreeTableRow<T> cell;
+
+        TreeTableView<T> treeTableView = getSkinnable();
+        if (treeTableView.getRowFactory() != null) {
+            cell = treeTableView.getRowFactory().call(treeTableView);
+        } else {
+            cell = new TreeTableRow<T>();
+        }
+
+        // If there is no disclosure node, then add one of my own
+        if (cell.getDisclosureNode() == null) {
+            final StackPane disclosureNode = new StackPane();
+            disclosureNode.getStyleClass().setAll("tree-disclosure-node");
+            disclosureNode.setMouseTransparent(true);
+
+            final StackPane disclosureNodeArrow = new StackPane();
+            disclosureNodeArrow.getStyleClass().setAll("arrow");
+            disclosureNode.getChildren().add(disclosureNodeArrow);
+
+            cell.setDisclosureNode(disclosureNode);
+        }
+
+        cell.updateTreeTableView(treeTableView);
+        return cell;
+    }
+
+    private TreeItem<T> getRoot() {
+        return weakRootRef == null ? null : weakRootRef.get();
+    }
+    private void setRoot(TreeItem<T> newRoot) {
+        if (getRoot() != null && weakRootListener != null) {
+            getRoot().removeEventHandler(TreeItem.<T>treeNotificationEvent(), weakRootListener);
+        }
+        weakRootRef = new WeakReference<>(newRoot);
+        if (getRoot() != null) {
+            weakRootListener = new WeakEventHandler<>(rootListener);
+            getRoot().addEventHandler(TreeItem.<T>treeNotificationEvent(), weakRootListener);
+        }
+
+        updateRowCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TreeTableColumn<T, ?>> getVisibleLeafColumns() {
+        return getSkinnable().getVisibleLeafColumns();
+    }
+
+    @Override int getVisibleLeafIndex(TreeTableColumn<T,?> tc) {
+        return getSkinnable().getVisibleLeafIndex(tc);
+    }
+
+    @Override TreeTableColumn<T,?> getVisibleLeafColumn(int col) {
+        return getSkinnable().getVisibleLeafColumn(col);
+    }
+
+    /** {@inheritDoc} */
+    @Override TreeTableView.TreeTableViewFocusModel<T> getFocusModel() {
+        return getSkinnable().getFocusModel();
+    }
+
+    /** {@inheritDoc} */
+    @Override TreeTablePosition<T, ?> getFocusedCell() {
+        return getSkinnable().getFocusModel().getFocusedCell();
+    }
+
+    /** {@inheritDoc} */
+    @Override TableSelectionModel<TreeItem<T>> getSelectionModel() {
+        return getSkinnable().getSelectionModel();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Callback<TreeTableView<T>, TreeTableRow<T>>> rowFactoryProperty() {
+        return getSkinnable().rowFactoryProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Node> placeholderProperty() {
+        return getSkinnable().placeholderProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<ObservableList<TreeItem<T>>> itemsProperty() {
+        if (tableBackingListProperty == null) {
+            this.tableBackingList = new TreeTableViewBackingList<>(getSkinnable());
+            this.tableBackingListProperty = new SimpleObjectProperty<>(tableBackingList);
+        }
+        return tableBackingListProperty;
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TreeTableColumn<T,?>> getColumns() {
+        return getSkinnable().getColumns();
+    }
+
+    /** {@inheritDoc} */
+    @Override BooleanProperty tableMenuButtonVisibleProperty() {
+        return getSkinnable().tableMenuButtonVisibleProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObjectProperty<Callback<ResizeFeaturesBase, Boolean>> columnResizePolicyProperty() {
+        return (ObjectProperty<Callback<ResizeFeaturesBase, Boolean>>) (Object) getSkinnable().columnResizePolicyProperty();
+    }
+
+    /** {@inheritDoc} */
+    @Override ObservableList<TreeTableColumn<T,?>> getSortOrder() {
+        return getSkinnable().getSortOrder();
+    }
+
+    @Override boolean resizeColumn(TreeTableColumn<T,?> tc, double delta) {
+        return getSkinnable().resizeColumn(tc, delta);
+    }
+
+    /*
+     * FIXME: Naive implementation ahead
+     * Attempts to resize column based on the pref width of all items contained
+     * in this column. This can be potentially very expensive if the number of
+     * rows is large.
+     */
+    @Override void resizeColumnToFitContent(TreeTableColumn<T,?> tc, int maxRows) {
+        final TreeTableColumn col = tc;
+        List<?> items = itemsProperty().get();
+        if (items == null || items.isEmpty()) return;
+
+        Callback cellFactory = col.getCellFactory();
+        if (cellFactory == null) return;
+
+        TreeTableCell<T,?> cell = (TreeTableCell) cellFactory.call(col);
+        if (cell == null) return;
+
+        // set this property to tell the TableCell we want to know its actual
+        // preferred width, not the width of the associated TableColumnBase
+        cell.getProperties().put(Properties.DEFER_TO_PARENT_PREF_WIDTH, Boolean.TRUE);
+
+        // determine cell padding
+        double padding = 10;
+        Node n = cell.getSkin() == null ? null : cell.getSkin().getNode();
+        if (n instanceof Region) {
+            Region r = (Region) n;
+            padding = r.snappedLeftInset() + r.snappedRightInset();
+        }
+
+        final TreeTableView<T> treeTableView = getSkinnable();
+
+        TreeTableRow<T> treeTableRow = new TreeTableRow<>();
+        treeTableRow.updateTreeTableView(treeTableView);
+
+        int rows = maxRows == -1 ? items.size() : Math.min(items.size(), maxRows);
+        double maxWidth = 0;
+        for (int row = 0; row < rows; row++) {
+            treeTableRow.updateIndex(row);
+            treeTableRow.updateTreeItem(treeTableView.getTreeItem(row));
+
+            cell.updateTreeTableColumn(col);
+            cell.updateTreeTableView(treeTableView);
+            cell.updateTreeTableRow(treeTableRow);
+            cell.updateIndex(row);
+
+            if ((cell.getText() != null && !cell.getText().isEmpty()) || cell.getGraphic() != null) {
+                getChildren().add(cell);
+                cell.applyCss();
+
+                double w = cell.prefWidth(-1);
+
+                maxWidth = Math.max(maxWidth, w);
+                getChildren().remove(cell);
+            }
+        }
+
+        // dispose of the cell to prevent it retaining listeners (see RT-31015)
+        cell.updateIndex(-1);
+
+        // RT-36855 - take into account the column header text / graphic widths.
+        // Magic 10 is to allow for sort arrow to appear without text truncation.
+        TableColumnHeader header = getTableHeaderRow().getColumnHeaderFor(tc);
+        double headerTextWidth = Utils.computeTextWidth(header.label.getFont(), tc.getText(), -1);
+        Node graphic = header.label.getGraphic();
+        double headerGraphicWidth = graphic == null ? 0 : graphic.prefWidth(-1) + header.label.getGraphicTextGap();
+        double headerWidth = headerTextWidth + headerGraphicWidth + 10 + header.snappedLeftInset() + header.snappedRightInset();
+        maxWidth = Math.max(maxWidth, headerWidth);
+
+        // RT-23486
+        maxWidth += padding;
+        if(treeTableView.getColumnResizePolicy() == TreeTableView.CONSTRAINED_RESIZE_POLICY) {
+            maxWidth = Math.max(maxWidth, col.getWidth());
+        }
+
+        col.impl_setWidth(maxWidth);
+    }
+
+    /** {@inheritDoc} */
+    @Override int getItemCount() {
+        return getSkinnable().getExpandedItemCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override void horizontalScroll() {
+        super.horizontalScroll();
+        if (getSkinnable().getFixedCellSize() > 0) {
+            flow.requestCellLayout();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override void updateRowCount() {
+        updatePlaceholderRegionVisibility();
+
+        tableBackingList.resetSize();
+
+        int oldCount = flow.getCellCount();
+        int newCount = getItemCount();
+
+        // if this is not called even when the count is the same, we get a
+        // memory leak in VirtualFlow.sheet.children. This can probably be
+        // optimised in the future when time permits.
+        flow.setCellCount(newCount);
+
+        if (forceCellRecreate) {
+            needCellsRecreated = true;
+            forceCellRecreate = false;
+        } else if (newCount != oldCount) {
+            needCellsRebuilt = true;
+        } else {
+            needCellsReconfigured = true;
+        }
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * A simple read only list structure that maps into the TreeTableView tree
+     * structure.
+     */
+    private static class TreeTableViewBackingList<T> extends ReadOnlyUnbackedObservableList<TreeItem<T>> {
+        private final TreeTableView<T> treeTable;
+        
+        private int size = -1;
+        
+        TreeTableViewBackingList(TreeTableView<T> treeTable) {
+            this.treeTable = treeTable;
+        }
+        
+        void resetSize() {
+            int oldSize = size;
+            size = -1;
+            
+            // TODO we can certainly make this better....but it may not really matter
+            callObservers(new NonIterableChange.GenericAddRemoveChange<TreeItem<T>>(
+                    0, oldSize, FXCollections.<TreeItem<T>>emptyObservableList(), this));
+        }
+        
+        @Override public TreeItem<T> get(int i) {
+            return treeTable.getTreeItem(i);
+        }
+
+        @Override public int size() {
+            if (size == -1) {
+                size = treeTable.getExpandedItemCount();
+            }
+            return size;
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/TreeViewSkin.java	2015-09-03 15:24:52.638368600 -0700
+++ /dev/null	2015-09-03 15:24:53.000000000 -0700
@@ -1,567 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.WeakInvalidationListener;
-import javafx.collections.FXCollections;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableList;
-import javafx.collections.ObservableMap;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
-import javafx.event.WeakEventHandler;
-import javafx.scene.AccessibleAction;
-import javafx.scene.AccessibleAttribute;
-import javafx.scene.Node;
-import javafx.scene.control.*;
-import javafx.scene.control.TreeItem.TreeModificationEvent;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.StackPane;
-import java.lang.ref.WeakReference;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.sun.javafx.scene.control.behavior.TreeViewBehavior;
-
-public class TreeViewSkin<T> extends VirtualContainerBase<TreeView<T>, TreeViewBehavior<T>, TreeCell<T>> {
-
-    public static final String RECREATE = "treeRecreateKey";
-
-    // RT-34744 : IS_PANNABLE will be false unless
-    // com.sun.javafx.scene.control.skin.TreeViewSkin.pannable
-    // is set to true. This is done in order to make TreeView functional
-    // on embedded systems with touch screens which do not generate scroll
-    // events for touch drag gestures.
-    private static final boolean IS_PANNABLE =
-            AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> Boolean.getBoolean("com.sun.javafx.scene.control.skin.TreeViewSkin.pannable"));
-
-
-    public TreeViewSkin(final TreeView treeView) {
-        super(treeView, new TreeViewBehavior(treeView));
-
-        // init the VirtualFlow
-        flow.setPannable(IS_PANNABLE);
-        flow.setCreateCell(flow1 -> TreeViewSkin.this.createCell());
-        flow.setFixedCellSize(treeView.getFixedCellSize());
-        getChildren().add(flow);
-        
-        setRoot(getSkinnable().getRoot());
-        
-        EventHandler<MouseEvent> ml = event -> {
-            // RT-15127: cancel editing on scroll. This is a bit extreme
-            // (we are cancelling editing on touching the scrollbars).
-            // This can be improved at a later date.
-            if (treeView.getEditingItem() != null) {
-                treeView.edit(null);
-            }
-
-            // This ensures that the tree maintains the focus, even when the vbar
-            // and hbar controls inside the flow are clicked. Without this, the
-            // focus border will not be shown when the user interacts with the
-            // scrollbars, and more importantly, keyboard navigation won't be
-            // available to the user.
-            if (treeView.isFocusTraversable()) {
-                treeView.requestFocus();
-            }
-        };
-        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
-
-        final ObservableMap<Object, Object> properties = treeView.getProperties();
-        properties.remove(RECREATE);
-        properties.addListener(propertiesMapListener);
-
-        // init the behavior 'closures'
-        getBehavior().setOnFocusPreviousRow(() -> { onFocusPreviousCell(); });
-        getBehavior().setOnFocusNextRow(() -> { onFocusNextCell(); });
-        getBehavior().setOnMoveToFirstCell(() -> { onMoveToFirstCell(); });
-        getBehavior().setOnMoveToLastCell(() -> { onMoveToLastCell(); });
-        getBehavior().setOnScrollPageDown(isFocusDriven -> onScrollPageDown(isFocusDriven));
-        getBehavior().setOnScrollPageUp(isFocusDriven -> onScrollPageUp(isFocusDriven));
-        getBehavior().setOnSelectPreviousRow(() -> { onSelectPreviousCell(); });
-        getBehavior().setOnSelectNextRow(() -> { onSelectNextCell(); });
-
-        registerChangeListener(treeView.rootProperty(), "ROOT");
-        registerChangeListener(treeView.showRootProperty(), "SHOW_ROOT");
-        registerChangeListener(treeView.cellFactoryProperty(), "CELL_FACTORY");
-        registerChangeListener(treeView.fixedCellSizeProperty(), "FIXED_CELL_SIZE");
-        
-        updateRowCount();
-    }
-    
-    @Override protected void handleControlPropertyChanged(String p) {
-        super.handleControlPropertyChanged(p);
-        
-        if ("ROOT".equals(p)) {
-            setRoot(getSkinnable().getRoot());
-        } else if ("SHOW_ROOT".equals(p)) {
-            // if we turn off showing the root, then we must ensure the root
-            // is expanded - otherwise we end up with no visible items in
-            // the tree.
-            if (! getSkinnable().isShowRoot() && getRoot() != null) {
-                 getRoot().setExpanded(true);
-            }
-            // update the item count in the flow and behavior instances
-            updateRowCount();
-        } else if ("CELL_FACTORY".equals(p)) {
-            flow.recreateCells();
-        } else if ("FIXED_CELL_SIZE".equals(p)) {
-            flow.setFixedCellSize(getSkinnable().getFixedCellSize());
-        }
-    }
-    
-//    private boolean needItemCountUpdate = false;
-    private boolean needCellsRebuilt = true;
-    private boolean needCellsReconfigured = false;
-
-    private MapChangeListener<Object, Object> propertiesMapListener = c -> {
-        if (! c.wasAdded()) return;
-        if (RECREATE.equals(c.getKey())) {
-            needCellsRebuilt = true;
-            getSkinnable().requestLayout();
-            getSkinnable().getProperties().remove(RECREATE);
-        }
-    };
-    
-    private EventHandler<TreeModificationEvent<T>> rootListener = e -> {
-        if (e.wasAdded() && e.wasRemoved() && e.getAddedSize() == e.getRemovedSize()) {
-            // Fix for RT-14842, where the children of a TreeItem were changing,
-            // but because the overall item count was staying the same, there was
-            // no event being fired to the skin to be informed that the items
-            // had changed. So, here we just watch for the case where the number
-            // of items being added is equal to the number of items being removed.
-            rowCountDirty = true;
-            getSkinnable().requestLayout();
-        } else if (e.getEventType().equals(TreeItem.valueChangedEvent())) {
-            // Fix for RT-14971 and RT-15338.
-            needCellsRebuilt = true;
-            getSkinnable().requestLayout();
-        } else {
-            // Fix for RT-20090. We are checking to see if the event coming
-            // from the TreeItem root is an event where the count has changed.
-            EventType<?> eventType = e.getEventType();
-            while (eventType != null) {
-                if (eventType.equals(TreeItem.<T>expandedItemCountChangeEvent())) {
-                    rowCountDirty = true;
-                    getSkinnable().requestLayout();
-                    break;
-                }
-                eventType = eventType.getSuperType();
-            }
-        }
-
-        // fix for RT-37853
-        getSkinnable().edit(null);
-    };
-    
-    private WeakEventHandler<TreeModificationEvent<T>> weakRootListener;
-            
-    
-    private WeakReference<TreeItem<T>> weakRoot;
-    private TreeItem<T> getRoot() {
-        return weakRoot == null ? null : weakRoot.get();
-    }
-    private void setRoot(TreeItem<T> newRoot) {
-        if (getRoot() != null && weakRootListener != null) {
-            getRoot().removeEventHandler(TreeItem.<T>treeNotificationEvent(), weakRootListener);
-        }
-        weakRoot = new WeakReference<>(newRoot);
-        if (getRoot() != null) {
-            weakRootListener = new WeakEventHandler<>(rootListener);
-            getRoot().addEventHandler(TreeItem.<T>treeNotificationEvent(), weakRootListener);
-        }
-
-        updateRowCount();
-    }
-
-    @Override public int getItemCount() {
-        return getSkinnable().getExpandedItemCount();
-    }
-
-    @Override protected void updateRowCount() {
-//        int oldCount = flow.getCellCount();
-        int newCount = getItemCount();
-        
-        // if this is not called even when the count is the same, we get a 
-        // memory leak in VirtualFlow.sheet.children. This can probably be 
-        // optimised in the future when time permits.
-        flow.setCellCount(newCount);
-
-        // Ideally we would be more nuanced here, toggling a cheaper needs* 
-        // field, but if we do we hit issues such as those identified in 
-        // RT-27852, where the expended item count of the new root equals the
-        // EIC of the old root, which would lead to the visuals not updating
-        // properly. 
-        needCellsRebuilt = true;
-        getSkinnable().requestLayout();
-    }
-
-    @Override public TreeCell<T> createCell() {
-        final TreeCell<T> cell;
-        if (getSkinnable().getCellFactory() != null) {
-            cell = getSkinnable().getCellFactory().call(getSkinnable());
-        } else {
-            cell = createDefaultCellImpl();
-        }
-
-        // If there is no disclosure node, then add one of my own
-        if (cell.getDisclosureNode() == null) {
-            final StackPane disclosureNode = new StackPane();
-
-            /* This code is intentionally commented.
-             * Currently as it stands it does provided any functionality and interferes
-             * with TreeView. The VO cursor move over the DISCLOSURE_NODE instead of the 
-             * tree item itself. This is possibly caused by the order of item's children 
-             * (the Labeled and the disclosure node).
-             */
-//            final StackPane disclosureNode = new StackPane() {
-//                @Override protected Object accGetAttribute(Attribute attribute, Object... parameters) {
-//                    switch (attribute) {
-//                        case ROLE: return Role.DISCLOSURE_NODE;
-//                        default: return super.accGetAttribute(attribute, parameters);
-//                    }
-//                }
-//            };
-            disclosureNode.getStyleClass().setAll("tree-disclosure-node");
-
-            final StackPane disclosureNodeArrow = new StackPane();
-            disclosureNodeArrow.getStyleClass().setAll("arrow");
-            disclosureNode.getChildren().add(disclosureNodeArrow);
-
-            cell.setDisclosureNode(disclosureNode);
-        }
-
-        cell.updateTreeView(getSkinnable());
-
-        return cell;
-    }
-
-    // Note: This is a copy/paste of javafx.scene.control.cell.DefaultTreeCell,
-    // which is package-protected
-    private TreeCell<T> createDefaultCellImpl() {
-        return new TreeCell<T>() {
-            private HBox hbox;
-            
-            private WeakReference<TreeItem<T>> treeItemRef;
-            
-            private InvalidationListener treeItemGraphicListener = observable -> {
-                updateDisplay(getItem(), isEmpty());
-            };
-            
-            private InvalidationListener treeItemListener = new InvalidationListener() {
-                @Override public void invalidated(Observable observable) {
-                    TreeItem<T> oldTreeItem = treeItemRef == null ? null : treeItemRef.get();
-                    if (oldTreeItem != null) {
-                        oldTreeItem.graphicProperty().removeListener(weakTreeItemGraphicListener);
-                    }
-                    
-                    TreeItem<T> newTreeItem = getTreeItem();
-                    if (newTreeItem != null) {
-                        newTreeItem.graphicProperty().addListener(weakTreeItemGraphicListener);
-                        treeItemRef = new WeakReference<TreeItem<T>>(newTreeItem);
-                    }
-                }
-            };
-            
-            private WeakInvalidationListener weakTreeItemGraphicListener =
-                    new WeakInvalidationListener(treeItemGraphicListener);
-            
-            private WeakInvalidationListener weakTreeItemListener =
-                    new WeakInvalidationListener(treeItemListener);
-            
-            {
-                treeItemProperty().addListener(weakTreeItemListener);
-                
-                if (getTreeItem() != null) {
-                    getTreeItem().graphicProperty().addListener(weakTreeItemGraphicListener);
-                }
-            }
-            
-            private void updateDisplay(T item, boolean empty) {
-                if (item == null || empty) {
-                    hbox = null;
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    // update the graphic if one is set in the TreeItem
-                    TreeItem<T> treeItem = getTreeItem();
-                    Node graphic = treeItem == null ? null : treeItem.getGraphic();
-                    if (graphic != null) {
-                        if (item instanceof Node) {
-                            setText(null);
-                            
-                            // the item is a Node, and the graphic exists, so 
-                            // we must insert both into an HBox and present that
-                            // to the user (see RT-15910)
-                            if (hbox == null) {
-                                hbox = new HBox(3);
-                            }
-                            hbox.getChildren().setAll(graphic, (Node)item);
-                            setGraphic(hbox);
-                        } else {
-                            hbox = null;
-                            setText(item.toString());
-                            setGraphic(graphic);
-                        }
-                    } else {
-                        hbox = null;
-                        if (item instanceof Node) {
-                            setText(null);
-                            setGraphic((Node)item);
-                        } else {
-                            setText(item.toString());
-                            setGraphic(null);
-                        }
-                    }
-                }                
-            }
-            
-            @Override public void updateItem(T item, boolean empty) {
-                super.updateItem(item, empty);
-                updateDisplay(item, empty);
-            }
-        };
-    }
-    
-    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset) * 0.618033987;
-    }
-
-    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
-        return 400;
-    }
-
-    @Override
-    protected void layoutChildren(final double x, final double y,
-            final double w, final double h) {
-        super.layoutChildren(x, y, w, h);
-        
-        if (needCellsRebuilt) {
-            flow.rebuildCells();
-        } else if (needCellsReconfigured) {
-            flow.reconfigureCells();
-        } 
-        
-        needCellsRebuilt = false;
-        needCellsReconfigured = false;
-        
-        flow.resizeRelocate(x, y, w, h);
-    }
-    
-    private void onFocusPreviousCell() {
-        FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
-        if (fm == null) return;
-        flow.show(fm.getFocusedIndex());
-    }
-
-    private void onFocusNextCell() {
-        FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
-        if (fm == null) return;
-        flow.show(fm.getFocusedIndex());
-    }
-
-    private void onSelectPreviousCell() {
-        int row = getSkinnable().getSelectionModel().getSelectedIndex();
-        flow.show(row);
-    }
-
-    private void onSelectNextCell() {
-        int row = getSkinnable().getSelectionModel().getSelectedIndex();
-        flow.show(row);
-    }
-
-    private void onMoveToFirstCell() {
-        flow.show(0);
-        flow.setPosition(0);
-    }
-
-    private void onMoveToLastCell() {
-        flow.show(getItemCount());
-        flow.setPosition(1);
-    }
-
-    /**
-     * Function used to scroll the container down by one 'page'.
-     */
-    public int onScrollPageDown(boolean isFocusDriven) {
-        TreeCell<T> lastVisibleCell = flow.getLastVisibleCellWithinViewPort();
-        if (lastVisibleCell == null) return -1;
-
-        final SelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
-        final FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
-        if (sm == null || fm == null) return -1;
-
-        int lastVisibleCellIndex = lastVisibleCell.getIndex();
-
-        // isSelected represents focus OR selection
-        boolean isSelected = false;
-        if (isFocusDriven) {
-            isSelected = lastVisibleCell.isFocused() || fm.isFocused(lastVisibleCellIndex);
-        } else {
-            isSelected = lastVisibleCell.isSelected() || sm.isSelected(lastVisibleCellIndex);
-        }
-
-        if (isSelected) {
-            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == lastVisibleCellIndex)
-                    || (! isFocusDriven && sm.getSelectedIndex() == lastVisibleCellIndex);
-
-            if (isLeadIndex) {
-                // if the last visible cell is selected, we want to shift that cell up
-                // to be the top-most cell, or at least as far to the top as we can go.
-                flow.showAsFirst(lastVisibleCell);
-
-                TreeCell<T> newLastVisibleCell = flow.getLastVisibleCellWithinViewPort();
-                lastVisibleCell = newLastVisibleCell == null ? lastVisibleCell : newLastVisibleCell;
-            }
-        } else {
-            // if the selection is not on the 'bottom' most cell, we firstly move
-            // the selection down to that, without scrolling the contents, so
-            // this is a no-op
-        }
-
-        int newSelectionIndex = lastVisibleCell.getIndex();
-        flow.show(lastVisibleCell);
-        return newSelectionIndex;
-    }
-
-    /**
-     * Function used to scroll the container up by one 'page'.
-     */
-    public int onScrollPageUp(boolean isFocusDriven) {
-        TreeCell<T> firstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
-        if (firstVisibleCell == null) return -1;
-
-        final SelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
-        final FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
-        if (sm == null || fm == null) return -1;
-
-        int firstVisibleCellIndex = firstVisibleCell.getIndex();
-
-        // isSelected represents focus OR selection
-        boolean isSelected = false;
-        if (isFocusDriven) {
-            isSelected = firstVisibleCell.isFocused() || fm.isFocused(firstVisibleCellIndex);
-        } else {
-            isSelected = firstVisibleCell.isSelected() || sm.isSelected(firstVisibleCellIndex);
-        }
-
-        if (isSelected) {
-            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == firstVisibleCellIndex)
-                    || (! isFocusDriven && sm.getSelectedIndex() == firstVisibleCellIndex);
-
-            if (isLeadIndex) {
-                // if the first visible cell is selected, we want to shift that cell down
-                // to be the bottom-most cell, or at least as far to the bottom as we can go.
-                flow.showAsLast(firstVisibleCell);
-
-                TreeCell<T> newFirstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
-                firstVisibleCell = newFirstVisibleCell == null ? firstVisibleCell : newFirstVisibleCell;
-            }
-        } else {
-            // if the selection is not on the 'top' most cell, we firstly move
-            // the selection up to that, without scrolling the contents, so
-            // this is a no-op
-        }
-
-        int newSelectionIndex = firstVisibleCell.getIndex();
-        flow.show(firstVisibleCell);
-        return newSelectionIndex;
-    }
-
-    @Override
-    protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
-        switch (attribute) {
-            case FOCUS_ITEM: {
-                FocusModel<?> fm = getSkinnable().getFocusModel();
-                int focusedIndex = fm.getFocusedIndex();
-                if (focusedIndex == -1) {
-                    if (getItemCount() > 0) {
-                        focusedIndex = 0;
-                    } else {
-                        return null;
-                    }
-                }
-                return flow.getPrivateCell(focusedIndex);
-            }
-            case ROW_AT_INDEX: {
-                final int rowIndex = (Integer)parameters[0];
-                return rowIndex < 0 ? null : flow.getPrivateCell(rowIndex);
-            }
-            case SELECTED_ITEMS: {
-                MultipleSelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
-                ObservableList<Integer> indices = sm.getSelectedIndices();
-                List<Node> selection = new ArrayList<>(indices.size());
-                for (int i : indices) {
-                    TreeCell<T> row = flow.getPrivateCell(i);
-                    if (row != null) selection.add(row);
-                }
-                return FXCollections.observableArrayList(selection);
-            }
-            case VERTICAL_SCROLLBAR: return flow.getVbar();
-            case HORIZONTAL_SCROLLBAR: return flow.getHbar();
-            default: return super.queryAccessibleAttribute(attribute, parameters);
-        }
-    }
-
-    @Override
-    protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
-        switch (action) {
-            case SHOW_ITEM: {
-                Node item = (Node)parameters[0];
-                if (item instanceof TreeCell) {
-                    @SuppressWarnings("unchecked")
-                    TreeCell<T> cell = (TreeCell<T>)item;
-                    flow.show(cell.getIndex());
-                }
-                break;
-            }
-            case SET_SELECTED_ITEMS: {
-                @SuppressWarnings("unchecked")
-                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
-                if (items != null) {
-                    MultipleSelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
-                    if (sm != null) {
-                        sm.clearSelection();
-                        for (Node item : items) {
-                            if (item instanceof TreeCell) {
-                                @SuppressWarnings("unchecked")
-                                TreeCell<T> cell = (TreeCell<T>)item;
-                                sm.select(cell.getIndex());
-                            }
-                        }
-                    }
-                }
-                break;
-            }
-            default: super.executeAccessibleAction(action, parameters);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:24:53.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/TreeViewSkin.java	2015-09-03 15:24:51.871324700 -0700
@@ -0,0 +1,633 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.behavior.BehaviorBase;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.WeakInvalidationListener;
+import javafx.collections.FXCollections;
+import javafx.collections.MapChangeListener;
+import javafx.collections.ObservableList;
+import javafx.collections.ObservableMap;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.event.WeakEventHandler;
+import javafx.scene.AccessibleAction;
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.control.TreeItem.TreeModificationEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.StackPane;
+import java.lang.ref.WeakReference;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.javafx.scene.control.behavior.TreeViewBehavior;
+
+/**
+ * Default skin implementation for the {@link TreeView} control.
+ *
+ * @see TreeView
+ * @since 9
+ */
+public class TreeViewSkin<T> extends VirtualContainerBase<TreeView<T>, TreeCell<T>> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    // RT-34744 : IS_PANNABLE will be false unless
+    // javafx.scene.control.skin.TreeViewSkin.pannable
+    // is set to true. This is done in order to make TreeView functional
+    // on embedded systems with touch screens which do not generate scroll
+    // events for touch drag gestures.
+    private static final boolean IS_PANNABLE =
+            AccessController.doPrivileged((PrivilegedAction<Boolean>) () -> Boolean.getBoolean("javafx.scene.control.skin.TreeViewSkin.pannable"));
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+
+    private final VirtualFlow<TreeCell<T>> flow;
+    private WeakReference<TreeItem<T>> weakRoot;
+    private final TreeViewBehavior<T> behavior;
+
+    //    private boolean needItemCountUpdate = false;
+    private boolean needCellsRebuilt = true;
+    private boolean needCellsReconfigured = false;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Listeners                                                               *
+     *                                                                         *
+     **************************************************************************/
+
+    private MapChangeListener<Object, Object> propertiesMapListener = c -> {
+        if (! c.wasAdded()) return;
+        if (Properties.RECREATE.equals(c.getKey())) {
+            needCellsRebuilt = true;
+            getSkinnable().requestLayout();
+            getSkinnable().getProperties().remove(Properties.RECREATE);
+        }
+    };
+
+    private EventHandler<TreeModificationEvent<T>> rootListener = e -> {
+        if (e.wasAdded() && e.wasRemoved() && e.getAddedSize() == e.getRemovedSize()) {
+            // Fix for RT-14842, where the children of a TreeItem were changing,
+            // but because the overall item count was staying the same, there was
+            // no event being fired to the skin to be informed that the items
+            // had changed. So, here we just watch for the case where the number
+            // of items being added is equal to the number of items being removed.
+            rowCountDirty = true;
+            getSkinnable().requestLayout();
+        } else if (e.getEventType().equals(TreeItem.valueChangedEvent())) {
+            // Fix for RT-14971 and RT-15338.
+            needCellsRebuilt = true;
+            getSkinnable().requestLayout();
+        } else {
+            // Fix for RT-20090. We are checking to see if the event coming
+            // from the TreeItem root is an event where the count has changed.
+            EventType<?> eventType = e.getEventType();
+            while (eventType != null) {
+                if (eventType.equals(TreeItem.<T>expandedItemCountChangeEvent())) {
+                    rowCountDirty = true;
+                    getSkinnable().requestLayout();
+                    break;
+                }
+                eventType = eventType.getSuperType();
+            }
+        }
+
+        // fix for RT-37853
+        getSkinnable().edit(null);
+    };
+
+    private WeakEventHandler<TreeModificationEvent<T>> weakRootListener;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new TreeViewSkin instance, installing the necessary child
+     * nodes into the Control {@link Control#getChildren() children} list, as
+     * well as the necessary input mappings for handling key, mouse, etc events.
+     *
+     * @param control The control that this skin should be installed onto.
+     */
+    public TreeViewSkin(final TreeView control) {
+        super(control);
+
+        // install default input map for the TreeView control
+        behavior = new TreeViewBehavior<>(control);
+//        control.setInputMap(behavior.getInputMap());
+
+        // init the VirtualFlow
+        flow = getVirtualFlow();
+        flow.setPannable(IS_PANNABLE);
+        flow.setCellFactory(flow1 -> createCell());
+        flow.setFixedCellSize(control.getFixedCellSize());
+        getChildren().add(flow);
+        
+        setRoot(getSkinnable().getRoot());
+        
+        EventHandler<MouseEvent> ml = event -> {
+            // RT-15127: cancel editing on scroll. This is a bit extreme
+            // (we are cancelling editing on touching the scrollbars).
+            // This can be improved at a later date.
+            if (control.getEditingItem() != null) {
+                control.edit(null);
+            }
+
+            // This ensures that the tree maintains the focus, even when the vbar
+            // and hbar controls inside the flow are clicked. Without this, the
+            // focus border will not be shown when the user interacts with the
+            // scrollbars, and more importantly, keyboard navigation won't be
+            // available to the user.
+            if (control.isFocusTraversable()) {
+                control.requestFocus();
+            }
+        };
+        flow.getVbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+        flow.getHbar().addEventFilter(MouseEvent.MOUSE_PRESSED, ml);
+
+        final ObservableMap<Object, Object> properties = control.getProperties();
+        properties.remove(Properties.RECREATE);
+        properties.addListener(propertiesMapListener);
+
+        // init the behavior 'closures'
+        behavior.setOnFocusPreviousRow(() -> { onFocusPreviousCell(); });
+        behavior.setOnFocusNextRow(() -> { onFocusNextCell(); });
+        behavior.setOnMoveToFirstCell(() -> { onMoveToFirstCell(); });
+        behavior.setOnMoveToLastCell(() -> { onMoveToLastCell(); });
+        behavior.setOnScrollPageDown(this::onScrollPageDown);
+        behavior.setOnScrollPageUp(this::onScrollPageUp);
+        behavior.setOnSelectPreviousRow(() -> { onSelectPreviousCell(); });
+        behavior.setOnSelectNextRow(() -> { onSelectNextCell(); });
+
+        registerChangeListener(control.rootProperty(), e -> setRoot(getSkinnable().getRoot()));
+        registerChangeListener(control.showRootProperty(), e -> {
+            // if we turn off showing the root, then we must ensure the root
+            // is expanded - otherwise we end up with no visible items in
+            // the tree.
+            if (! getSkinnable().isShowRoot() && getRoot() != null) {
+                getRoot().setExpanded(true);
+            }
+            // update the item count in the flow and behavior instances
+            updateRowCount();
+        });
+        registerChangeListener(control.cellFactoryProperty(), e -> flow.recreateCells());
+        registerChangeListener(control.fixedCellSizeProperty(), e -> flow.setFixedCellSize(getSkinnable().getFixedCellSize()));
+        
+        updateRowCount();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override public void dispose() {
+        super.dispose();
+
+        if (behavior != null) {
+            behavior.dispose();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return computePrefHeight(-1, topInset, rightInset, bottomInset, leftInset) * 0.618033987;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width, double topInset, double rightInset, double bottomInset, double leftInset) {
+        return 400;
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(final double x, final double y,
+                                  final double w, final double h) {
+        super.layoutChildren(x, y, w, h);
+
+        if (needCellsRebuilt) {
+            flow.rebuildCells();
+        } else if (needCellsReconfigured) {
+            flow.reconfigureCells();
+        }
+
+        needCellsRebuilt = false;
+        needCellsReconfigured = false;
+
+        flow.resizeRelocate(x, y, w, h);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM: {
+                FocusModel<?> fm = getSkinnable().getFocusModel();
+                int focusedIndex = fm.getFocusedIndex();
+                if (focusedIndex == -1) {
+                    if (getItemCount() > 0) {
+                        focusedIndex = 0;
+                    } else {
+                        return null;
+                    }
+                }
+                return flow.getPrivateCell(focusedIndex);
+            }
+            case ROW_AT_INDEX: {
+                final int rowIndex = (Integer)parameters[0];
+                return rowIndex < 0 ? null : flow.getPrivateCell(rowIndex);
+            }
+            case SELECTED_ITEMS: {
+                MultipleSelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
+                ObservableList<Integer> indices = sm.getSelectedIndices();
+                List<Node> selection = new ArrayList<>(indices.size());
+                for (int i : indices) {
+                    TreeCell<T> row = flow.getPrivateCell(i);
+                    if (row != null) selection.add(row);
+                }
+                return FXCollections.observableArrayList(selection);
+            }
+            case VERTICAL_SCROLLBAR: return flow.getVbar();
+            case HORIZONTAL_SCROLLBAR: return flow.getHbar();
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void executeAccessibleAction(AccessibleAction action, Object... parameters) {
+        switch (action) {
+            case SHOW_ITEM: {
+                Node item = (Node)parameters[0];
+                if (item instanceof TreeCell) {
+                    @SuppressWarnings("unchecked")
+                    TreeCell<T> cell = (TreeCell<T>)item;
+                    flow.scrollTo(cell.getIndex());
+                }
+                break;
+            }
+            case SET_SELECTED_ITEMS: {
+                @SuppressWarnings("unchecked")
+                ObservableList<Node> items = (ObservableList<Node>)parameters[0];
+                if (items != null) {
+                    MultipleSelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
+                    if (sm != null) {
+                        sm.clearSelection();
+                        for (Node item : items) {
+                            if (item instanceof TreeCell) {
+                                @SuppressWarnings("unchecked")
+                                TreeCell<T> cell = (TreeCell<T>)item;
+                                sm.select(cell.getIndex());
+                            }
+                        }
+                    }
+                }
+                break;
+            }
+            default: super.executeAccessibleAction(action, parameters);
+        }
+    }
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    private TreeCell<T> createCell() {
+        final TreeCell<T> cell;
+        if (getSkinnable().getCellFactory() != null) {
+            cell = getSkinnable().getCellFactory().call(getSkinnable());
+        } else {
+            cell = createDefaultCellImpl();
+        }
+
+        // If there is no disclosure node, then add one of my own
+        if (cell.getDisclosureNode() == null) {
+            final StackPane disclosureNode = new StackPane();
+
+            /* This code is intentionally commented.
+             * Currently as it stands it does provided any functionality and interferes
+             * with TreeView. The VO cursor move over the DISCLOSURE_NODE instead of the
+             * tree item itself. This is possibly caused by the order of item's children
+             * (the Labeled and the disclosure node).
+             */
+//            final StackPane disclosureNode = new StackPane() {
+//                @Override protected Object accGetAttribute(Attribute attribute, Object... parameters) {
+//                    switch (attribute) {
+//                        case ROLE: return Role.DISCLOSURE_NODE;
+//                        default: return super.accGetAttribute(attribute, parameters);
+//                    }
+//                }
+//            };
+            disclosureNode.getStyleClass().setAll("tree-disclosure-node");
+
+            final StackPane disclosureNodeArrow = new StackPane();
+            disclosureNodeArrow.getStyleClass().setAll("arrow");
+            disclosureNode.getChildren().add(disclosureNodeArrow);
+
+            cell.setDisclosureNode(disclosureNode);
+        }
+
+        cell.updateTreeView(getSkinnable());
+
+        return cell;
+    }
+
+    private TreeItem<T> getRoot() {
+        return weakRoot == null ? null : weakRoot.get();
+    }
+    private void setRoot(TreeItem<T> newRoot) {
+        if (getRoot() != null && weakRootListener != null) {
+            getRoot().removeEventHandler(TreeItem.<T>treeNotificationEvent(), weakRootListener);
+        }
+        weakRoot = new WeakReference<>(newRoot);
+        if (getRoot() != null) {
+            weakRootListener = new WeakEventHandler<>(rootListener);
+            getRoot().addEventHandler(TreeItem.<T>treeNotificationEvent(), weakRootListener);
+        }
+
+        updateRowCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override int getItemCount() {
+        return getSkinnable().getExpandedItemCount();
+    }
+
+    /** {@inheritDoc} */
+    @Override void updateRowCount() {
+//        int oldCount = flow.getCellCount();
+        int newCount = getItemCount();
+
+        // if this is not called even when the count is the same, we get a
+        // memory leak in VirtualFlow.sheet.children. This can probably be
+        // optimised in the future when time permits.
+        flow.setCellCount(newCount);
+
+        // Ideally we would be more nuanced here, toggling a cheaper needs*
+        // field, but if we do we hit issues such as those identified in
+        // RT-27852, where the expended item count of the new root equals the
+        // EIC of the old root, which would lead to the visuals not updating
+        // properly.
+        needCellsRebuilt = true;
+        getSkinnable().requestLayout();
+    }
+
+    // Note: This is a copy/paste of javafx.scene.control.cell.DefaultTreeCell,
+    // which is package-protected
+    private TreeCell<T> createDefaultCellImpl() {
+        return new TreeCell<T>() {
+            private HBox hbox;
+            
+            private WeakReference<TreeItem<T>> treeItemRef;
+            
+            private InvalidationListener treeItemGraphicListener = observable -> {
+                updateDisplay(getItem(), isEmpty());
+            };
+            
+            private InvalidationListener treeItemListener = new InvalidationListener() {
+                @Override public void invalidated(Observable observable) {
+                    TreeItem<T> oldTreeItem = treeItemRef == null ? null : treeItemRef.get();
+                    if (oldTreeItem != null) {
+                        oldTreeItem.graphicProperty().removeListener(weakTreeItemGraphicListener);
+                    }
+                    
+                    TreeItem<T> newTreeItem = getTreeItem();
+                    if (newTreeItem != null) {
+                        newTreeItem.graphicProperty().addListener(weakTreeItemGraphicListener);
+                        treeItemRef = new WeakReference<TreeItem<T>>(newTreeItem);
+                    }
+                }
+            };
+            
+            private WeakInvalidationListener weakTreeItemGraphicListener =
+                    new WeakInvalidationListener(treeItemGraphicListener);
+            
+            private WeakInvalidationListener weakTreeItemListener =
+                    new WeakInvalidationListener(treeItemListener);
+            
+            {
+                treeItemProperty().addListener(weakTreeItemListener);
+                
+                if (getTreeItem() != null) {
+                    getTreeItem().graphicProperty().addListener(weakTreeItemGraphicListener);
+                }
+            }
+            
+            private void updateDisplay(T item, boolean empty) {
+                if (item == null || empty) {
+                    hbox = null;
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    // update the graphic if one is set in the TreeItem
+                    TreeItem<T> treeItem = getTreeItem();
+                    Node graphic = treeItem == null ? null : treeItem.getGraphic();
+                    if (graphic != null) {
+                        if (item instanceof Node) {
+                            setText(null);
+                            
+                            // the item is a Node, and the graphic exists, so 
+                            // we must insert both into an HBox and present that
+                            // to the user (see RT-15910)
+                            if (hbox == null) {
+                                hbox = new HBox(3);
+                            }
+                            hbox.getChildren().setAll(graphic, (Node)item);
+                            setGraphic(hbox);
+                        } else {
+                            hbox = null;
+                            setText(item.toString());
+                            setGraphic(graphic);
+                        }
+                    } else {
+                        hbox = null;
+                        if (item instanceof Node) {
+                            setText(null);
+                            setGraphic((Node)item);
+                        } else {
+                            setText(item.toString());
+                            setGraphic(null);
+                        }
+                    }
+                }                
+            }
+            
+            @Override public void updateItem(T item, boolean empty) {
+                super.updateItem(item, empty);
+                updateDisplay(item, empty);
+            }
+        };
+    }
+    
+    private void onFocusPreviousCell() {
+        FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
+        if (fm == null) return;
+        flow.scrollTo(fm.getFocusedIndex());
+    }
+
+    private void onFocusNextCell() {
+        FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
+        if (fm == null) return;
+        flow.scrollTo(fm.getFocusedIndex());
+    }
+
+    private void onSelectPreviousCell() {
+        int row = getSkinnable().getSelectionModel().getSelectedIndex();
+        flow.scrollTo(row);
+    }
+
+    private void onSelectNextCell() {
+        int row = getSkinnable().getSelectionModel().getSelectedIndex();
+        flow.scrollTo(row);
+    }
+
+    private void onMoveToFirstCell() {
+        flow.scrollTo(0);
+        flow.setPosition(0);
+    }
+
+    private void onMoveToLastCell() {
+        flow.scrollTo(getItemCount());
+        flow.setPosition(1);
+    }
+
+    /**
+     * Function used to scroll the container down by one 'page'.
+     */
+    private int onScrollPageDown(boolean isFocusDriven) {
+        TreeCell<T> lastVisibleCell = flow.getLastVisibleCellWithinViewPort();
+        if (lastVisibleCell == null) return -1;
+
+        final SelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
+        final FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
+        if (sm == null || fm == null) return -1;
+
+        int lastVisibleCellIndex = lastVisibleCell.getIndex();
+
+        // isSelected represents focus OR selection
+        boolean isSelected = false;
+        if (isFocusDriven) {
+            isSelected = lastVisibleCell.isFocused() || fm.isFocused(lastVisibleCellIndex);
+        } else {
+            isSelected = lastVisibleCell.isSelected() || sm.isSelected(lastVisibleCellIndex);
+        }
+
+        if (isSelected) {
+            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == lastVisibleCellIndex)
+                    || (! isFocusDriven && sm.getSelectedIndex() == lastVisibleCellIndex);
+
+            if (isLeadIndex) {
+                // if the last visible cell is selected, we want to shift that cell up
+                // to be the top-most cell, or at least as far to the top as we can go.
+                flow.scrollToTop(lastVisibleCell);
+
+                TreeCell<T> newLastVisibleCell = flow.getLastVisibleCellWithinViewPort();
+                lastVisibleCell = newLastVisibleCell == null ? lastVisibleCell : newLastVisibleCell;
+            }
+        } else {
+            // if the selection is not on the 'bottom' most cell, we firstly move
+            // the selection down to that, without scrolling the contents, so
+            // this is a no-op
+        }
+
+        int newSelectionIndex = lastVisibleCell.getIndex();
+        flow.scrollTo(lastVisibleCell);
+        return newSelectionIndex;
+    }
+
+    /**
+     * Function used to scroll the container up by one 'page'.
+     */
+    private int onScrollPageUp(boolean isFocusDriven) {
+        TreeCell<T> firstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
+        if (firstVisibleCell == null) return -1;
+
+        final SelectionModel<TreeItem<T>> sm = getSkinnable().getSelectionModel();
+        final FocusModel<TreeItem<T>> fm = getSkinnable().getFocusModel();
+        if (sm == null || fm == null) return -1;
+
+        int firstVisibleCellIndex = firstVisibleCell.getIndex();
+
+        // isSelected represents focus OR selection
+        boolean isSelected = false;
+        if (isFocusDriven) {
+            isSelected = firstVisibleCell.isFocused() || fm.isFocused(firstVisibleCellIndex);
+        } else {
+            isSelected = firstVisibleCell.isSelected() || sm.isSelected(firstVisibleCellIndex);
+        }
+
+        if (isSelected) {
+            boolean isLeadIndex = (isFocusDriven && fm.getFocusedIndex() == firstVisibleCellIndex)
+                    || (! isFocusDriven && sm.getSelectedIndex() == firstVisibleCellIndex);
+
+            if (isLeadIndex) {
+                // if the first visible cell is selected, we want to shift that cell down
+                // to be the bottom-most cell, or at least as far to the bottom as we can go.
+                flow.scrollToBottom(firstVisibleCell);
+
+                TreeCell<T> newFirstVisibleCell = flow.getFirstVisibleCellWithinViewPort();
+                firstVisibleCell = newFirstVisibleCell == null ? firstVisibleCell : newFirstVisibleCell;
+            }
+        } else {
+            // if the selection is not on the 'top' most cell, we firstly move
+            // the selection up to that, without scrolling the contents, so
+            // this is a no-op
+        }
+
+        int newSelectionIndex = firstVisibleCell.getIndex();
+        flow.scrollTo(firstVisibleCell);
+        return newSelectionIndex;
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualContainerBase.java	2015-09-03 15:25:00.621825200 -0700
+++ /dev/null	2015-09-03 15:25:01.000000000 -0700
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2010, 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.Control;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.ScrollToEvent;
-
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-/**
- * Parent class to control skins whose contents are virtualized and scrollable.
- * This class handles the interaction with the VirtualFlow class, which is the
- * main class handling the virtualization of the contents of this container.
- *
- * @profile common
- */
-public abstract class VirtualContainerBase<C extends Control, B extends BehaviorBase<C>, I extends IndexedCell> extends BehaviorSkinBase<C, B> {
-    
-    protected boolean rowCountDirty;
-
-    public VirtualContainerBase(final C control, B behavior) {
-        super(control, behavior);
-        flow = createVirtualFlow();
-        
-        control.addEventHandler(ScrollToEvent.scrollToTopIndex(), event -> {
-            // Fix for RT-24630: The row count in VirtualFlow was incorrect
-            // (normally zero), so the scrollTo call was misbehaving.
-            if (rowCountDirty) {
-                // update row count before we do a scroll
-                updateRowCount();
-                rowCountDirty = false;
-            }
-            flow.scrollTo(event.getScrollTarget());
-        });
-    }
-
-    /**
-     * The virtualized container which handles the layout and scrolling of
-     * all the cells.
-     */
-    protected final VirtualFlow<I> flow;
-
-    /**
-     * Returns a Cell available to be used in the virtual flow. This means you
-     * may return either a previously used, but now unrequired cell, or alternatively
-     * create a new Cell instance.
-     *
-     * Preference is obviously given to reusing cells whenever possible, to keep
-     * performance costs down.
-     */
-    public abstract I createCell();
-
-    /**
-     * This enables skin subclasses to provide a custom VirtualFlow implementation,
-     * rather than have VirtualContainerBase instantiate the default instance.
-     */
-    protected VirtualFlow<I> createVirtualFlow() {
-        return new VirtualFlow<I>();
-    }
-
-    /**
-     * Returns the total number of items in this container, including those
-     * that are currently hidden because they are out of view.
-     */
-    public abstract int getItemCount();
-    
-    protected abstract void updateRowCount();
-
-    double getMaxCellWidth(int rowsToCount) {
-        return snappedLeftInset() + flow.getMaxCellWidth(rowsToCount) + snappedRightInset();
-    }
-    
-    double getVirtualFlowPreferredHeight(int rows) {
-        double height = 1.0;
-        
-        for (int i = 0; i < rows && i < getItemCount(); i++) {
-            height += flow.getCellLength(i);
-        }
-
-        return height + snappedTopInset() + snappedBottomInset();
-    }
-
-    @Override protected void layoutChildren(double x, double y, double w, double h) {
-        checkState();
-    }
-
-    protected void checkState() {
-        if (rowCountDirty) {
-            updateRowCount();
-            rowCountDirty = false;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:25:01.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/VirtualContainerBase.java	2015-09-03 15:24:59.791777800 -0700
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2010, 2015, 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.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.control.Cell;
+import javafx.scene.control.Control;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.ScrollToEvent;
+import javafx.scene.control.SkinBase;
+import javafx.util.Callback;
+
+/**
+ * Parent class to control skins whose contents are virtualized and scrollable.
+ * This class handles the interaction with the VirtualFlow class, which is the
+ * main class handling the virtualization of the contents of this container.
+ */
+public abstract class VirtualContainerBase<C extends Control, I extends IndexedCell> extends SkinBase<C> {
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+    
+    boolean rowCountDirty;
+
+    /**
+     * The virtualized container which handles the layout and scrolling of
+     * all the cells.
+     */
+    private final VirtualFlow<I> flow;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     *
+     * @param control
+     */
+    public VirtualContainerBase(final C control) {
+        super(control);
+        flow = createVirtualFlow();
+        
+        control.addEventHandler(ScrollToEvent.scrollToTopIndex(), event -> {
+            // Fix for RT-24630: The row count in VirtualFlow was incorrect
+            // (normally zero), so the scrollTo call was misbehaving.
+            if (rowCountDirty) {
+                // update row count before we do a scroll
+                updateRowCount();
+                rowCountDirty = false;
+            }
+            flow.scrollToTop(event.getScrollTarget());
+        });
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Abstract API                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Returns the total number of items in this container, including those
+     * that are currently hidden because they are out of view.
+     */
+    abstract int getItemCount();
+    
+    abstract void updateRowCount();
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren(double x, double y, double w, double h) {
+        checkState();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * This enables skin subclasses to provide a custom VirtualFlow implementation,
+     * rather than have VirtualContainerBase instantiate the default instance.
+     */
+    VirtualFlow<I> createVirtualFlow() {
+        return new VirtualFlow<>();
+    }
+
+    final VirtualFlow<I> getVirtualFlow() {
+        return flow;
+    }
+
+    double getMaxCellWidth(int rowsToCount) {
+        return snappedLeftInset() + flow.getMaxCellWidth(rowsToCount) + snappedRightInset();
+    }
+
+    double getVirtualFlowPreferredHeight(int rows) {
+        double height = 1.0;
+
+        for (int i = 0; i < rows && i < getItemCount(); i++) {
+            height += flow.getCellLength(i);
+        }
+
+        return height + snappedTopInset() + snappedBottomInset();
+    }
+
+    void checkState() {
+        if (rowCountDirty) {
+            updateRowCount();
+            rowCountDirty = false;
+        }
+    }
+}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/VirtualFlow.java	2015-09-03 15:25:09.061308000 -0700
+++ /dev/null	2015-09-03 15:25:10.000000000 -0700
@@ -1,2889 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.Logging;
-import com.sun.javafx.scene.traversal.Algorithm;
-import com.sun.javafx.scene.traversal.Direction;
-import com.sun.javafx.scene.traversal.ParentTraversalEngine;
-import com.sun.javafx.scene.traversal.TraversalContext;
-import javafx.animation.KeyFrame;
-import javafx.animation.Timeline;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.BooleanPropertyBase;
-import javafx.beans.value.ChangeListener;
-import javafx.collections.ObservableList;
-import javafx.event.EventDispatcher;
-import javafx.event.EventHandler;
-import javafx.geometry.Orientation;
-import javafx.scene.AccessibleRole;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.Cell;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.ScrollBar;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.input.ScrollEvent;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.shape.Rectangle;
-import javafx.util.Callback;
-import javafx.util.Duration;
-import sun.util.logging.PlatformLogger;
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.List;
-
-/**
- * Implementation of a virtualized container using a cell based mechanism.
- */
-public class VirtualFlow<T extends IndexedCell> extends Region {
-
-    /**
-     * Scroll events may request to scroll about a number of "lines". We first
-     * decide how big one "line" is - for fixed cell size it's clear,
-     * for variable cell size we settle on a single number so that the scrolling
-     * speed is consistent. Now if the line is so big that
-     * MIN_SCROLLING_LINES_PER_PAGE of them don't fit into one page, we make
-     * them smaller to prevent the scrolling step to be too big (perhaps
-     * even more than one page).
-     */
-    private static final int MIN_SCROLLING_LINES_PER_PAGE = 8;
-                    
-    private boolean touchDetected = false;
-    private boolean mouseDown = false;
-
-    /**
-     * There are two main complicating factors in the implementation of the
-     * VirtualFlow, which are made even more complicated due to the performance
-     * sensitive nature of this code. The first factor is the actual
-     * virtualization mechanism, wired together with the PositionMapper.
-     * The second complicating factor is the desire to do minimal layout
-     * and minimal updates to CSS.
-     *
-     * Since the layout mechanism runs at most once per pulse, we want to hook
-     * into this mechanism for minimal recomputation. Whenever a layout pass
-     * is run we record the width/height that the virtual flow was last laid
-     * out to. In subsequent passes, if the width/height has not changed then
-     * we know we only have to rebuild the cells. If the width or height has
-     * changed, then we can make appropriate decisions based on whether the
-     * width / height has been reduced or expanded.
-     *
-     * In various places, if requestLayout is called it is generally just
-     * used to indicate that some form of layout needs to happen (either the
-     * entire thing has to be reconstructed, or just the cells need to be
-     * reconstructed, generally).
-     *
-     * The accumCell is a special cell which is used in some computations
-     * when an actual cell for that item isn't currently available. However,
-     * the accumCell must be cleared whenever the cellFactory function is
-     * changed because we need to use the cells that come from the new factory.
-     *
-     * In addition to storing the lastWidth and lastHeight, we also store the
-     * number of cells that existed last time we performed a layout. In this
-     * way if the number of cells change, we can request a layout and when it
-     * occurs we can tell that the number of cells has changed and react
-     * accordingly.
-     *
-     * Because the VirtualFlow can be laid out horizontally or vertically a
-     * naming problem is present when trying to conceptualize and implement
-     * the flow. In particular, the words "width" and "height" are not
-     * precise when describing the unit of measure along the "virtualized"
-     * axis and the "orthogonal" axis. For example, the height of a cell when
-     * the flow is vertical is the magnitude along the "virtualized axis",
-     * and the width is along the axis orthogonal to it.
-     *
-     * Since "height" and "width" are not reliable terms, we use the words
-     * "length" and "breadth" to describe the magnitude of a cell along
-     * the virtualized axis and orthogonal axis. For example, in a vertical
-     * flow, the height=length and the width=breadth. In a horizontal axis,
-     * the height=breadth and the width=length.
-     *
-     * These terms are somewhat arbitrary, but chosen so that when reading
-     * most of the below code you can think in just one dimension, with
-     * helper functions converting width/height in to length/breadth, while
-     * also being different from width/height so as not to get confused with
-     * the actual width/height of a cell.
-     */
-    /**
-     * Indicates the primary direction of virtualization. If true, then the
-     * primary direction of virtualization is vertical, meaning that cells will
-     * stack vertically on top of each other. If false, then they will stack
-     * horizontally next to each other.
-     */
-    private BooleanProperty vertical;
-    public final void setVertical(boolean value) {
-        verticalProperty().set(value);
-    }
-
-    public final boolean isVertical() {
-        return vertical == null ? true : vertical.get();
-    }
-
-    public final BooleanProperty verticalProperty() {
-        if (vertical == null) {
-            vertical = new BooleanPropertyBase(true) {
-                @Override protected void invalidated() {                    
-                    pile.clear();
-                    sheetChildren.clear();
-                    cells.clear();
-                    lastWidth = lastHeight = -1;
-                    setMaxPrefBreadth(-1);
-                    setViewportBreadth(0);
-                    setViewportLength(0);
-                    lastPosition = 0;
-                    hbar.setValue(0);
-                    vbar.setValue(0);
-                    setPosition(0.0f);
-                    setNeedsLayout(true);
-                    requestLayout();
-                }
-
-                @Override
-                public Object getBean() {
-                    return VirtualFlow.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "vertical";
-                }
-            };
-        }
-        return vertical;
-    }
-
-    /**
-     * Indicates whether the VirtualFlow viewport is capable of being panned
-     * by the user (either via the mouse or touch events).
-     */
-    private boolean pannable = true;
-    public boolean isPannable() { return pannable; }
-    public void setPannable(boolean value) { this.pannable = value; }
-
-    /**
-     * Indicates the number of cells that should be in the flow. The user of
-     * the VirtualFlow must set this appropriately. When the cell count changes
-     * the VirtualFlow responds by updating the visuals. If the items backing
-     * the cells change, but the count has not changed, you must call the
-     * reconfigureCells() function to update the visuals.
-     */
-    private int cellCount;
-    public int getCellCount() { return cellCount; }
-    public void setCellCount(int i) {
-        int oldCount = cellCount;
-        this.cellCount = i;
-        
-        boolean countChanged = oldCount != cellCount;
-
-        // ensure that the virtual scrollbar adjusts in size based on the current
-        // cell count.
-        if (countChanged) {
-            VirtualScrollBar lengthBar = isVertical() ? vbar : hbar;
-            lengthBar.setMax(i);
-        }
-
-        // I decided *not* to reset maxPrefBreadth here for the following
-        // situation. Suppose I have 30 cells and then I add 10 more. Just
-        // because I added 10 more doesn't mean the max pref should be
-        // reset. Suppose the first 3 cells were extra long, and I was
-        // scrolled down such that they weren't visible. If I were to reset
-        // maxPrefBreadth when subsequent cells were added or removed, then the
-        // scroll bars would erroneously reset as well. So I do not reset
-        // the maxPrefBreadth here.
-
-        // Fix for RT-12512, RT-14301 and RT-14864.
-        // Without this, the VirtualFlow length-wise scrollbar would not change
-        // as expected. This would leave items unable to be shown, as they
-        // would exist outside of the visible area, even when the scrollbar
-        // was at its maximum position.
-        // FIXME this should be only executed on the pulse, so this will likely
-        // lead to performance degradation until it is handled properly.
-        if (countChanged) {
-            layoutChildren();
-
-            // Fix for RT-13965: Without this line of code, the number of items in
-            // the sheet would constantly grow, leaking memory for the life of the
-            // application. This was especially apparent when the total number of
-            // cells changes - regardless of whether it became bigger or smaller.
-            sheetChildren.clear();
-
-            Parent parent = getParent();
-            if (parent != null) parent.requestLayout();
-        }
-        // TODO suppose I had 100 cells and I added 100 more. Further
-        // suppose I was scrolled to the bottom when that happened. I
-        // actually want to update the position of the mapper such that
-        // the view remains "stable".
-    }
-
-    /**
-     * The position of the VirtualFlow within its list of cells. This is a value
-     * between 0 and 1.
-     */
-    private double position;
-
-    public double getPosition() {
-        return position;
-    }
-
-    public void setPosition(double newPosition) {
-        boolean needsUpdate = this.position != newPosition;
-        this.position = com.sun.javafx.util.Utils.clamp(0, newPosition, 1);;
-        if (needsUpdate) {
-            requestLayout();
-        }
-    }
-    
-    /**
-     * For optimisation purposes, some use cases can trade dynamic cell length
-     * for speed - if fixedCellSize is greater than zero we'll use that rather
-     * than determine it by querying the cell itself.
-     */
-    private double fixedCellSize = 0;
-    private boolean fixedCellSizeEnabled = false;
-
-    public void setFixedCellSize(final double value) {
-        this.fixedCellSize = value;
-        this.fixedCellSizeEnabled = fixedCellSize > 0;
-        needsCellsLayout = true;
-        layoutChildren();
-    }
-    
-    /**
-     * Callback which is invoked whenever the VirtualFlow needs a new
-     * IndexedCell. The VirtualFlow attempts to reuse cells whenever possible
-     * and only creates the minimal number of cells necessary.
-     */
-    private Callback<VirtualFlow, T> createCell;
-    public Callback<VirtualFlow, T> getCreateCell() { return createCell; }
-    public void setCreateCell(Callback<VirtualFlow, T> cc) {
-        this.createCell = cc;
-
-        if (createCell != null) {
-            accumCell = null;
-            setNeedsLayout(true);
-            recreateCells();
-            if (getParent() != null) getParent().requestLayout();
-        }
-    }
-
-    /**
-     * The maximum preferred size in the non-virtual direction. For example,
-     * if vertical, then this is the max pref width of all cells encountered.
-     * <p>
-     * In general, this is the largest preferred size in the non-virtual
-     * direction that we have ever encountered. We don't reduce this size
-     * unless instructed to do so, so as to reduce the amount of scroll bar
-     * jitter. The access on this variable is package ONLY FOR TESTING.
-     */
-    private double maxPrefBreadth;
-    protected final void setMaxPrefBreadth(double value) {
-        this.maxPrefBreadth = value;
-    }
-    protected final double getMaxPrefBreadth() {
-        return maxPrefBreadth;
-    }
-
-    /**
-     * The breadth of the viewport portion of the VirtualFlow as computed during
-     * the layout pass. In a vertical flow this would be the same as the clip
-     * view width. In a horizontal flow this is the clip view height.
-     * The access on this variable is package ONLY FOR TESTING.
-     */
-    private double viewportBreadth;
-    protected final void setViewportBreadth(double value) {
-        this.viewportBreadth = value;
-    }
-    protected final double getViewportBreadth() {
-        return viewportBreadth;
-    }
-
-    /**
-     * The length of the viewport portion of the VirtualFlow as computed
-     * during the layout pass. In a vertical flow this would be the same as the
-     * clip view height. In a horizontal flow this is the clip view width.
-     * The access on this variable is package ONLY FOR TESTING.
-     */
-    private double viewportLength;
-    void setViewportLength(double value) {
-        this.viewportLength = value;
-    }
-    protected double getViewportLength() {
-        return viewportLength;
-    }
-
-
-    /**
-     * The width of the VirtualFlow the last time it was laid out. We
-     * use this information for several fast paths during the layout pass.
-     */
-    double lastWidth = -1;
-
-    /**
-     * The height of the VirtualFlow the last time it was laid out. We
-     * use this information for several fast paths during the layout pass.
-     */
-    double lastHeight = -1;
-
-    /**
-     * The number of "virtual" cells in the flow the last time it was laid out.
-     * For example, there may have been 1000 virtual cells, but only 20 actual
-     * cells created and in use. In that case, lastCellCount would be 1000.
-     */
-    int lastCellCount = 0;
-
-    /**
-     * We remember the last value for vertical the last time we laid out the
-     * flow. If vertical has changed, we will want to change the max & value
-     * for the different scroll bars. Since we do all the scroll bar update
-     * work in the layoutChildren function, we need to know what the old value for
-     * vertical was.
-     */
-    boolean lastVertical;
-
-    /**
-     * The position last time we laid out. If none of the lastXXX vars have
-     * changed respective to their values in layoutChildren, then we can just punt
-     * out of the method (I hope...)
-     */
-    double lastPosition;
-
-    /**
-     * The breadth of the first visible cell last time we laid out.
-     */
-    double lastCellBreadth = -1;
-
-    /**
-     * The length of the first visible cell last time we laid out.
-     */
-    double lastCellLength = -1;
-
-    /**
-     * The list of cells representing those cells which actually make up the
-     * current view. The cells are ordered such that the first cell in this
-     * list is the first in the view, and the last cell is the last in the
-     * view. When pixel scrolling, the list is simply shifted and items drop
-     * off the beginning or the end, depending on the order of scrolling.
-     * <p>
-     * This is package private ONLY FOR TESTING
-     */
-    final ArrayLinkedList<T> cells = new ArrayLinkedList<T>();
-    protected List<T> getCells() {
-        return cells;
-    }
-
-    /**
-     * A structure containing cells that can be reused later. These are cells
-     * that at one time were needed to populate the view, but now are no longer
-     * needed. We keep them here until they are needed again.
-     * <p>
-     * This is package private ONLY FOR TESTING
-     */
-    final ArrayLinkedList<T> pile = new ArrayLinkedList<T>();
-
-    /**
-     * A special cell used to accumulate bounds, such that we reduce object
-     * churn. This cell must be recreated whenever the cell factory function
-     * changes. This has package access ONLY for testing.
-     */
-    T accumCell;
-
-    /**
-     * This group is used for holding the 'accumCell'. 'accumCell' must
-     * be added to the skin for it to be styled. Otherwise, it doesn't
-     * report the correct width/height leading to issues when scrolling
-     * the flow
-     */
-    Group accumCellParent;
-
-    /**
-     * The group which holds the cells.
-     */
-    final Group sheet;
-    
-    final ObservableList<Node> sheetChildren;
-    
-    /**
-     * The scroll bar used for scrolling horizontally. This has package access
-     * ONLY for testing.
-     */
-    private VirtualScrollBar hbar = new VirtualScrollBar(this);
-
-    protected final VirtualScrollBar getHbar() {
-        return hbar;
-    }
-    /**
-     * The scroll bar used to scrolling vertically. This has package access
-     * ONLY for testing.
-     */
-    private VirtualScrollBar vbar = new VirtualScrollBar(this);
-
-    protected final VirtualScrollBar getVbar() {
-        return vbar;
-    }
-
-    /**
-     * Control in which the cell's sheet is placed and forms the viewport. The
-     * viewportBreadth and viewportLength are simply the dimensions of the
-     * clipView. This has package access ONLY for testing.
-     */
-    ClippedContainer clipView;
-
-    /**
-     * When both the horizontal and vertical scroll bars are visible,
-     * we have to 'fill in' the bottom right corner where the two scroll bars
-     * meet. This is handled by this corner region. This has package access
-     * ONLY for testing.
-     */
-    StackPane corner;
-
-    // used for panning the virtual flow
-    private double lastX;
-    private double lastY;
-    private boolean isPanning = false;
-
-    public VirtualFlow() {
-        getStyleClass().add("virtual-flow");
-        setId("virtual-flow");
-
-        // initContent
-        // --- sheet
-        sheet = new Group();
-        sheet.getStyleClass().add("sheet");
-        sheet.setAutoSizeChildren(false);
-        
-        sheetChildren = sheet.getChildren();
-
-        // --- clipView
-        clipView = new ClippedContainer(this);
-        clipView.setNode(sheet);
-        getChildren().add(clipView);
-
-        // --- accumCellParent
-        accumCellParent = new Group();
-        accumCellParent.setVisible(false);
-        getChildren().add(accumCellParent);
-
-        
-        /*
-        ** don't allow the ScrollBar to handle the ScrollEvent,
-        ** In a VirtualFlow a vertical scroll should scroll on the vertical only,
-        ** whereas in a horizontal ScrollBar it can scroll horizontally.
-        */ 
-        // block the event from being passed down to children
-        final EventDispatcher blockEventDispatcher = (event, tail) -> event;
-        // block ScrollEvent from being passed down to scrollbar's skin
-        final EventDispatcher oldHsbEventDispatcher = hbar.getEventDispatcher();
-        hbar.setEventDispatcher((event, tail) -> {
-            if (event.getEventType() == ScrollEvent.SCROLL &&
-                    !((ScrollEvent)event).isDirect()) {
-                tail = tail.prepend(blockEventDispatcher);
-                tail = tail.prepend(oldHsbEventDispatcher);
-                return tail.dispatchEvent(event);
-            }
-            return oldHsbEventDispatcher.dispatchEvent(event, tail);
-        });
-        // block ScrollEvent from being passed down to scrollbar's skin
-        final EventDispatcher oldVsbEventDispatcher = vbar.getEventDispatcher();
-        vbar.setEventDispatcher((event, tail) -> {
-            if (event.getEventType() == ScrollEvent.SCROLL &&
-                    !((ScrollEvent)event).isDirect()) {
-                tail = tail.prepend(blockEventDispatcher);
-                tail = tail.prepend(oldVsbEventDispatcher);
-                return tail.dispatchEvent(event);
-            }
-            return oldVsbEventDispatcher.dispatchEvent(event, tail);
-        });
-        /*
-        ** listen for ScrollEvents over the whole of the VirtualFlow
-        ** area, the above dispatcher having removed the ScrollBars
-        ** scroll event handling.
-        */
-        setOnScroll(new EventHandler<javafx.scene.input.ScrollEvent>() {
-            @Override public void handle(ScrollEvent event) {
-                if (BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                    if (touchDetected == false &&  mouseDown == false ) {
-                        startSBReleasedAnimation();
-                    }
-                }
-                /*
-                ** calculate the delta in the direction of the flow.
-                */ 
-                double virtualDelta = 0.0;
-                if (isVertical()) {
-                    switch(event.getTextDeltaYUnits()) {
-                        case PAGES:
-                            virtualDelta = event.getTextDeltaY() * lastHeight;
-                            break;
-                        case LINES:
-                            double lineSize;
-                            if (fixedCellSizeEnabled) {
-                                lineSize = fixedCellSize;
-                            } else {
-                                // For the scrolling to be reasonably consistent
-                                // we set the lineSize to the average size
-                                // of all currently loaded lines.
-                                T lastCell = cells.getLast();
-                                lineSize =
-                                        (getCellPosition(lastCell)
-                                            + getCellLength(lastCell)
-                                            - getCellPosition(cells.getFirst()))
-                                        / cells.size();
-                            }
-
-                            if (lastHeight / lineSize < MIN_SCROLLING_LINES_PER_PAGE) {
-                                lineSize = lastHeight / MIN_SCROLLING_LINES_PER_PAGE;
-                            }
-
-                            virtualDelta = event.getTextDeltaY() * lineSize;
-                            break;
-                        case NONE:
-                            virtualDelta = event.getDeltaY();
-                    }
-                } else { // horizontal
-                    switch(event.getTextDeltaXUnits()) {
-                        case CHARACTERS:
-                            // can we get character size here?
-                            // for now, fall through to pixel values
-                        case NONE:
-                            double dx = event.getDeltaX();
-                            double dy = event.getDeltaY();
-
-                            virtualDelta = (Math.abs(dx) > Math.abs(dy) ? dx : dy);
-                    }
-                }
-
-                if (virtualDelta != 0.0) { 
-                    /*
-                    ** only consume it if we use it
-                    */
-                    double result = adjustPixels(-virtualDelta);
-                    if (result != 0.0) {
-                        event.consume();
-                    }
-                }
-
-                ScrollBar nonVirtualBar = isVertical() ? hbar : vbar;
-                if (needBreadthBar) {
-                    double nonVirtualDelta = isVertical() ? event.getDeltaX() : event.getDeltaY();
-                    if (nonVirtualDelta != 0.0) {
-                        double newValue = nonVirtualBar.getValue() - nonVirtualDelta;
-                        if (newValue < nonVirtualBar.getMin()) {
-                            nonVirtualBar.setValue(nonVirtualBar.getMin());
-                        } else if (newValue > nonVirtualBar.getMax()) {
-                            nonVirtualBar.setValue(nonVirtualBar.getMax());
-                        } else {
-                            nonVirtualBar.setValue(newValue);
-                        }
-                        event.consume();
-                    }
-                }
-            }
-        });
-
-
-        addEventFilter(MouseEvent.MOUSE_PRESSED, new EventHandler<MouseEvent>() {
-            @Override
-            public void handle(MouseEvent e) {
-                mouseDown = true;
-                if (BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                    scrollBarOn();
-                }
-                if (isFocusTraversable()) {
-                    // We check here to see if the current focus owner is within
-                    // this VirtualFlow, and if so we back-off from requesting
-                    // focus back to the VirtualFlow itself. This is particularly
-                    // relevant given the bug identified in RT-32869. In this
-                    // particular case TextInputControl was clearing selection
-                    // when the focus on the TextField changed, meaning that the
-                    // right-click context menu was not showing the correct
-                    // options as there was no selection in the TextField.
-                    boolean doFocusRequest = true;
-                    Node focusOwner = getScene().getFocusOwner();
-                    if (focusOwner != null) {
-                        Parent parent = focusOwner.getParent();
-                        while (parent != null) {
-                            if (parent.equals(VirtualFlow.this)) {
-                                doFocusRequest = false;
-                                break;
-                            }
-                            parent = parent.getParent();
-                        }
-                    }
-
-                    if (doFocusRequest) {
-                        requestFocus();
-                    }
-                }
-
-                lastX = e.getX();
-                lastY = e.getY();
-
-                // determine whether the user has push down on the virtual flow,
-                // or whether it is the scrollbar. This is done to prevent
-                // mouse events being 'doubled up' when dragging the scrollbar
-                // thumb - it has the side-effect of also starting the panning
-                // code, leading to flicker
-                isPanning = ! (vbar.getBoundsInParent().contains(e.getX(), e.getY())
-                        || hbar.getBoundsInParent().contains(e.getX(), e.getY()));
-            }
-        });
-        addEventFilter(MouseEvent.MOUSE_RELEASED, e -> {
-            mouseDown = false;
-            if (BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                startSBReleasedAnimation();
-            }
-        });
-        addEventFilter(MouseEvent.MOUSE_DRAGGED, e -> {
-            if (BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                scrollBarOn();
-            }
-            if (! isPanning || ! isPannable()) return;
-
-            // With panning enabled, we support panning in both vertical
-            // and horizontal directions, regardless of the fact that
-            // VirtualFlow is virtual in only one direction.
-            double xDelta = lastX - e.getX();
-            double yDelta = lastY - e.getY();
-
-            // figure out the distance that the mouse moved in the virtual
-            // direction, and then perform the movement along that axis
-            // virtualDelta will contain the amount we actually did move
-            double virtualDelta = isVertical() ? yDelta : xDelta;
-            double actual = adjustPixels(virtualDelta);
-            if (actual != 0) {
-                // update last* here, as we know we've just adjusted the
-                // scrollbar. This means we don't get the situation where a
-                // user presses-and-drags a long way past the min or max
-                // values, only to change directions and see the scrollbar
-                // start moving immediately.
-                if (isVertical()) lastY = e.getY();
-                else lastX = e.getX();
-            }
-
-            // similarly, we do the same in the non-virtual direction
-            double nonVirtualDelta = isVertical() ? xDelta : yDelta;
-            ScrollBar nonVirtualBar = isVertical() ? hbar : vbar;
-            if (nonVirtualBar.isVisible()) {
-                double newValue = nonVirtualBar.getValue() + nonVirtualDelta;
-                if (newValue < nonVirtualBar.getMin()) {
-                    nonVirtualBar.setValue(nonVirtualBar.getMin());
-                } else if (newValue > nonVirtualBar.getMax()) {
-                    nonVirtualBar.setValue(nonVirtualBar.getMax());
-                } else {
-                    nonVirtualBar.setValue(newValue);
-
-                    // same as the last* comment above
-                    if (isVertical()) lastX = e.getX();
-                    else lastY = e.getY();
-                }
-            }
-        });
-
-        /*
-         * We place the scrollbars _above_ the rectangle, such that the drag
-         * operations often used in conjunction with scrollbars aren't
-         * misinterpreted as drag operations on the rectangle as well (which
-         * would be the case if the scrollbars were underneath it as the
-         * rectangle itself doesn't block the mouse.
-         */
-        // --- vbar
-        vbar.setOrientation(Orientation.VERTICAL);
-        vbar.addEventHandler(MouseEvent.ANY, event -> {
-            event.consume();
-        });
-        getChildren().add(vbar);
-
-        // --- hbar
-        hbar.setOrientation(Orientation.HORIZONTAL);
-        hbar.addEventHandler(MouseEvent.ANY, event -> {
-            event.consume();
-        });
-        getChildren().add(hbar);
-
-        // --- corner
-        corner = new StackPane();
-        corner.getStyleClass().setAll("corner");
-        getChildren().add(corner);
-        
-        
-        
-        // initBinds
-        // clipView binds
-        InvalidationListener listenerX = valueModel -> {
-            updateHbar();
-        };
-        verticalProperty().addListener(listenerX);
-        hbar.valueProperty().addListener(listenerX);
-        hbar.visibleProperty().addListener(listenerX);
-
-//        ChangeListener listenerY = new ChangeListener() {
-//            @Override public void handle(Bean bean, PropertyReference property) {
-//                clipView.setClipY(isVertical() ? 0 : vbar.getValue());
-//            }
-//        };
-//        addChangedListener(VERTICAL, listenerY);
-//        vbar.addChangedListener(ScrollBar.VALUE, listenerY);
-
-        ChangeListener<Number> listenerY = (ov, t, t1) -> {
-            clipView.setClipY(isVertical() ? 0 : vbar.getValue());
-        };
-        vbar.valueProperty().addListener(listenerY);
-        
-        super.heightProperty().addListener((observable, oldHeight, newHeight) -> {
-            // Fix for RT-8480, where the VirtualFlow does not show its content
-            // after changing size to 0 and back.
-            if (oldHeight.doubleValue() == 0 && newHeight.doubleValue() > 0) {
-                recreateCells();
-            }
-        });
-
-
-        /*
-        ** there are certain animations that need to know if the touch is
-        ** happening.....
-        */
-        setOnTouchPressed(e -> {
-            touchDetected = true;
-            scrollBarOn();
-        });
-
-        setOnTouchReleased(e -> {
-            touchDetected = false;
-            startSBReleasedAnimation();
-        });
-
-        setImpl_traversalEngine(new ParentTraversalEngine(this, new Algorithm() {
-
-            Node selectNextAfterIndex(int index, TraversalContext context) {
-                T nextCell;
-                while ((nextCell = getVisibleCell(++index)) != null) {
-                    if (nextCell.isFocusTraversable()) {
-                        return nextCell;
-                    }
-                    Node n = context.selectFirstInParent(nextCell);
-                    if (n != null) {
-                        return n;
-                    }
-                }
-                return null;
-            }
-
-            Node selectPreviousBeforeIndex(int index, TraversalContext context) {
-                T prevCell;
-                while ((prevCell = getVisibleCell(--index)) != null) {
-                    Node prev = context.selectLastInParent(prevCell);
-                    if (prev != null) {
-                        return prev;
-                    }
-                    if (prevCell.isFocusTraversable()) {
-                        return prevCell;
-                    }
-                }
-                return null;
-            }
-
-            @Override
-            public Node select(Node owner, Direction dir, TraversalContext context) {
-                T cell;
-                if (cells.isEmpty()) return null;
-                if (cells.contains(owner)) {
-                    cell = (T) owner;
-                } else {
-                    cell = findOwnerCell(owner);
-                    Node next = context.selectInSubtree(cell, owner, dir);
-                    if (next != null) {
-                        return next;
-                    }
-                    if (dir == Direction.NEXT) dir = Direction.NEXT_IN_LINE;
-                }
-                int cellIndex = cell.getIndex();
-                switch(dir) {
-                    case PREVIOUS:
-                        return selectPreviousBeforeIndex(cellIndex, context);
-                    case NEXT:
-                        Node n = context.selectFirstInParent(cell);
-                        if (n != null) {
-                            return n;
-                        }
-                        // Intentional fall-through
-                    case NEXT_IN_LINE:
-                        return selectNextAfterIndex(cellIndex, context);
-                }
-                return null;
-            }
-
-            private T findOwnerCell(Node owner) {
-                Parent p = owner.getParent();
-                while (!cells.contains(p)) {
-                    p = p.getParent();
-                }
-                return (T)p;
-            }
-
-            @Override
-            public Node selectFirst(TraversalContext context) {
-                T firstCell = cells.getFirst();
-                if (firstCell == null) return null;
-                if (firstCell.isFocusTraversable()) return firstCell;
-                Node n = context.selectFirstInParent(firstCell);
-                if (n != null) {
-                    return n;
-                }
-                return selectNextAfterIndex(firstCell.getIndex(), context);
-            }
-
-            @Override
-            public Node selectLast(TraversalContext context) {
-                T lastCell = cells.getLast();
-                if (lastCell == null) return null;
-                Node p = context.selectLastInParent(lastCell);
-                if (p != null) {
-                    return p;
-                }
-                if (lastCell.isFocusTraversable()) return lastCell;
-                return selectPreviousBeforeIndex(lastCell.getIndex(), context);
-            }
-        }));
-
-    }
-
-    void updateHbar() {
-        // Bring the clipView.clipX back to 0 if control is vertical or
-        // the hbar isn't visible (fix for RT-11666)
-        if (! isVisible() || getScene() == null) return;
-
-        if (isVertical()) {
-            if (hbar.isVisible()) {
-                clipView.setClipX(hbar.getValue());
-            } else {
-                // all cells are now less than the width of the flow,
-                // so we should shift the hbar/clip such that
-                // everything is visible in the viewport.
-                clipView.setClipX(0);
-                hbar.setValue(0);
-            }
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                          Layout Functionality                           *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Overridden to implement somewhat more efficient support for layout. The
-     * VirtualFlow can generally be considered as being unmanaged, in that
-     * whenever the position changes, or other such things change, we need
-     * to perform a layout but there is no reason to notify the parent. However
-     * when things change which may impact the preferred size (such as
-     * vertical, createCell, and configCell) then we need to notify the
-     * parent.
-     */
-    @Override public void requestLayout() {
-        // isNeedsLayout() is commented out due to RT-21417. This does not
-        // appear to impact performance (indeed, it may help), and resolves the
-        // issue identified in RT-21417.
-        setNeedsLayout(true);
-    }
-    
-    @Override protected void layoutChildren() {
-        if (needsRecreateCells) {
-            lastWidth = -1;
-            lastHeight = -1;
-            releaseCell(accumCell);
-//            accumCell = null;
-//            accumCellParent.getChildren().clear();
-            sheet.getChildren().clear();
-            for (int i = 0, max = cells.size(); i < max; i++) {
-                cells.get(i).updateIndex(-1);
-            }
-            cells.clear();
-            pile.clear();
-            releaseAllPrivateCells();
-        } else if (needsRebuildCells) {
-            lastWidth = -1;
-            lastHeight = -1;
-            releaseCell(accumCell);
-            for (int i=0; i<cells.size(); i++) {
-                cells.get(i).updateIndex(-1);
-            }
-            addAllToPile();
-            releaseAllPrivateCells();
-        } else if (needsReconfigureCells) {
-            setMaxPrefBreadth(-1);
-            lastWidth = -1;
-            lastHeight = -1;
-        }
-
-        if (! dirtyCells.isEmpty()) {
-            int index;
-            final int cellsSize = cells.size();
-            while ((index = dirtyCells.nextSetBit(0)) != -1 && index < cellsSize) {
-                T cell = cells.get(index);
-                // updateIndex(-1) works for TableView, but breaks ListView.
-                // For now, the TableView just does not use the dirtyCells API
-//                cell.updateIndex(-1);
-                if (cell != null) {
-                    cell.requestLayout();
-                }
-                dirtyCells.clear(index);
-            }
-
-            setMaxPrefBreadth(-1);
-            lastWidth = -1;
-            lastHeight = -1;
-        }
-
-        final boolean hasSizeChange = sizeChanged;
-        boolean recreatedOrRebuilt = needsRebuildCells || needsRecreateCells || sizeChanged;
-
-        needsRecreateCells = false;
-        needsReconfigureCells = false;
-        needsRebuildCells = false;
-        sizeChanged = false;
-
-        if (needsCellsLayout) {
-            for (int i = 0, max = cells.size(); i < max; i++) {
-                Cell<?> cell = cells.get(i);
-                if (cell != null) {
-                    cell.requestLayout();
-                }
-            }
-            needsCellsLayout = false;
-
-            // yes, we return here - if needsCellsLayout was set to true, we
-            // only did it to do the above - not rerun the entire layout.
-            return;
-        }
-
-        final double width = getWidth();
-        final double height = getHeight();
-        final boolean isVertical = isVertical();
-        final double position = getPosition();
-
-        // if the width and/or height is 0, then there is no point doing
-        // any of this work. In particular, this can happen during startup
-        if (width <= 0 || height <= 0) {
-            addAllToPile();
-            lastWidth = width;
-            lastHeight = height;
-            hbar.setVisible(false);
-            vbar.setVisible(false);
-            corner.setVisible(false);
-            return;
-        }
-
-        // we check if any of the cells in the cells list need layout. This is a
-        // sign that they are perhaps animating their sizes. Without this check,
-        // we may not perform a layout here, meaning that the cell will likely
-        // 'jump' (in height normally) when the user drags the virtual thumb as
-        // that is the first time the layout would occur otherwise.
-        boolean cellNeedsLayout = false;
-        boolean thumbNeedsLayout = false;
-
-        if (BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-            if ((tempVisibility == true && (hbar.isVisible() == false || vbar.isVisible() == false)) ||
-                (tempVisibility == false && (hbar.isVisible() == true || vbar.isVisible() == true))) {
-                thumbNeedsLayout = true;
-            }
-        }
-
-        if (!cellNeedsLayout) {
-            for (int i = 0; i < cells.size(); i++) {
-                Cell<?> cell = cells.get(i);
-                cellNeedsLayout = cell.isNeedsLayout();
-                if (cellNeedsLayout) break;
-            }
-        }
-
-
-        T firstCell = getFirstVisibleCell();
-
-        // If no cells need layout, we check other criteria to see if this
-        // layout call is even necessary. If it is found that no layout is
-        // needed, we just punt.
-        if (! cellNeedsLayout && !thumbNeedsLayout) {
-            boolean cellSizeChanged = false;
-            if (firstCell != null) {
-                double breadth = getCellBreadth(firstCell);
-                double length = getCellLength(firstCell);
-                cellSizeChanged = (breadth != lastCellBreadth) || (length != lastCellLength);
-                lastCellBreadth = breadth;
-                lastCellLength = length;
-            }
-
-            if (width == lastWidth &&
-                height == lastHeight &&
-                cellCount == lastCellCount &&
-                isVertical == lastVertical &&
-                position == lastPosition &&
-                ! cellSizeChanged)
-            {
-                // TODO this happens to work around the problem tested by
-                // testCellLayout_LayoutWithoutChangingThingsUsesCellsInSameOrderAsBefore
-                // but isn't a proper solution. Really what we need to do is, when
-                // laying out cells, we need to make sure that if a cell is pressed
-                // AND we are doing a full rebuild then we need to make sure we
-                // use that cell in the same physical location as before so that
-                // it gets the mouse release event.
-                return;
-            }
-        }
-
-        /*
-         * This function may get called under a variety of circumstances.
-         * It will determine what has changed from the last time it was laid
-         * out, and will then take one of several execution paths based on
-         * what has changed so as to perform minimal layout work and also to
-         * give the expected behavior. One or more of the following may have
-         * happened:
-         *
-         *  1) width/height has changed
-         *      - If the width and/or height has been reduced (but neither of
-         *        them has been expanded), then we simply have to reposition and
-         *        resize the scroll bars
-         *      - If the width (in the vertical case) has expanded, then we
-         *        need to resize the existing cells and reposition and resize
-         *        the scroll bars
-         *      - If the height (in the vertical case) has expanded, then we
-         *        need to resize and reposition the scroll bars and add
-         *        any trailing cells
-         *
-         *  2) cell count has changed
-         *      - If the number of cells is bigger, or it is smaller but not
-         *        so small as to move the position then we can just update the
-         *        cells in place without performing layout and update the
-         *        scroll bars.
-         *      - If the number of cells has been reduced and it affects the
-         *        position, then move the position and rebuild all the cells
-         *        and update the scroll bars
-         *
-         *  3) size of the cell has changed
-         *      - If the size changed in the virtual direction (ie: height
-         *        in the case of vertical) then layout the cells, adding
-         *        trailing cells as necessary and updating the scroll bars
-         *      - If the size changed in the non virtual direction (ie: width
-         *        in the case of vertical) then simply adjust the widths of
-         *        the cells as appropriate and adjust the scroll bars
-         *
-         *  4) vertical changed, cells is empty, maxPrefBreadth == -1, etc
-         *      - Full rebuild.
-         *
-         * Each of the conditions really resolves to several of a handful of
-         * possible outcomes:
-         *  a) reposition & rebuild scroll bars
-         *  b) resize cells in non-virtual direction
-         *  c) add trailing cells
-         *  d) update cells
-         *  e) resize cells in the virtual direction
-         *  f) all of the above
-         *
-         * So this function first determines what outcomes need to occur, and
-         * then will execute all the ones that really need to happen. Every code
-         * path ends up touching the "reposition & rebuild scroll bars" outcome,
-         * so that one will be executed every time.
-         */
-        boolean needTrailingCells = false;
-        boolean rebuild = cellNeedsLayout  ||
-                isVertical != lastVertical ||
-                cells.isEmpty()            ||
-                getMaxPrefBreadth() == -1  ||
-                position != lastPosition   ||
-                cellCount != lastCellCount ||
-                hasSizeChange ||
-                (isVertical && height < lastHeight) || (! isVertical && width < lastWidth);
-
-        if (!rebuild) {
-            // Check if maxPrefBreadth didn't change
-            double maxPrefBreadth = getMaxPrefBreadth();
-            boolean foundMax = false;
-            for (int i = 0; i < cells.size(); ++i) {
-                double breadth = getCellBreadth(cells.get(i));
-                if (maxPrefBreadth == breadth) {
-                    foundMax = true;
-                } else if (breadth > maxPrefBreadth) {
-                    rebuild = true;
-                    break;
-                }
-            }
-            if (!foundMax) { // All values were lower
-                rebuild = true;
-            }
-        }
-
-        if (! rebuild) {
-            if ((isVertical && height > lastHeight) || (! isVertical && width > lastWidth)) {
-                // resized in the virtual direction
-                needTrailingCells = true;
-            }
-        }
-
-        initViewport();
-
-        // Get the index of the "current" cell
-        int currentIndex = computeCurrentIndex();
-        if (lastCellCount != cellCount) {
-            // The cell count has changed. We want to keep the viewport
-            // stable if possible. If position was 0 or 1, we want to keep
-            // the position in the same place. If the new cell count is >=
-            // the currentIndex, then we will adjust the position to be 1.
-            // Otherwise, our goal is to leave the index of the cell at the
-            // top consistent, with the same translation etc.
-            if (position == 0 || position == 1) {
-                // Update the item count
-//                setItemCount(cellCount);
-            } else if (currentIndex >= cellCount) {
-                setPosition(1.0f);
-//                setItemCount(cellCount);
-            } else if (firstCell != null) {
-                double firstCellOffset = getCellPosition(firstCell);
-                int firstCellIndex = getCellIndex(firstCell);
-//                setItemCount(cellCount);
-                adjustPositionToIndex(firstCellIndex);
-                double viewportTopToCellTop = -computeOffsetForCell(firstCellIndex);
-                adjustByPixelAmount(viewportTopToCellTop - firstCellOffset);
-            }
-
-            // Update the current index
-            currentIndex = computeCurrentIndex();
-        }
-
-        if (rebuild) {
-            setMaxPrefBreadth(-1);
-            // Start by dumping all the cells into the pile
-            addAllToPile();
-
-            // The distance from the top of the viewport to the top of the
-            // cell for the current index.
-            double offset = -computeViewportOffset(getPosition());
-
-            // Add all the leading and trailing cells (the call to add leading
-            // cells will add the current cell as well -- that is, the one that
-            // represents the current position on the mapper).
-            addLeadingCells(currentIndex, offset);
-
-            // Force filling of space with empty cells if necessary
-            addTrailingCells(true);
-        } else if (needTrailingCells) {
-            addTrailingCells(true);
-        }
-
-        computeBarVisiblity();
-        updateScrollBarsAndCells(recreatedOrRebuilt);
-
-        lastWidth = getWidth();
-        lastHeight = getHeight();
-        lastCellCount = getCellCount();
-        lastVertical = isVertical();
-        lastPosition = getPosition();
-
-        cleanPile();
-    }
-
-    /**
-     * Adds all the cells prior to and including the given currentIndex, until
-     * no more can be added without falling off the flow. The startOffset
-     * indicates the distance from the leading edge (top) of the viewport to
-     * the leading edge (top) of the currentIndex.
-     */
-    protected void addLeadingCells(int currentIndex, double startOffset) {
-        // The offset will keep track of the distance from the top of the
-        // viewport to the top of the current index. We will increment it
-        // as we lay out leading cells.
-        double offset = startOffset;
-        // The index is the absolute index of the cell being laid out
-        int index = currentIndex;
-
-        // Offset should really be the bottom of the current index
-        boolean first = true; // first time in, we just fudge the offset and let
-                              // it be the top of the current index then redefine
-                              // it as the bottom of the current index thereafter
-        // while we have not yet laid out so many cells that they would fall
-        // off the flow, we will continue to create and add cells. The
-        // offset is our indication of whether we can lay out additional
-        // cells. If the offset is ever < 0, except in the case of the very
-        // first cell, then we must quit.
-        T cell = null;
-
-        // special case for the position == 1.0, skip adding last invisible cell
-        if (index == cellCount && offset == getViewportLength()) {
-            index--;
-            first = false;
-        }
-        while (index >= 0 && (offset > 0 || first)) {
-            cell = getAvailableCell(index);
-            setCellIndex(cell, index);
-            resizeCellSize(cell); // resize must be after config
-            cells.addFirst(cell);
-
-            // A little gross but better than alternatives because it reduces
-            // the number of times we have to update a cell or compute its
-            // size. The first time into this loop "offset" is actually the
-            // top of the current index. On all subsequent visits, it is the
-            // bottom of the current index.
-            if (first) {
-                first = false;
-            } else {
-                offset -= getCellLength(cell);
-            }
-
-            // Position the cell, and update the maxPrefBreadth variable as we go.
-            positionCell(cell, offset);
-            setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
-            cell.setVisible(true);
-            --index;
-        }
-
-        // There are times when after laying out the cells we discover that
-        // the top of the first cell which represents index 0 is below the top
-        // of the viewport. In these cases, we have to adjust the cells up
-        // and reset the mapper position. This might happen when items got
-        // removed at the top or when the viewport size increased.
-        if (cells.size() > 0) {
-            cell = cells.getFirst();
-            int firstIndex = getCellIndex(cell);
-            double firstCellPos = getCellPosition(cell);
-            if (firstIndex == 0 && firstCellPos > 0) {
-                setPosition(0.0f);
-                offset = 0;
-                for (int i = 0; i < cells.size(); i++) {
-                    cell = cells.get(i);
-                    positionCell(cell, offset);
-                    offset += getCellLength(cell);
-                }
-            }
-        } else {
-            // reset scrollbar to top, so if the flow sees cells again it starts at the top
-            vbar.setValue(0);
-            hbar.setValue(0);
-        }
-    }
-
-    /**
-     * Adds all the trailing cells that come <em>after</em> the last index in
-     * the cells ObservableList.
-     */
-    protected boolean addTrailingCells(boolean fillEmptyCells) {
-        // If cells is empty then addLeadingCells bailed for some reason and
-        // we're hosed, so just punt
-        if (cells.isEmpty()) return false;
-        
-        // While we have not yet laid out so many cells that they would fall
-        // off the flow, so we will continue to create and add cells. When the
-        // offset becomes greater than the width/height of the flow, then we
-        // know we cannot add any more cells.
-        T startCell = cells.getLast();
-        double offset = getCellPosition(startCell) + getCellLength(startCell);
-        int index = getCellIndex(startCell) + 1;
-        boolean filledWithNonEmpty = index <= cellCount;
-
-        final double viewportLength = getViewportLength();
-
-        // Fix for RT-37421, which was a regression caused by RT-36556
-        if (offset < 0 && !fillEmptyCells) {
-            return false;
-        }
-
-        //
-        // RT-36507: viewportLength - offset gives the maximum number of
-        // additional cells that should ever be able to fit in the viewport if
-        // every cell had a height of 1. If index ever exceeds this count,
-        // then offset is not incrementing fast enough, or at all, which means
-        // there is something wrong with the cell size calculation.
-        //
-        final double maxCellCount = viewportLength - offset;
-        while (offset < viewportLength) {
-            if (index >= cellCount) {
-                if (offset < viewportLength) filledWithNonEmpty = false;
-                if (! fillEmptyCells) return filledWithNonEmpty;
-                // RT-36507 - return if we've exceeded the maximum
-                if (index > maxCellCount) {
-                    final PlatformLogger logger = Logging.getControlsLogger();
-                    if (logger.isLoggable(PlatformLogger.Level.INFO)) {
-                        if (startCell != null) {
-                            logger.info("index exceeds maxCellCount. Check size calculations for " + startCell.getClass());
-                        } else {
-                            logger.info("index exceeds maxCellCount");
-                        }
-                    }
-                    return filledWithNonEmpty;
-                }
-            }
-            T cell = getAvailableCell(index);
-            setCellIndex(cell, index);
-            resizeCellSize(cell); // resize happens after config!
-            cells.addLast(cell);
-
-            // Position the cell and update the max pref
-            positionCell(cell, offset);
-            setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
-
-            offset += getCellLength(cell);
-            cell.setVisible(true);
-            ++index;
-        }
-
-        // Discover whether the first cell coincides with index #0. If after
-        // adding all the trailing cells we find that a) the first cell was
-        // not index #0 and b) there are trailing cells, then we have a
-        // problem. We need to shift all the cells down and add leading cells,
-        // one at a time, until either the very last non-empty cells is aligned
-        // with the bottom OR we have laid out cell index #0 at the first
-        // position.
-        T firstCell = cells.getFirst();
-        index = getCellIndex(firstCell);
-        T lastNonEmptyCell = getLastVisibleCell();
-        double start = getCellPosition(firstCell);
-        double end = getCellPosition(lastNonEmptyCell) + getCellLength(lastNonEmptyCell);
-        if ((index != 0 || (index == 0 && start < 0)) && fillEmptyCells &&
-                lastNonEmptyCell != null && getCellIndex(lastNonEmptyCell) == cellCount - 1 && end < viewportLength) {
-
-            double prospectiveEnd = end;
-            double distance = viewportLength - end;
-            while (prospectiveEnd < viewportLength && index != 0 && (-start) < distance) {
-                index--;
-                T cell = getAvailableCell(index);
-                setCellIndex(cell, index);
-                resizeCellSize(cell); // resize must be after config
-                cells.addFirst(cell);
-                double cellLength = getCellLength(cell);
-                start -= cellLength;
-                prospectiveEnd += cellLength;
-                positionCell(cell, start);
-                setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
-                cell.setVisible(true);
-            }
-
-            // The amount by which to translate the cells down
-            firstCell = cells.getFirst();
-            start = getCellPosition(firstCell);
-            double delta = viewportLength - end;
-            if (getCellIndex(firstCell) == 0 && delta > (-start)) {
-                delta = (-start);
-            }
-            // Move things
-            for (int i = 0; i < cells.size(); i++) {
-                T cell = cells.get(i);
-                positionCell(cell, getCellPosition(cell) + delta);
-            }
-
-            // Check whether the first cell, subsequent to our adjustments, is
-            // now index #0 and aligned with the top. If so, change the position
-            // to be at 0 instead of 1.
-            start = getCellPosition(firstCell);
-            if (getCellIndex(firstCell) == 0 && start == 0) {
-                setPosition(0);
-            } else if (getPosition() != 1) {
-                setPosition(1);
-            }
-        }
-
-        return filledWithNonEmpty;
-    }
-
-    /**
-     * @return true if bar visibility changed
-     */
-    private boolean computeBarVisiblity() {
-        if (cells.isEmpty()) {
-            // In case no cells are set yet, we assume no bars are needed
-            needLengthBar = false;
-            needBreadthBar = false;
-            return true;
-        }
-
-        final boolean isVertical = isVertical();
-        boolean barVisibilityChanged = false;
-
-        VirtualScrollBar breadthBar = isVertical ? hbar : vbar;
-        VirtualScrollBar lengthBar = isVertical ? vbar : hbar;
-
-        final double viewportBreadth = getViewportBreadth();
-
-        final int cellsSize = cells.size();
-        for (int i = 0; i < 2; i++) {
-            final boolean lengthBarVisible = getPosition() > 0
-                    || cellCount > cellsSize
-                    || (cellCount == cellsSize && (getCellPosition(cells.getLast()) + getCellLength(cells.getLast())) > getViewportLength())
-                    || (cellCount == cellsSize - 1 && barVisibilityChanged && needBreadthBar);
-
-            if (lengthBarVisible ^ needLengthBar) {
-                needLengthBar = lengthBarVisible;
-                barVisibilityChanged = true;
-            }
-
-            // second conditional removed for RT-36669.
-            final boolean breadthBarVisible = (maxPrefBreadth > viewportBreadth);// || (needLengthBar && maxPrefBreadth > (viewportBreadth - lengthBarBreadth));
-            if (breadthBarVisible ^ needBreadthBar) {
-                needBreadthBar = breadthBarVisible;
-                barVisibilityChanged = true;
-            }
-        }
-
-        // Start by optimistically deciding whether the length bar and
-        // breadth bar are needed and adjust the viewport dimensions
-        // accordingly. If during layout we find that one or the other of the
-        // bars actually is needed, then we will perform a cleanup pass
-
-        if (!BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-            updateViewportDimensions();
-            breadthBar.setVisible(needBreadthBar);
-            lengthBar.setVisible(needLengthBar);
-        } else {
-            breadthBar.setVisible(needBreadthBar && tempVisibility);
-            lengthBar.setVisible(needLengthBar && tempVisibility);
-        }
-
-        return barVisibilityChanged;
-    }
-
-    private void updateViewportDimensions() {
-        final boolean isVertical = isVertical();
-        final double breadthBarLength = snapSize(isVertical ? hbar.prefHeight(-1) : vbar.prefWidth(-1));
-        final double lengthBarBreadth = snapSize(isVertical ? vbar.prefWidth(-1) : hbar.prefHeight(-1));
-
-        setViewportBreadth((isVertical ? getWidth() : getHeight()) - (needLengthBar ? lengthBarBreadth : 0));
-        setViewportLength((isVertical ? getHeight() : getWidth()) - (needBreadthBar ? breadthBarLength : 0));
-    }
-
-    private void initViewport() {
-        // Initialize the viewportLength and viewportBreadth to match the
-        // width/height of the flow
-        final boolean isVertical = isVertical();
-
-        updateViewportDimensions();
-
-        VirtualScrollBar breadthBar = isVertical ? hbar : vbar;
-        VirtualScrollBar lengthBar = isVertical ? vbar : hbar;
-
-        // If there has been a switch between the virtualized bar, then we
-        // will want to do some stuff TODO.
-        breadthBar.setVirtual(false);
-        lengthBar.setVirtual(true);
-    }
-
-    @Override protected void setWidth(double value) {
-        if (value != lastWidth) {
-            super.setWidth(value);
-            sizeChanged = true;
-            setNeedsLayout(true);
-            requestLayout();
-        }
-    }
-
-    @Override protected void setHeight(double value) {
-        if (value != lastHeight) {
-            super.setHeight(value);
-            sizeChanged = true;
-            setNeedsLayout(true);
-            requestLayout();
-        }
-    }
-
-    private void updateScrollBarsAndCells(boolean recreate) {
-        // Assign the hbar and vbar to the breadthBar and lengthBar so as
-        // to make some subsequent calculations easier.
-        final boolean isVertical = isVertical();
-        VirtualScrollBar breadthBar = isVertical ? hbar : vbar;
-        VirtualScrollBar lengthBar = isVertical ? vbar : hbar;
-
-        // We may have adjusted the viewport length and breadth after the
-        // layout due to scroll bars becoming visible. So we need to perform
-        // a follow up pass and resize and shift all the cells to fit the
-        // viewport. Note that the prospective viewport size is always >= the
-        // final viewport size, so we don't have to worry about adding
-        // cells during this cleanup phase.
-        fitCells();
-        
-        // Update cell positions.
-        // When rebuilding the cells, we add the cells and along the way compute
-        // the maxPrefBreadth. Based on the computed value, we may add
-        // the breadth scrollbar which changes viewport length, so we need
-        // to re-position the cells.
-        if (!cells.isEmpty()) {
-            final double currOffset = -computeViewportOffset(getPosition());
-            final int currIndex = computeCurrentIndex() - cells.getFirst().getIndex();
-            final int size = cells.size();
-
-            // position leading cells
-            double offset = currOffset;
-
-            for (int i = currIndex - 1; i >= 0 && i < size; i--) {
-                final T cell = cells.get(i);
-
-                offset -= getCellLength(cell);
-
-                positionCell(cell, offset);
-            }
-
-            // position trailing cells
-            offset = currOffset;
-            for (int i = currIndex; i >= 0 && i < size; i++) {
-                final T cell = cells.get(i);
-                positionCell(cell, offset);
-
-                offset += getCellLength(cell);
-            }
-        }
-
-        // Toggle visibility on the corner
-        corner.setVisible(breadthBar.isVisible() && lengthBar.isVisible());
-
-        double sumCellLength = 0;
-        double flowLength = (isVertical ? getHeight() : getWidth()) -
-            (breadthBar.isVisible() ? breadthBar.prefHeight(-1) : 0);
-
-        final double viewportBreadth = getViewportBreadth();
-        final double viewportLength = getViewportLength();
-        
-        // Now position and update the scroll bars
-        if (breadthBar.isVisible()) {
-            /*
-            ** Positioning the ScrollBar
-            */
-            if (!BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                if (isVertical) {
-                    hbar.resizeRelocate(0, viewportLength,
-                        viewportBreadth, hbar.prefHeight(viewportBreadth));
-                } else {
-                    vbar.resizeRelocate(viewportLength, 0,
-                        vbar.prefWidth(viewportBreadth), viewportBreadth);
-                }
-            }
-            else {
-                if (isVertical) {
-                    hbar.resizeRelocate(0, (viewportLength-hbar.getHeight()),
-                        viewportBreadth, hbar.prefHeight(viewportBreadth));
-                } else {
-                    vbar.resizeRelocate((viewportLength-vbar.getWidth()), 0,
-                        vbar.prefWidth(viewportBreadth), viewportBreadth);
-                }
-            }
-
-            if (getMaxPrefBreadth() != -1) {
-                double newMax = Math.max(1, getMaxPrefBreadth() - viewportBreadth);
-                if (newMax != breadthBar.getMax()) {
-                    breadthBar.setMax(newMax);
-
-                    double breadthBarValue = breadthBar.getValue();
-                    boolean maxed = breadthBarValue != 0 && newMax == breadthBarValue;
-                    if (maxed || breadthBarValue > newMax) {
-                        breadthBar.setValue(newMax);
-                    }
-
-                    breadthBar.setVisibleAmount((viewportBreadth / getMaxPrefBreadth()) * newMax);
-                }
-            }
-        }
-        
-        // determine how many cells there are on screen so that the scrollbar
-        // thumb can be appropriately sized
-        if (recreate && (lengthBar.isVisible() || BehaviorSkinBase.IS_TOUCH_SUPPORTED)) {
-            int numCellsVisibleOnScreen = 0;
-            for (int i = 0, max = cells.size(); i < max; i++) {
-                T cell = cells.get(i);
-                if (cell != null && !cell.isEmpty()) {
-                    sumCellLength += (isVertical ? cell.getHeight() : cell.getWidth());
-                    if (sumCellLength > flowLength) {
-                        break;
-                    }
-
-                    numCellsVisibleOnScreen++;
-                }
-            }
-
-            lengthBar.setMax(1);
-            if (numCellsVisibleOnScreen == 0 && cellCount == 1) {
-                    // special case to help resolve RT-17701 and the case where we have
-                // only a single row and it is bigger than the viewport
-                lengthBar.setVisibleAmount(flowLength / sumCellLength);
-            } else {
-                lengthBar.setVisibleAmount(numCellsVisibleOnScreen / (float) cellCount);
-            }
-        }
-
-        if (lengthBar.isVisible()) {
-            // Fix for RT-11873. If this isn't here, we can have a situation where
-            // the scrollbar scrolls endlessly. This is possible when the cell
-            // count grows as the user hits the maximal position on the scrollbar
-            // (i.e. the list size dynamically grows as the user needs more).
-            //
-            // This code was commented out to resolve RT-14477 after testing
-            // whether RT-11873 can be recreated. It could not, and therefore
-            // for now this code will remained uncommented until it is deleted
-            // following further testing.
-//            if (lengthBar.getValue() == 1.0 && lastCellCount != cellCount) {
-//                lengthBar.setValue(0.99);
-//            }
-
-            /*
-            ** Positioning the ScrollBar
-            */
-            if (!BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                if (isVertical) {
-                    vbar.resizeRelocate(viewportBreadth, 0, vbar.prefWidth(viewportLength), viewportLength);
-                } else {
-                    hbar.resizeRelocate(0, viewportBreadth, viewportLength, hbar.prefHeight(-1));
-                }
-            }
-            else {
-                if (isVertical) {
-                    vbar.resizeRelocate((viewportBreadth-vbar.getWidth()), 0, vbar.prefWidth(viewportLength), viewportLength);
-                } else {
-                    hbar.resizeRelocate(0, (viewportBreadth-hbar.getHeight()), viewportLength, hbar.prefHeight(-1));
-                }
-            }
-        }
-
-        if (corner.isVisible()) {
-            if (!BehaviorSkinBase.IS_TOUCH_SUPPORTED) {
-                corner.resize(vbar.getWidth(), hbar.getHeight());
-                corner.relocate(hbar.getLayoutX() + hbar.getWidth(), vbar.getLayoutY() + vbar.getHeight());
-            }
-            else {
-                corner.resize(vbar.getWidth(), hbar.getHeight());
-                corner.relocate(hbar.getLayoutX() + (hbar.getWidth()-vbar.getWidth()), vbar.getLayoutY() + (vbar.getHeight()-hbar.getHeight()));
-                hbar.resize(hbar.getWidth()-vbar.getWidth(), hbar.getHeight());
-                vbar.resize(vbar.getWidth(), vbar.getHeight()-hbar.getHeight());
-            }
-        }
-
-        clipView.resize(snapSize(isVertical ? viewportBreadth : viewportLength),
-                        snapSize(isVertical ? viewportLength : viewportBreadth));
-
-        // If the viewportLength becomes large enough that all cells fit
-        // within the viewport, then we want to update the value to match.
-        if (getPosition() != lengthBar.getValue()) {
-            lengthBar.setValue(getPosition());
-        }
-    }
-
-    /**
-     * Adjusts the cells location and size if necessary. The breadths of all
-     * cells will be adjusted to fit the viewportWidth or maxPrefBreadth, and
-     * the layout position will be updated if necessary based on index and
-     * offset.
-     */
-    private void fitCells() {
-        double size = Math.max(getMaxPrefBreadth(), getViewportBreadth());
-        boolean isVertical = isVertical();
-
-        // Note: Do not optimise this loop by pre-calculating the cells size and
-        // storing that into a int value - this can lead to RT-32828
-        for (int i = 0; i < cells.size(); i++) {
-            Cell<?> cell = cells.get(i);
-            if (isVertical) {
-                cell.resize(size, cell.prefHeight(size));
-            } else {
-                cell.resize(cell.prefWidth(size), size);
-            }
-        }
-    }
-
-    private void cull() {
-        final double viewportLength = getViewportLength();
-        for (int i = cells.size() - 1; i >= 0; i--) {
-            T cell = cells.get(i);
-            double cellSize = getCellLength(cell);
-            double cellStart = getCellPosition(cell);
-            double cellEnd = cellStart + cellSize;
-            if (cellStart >= viewportLength || cellEnd < 0) {
-                addToPile(cells.remove(i));
-            }
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                Helper functions for working with cells                  *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Return the index for a given cell. This allows subclasses to customise
-     * how cell indices are retrieved.
-     */
-    protected int getCellIndex(T cell){
-        return cell.getIndex();
-    }
-
-
-    /**
-     * Return a cell for the given index. This may be called for any cell,
-     * including beyond the range defined by cellCount, in which case an
-     * empty cell will be returned. The returned value should not be stored for
-     * any reason.
-     */
-    public T getCell(int index) {
-        // If there are cells, then we will attempt to get an existing cell
-        if (! cells.isEmpty()) {
-            // First check the cells that have already been created and are
-            // in use. If this call returns a value, then we can use it
-            T cell = getVisibleCell(index);
-            if (cell != null) return cell;
-        }
-
-        // check the pile
-        for (int i = 0; i < pile.size(); i++) {
-            T cell = pile.get(i);
-            if (getCellIndex(cell) == index) {
-                // Note that we don't remove from the pile: if we do it leads
-                // to a severe performance decrease. This seems to be OK, as
-                // getCell() is only used for cell measurement purposes.
-                // pile.remove(i);
-                return cell;
-            }
-        }
-
-        if (pile.size() > 0) {
-            return pile.get(0);
-        }
-
-        // We need to use the accumCell and return that
-        if (accumCell == null) {
-            Callback<VirtualFlow,T> createCell = getCreateCell();
-            if (createCell != null) {
-                accumCell = createCell.call(this);
-                accumCell.getProperties().put(NEW_CELL, null);
-                accumCellParent.getChildren().setAll(accumCell);
-
-                // Note the screen reader will attempt to find all
-                // the items inside the view to calculate the item count.
-                // Having items under different parents (sheet and accumCellParent)
-                // leads the screen reader to compute wrong values.
-                // The regular scheme to provide items to the screen reader
-                // uses getPrivateCell(), which places the item in the sheet.
-                // The accumCell, and its children, should be ignored by the
-                // screen reader. 
-                accumCell.setAccessibleRole(AccessibleRole.NODE);
-                accumCell.getChildrenUnmodifiable().addListener((Observable c) -> {
-                    for (Node n : accumCell.getChildrenUnmodifiable()) {
-                        n.setAccessibleRole(AccessibleRole.NODE);
-                    }
-                });
-            }
-        }
-        setCellIndex(accumCell, index);
-        resizeCellSize(accumCell);
-        return accumCell;
-    }
-
-    /**
-     * After using the accum cell, it needs to be released!
-     */
-    private void releaseCell(T cell) {
-        if (accumCell != null && cell == accumCell) {
-            accumCell.updateIndex(-1);
-        }
-    }
-
-    /**
-     * This method is an experts-only method - if the requested index is not
-     * already an existing visible cell, it will create a cell for the
-     * given index and insert it into the sheet. From that point on it will be
-     * unmanaged, and is up to the caller of this method to manage it.
-     */
-    T getPrivateCell(int index)  {
-        T cell = null;
-
-        // If there are cells, then we will attempt to get an existing cell
-        if (! cells.isEmpty()) {
-            // First check the cells that have already been created and are
-            // in use. If this call returns a value, then we can use it
-            cell = getVisibleCell(index);
-            if (cell != null) {
-                // Force the underlying text inside the cell to be updated
-                // so that when the screen reader runs, it will match the
-                // text in the cell (force updateDisplayedText())
-                cell.layout();
-                return cell;
-            }
-        }
-
-        // check the existing sheet children
-        if (cell == null) {
-            for (int i = 0; i < sheetChildren.size(); i++) {
-                T _cell = (T) sheetChildren.get(i);
-                if (getCellIndex(_cell) == index) {
-                    return _cell;
-                }
-            }
-        }
-
-        if (cell == null) {
-            Callback<VirtualFlow, T> createCell = getCreateCell();
-            if (createCell != null) {
-                cell = createCell.call(this);
-            }
-        }
-
-        if (cell != null) {
-            setCellIndex(cell, index);
-            resizeCellSize(cell);
-            cell.setVisible(false);
-            sheetChildren.add(cell);
-            privateCells.add(cell);
-        }
-
-        return cell;
-    }
-
-    private final List<T> privateCells = new ArrayList<>();
-
-    private void releaseAllPrivateCells() {
-        sheetChildren.removeAll(privateCells);
-    }
-
-    /**
-     * Compute and return the length of the cell for the given index. This is
-     * called both internally when adjusting by pixels, and also at times
-     * by PositionMapper (see the getItemSize callback). When called by
-     * PositionMapper, it is possible that it will be called for some index
-     * which is not associated with any cell, so we have to do a bit of work
-     * to use a cell as a helper for computing cell size in some cases.
-     */
-    protected double getCellLength(int index) {
-        if (fixedCellSizeEnabled) return fixedCellSize;
-        
-        T cell = getCell(index);
-        double length = getCellLength(cell);
-        releaseCell(cell);
-        return length;
-    }
-
-    /**
-     */
-    protected double getCellBreadth(int index) {
-        T cell = getCell(index);
-        double b = getCellBreadth(cell);
-        releaseCell(cell);
-        return b;
-    }
-
-    /**
-     * Gets the length of a specific cell
-     */
-    protected double getCellLength(T cell) {
-        if (cell == null) return 0;
-        if (fixedCellSizeEnabled) return fixedCellSize;
-
-        return isVertical() ?
-            cell.getLayoutBounds().getHeight()
-            : cell.getLayoutBounds().getWidth();
-    }
-
-//    private double getCellPrefLength(T cell) {
-//        return isVertical() ?
-//            cell.prefHeight(-1)
-//            : cell.prefWidth(-1);
-//    }
-
-    /**
-     * Gets the breadth of a specific cell
-     */
-    protected double getCellBreadth(Cell cell) {
-        return isVertical() ?
-            cell.prefWidth(-1)
-            : cell.prefHeight(-1);
-    }
-
-    /**
-     * Gets the layout position of the cell along the length axis
-     */
-    protected double getCellPosition(T cell) {
-        if (cell == null) return 0;
-
-        return isVertical() ?
-            cell.getLayoutY()
-            : cell.getLayoutX();
-    }
-
-    protected void positionCell(T cell, double position) {
-        if (isVertical()) {
-            cell.setLayoutX(0);
-            cell.setLayoutY(snapSize(position));
-        } else {
-            cell.setLayoutX(snapSize(position));
-            cell.setLayoutY(0);
-        }
-    }
-
-    protected void resizeCellSize(T cell) {
-        if (cell == null) return;
-        
-        if (isVertical()) {
-            double width = Math.max(getMaxPrefBreadth(), getViewportBreadth());
-            cell.resize(width, fixedCellSizeEnabled ? fixedCellSize : Utils.boundedSize(cell.prefHeight(width), cell.minHeight(width), cell.maxHeight(width)));
-        } else {
-            double height = Math.max(getMaxPrefBreadth(), getViewportBreadth());
-            cell.resize(fixedCellSizeEnabled ? fixedCellSize : Utils.boundedSize(cell.prefWidth(height), cell.minWidth(height), cell.maxWidth(height)), height);
-        }
-    }
-
-    protected void setCellIndex(T cell, int index) {
-        assert cell != null;
-
-        cell.updateIndex(index);
-
-        // make sure the cell is sized correctly. This is important for both
-        // general layout of cells in a VirtualFlow, but also in cases such as
-        // RT-34333, where the sizes were being reported incorrectly to the
-        // ComboBox popup.
-        if ((cell.isNeedsLayout() && cell.getScene() != null) || cell.getProperties().containsKey(NEW_CELL)) {
-            cell.applyCss();
-            cell.getProperties().remove(NEW_CELL);
-        }
-    }
-
-    /***************************************************************************
-     *                                                                         *
-     *                 Helper functions for cell management                    *
-     *                                                                         *
-     **************************************************************************/
-
-
-    /**
-     * Indicates that this is a newly created cell and we need call impl_processCSS for it.
-     *
-     * See RT-23616 for more details.
-     */
-    private static final String NEW_CELL = "newcell";
-
-    /**
-     * Get a cell which can be used in the layout. This function will reuse
-     * cells from the pile where possible, and will create new cells when
-     * necessary.
-     */
-    protected T getAvailableCell(int prefIndex) {
-        T cell = null;
-        
-        // Fix for RT-12822. We try to retrieve the cell from the pile rather
-        // than just grab a random cell from the pile (or create another cell).
-        for (int i = 0, max = pile.size(); i < max; i++) {
-            T _cell = pile.get(i);
-            assert _cell != null;
-            
-            if (getCellIndex(_cell) == prefIndex) {
-                cell = _cell;
-                pile.remove(i);
-                break;
-            }
-            cell = null;
-        }
-
-        if (cell == null) {
-            if (pile.size() > 0) {
-                // we try to get a cell with an index that is the same even/odd
-                // as the prefIndex. This saves us from having to run so much
-                // css on the cell as it will not change from even to odd, or
-                // vice versa
-                final boolean prefIndexIsEven = (prefIndex & 1) == 0;
-                for (int i = 0, max = pile.size(); i < max; i++) {
-                    final T c = pile.get(i);
-                    final int cellIndex = getCellIndex(c);
-
-                    if ((cellIndex & 1) == 0 && prefIndexIsEven) {
-                        cell = c;
-                        pile.remove(i);
-                        break;
-                    } else if ((cellIndex & 1) == 1 && ! prefIndexIsEven) {
-                        cell = c;
-                        pile.remove(i);
-                        break;
-                    }
-                }
-
-                if (cell == null) {
-                    cell = pile.removeFirst();
-                }
-            } else {
-                cell = getCreateCell().call(this);
-                cell.getProperties().put(NEW_CELL, null);
-            }
-        }
-
-        if (cell.getParent() == null) {
-            sheetChildren.add(cell);
-        }
-        
-        return cell;
-    }
-
-    // protected to allow subclasses to clean up
-    protected void addAllToPile() {
-        for (int i = 0, max = cells.size(); i < max; i++) {
-            addToPile(cells.removeFirst());
-        }
-    }
-
-    /**
-     * Puts the given cell onto the pile. This is called whenever a cell has
-     * fallen off the flow's start.
-     */
-    private void addToPile(T cell) {
-        assert cell != null;
-        pile.addLast(cell);
-    }
-
-    private void cleanPile() {
-        boolean wasFocusOwner = false;
-
-        for (int i = 0, max = pile.size(); i < max; i++) {
-            T cell = pile.get(i);
-            wasFocusOwner = wasFocusOwner || doesCellContainFocus(cell);
-            cell.setVisible(false);
-        }
-
-        // Fix for RT-35876: Rather than have the cells do weird things with
-        // focus (in particular, have focus jump between cells), we return focus
-        // to the VirtualFlow itself.
-        if (wasFocusOwner) {
-            requestFocus();
-        }
-    }
-
-    private boolean doesCellContainFocus(Cell<?> c) {
-        Scene scene = c.getScene();
-        final Node focusOwner = scene == null ? null : scene.getFocusOwner();
-
-        if (focusOwner != null) {
-            if (c.equals(focusOwner)) {
-                return true;
-            }
-
-            Parent p = focusOwner.getParent();
-            while (p != null && ! (p instanceof VirtualFlow)) {
-                if (c.equals(p)) {
-                    return true;
-                }
-                p = p.getParent();
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Gets a cell for the given index if the cell has been created and laid out.
-     * "Visible" is a bit of a misnomer, the cell might not be visible in the
-     * viewport (it may be clipped), but does distinguish between cells that
-     * have been created and are in use vs. those that are in the pile or
-     * not created.
-     */
-    public T getVisibleCell(int index) {
-        if (cells.isEmpty()) return null;
-
-        // check the last index
-        T lastCell = cells.getLast();
-        int lastIndex = getCellIndex(lastCell);
-        if (index == lastIndex) return lastCell;
-
-        // check the first index
-        T firstCell = cells.getFirst();
-        int firstIndex = getCellIndex(firstCell);
-        if (index == firstIndex) return firstCell;
-
-        // if index is > firstIndex and < lastIndex then we can get the index
-        if (index > firstIndex && index < lastIndex) {
-            T cell = cells.get(index - firstIndex);
-            if (getCellIndex(cell) == index) return cell;
-        }
-
-        // there is no visible cell for the specified index
-        return null;
-    }
-
-    /**
-     * Locates and returns the last non-empty IndexedCell that is currently
-     * partially or completely visible. This function may return null if there
-     * are no cells, or if the viewport length is 0.
-     */
-    public T getLastVisibleCell() {
-        if (cells.isEmpty() || getViewportLength() <= 0) return null;
-
-        T cell;
-        for (int i = cells.size() - 1; i >= 0; i--) {
-            cell = cells.get(i);
-            if (! cell.isEmpty()) {
-                return cell;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Locates and returns the first non-empty IndexedCell that is partially or
-     * completely visible. This really only ever returns null if there are no
-     * cells or the viewport length is 0.
-     */
-    public T getFirstVisibleCell() {
-        if (cells.isEmpty() || getViewportLength() <= 0) return null;
-        T cell = cells.getFirst();
-        return cell.isEmpty() ? null : cell;
-    }
-
-    // Returns last visible cell whose bounds are entirely within the viewport
-    public T getLastVisibleCellWithinViewPort() {
-        if (cells.isEmpty() || getViewportLength() <= 0) return null;
-
-        T cell;
-        final double max = getViewportLength();
-        for (int i = cells.size() - 1; i >= 0; i--) {
-            cell = cells.get(i);
-            if (cell.isEmpty()) continue;
-
-            final double cellStart = getCellPosition(cell);
-            final double cellEnd = cellStart + getCellLength(cell);
-
-            // we use the magic +2 to allow for a little bit of fuzziness,
-            // this is to help in situations such as RT-34407
-            if (cellEnd <= (max + 2)) {
-                return cell;
-            }
-        }
-
-        return null;
-    }
-
-    // Returns first visible cell whose bounds are entirely within the viewport
-    public T getFirstVisibleCellWithinViewPort() {
-        if (cells.isEmpty() || getViewportLength() <= 0) return null;
-
-        T cell;
-        for (int i = 0; i < cells.size(); i++) {
-            cell = cells.get(i);
-            if (cell.isEmpty()) continue;
-
-            final double cellStart = getCellPosition(cell);
-            if (cellStart >= 0) {
-                return cell;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Adjust the position of cells so that the specified cell
-     * will be positioned at the start of the viewport. The given cell must
-     * already be "live". This is bad public API!
-     */
-    public void showAsFirst(T firstCell) {
-        if (firstCell != null) {
-            adjustPixels(getCellPosition(firstCell));
-        }
-    }
-
-    /**
-     * Adjust the position of cells so that the specified cell
-     * will be positioned at the end of the viewport. The given cell must
-     * already be "live". This is bad public API!
-     */
-    public void showAsLast(T lastCell) {
-        if (lastCell != null) {
-            adjustPixels(getCellPosition(lastCell) + getCellLength(lastCell) - getViewportLength());
-        }
-    }
-
-    /**
-     * Adjusts the cells such that the selected cell will be fully visible in
-     * the viewport (but only just).
-     */
-    public void show(T cell) {
-        if (cell != null) {
-            final double start = getCellPosition(cell);
-            final double length = getCellLength(cell);
-            final double end = start + length;
-            final double viewportLength = getViewportLength();
-
-            if (start < 0) {
-                adjustPixels(start);
-            } else if (end > viewportLength) {
-                adjustPixels(end - viewportLength);
-            }
-        }
-    }
-
-    public void show(int index) {
-        T cell = getVisibleCell(index);
-        if (cell != null) {
-            show(cell);
-        } else {
-            // See if the previous index is a visible cell
-            T prev = getVisibleCell(index - 1);
-            if (prev != null) {
-                // Need to add a new cell and then we can show it
-//                layingOut = true;
-                cell = getAvailableCell(index);
-                setCellIndex(cell, index);
-                resizeCellSize(cell); // resize must be after config
-                cells.addLast(cell);
-                positionCell(cell, getCellPosition(prev) + getCellLength(prev));
-                setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
-                cell.setVisible(true);
-                show(cell);
-//                layingOut = false;
-                return;
-            }
-            // See if the next index is a visible cell
-            T next = getVisibleCell(index + 1);
-            if (next != null) {
-//                layingOut = true;
-                cell = getAvailableCell(index);
-                setCellIndex(cell, index);
-                resizeCellSize(cell); // resize must be after config
-                cells.addFirst(cell);
-                positionCell(cell, getCellPosition(next) - getCellLength(cell));
-                setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
-                cell.setVisible(true);
-                show(cell);
-//                layingOut = false;
-                return;
-            }
-
-            // In this case, we're asked to show a random cell
-//            layingOut = true;
-            adjustPositionToIndex(index);
-            addAllToPile();
-            requestLayout();
-//            layingOut = false;            
-        }
-    }
-
-    public void scrollTo(int index) {
-        boolean posSet = false;
-        
-        if (index >= cellCount - 1) {
-            setPosition(1);
-            posSet = true;
-        } else if (index < 0) {
-            setPosition(0);
-            posSet = true;
-        }
-        
-        if (! posSet) {
-            adjustPositionToIndex(index);
-            double offset = - computeOffsetForCell(index);
-            adjustByPixelAmount(offset);
-        }
-        
-        requestLayout();        
-    }
-    
-    //TODO We assume all the cell have the same length.  We will need to support
-    // cells of different lengths.
-    public void scrollToOffset(int offset) {
-        adjustPixels(offset * getCellLength(0));
-    }    
-    
-    /**
-     * Given a delta value representing a number of pixels, this method attempts
-     * to move the VirtualFlow in the given direction (positive is down/right,
-     * negative is up/left) the given number of pixels. It returns the number of
-     * pixels actually moved.
-     */
-    public double adjustPixels(final double delta) {
-        // Short cut this method for cases where nothing should be done
-        if (delta == 0) return 0;
-
-        final boolean isVertical = isVertical();
-        if (((isVertical && (tempVisibility ? !needLengthBar : !vbar.isVisible())) ||
-                (! isVertical && (tempVisibility ? !needLengthBar : !hbar.isVisible())))) return 0;
-        
-        double pos = getPosition();
-        if (pos == 0.0f && delta < 0) return 0;
-        if (pos == 1.0f && delta > 0) return 0;
-
-        adjustByPixelAmount(delta);
-        if (pos == getPosition()) {
-            // The pos hasn't changed, there's nothing to do. This is likely
-            // to occur when we hit either extremity
-            return 0;
-        }
-
-        // Now move stuff around. Translating by pixels fundamentally means
-        // moving the cells by the delta. However, after having
-        // done that, we need to go through the cells and see which cells,
-        // after adding in the translation factor, now fall off the viewport.
-        // Also, we need to add cells as appropriate to the end (or beginning,
-        // depending on the direction of travel).
-        //
-        // One simplifying assumption (that had better be true!) is that we
-        // will only make it this far in the function if the virtual scroll
-        // bar is visible. Otherwise, we never will pixel scroll. So as we go,
-        // if we find that the maxPrefBreadth exceeds the viewportBreadth,
-        // then we will be sure to show the breadthBar and update it
-        // accordingly.
-        if (cells.size() > 0) {
-            for (int i = 0; i < cells.size(); i++) {
-                T cell = cells.get(i);
-                assert cell != null;
-                positionCell(cell, getCellPosition(cell) - delta);
-            }
-
-            // Fix for RT-32908
-            T firstCell = cells.getFirst();
-            double layoutY = firstCell == null ? 0 : getCellPosition(firstCell);
-            for (int i = 0; i < cells.size(); i++) {
-                T cell = cells.get(i);
-                assert cell != null;
-                double actualLayoutY = getCellPosition(cell);
-                if (actualLayoutY != layoutY) {
-                    // we need to shift the cell to layoutY
-                    positionCell(cell, layoutY);
-                }
-
-                layoutY += getCellLength(cell);
-            }
-            // end of fix for RT-32908
-            cull();
-            firstCell = cells.getFirst();
-
-            // Add any necessary leading cells
-            if (firstCell != null) {
-                int firstIndex = getCellIndex(firstCell);
-                double prevIndexSize = getCellLength(firstIndex - 1);
-                addLeadingCells(firstIndex - 1, getCellPosition(firstCell) - prevIndexSize);
-            } else {
-                int currentIndex = computeCurrentIndex();
-
-                // The distance from the top of the viewport to the top of the
-                // cell for the current index.
-                double offset = -computeViewportOffset(getPosition());
-
-                // Add all the leading and trailing cells (the call to add leading
-                // cells will add the current cell as well -- that is, the one that
-                // represents the current position on the mapper).
-                addLeadingCells(currentIndex, offset);
-            }
-
-            // Starting at the tail of the list, loop adding cells until
-            // all the space on the table is filled up. We want to make
-            // sure that we DO NOT add empty trailing cells (since we are
-            // in the full virtual case and so there are no trailing empty
-            // cells).
-            if (! addTrailingCells(false)) {
-                // Reached the end, but not enough cells to fill up to
-                // the end. So, remove the trailing empty space, and translate
-                // the cells down
-                final T lastCell = getLastVisibleCell();
-                final double lastCellSize = getCellLength(lastCell);
-                final double cellEnd = getCellPosition(lastCell) + lastCellSize;
-                final double viewportLength = getViewportLength();
-
-                if (cellEnd < viewportLength) {
-                    // Reposition the nodes
-                    double emptySize = viewportLength - cellEnd;
-                    for (int i = 0; i < cells.size(); i++) {
-                        T cell = cells.get(i);
-                        positionCell(cell, getCellPosition(cell) + emptySize);
-                    }
-                    setPosition(1.0f);
-                    // fill the leading empty space
-                    firstCell = cells.getFirst();
-                    int firstIndex = getCellIndex(firstCell);
-                    double prevIndexSize = getCellLength(firstIndex - 1);
-                    addLeadingCells(firstIndex - 1, getCellPosition(firstCell) - prevIndexSize);
-                }
-            }
-        }
-
-        // Now throw away any cells that don't fit
-        cull();
-
-        // Finally, update the scroll bars
-        updateScrollBarsAndCells(false);
-        lastPosition = getPosition();
-
-        // notify
-        return delta; // TODO fake
-    }
-
-    private boolean needsReconfigureCells = false; // when cell contents are the same
-    private boolean needsRecreateCells = false; // when cell factory changed
-    private boolean needsRebuildCells = false; // when cell contents have changed
-    private boolean needsCellsLayout = false;
-    private boolean sizeChanged = false;
-    private final BitSet dirtyCells = new BitSet();
-    
-    public void reconfigureCells() {
-        needsReconfigureCells = true;
-        requestLayout();
-    }
-
-    public void recreateCells() {
-        needsRecreateCells = true;
-        requestLayout();
-    }
-    
-    public void rebuildCells() {
-        needsRebuildCells = true;
-        requestLayout();
-    }
-
-    public void requestCellLayout() {
-        needsCellsLayout = true;
-        requestLayout();
-    }
-
-    public void setCellDirty(int index) {
-        dirtyCells.set(index);
-        requestLayout();
-    }
-
-    private static final double GOLDEN_RATIO_MULTIPLIER = 0.618033987;
-
-    private double getPrefBreadth(double oppDimension) {
-        double max = getMaxCellWidth(10);
-
-        // This primarily exists for the case where we do not want the breadth
-        // to grow to ensure a golden ratio between width and height (for example,
-        // when a ListView is used in a ComboBox - the width should not grow
-        // just because items are being added to the ListView)
-        if (oppDimension > -1) {
-            double prefLength = getPrefLength();
-            max = Math.max(max, prefLength * GOLDEN_RATIO_MULTIPLIER);
-        }
-        
-        return max;
-    }
-
-    private double getPrefLength() {
-        double sum = 0.0;
-        int rows = Math.min(10, cellCount);
-        for (int i = 0; i < rows; i++) {
-            sum += getCellLength(i);
-        }
-        return sum;
-    }
-
-    @Override protected double computePrefWidth(double height) {
-        double w = isVertical() ? getPrefBreadth(height) : getPrefLength();
-        return w + vbar.prefWidth(-1);
-    }
-
-    @Override protected double computePrefHeight(double width) {
-        double h = isVertical() ? getPrefLength() : getPrefBreadth(width);
-        return h + hbar.prefHeight(-1);
-    }
-    
-    double getMaxCellWidth(int rowsToCount) {
-        double max = 0.0;
-        
-        // we always measure at least one row
-        int rows = Math.max(1, rowsToCount == -1 ? cellCount : rowsToCount); 
-        for (int i = 0; i < rows; i++) {
-            max = Math.max(max, getCellBreadth(i));
-        }
-        return max;
-    }
-    
-    
-    
-    // Old PositionMapper
-    /**
-     * Given a position value between 0 and 1, compute and return the viewport
-     * offset from the "current" cell associated with that position value.
-     * That is, if the return value of this function where used as a translation
-     * factor for a sheet that contained all the items, then the current
-     * item would end up positioned correctly.
-     */
-    private double computeViewportOffset(double position) {
-        double p = com.sun.javafx.util.Utils.clamp(0, position, 1);
-        double fractionalPosition = p * getCellCount();
-        int cellIndex = (int) fractionalPosition;
-        double fraction = fractionalPosition - cellIndex;
-        double cellSize = getCellLength(cellIndex);
-        double pixelOffset = cellSize * fraction;
-        double viewportOffset = getViewportLength() * p;
-        return pixelOffset - viewportOffset;
-    }
-
-    private void adjustPositionToIndex(int index) {
-        int cellCount = getCellCount();
-        if (cellCount <= 0) {
-            setPosition(0.0f);
-        } else {            
-            setPosition(((double)index) / cellCount);
-        }
-    }
-
-    /**
-     * Adjust the position based on a delta of pixels. If negative, then the
-     * position will be adjusted negatively. If positive, then the position will
-     * be adjusted positively. If the pixel amount is too great for the range of
-     * the position, then it will be clamped such that position is always
-     * strictly between 0 and 1
-     */
-    private void adjustByPixelAmount(double numPixels) {
-        if (numPixels == 0) return;
-        // Starting from the current cell, we move in the direction indicated
-        // by numPixels one cell at a team. For each cell, we discover how many
-        // pixels the "position" line would move within that cell, and adjust
-        // our count of numPixels accordingly. When we come to the "final" cell,
-        // then we can take the remaining number of pixels and multiply it by
-        // the "travel rate" of "p" within that cell to get the delta. Add
-        // the delta to "p" to get position.
-
-        // get some basic info about the list and the current cell
-        boolean forward = numPixels > 0;
-        int cellCount = getCellCount();
-        double fractionalPosition = getPosition() * cellCount;
-        int cellIndex = (int) fractionalPosition;
-        if (forward && cellIndex == cellCount) return;
-        double cellSize = getCellLength(cellIndex);
-        double fraction = fractionalPosition - cellIndex;
-        double pixelOffset = cellSize * fraction;
-
-        // compute the percentage of "position" that represents each cell
-        double cellPercent = 1.0 / cellCount;
-
-        // To help simplify the algorithm, we pretend as though the current
-        // position is at the beginning of the current cell. This reduces some
-        // of the corner cases and provides a simpler algorithm without adding
-        // any overhead to performance.
-        double start = computeOffsetForCell(cellIndex);
-        double end = cellSize + computeOffsetForCell(cellIndex + 1);
-
-        // We need to discover the distance that the fictional "position line"
-        // would travel within this cell, from its current position to the end.
-        double remaining = end - start;
-
-        // Keep track of the number of pixels left to travel
-        double n = forward ?
-              numPixels + pixelOffset - (getViewportLength() * getPosition()) - start
-            : -numPixels + end - (pixelOffset - (getViewportLength() * getPosition()));
-
-        // "p" represents the most recent value for position. This is always
-        // based on the edge between two cells, except at the very end of the
-        // algorithm where it is added to the computed "p" offset for the final
-        // value of Position.
-        double p = cellPercent * cellIndex;
-
-        // Loop over the cells one at a time until either we reach the end of
-        // the cells, or we find that the "n" will fall within the cell we're on
-        while (n > remaining && ((forward && cellIndex < cellCount - 1) || (! forward && cellIndex > 0))) {
-            if (forward) cellIndex++; else cellIndex--;
-            n -= remaining;
-            cellSize = getCellLength(cellIndex);
-            start = computeOffsetForCell(cellIndex);
-            end = cellSize + computeOffsetForCell(cellIndex + 1);
-            remaining = end - start;
-            p = cellPercent * cellIndex;
-        }
-
-        // if remaining is < n, then we must have hit an end, so as a
-        // fast path, we can just set position to 1.0 or 0.0 and return
-        // because we know we hit the end
-        if (n > remaining) {
-            setPosition(forward ? 1.0f : 0.0f);
-        } else if (forward) {
-            double rate = cellPercent / Math.abs(end - start);
-            setPosition(p + (rate * n));
-        } else {
-            double rate = cellPercent / Math.abs(end - start);
-            setPosition((p + cellPercent) - (rate * n));
-        }
-    }
-
-    private int computeCurrentIndex() {
-        return (int) (getPosition() * getCellCount());
-    }
-
-    /**
-     * Given an item index, this function will compute and return the viewport
-     * offset from the beginning of the specified item. Notice that because each
-     * item has the same percentage of the position dedicated to it, and since
-     * we are measuring from the start of each item, this is a very simple
-     * calculation.
-     */
-    private double computeOffsetForCell(int itemIndex) {
-        double cellCount = getCellCount();
-        double p = com.sun.javafx.util.Utils.clamp(0, itemIndex, cellCount) / cellCount;
-        return -(getViewportLength() * p);
-    }
-    
-//    /**
-//     * Adjust the position based on a chunk of pixels. The position is based
-//     * on the start of the scrollbar position.
-//     */
-//    private void adjustByPixelChunk(double numPixels) {
-//        setPosition(0);
-//        adjustByPixelAmount(numPixels);
-//    }
-    // end of old PositionMapper code
-    
-    
-    /**
-     * A simple extension to Region that ensures that anything wanting to flow
-     * outside of the bounds of the Region is clipped.
-     */
-    static class ClippedContainer extends Region {
-
-        /**
-         * The Node which is embedded within this {@code ClipView}.
-         */
-        private Node node;
-        public Node getNode() { return this.node; }
-        public void setNode(Node n) {
-            this.node = n;
-
-            getChildren().clear();
-            getChildren().add(node);
-        }
-
-        public void setClipX(double clipX) {
-            setLayoutX(-clipX);
-            clipRect.setLayoutX(clipX);
-        }
-
-        public void setClipY(double clipY) {
-            setLayoutY(-clipY);
-            clipRect.setLayoutY(clipY);
-        }
-
-        private final Rectangle clipRect;
-
-        public ClippedContainer(final VirtualFlow<?> flow) {
-            if (flow == null) {
-                throw new IllegalArgumentException("VirtualFlow can not be null");
-            }
-
-            getStyleClass().add("clipped-container");
-
-            // clipping
-            clipRect = new Rectangle();
-            clipRect.setSmooth(false);
-            setClip(clipRect);
-            // --- clipping
-            
-            super.widthProperty().addListener(valueModel -> {
-                clipRect.setWidth(getWidth());
-            });
-            super.heightProperty().addListener(valueModel -> {
-                clipRect.setHeight(getHeight());
-            });
-        }
-    }
-
-    /**
-     * A List-like implementation that is exceedingly efficient for the purposes
-     * of the VirtualFlow. Typically there is not much variance in the number of
-     * cells -- it is always some reasonably consistent number. Yet for efficiency
-     * in code, we like to use a linked list implementation so as to append to
-     * start or append to end. However, at times when we need to iterate, LinkedList
-     * is expensive computationally as well as requiring the construction of
-     * temporary iterators.
-     * <p>
-     * This linked list like implementation is done using an array. It begins by
-     * putting the first item in the center of the allocated array, and then grows
-     * outward (either towards the first or last of the array depending on whether
-     * we are inserting at the head or tail). It maintains an index to the start
-     * and end of the array, so that it can efficiently expose iteration.
-     * <p>
-     * This class is package private solely for the sake of testing.
-     */
-    public static class ArrayLinkedList<T> extends AbstractList<T> {
-        /**
-         * The array list backing this class. We default the size of the array
-         * list to be fairly large so as not to require resizing during normal
-         * use, and since that many ArrayLinkedLists won't be created it isn't
-         * very painful to do so.
-         */
-        private final ArrayList<T> array;
-
-        private int firstIndex = -1;
-        private int lastIndex = -1;
-
-        public ArrayLinkedList() {
-            array = new ArrayList<T>(50);
-
-            for (int i = 0; i < 50; i++) {
-                array.add(null);
-            }
-        }
-
-        public T getFirst() {
-            return firstIndex == -1 ? null : array.get(firstIndex);
-        }
-
-        public T getLast() {
-            return lastIndex == -1 ? null : array.get(lastIndex);
-        }
-
-        public void addFirst(T cell) {
-            // if firstIndex == -1 then that means this is the first item in the
-            // list and we need to initialize firstIndex and lastIndex
-            if (firstIndex == -1) {
-                firstIndex = lastIndex = array.size() / 2;
-                array.set(firstIndex, cell);
-            } else if (firstIndex == 0) {
-                // we're already at the head of the array, so insert at position
-                // 0 and then increment the lastIndex to compensate
-                array.add(0, cell);
-                lastIndex++;
-            } else {
-                // we're not yet at the head of the array, so insert at the
-                // firstIndex - 1 position and decrement first position
-                array.set(--firstIndex, cell);
-            }
-        }
-
-        public void addLast(T cell) {
-            // if lastIndex == -1 then that means this is the first item in the
-            // list and we need to initialize the firstIndex and lastIndex
-            if (firstIndex == -1) {
-                firstIndex = lastIndex = array.size() / 2;
-                array.set(lastIndex, cell);
-            } else if (lastIndex == array.size() - 1) {
-                // we're at the end of the array so need to "add" so as to force
-                // the array to be expanded in size
-                array.add(++lastIndex, cell);
-            } else {
-                array.set(++lastIndex, cell);
-            }
-        }
-
-        public int size() {
-            return firstIndex == -1 ? 0 : lastIndex - firstIndex + 1;
-        }
-
-        public boolean isEmpty() {
-            return firstIndex == -1;
-        }
-
-        public T get(int index) {
-            if (index > (lastIndex - firstIndex) || index < 0) {
-                // Commented out exception due to RT-29111
-                // throw new java.lang.ArrayIndexOutOfBoundsException();
-                return null;
-            }
-
-            return array.get(firstIndex + index);
-        }
-
-        public void clear() {
-            for (int i = 0; i < array.size(); i++) {
-                array.set(i, null);
-            }
-
-            firstIndex = lastIndex = -1;
-        }
-
-        public T removeFirst() {
-            if (isEmpty()) return null;
-            return remove(0);
-        }
-
-        public T removeLast() {
-            if (isEmpty()) return null;
-            return remove(lastIndex - firstIndex);
-        }
-
-        public T remove(int index) {
-            if (index > lastIndex - firstIndex || index < 0) {
-                throw new java.lang.ArrayIndexOutOfBoundsException();
-            }
-
-            // if the index == 0, then we're removing the first
-            // item and can simply set it to null in the array and increment
-            // the firstIndex unless there is only one item, in which case
-            // we have to also set first & last index to -1.
-            if (index == 0) {
-                T cell = array.get(firstIndex);
-                array.set(firstIndex, null);
-                if (firstIndex == lastIndex) {
-                    firstIndex = lastIndex = -1;
-                } else {
-                    firstIndex++;
-                }
-                return cell;
-            } else if (index == lastIndex - firstIndex) {
-                // if the index == lastIndex - firstIndex, then we're removing the
-                // last item and can simply set it to null in the array and
-                // decrement the lastIndex
-                T cell = array.get(lastIndex);
-                array.set(lastIndex--, null);
-                return cell;
-            } else {
-                // if the index is somewhere in between, then we have to remove the
-                // item and decrement the lastIndex
-                T cell = array.get(firstIndex + index);
-                array.set(firstIndex + index, null);
-                for (int i = (firstIndex + index + 1); i <= lastIndex; i++) {
-                    array.set(i - 1, array.get(i));
-                }
-                array.set(lastIndex--, null);
-                return cell;
-            }
-        }
-    }
-
-    Timeline sbTouchTimeline;
-    KeyFrame sbTouchKF1;
-    KeyFrame sbTouchKF2;
-
-    private boolean needBreadthBar;
-    private boolean needLengthBar;
-    private boolean tempVisibility = false;
-
-    protected void startSBReleasedAnimation() {
-        if (sbTouchTimeline == null) {
-            /*
-            ** timeline to leave the scrollbars visible for a short
-            ** while after a scroll/drag
-            */
-            sbTouchTimeline = new Timeline();
-            sbTouchKF1 = new KeyFrame(Duration.millis(0), event -> {
-                tempVisibility = true;
-                requestLayout();
-            });
-
-            sbTouchKF2 = new KeyFrame(Duration.millis(1000), event -> {
-                if (touchDetected == false && mouseDown == false) {
-                    tempVisibility = false;
-                    requestLayout();
-                }
-            });
-            sbTouchTimeline.getKeyFrames().addAll(sbTouchKF1, sbTouchKF2);
-        }
-        sbTouchTimeline.playFromStart();
-    }
-
-    protected void scrollBarOn() {
-        tempVisibility = true;
-        requestLayout();
-    }
-}
--- /dev/null	2015-09-03 15:25:10.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java	2015-09-03 15:25:08.207259100 -0700
@@ -0,0 +1,2971 @@
+/*
+ * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.control.Logging;
+import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.control.VirtualScrollBar;
+import com.sun.javafx.scene.control.skin.Utils;
+import com.sun.javafx.scene.traversal.Algorithm;
+import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.ParentTraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalContext;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.BooleanPropertyBase;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.collections.ObservableList;
+import javafx.event.EventDispatcher;
+import javafx.event.EventHandler;
+import javafx.geometry.Orientation;
+import javafx.scene.AccessibleRole;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Cell;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ScrollBar;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.ScrollEvent;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import javafx.scene.shape.Rectangle;
+import javafx.util.Callback;
+import javafx.util.Duration;
+import sun.util.logging.PlatformLogger;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+
+/**
+ * Implementation of a virtualized container using a cell based mechanism. This
+ * is used by the skin implementations for UI controls such as
+ * {@link javafx.scene.control.ListView}, {@link javafx.scene.control.TreeView},
+ * {@link javafx.scene.control.TableView}, and {@link javafx.scene.control.TreeTableView}.
+ *
+ * @since 9
+ */
+public class VirtualFlow<T extends IndexedCell> extends Region {
+
+    /***************************************************************************
+     *                                                                         *
+     * Static fields                                                           *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Scroll events may request to scroll about a number of "lines". We first
+     * decide how big one "line" is - for fixed cell size it's clear,
+     * for variable cell size we settle on a single number so that the scrolling
+     * speed is consistent. Now if the line is so big that
+     * MIN_SCROLLING_LINES_PER_PAGE of them don't fit into one page, we make
+     * them smaller to prevent the scrolling step to be too big (perhaps
+     * even more than one page).
+     */
+    private static final int MIN_SCROLLING_LINES_PER_PAGE = 8;
+
+    /**
+     * Indicates that this is a newly created cell and we need call impl_processCSS for it.
+     *
+     * See RT-23616 for more details.
+     */
+    private static final String NEW_CELL = "newcell";
+
+    private static final double GOLDEN_RATIO_MULTIPLIER = 0.618033987;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private fields                                                          *
+     *                                                                         *
+     **************************************************************************/
+                    
+    private boolean touchDetected = false;
+    private boolean mouseDown = false;
+
+    /**
+     * The width of the VirtualFlow the last time it was laid out. We
+     * use this information for several fast paths during the layout pass.
+     */
+    double lastWidth = -1;
+
+    /**
+     * The height of the VirtualFlow the last time it was laid out. We
+     * use this information for several fast paths during the layout pass.
+     */
+    double lastHeight = -1;
+
+    /**
+     * The number of "virtual" cells in the flow the last time it was laid out.
+     * For example, there may have been 1000 virtual cells, but only 20 actual
+     * cells created and in use. In that case, lastCellCount would be 1000.
+     */
+    int lastCellCount = 0;
+
+    /**
+     * We remember the last value for vertical the last time we laid out the
+     * flow. If vertical has changed, we will want to change the max & value
+     * for the different scroll bars. Since we do all the scroll bar update
+     * work in the layoutChildren function, we need to know what the old value for
+     * vertical was.
+     */
+    boolean lastVertical;
+
+    /**
+     * The position last time we laid out. If none of the lastXXX vars have
+     * changed respective to their values in layoutChildren, then we can just punt
+     * out of the method (I hope...)
+     */
+    double lastPosition;
+
+    /**
+     * The breadth of the first visible cell last time we laid out.
+     */
+    double lastCellBreadth = -1;
+
+    /**
+     * The length of the first visible cell last time we laid out.
+     */
+    double lastCellLength = -1;
+
+    /**
+     * The list of cells representing those cells which actually make up the
+     * current view. The cells are ordered such that the first cell in this
+     * list is the first in the view, and the last cell is the last in the
+     * view. When pixel scrolling, the list is simply shifted and items drop
+     * off the beginning or the end, depending on the order of scrolling.
+     * <p>
+     * This is package private ONLY FOR TESTING
+     */
+    final ArrayLinkedList<T> cells = new ArrayLinkedList<T>();
+
+    /**
+     * A structure containing cells that can be reused later. These are cells
+     * that at one time were needed to populate the view, but now are no longer
+     * needed. We keep them here until they are needed again.
+     * <p>
+     * This is package private ONLY FOR TESTING
+     */
+    final ArrayLinkedList<T> pile = new ArrayLinkedList<T>();
+
+    /**
+     * A special cell used to accumulate bounds, such that we reduce object
+     * churn. This cell must be recreated whenever the cell factory function
+     * changes. This has package access ONLY for testing.
+     */
+    T accumCell;
+
+    /**
+     * This group is used for holding the 'accumCell'. 'accumCell' must
+     * be added to the skin for it to be styled. Otherwise, it doesn't
+     * report the correct width/height leading to issues when scrolling
+     * the flow
+     */
+    Group accumCellParent;
+
+    /**
+     * The group which holds the cells.
+     */
+    final Group sheet;
+
+    final ObservableList<Node> sheetChildren;
+
+    /**
+     * The scroll bar used for scrolling horizontally. This has package access
+     * ONLY for testing.
+     */
+    private VirtualScrollBar hbar = new VirtualScrollBar(this);
+
+    /**
+     * The scroll bar used to scrolling vertically. This has package access
+     * ONLY for testing.
+     */
+    private VirtualScrollBar vbar = new VirtualScrollBar(this);
+
+    /**
+     * Control in which the cell's sheet is placed and forms the viewport. The
+     * viewportBreadth and viewportLength are simply the dimensions of the
+     * clipView. This has package access ONLY for testing.
+     */
+    ClippedContainer clipView;
+
+    /**
+     * When both the horizontal and vertical scroll bars are visible,
+     * we have to 'fill in' the bottom right corner where the two scroll bars
+     * meet. This is handled by this corner region. This has package access
+     * ONLY for testing.
+     */
+    StackPane corner;
+
+    // used for panning the virtual flow
+    private double lastX;
+    private double lastY;
+    private boolean isPanning = false;
+
+    private boolean fixedCellSizeEnabled = false;
+
+    private boolean needsReconfigureCells = false; // when cell contents are the same
+    private boolean needsRecreateCells = false; // when cell factory changed
+    private boolean needsRebuildCells = false; // when cell contents have changed
+    private boolean needsCellsLayout = false;
+    private boolean sizeChanged = false;
+    private final BitSet dirtyCells = new BitSet();
+
+    Timeline sbTouchTimeline;
+    KeyFrame sbTouchKF1;
+    KeyFrame sbTouchKF2;
+
+    private boolean needBreadthBar;
+    private boolean needLengthBar;
+    private boolean tempVisibility = false;
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Constructors                                                            *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Creates a new VirtualFlow instance.
+     */
+    public VirtualFlow() {
+        getStyleClass().add("virtual-flow");
+        setId("virtual-flow");
+
+        // initContent
+        // --- sheet
+        sheet = new Group();
+        sheet.getStyleClass().add("sheet");
+        sheet.setAutoSizeChildren(false);
+        
+        sheetChildren = sheet.getChildren();
+
+        // --- clipView
+        clipView = new ClippedContainer(this);
+        clipView.setNode(sheet);
+        getChildren().add(clipView);
+
+        // --- accumCellParent
+        accumCellParent = new Group();
+        accumCellParent.setVisible(false);
+        getChildren().add(accumCellParent);
+
+
+        /*
+        ** don't allow the ScrollBar to handle the ScrollEvent,
+        ** In a VirtualFlow a vertical scroll should scroll on the vertical only,
+        ** whereas in a horizontal ScrollBar it can scroll horizontally.
+        */ 
+        // block the event from being passed down to children
+        final EventDispatcher blockEventDispatcher = (event, tail) -> event;
+        // block ScrollEvent from being passed down to scrollbar's skin
+        final EventDispatcher oldHsbEventDispatcher = hbar.getEventDispatcher();
+        hbar.setEventDispatcher((event, tail) -> {
+            if (event.getEventType() == ScrollEvent.SCROLL &&
+                    !((ScrollEvent)event).isDirect()) {
+                tail = tail.prepend(blockEventDispatcher);
+                tail = tail.prepend(oldHsbEventDispatcher);
+                return tail.dispatchEvent(event);
+            }
+            return oldHsbEventDispatcher.dispatchEvent(event, tail);
+        });
+        // block ScrollEvent from being passed down to scrollbar's skin
+        final EventDispatcher oldVsbEventDispatcher = vbar.getEventDispatcher();
+        vbar.setEventDispatcher((event, tail) -> {
+            if (event.getEventType() == ScrollEvent.SCROLL &&
+                    !((ScrollEvent)event).isDirect()) {
+                tail = tail.prepend(blockEventDispatcher);
+                tail = tail.prepend(oldVsbEventDispatcher);
+                return tail.dispatchEvent(event);
+            }
+            return oldVsbEventDispatcher.dispatchEvent(event, tail);
+        });
+        /*
+        ** listen for ScrollEvents over the whole of the VirtualFlow
+        ** area, the above dispatcher having removed the ScrollBars
+        ** scroll event handling.
+        */
+        setOnScroll(new EventHandler<ScrollEvent>() {
+            @Override public void handle(ScrollEvent event) {
+                if (Properties.IS_TOUCH_SUPPORTED) {
+                    if (touchDetected == false &&  mouseDown == false ) {
+                        startSBReleasedAnimation();
+                    }
+                }
+                /*
+                ** calculate the delta in the direction of the flow.
+                */
+                double virtualDelta = 0.0;
+                if (isVertical()) {
+                    switch(event.getTextDeltaYUnits()) {
+                        case PAGES:
+                            virtualDelta = event.getTextDeltaY() * lastHeight;
+                            break;
+                        case LINES:
+                            double lineSize;
+                            if (fixedCellSizeEnabled) {
+                                lineSize = getFixedCellSize();
+                            } else {
+                                // For the scrolling to be reasonably consistent
+                                // we set the lineSize to the average size
+                                // of all currently loaded lines.
+                                T lastCell = cells.getLast();
+                                lineSize =
+                                        (getCellPosition(lastCell)
+                                            + getCellLength(lastCell)
+                                            - getCellPosition(cells.getFirst()))
+                                        / cells.size();
+                            }
+
+                            if (lastHeight / lineSize < MIN_SCROLLING_LINES_PER_PAGE) {
+                                lineSize = lastHeight / MIN_SCROLLING_LINES_PER_PAGE;
+                            }
+
+                            virtualDelta = event.getTextDeltaY() * lineSize;
+                            break;
+                        case NONE:
+                            virtualDelta = event.getDeltaY();
+                    }
+                } else { // horizontal
+                    switch(event.getTextDeltaXUnits()) {
+                        case CHARACTERS:
+                            // can we get character size here?
+                            // for now, fall through to pixel values
+                        case NONE:
+                            double dx = event.getDeltaX();
+                            double dy = event.getDeltaY();
+
+                            virtualDelta = (Math.abs(dx) > Math.abs(dy) ? dx : dy);
+                    }
+                }
+
+                if (virtualDelta != 0.0) {
+                    /*
+                    ** only consume it if we use it
+                    */
+                    double result = scrollPixels(-virtualDelta);
+                    if (result != 0.0) {
+                        event.consume();
+                    }
+                }
+
+                ScrollBar nonVirtualBar = isVertical() ? hbar : vbar;
+                if (needBreadthBar) {
+                    double nonVirtualDelta = isVertical() ? event.getDeltaX() : event.getDeltaY();
+                    if (nonVirtualDelta != 0.0) {
+                        double newValue = nonVirtualBar.getValue() - nonVirtualDelta;
+                        if (newValue < nonVirtualBar.getMin()) {
+                            nonVirtualBar.setValue(nonVirtualBar.getMin());
+                        } else if (newValue > nonVirtualBar.getMax()) {
+                            nonVirtualBar.setValue(nonVirtualBar.getMax());
+                        } else {
+                            nonVirtualBar.setValue(newValue);
+                        }
+                        event.consume();
+                    }
+                }
+            }
+        });
+
+
+        addEventFilter(MouseEvent.MOUSE_PRESSED, new EventHandler<MouseEvent>() {
+            @Override
+            public void handle(MouseEvent e) {
+                mouseDown = true;
+                if (Properties.IS_TOUCH_SUPPORTED) {
+                    scrollBarOn();
+                }
+                if (isFocusTraversable()) {
+                    // We check here to see if the current focus owner is within
+                    // this VirtualFlow, and if so we back-off from requesting
+                    // focus back to the VirtualFlow itself. This is particularly
+                    // relevant given the bug identified in RT-32869. In this
+                    // particular case TextInputControl was clearing selection
+                    // when the focus on the TextField changed, meaning that the
+                    // right-click context menu was not showing the correct
+                    // options as there was no selection in the TextField.
+                    boolean doFocusRequest = true;
+                    Node focusOwner = getScene().getFocusOwner();
+                    if (focusOwner != null) {
+                        Parent parent = focusOwner.getParent();
+                        while (parent != null) {
+                            if (parent.equals(VirtualFlow.this)) {
+                                doFocusRequest = false;
+                                break;
+                            }
+                            parent = parent.getParent();
+                        }
+                    }
+
+                    if (doFocusRequest) {
+                        requestFocus();
+                    }
+                }
+
+                lastX = e.getX();
+                lastY = e.getY();
+
+                // determine whether the user has push down on the virtual flow,
+                // or whether it is the scrollbar. This is done to prevent
+                // mouse events being 'doubled up' when dragging the scrollbar
+                // thumb - it has the side-effect of also starting the panning
+                // code, leading to flicker
+                isPanning = ! (vbar.getBoundsInParent().contains(e.getX(), e.getY())
+                        || hbar.getBoundsInParent().contains(e.getX(), e.getY()));
+            }
+        });
+        addEventFilter(MouseEvent.MOUSE_RELEASED, e -> {
+            mouseDown = false;
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                startSBReleasedAnimation();
+            }
+        });
+        addEventFilter(MouseEvent.MOUSE_DRAGGED, e -> {
+            if (Properties.IS_TOUCH_SUPPORTED) {
+                scrollBarOn();
+            }
+            if (! isPanning || ! isPannable()) return;
+
+            // With panning enabled, we support panning in both vertical
+            // and horizontal directions, regardless of the fact that
+            // VirtualFlow is virtual in only one direction.
+            double xDelta = lastX - e.getX();
+            double yDelta = lastY - e.getY();
+
+            // figure out the distance that the mouse moved in the virtual
+            // direction, and then perform the movement along that axis
+            // virtualDelta will contain the amount we actually did move
+            double virtualDelta = isVertical() ? yDelta : xDelta;
+            double actual = scrollPixels(virtualDelta);
+            if (actual != 0) {
+                // update last* here, as we know we've just adjusted the
+                // scrollbar. This means we don't get the situation where a
+                // user presses-and-drags a long way past the min or max
+                // values, only to change directions and see the scrollbar
+                // start moving immediately.
+                if (isVertical()) lastY = e.getY();
+                else lastX = e.getX();
+            }
+
+            // similarly, we do the same in the non-virtual direction
+            double nonVirtualDelta = isVertical() ? xDelta : yDelta;
+            ScrollBar nonVirtualBar = isVertical() ? hbar : vbar;
+            if (nonVirtualBar.isVisible()) {
+                double newValue = nonVirtualBar.getValue() + nonVirtualDelta;
+                if (newValue < nonVirtualBar.getMin()) {
+                    nonVirtualBar.setValue(nonVirtualBar.getMin());
+                } else if (newValue > nonVirtualBar.getMax()) {
+                    nonVirtualBar.setValue(nonVirtualBar.getMax());
+                } else {
+                    nonVirtualBar.setValue(newValue);
+
+                    // same as the last* comment above
+                    if (isVertical()) lastX = e.getX();
+                    else lastY = e.getY();
+                }
+            }
+        });
+
+        /*
+         * We place the scrollbars _above_ the rectangle, such that the drag
+         * operations often used in conjunction with scrollbars aren't
+         * misinterpreted as drag operations on the rectangle as well (which
+         * would be the case if the scrollbars were underneath it as the
+         * rectangle itself doesn't block the mouse.
+         */
+        // --- vbar
+        vbar.setOrientation(Orientation.VERTICAL);
+        vbar.addEventHandler(MouseEvent.ANY, event -> {
+            event.consume();
+        });
+        getChildren().add(vbar);
+
+        // --- hbar
+        hbar.setOrientation(Orientation.HORIZONTAL);
+        hbar.addEventHandler(MouseEvent.ANY, event -> {
+            event.consume();
+        });
+        getChildren().add(hbar);
+
+        // --- corner
+        corner = new StackPane();
+        corner.getStyleClass().setAll("corner");
+        getChildren().add(corner);
+
+
+
+        // initBinds
+        // clipView binds
+        InvalidationListener listenerX = valueModel -> {
+            updateHbar();
+        };
+        verticalProperty().addListener(listenerX);
+        hbar.valueProperty().addListener(listenerX);
+        hbar.visibleProperty().addListener(listenerX);
+
+//        ChangeListener listenerY = new ChangeListener() {
+//            @Override public void handle(Bean bean, PropertyReference property) {
+//                clipView.setClipY(isVertical() ? 0 : vbar.getValue());
+//            }
+//        };
+//        addChangedListener(VERTICAL, listenerY);
+//        vbar.addChangedListener(ScrollBar.VALUE, listenerY);
+
+        ChangeListener<Number> listenerY = (ov, t, t1) -> {
+            clipView.setClipY(isVertical() ? 0 : vbar.getValue());
+        };
+        vbar.valueProperty().addListener(listenerY);
+
+        super.heightProperty().addListener((observable, oldHeight, newHeight) -> {
+            // Fix for RT-8480, where the VirtualFlow does not show its content
+            // after changing size to 0 and back.
+            if (oldHeight.doubleValue() == 0 && newHeight.doubleValue() > 0) {
+                recreateCells();
+            }
+        });
+
+
+        /*
+        ** there are certain animations that need to know if the touch is
+        ** happening.....
+        */
+        setOnTouchPressed(e -> {
+            touchDetected = true;
+            scrollBarOn();
+        });
+
+        setOnTouchReleased(e -> {
+            touchDetected = false;
+            startSBReleasedAnimation();
+        });
+
+        setImpl_traversalEngine(new ParentTraversalEngine(this, new Algorithm() {
+
+            Node selectNextAfterIndex(int index, TraversalContext context) {
+                T nextCell;
+                while ((nextCell = getVisibleCell(++index)) != null) {
+                    if (nextCell.isFocusTraversable()) {
+                        return nextCell;
+                    }
+                    Node n = context.selectFirstInParent(nextCell);
+                    if (n != null) {
+                        return n;
+                    }
+                }
+                return null;
+            }
+
+            Node selectPreviousBeforeIndex(int index, TraversalContext context) {
+                T prevCell;
+                while ((prevCell = getVisibleCell(--index)) != null) {
+                    Node prev = context.selectLastInParent(prevCell);
+                    if (prev != null) {
+                        return prev;
+                    }
+                    if (prevCell.isFocusTraversable()) {
+                        return prevCell;
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            public Node select(Node owner, Direction dir, TraversalContext context) {
+                T cell;
+                if (cells.isEmpty()) return null;
+                if (cells.contains(owner)) {
+                    cell = (T) owner;
+                } else {
+                    cell = findOwnerCell(owner);
+                    Node next = context.selectInSubtree(cell, owner, dir);
+                    if (next != null) {
+                        return next;
+                    }
+                    if (dir == Direction.NEXT) dir = Direction.NEXT_IN_LINE;
+                }
+                int cellIndex = cell.getIndex();
+                switch(dir) {
+                    case PREVIOUS:
+                        return selectPreviousBeforeIndex(cellIndex, context);
+                    case NEXT:
+                        Node n = context.selectFirstInParent(cell);
+                        if (n != null) {
+                            return n;
+                        }
+                        // Intentional fall-through
+                    case NEXT_IN_LINE:
+                        return selectNextAfterIndex(cellIndex, context);
+                }
+                return null;
+            }
+
+            private T findOwnerCell(Node owner) {
+                Parent p = owner.getParent();
+                while (!cells.contains(p)) {
+                    p = p.getParent();
+                }
+                return (T)p;
+            }
+
+            @Override
+            public Node selectFirst(TraversalContext context) {
+                T firstCell = cells.getFirst();
+                if (firstCell == null) return null;
+                if (firstCell.isFocusTraversable()) return firstCell;
+                Node n = context.selectFirstInParent(firstCell);
+                if (n != null) {
+                    return n;
+                }
+                return selectNextAfterIndex(firstCell.getIndex(), context);
+            }
+
+            @Override
+            public Node selectLast(TraversalContext context) {
+                T lastCell = cells.getLast();
+                if (lastCell == null) return null;
+                Node p = context.selectLastInParent(lastCell);
+                if (p != null) {
+                    return p;
+                }
+                if (lastCell.isFocusTraversable()) return lastCell;
+                return selectPreviousBeforeIndex(lastCell.getIndex(), context);
+            }
+        }));
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Properties                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * There are two main complicating factors in the implementation of the
+     * VirtualFlow, which are made even more complicated due to the performance
+     * sensitive nature of this code. The first factor is the actual
+     * virtualization mechanism, wired together with the PositionMapper.
+     * The second complicating factor is the desire to do minimal layout
+     * and minimal updates to CSS.
+     *
+     * Since the layout mechanism runs at most once per pulse, we want to hook
+     * into this mechanism for minimal recomputation. Whenever a layout pass
+     * is run we record the width/height that the virtual flow was last laid
+     * out to. In subsequent passes, if the width/height has not changed then
+     * we know we only have to rebuild the cells. If the width or height has
+     * changed, then we can make appropriate decisions based on whether the
+     * width / height has been reduced or expanded.
+     *
+     * In various places, if requestLayout is called it is generally just
+     * used to indicate that some form of layout needs to happen (either the
+     * entire thing has to be reconstructed, or just the cells need to be
+     * reconstructed, generally).
+     *
+     * The accumCell is a special cell which is used in some computations
+     * when an actual cell for that item isn't currently available. However,
+     * the accumCell must be cleared whenever the cellFactory function is
+     * changed because we need to use the cells that come from the new factory.
+     *
+     * In addition to storing the lastWidth and lastHeight, we also store the
+     * number of cells that existed last time we performed a layout. In this
+     * way if the number of cells change, we can request a layout and when it
+     * occurs we can tell that the number of cells has changed and react
+     * accordingly.
+     *
+     * Because the VirtualFlow can be laid out horizontally or vertically a
+     * naming problem is present when trying to conceptualize and implement
+     * the flow. In particular, the words "width" and "height" are not
+     * precise when describing the unit of measure along the "virtualized"
+     * axis and the "orthogonal" axis. For example, the height of a cell when
+     * the flow is vertical is the magnitude along the "virtualized axis",
+     * and the width is along the axis orthogonal to it.
+     *
+     * Since "height" and "width" are not reliable terms, we use the words
+     * "length" and "breadth" to describe the magnitude of a cell along
+     * the virtualized axis and orthogonal axis. For example, in a vertical
+     * flow, the height=length and the width=breadth. In a horizontal axis,
+     * the height=breadth and the width=length.
+     *
+     * These terms are somewhat arbitrary, but chosen so that when reading
+     * most of the below code you can think in just one dimension, with
+     * helper functions converting width/height in to length/breadth, while
+     * also being different from width/height so as not to get confused with
+     * the actual width/height of a cell.
+     */
+
+    // --- vertical
+    /**
+     * Indicates the primary direction of virtualization. If true, then the
+     * primary direction of virtualization is vertical, meaning that cells will
+     * stack vertically on top of each other. If false, then they will stack
+     * horizontally next to each other.
+     */
+    private BooleanProperty vertical;
+    public final void setVertical(boolean value) {
+        verticalProperty().set(value);
+    }
+
+    public final boolean isVertical() {
+        return vertical == null ? true : vertical.get();
+    }
+
+    public final BooleanProperty verticalProperty() {
+        if (vertical == null) {
+            vertical = new BooleanPropertyBase(true) {
+                @Override protected void invalidated() {
+                    pile.clear();
+                    sheetChildren.clear();
+                    cells.clear();
+                    lastWidth = lastHeight = -1;
+                    setMaxPrefBreadth(-1);
+                    setViewportBreadth(0);
+                    setViewportLength(0);
+                    lastPosition = 0;
+                    hbar.setValue(0);
+                    vbar.setValue(0);
+                    setPosition(0.0f);
+                    setNeedsLayout(true);
+                    requestLayout();
+                }
+
+                @Override
+                public Object getBean() {
+                    return VirtualFlow.this;
+                }
+
+                @Override
+                public String getName() {
+                    return "vertical";
+                }
+            };
+        }
+        return vertical;
+    }
+
+    // --- pannable
+    /**
+     * Indicates whether the VirtualFlow viewport is capable of being panned
+     * by the user (either via the mouse or touch events).
+     */
+    private BooleanProperty pannable = new SimpleBooleanProperty(this, "pannable", true);
+    public final boolean isPannable() { return pannable.get(); }
+    public final void setPannable(boolean value) { pannable.set(value); }
+    public final BooleanProperty pannableProperty() { return pannable; }
+
+    // --- cell count
+    /**
+     * Indicates the number of cells that should be in the flow. The user of
+     * the VirtualFlow must set this appropriately. When the cell count changes
+     * the VirtualFlow responds by updating the visuals. If the items backing
+     * the cells change, but the count has not changed, you must call the
+     * reconfigureCells() function to update the visuals.
+     */
+    private IntegerProperty cellCount = new SimpleIntegerProperty(this, "cellCount", 0) {
+        private int oldCount = 0;
+
+        @Override protected void invalidated() {
+            int cellCount = get();
+
+            boolean countChanged = oldCount != cellCount;
+            oldCount = cellCount;
+
+            // ensure that the virtual scrollbar adjusts in size based on the current
+            // cell count.
+            if (countChanged) {
+                VirtualScrollBar lengthBar = isVertical() ? vbar : hbar;
+                lengthBar.setMax(cellCount);
+            }
+
+            // I decided *not* to reset maxPrefBreadth here for the following
+            // situation. Suppose I have 30 cells and then I add 10 more. Just
+            // because I added 10 more doesn't mean the max pref should be
+            // reset. Suppose the first 3 cells were extra long, and I was
+            // scrolled down such that they weren't visible. If I were to reset
+            // maxPrefBreadth when subsequent cells were added or removed, then the
+            // scroll bars would erroneously reset as well. So I do not reset
+            // the maxPrefBreadth here.
+
+            // Fix for RT-12512, RT-14301 and RT-14864.
+            // Without this, the VirtualFlow length-wise scrollbar would not change
+            // as expected. This would leave items unable to be shown, as they
+            // would exist outside of the visible area, even when the scrollbar
+            // was at its maximum position.
+            // FIXME this should be only executed on the pulse, so this will likely
+            // lead to performance degradation until it is handled properly.
+            if (countChanged) {
+                layoutChildren();
+
+                // Fix for RT-13965: Without this line of code, the number of items in
+                // the sheet would constantly grow, leaking memory for the life of the
+                // application. This was especially apparent when the total number of
+                // cells changes - regardless of whether it became bigger or smaller.
+                sheetChildren.clear();
+
+                Parent parent = getParent();
+                if (parent != null) parent.requestLayout();
+            }
+            // TODO suppose I had 100 cells and I added 100 more. Further
+            // suppose I was scrolled to the bottom when that happened. I
+            // actually want to update the position of the mapper such that
+            // the view remains "stable".
+        }
+    };
+    public final int getCellCount() { return cellCount.get(); }
+    public final void setCellCount(int value) { cellCount.set(value);  }
+    public final IntegerProperty cellCountProperty() { return cellCount; }
+
+
+    // --- position
+    /**
+     * The position of the VirtualFlow within its list of cells. This is a value
+     * between 0 and 1.
+     */
+    private DoubleProperty position = new SimpleDoubleProperty(this, "position") {
+        @Override public void setValue(Number v) {
+            super.setValue(com.sun.javafx.util.Utils.clamp(0, get(), 1));
+        }
+
+        @Override protected void invalidated() {
+            super.invalidated();
+            requestLayout();
+        }
+    };
+    public final double getPosition() { return position.get(); }
+    public final void setPosition(double value) { position.set(value); }
+    public final DoubleProperty positionProperty() { return position; }
+
+    // --- fixed cell size
+    /**
+     * For optimisation purposes, some use cases can trade dynamic cell length
+     * for speed - if fixedCellSize is greater than zero we'll use that rather
+     * than determine it by querying the cell itself.
+     */
+    private DoubleProperty fixedCellSize = new SimpleDoubleProperty(this, "fixedCellSize") {
+        @Override protected void invalidated() {
+            fixedCellSizeEnabled = get() > 0;
+            needsCellsLayout = true;
+            layoutChildren();
+        }
+    };
+    public final void setFixedCellSize(final double value) { fixedCellSize.set(value); }
+    public final double getFixedCellSize() { return fixedCellSize.get(); }
+    public final DoubleProperty fixedCellSizeProperty() { return fixedCellSize; }
+
+
+    // --- Cell Factory
+    private ObjectProperty<Callback<VirtualFlow<T>, T>> cellFactory;
+
+    /**
+     * Sets a new cell factory to use in the VirtualFlow. This forces all old
+     * cells to be thrown away, and new cells to be created with
+     * the new cell factory.
+     */
+    public final void setCellFactory(Callback<VirtualFlow<T>, T> value) {
+        cellFactoryProperty().set(value);
+    }
+
+    /**
+     * Returns the current cell factory.
+     */
+    public final Callback<VirtualFlow<T>, T> getCellFactory() {
+        return cellFactory == null ? null : cellFactory.get();
+    }
+
+    /**
+     * <p>Setting a custom cell factory has the effect of deferring all cell
+     * creation, allowing for total customization of the cell. Internally, the
+     * VirtualFlow is responsible for reusing cells - all that is necessary
+     * is for the custom cell factory to return from this function a cell
+     * which might be usable for representing any item in the VirtualFlow.
+     *
+     * <p>Refer to the {@link Cell} class documentation for more detail.
+     */
+    public final ObjectProperty<Callback<VirtualFlow<T>, T>> cellFactoryProperty() {
+        if (cellFactory == null) {
+            cellFactory = new SimpleObjectProperty<Callback<VirtualFlow<T>, T>>(this, "cellFactory") {
+                @Override protected void invalidated() {
+                    if (get() != null) {
+                        accumCell = null;
+                        setNeedsLayout(true);
+                        recreateCells();
+                        if (getParent() != null) getParent().requestLayout();
+                    }
+                }
+            };
+        }
+        return cellFactory;
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Public API                                                              *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * Overridden to implement somewhat more efficient support for layout. The
+     * VirtualFlow can generally be considered as being unmanaged, in that
+     * whenever the position changes, or other such things change, we need
+     * to perform a layout but there is no reason to notify the parent. However
+     * when things change which may impact the preferred size (such as
+     * vertical, createCell, and configCell) then we need to notify the
+     * parent.
+     */
+    @Override public void requestLayout() {
+        // isNeedsLayout() is commented out due to RT-21417. This does not
+        // appear to impact performance (indeed, it may help), and resolves the
+        // issue identified in RT-21417.
+        setNeedsLayout(true);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void layoutChildren() {
+        if (needsRecreateCells) {
+            lastWidth = -1;
+            lastHeight = -1;
+            releaseCell(accumCell);
+//            accumCell = null;
+//            accumCellParent.getChildren().clear();
+            sheet.getChildren().clear();
+            for (int i = 0, max = cells.size(); i < max; i++) {
+                cells.get(i).updateIndex(-1);
+            }
+            cells.clear();
+            pile.clear();
+            releaseAllPrivateCells();
+        } else if (needsRebuildCells) {
+            lastWidth = -1;
+            lastHeight = -1;
+            releaseCell(accumCell);
+            for (int i=0; i<cells.size(); i++) {
+                cells.get(i).updateIndex(-1);
+            }
+            addAllToPile();
+            releaseAllPrivateCells();
+        } else if (needsReconfigureCells) {
+            setMaxPrefBreadth(-1);
+            lastWidth = -1;
+            lastHeight = -1;
+        }
+
+        if (! dirtyCells.isEmpty()) {
+            int index;
+            final int cellsSize = cells.size();
+            while ((index = dirtyCells.nextSetBit(0)) != -1 && index < cellsSize) {
+                T cell = cells.get(index);
+                // updateIndex(-1) works for TableView, but breaks ListView.
+                // For now, the TableView just does not use the dirtyCells API
+//                cell.updateIndex(-1);
+                if (cell != null) {
+                    cell.requestLayout();
+                }
+                dirtyCells.clear(index);
+            }
+
+            setMaxPrefBreadth(-1);
+            lastWidth = -1;
+            lastHeight = -1;
+        }
+
+        final boolean hasSizeChange = sizeChanged;
+        boolean recreatedOrRebuilt = needsRebuildCells || needsRecreateCells || sizeChanged;
+
+        needsRecreateCells = false;
+        needsReconfigureCells = false;
+        needsRebuildCells = false;
+        sizeChanged = false;
+
+        if (needsCellsLayout) {
+            for (int i = 0, max = cells.size(); i < max; i++) {
+                Cell<?> cell = cells.get(i);
+                if (cell != null) {
+                    cell.requestLayout();
+                }
+            }
+            needsCellsLayout = false;
+
+            // yes, we return here - if needsCellsLayout was set to true, we
+            // only did it to do the above - not rerun the entire layout.
+            return;
+        }
+
+        final double width = getWidth();
+        final double height = getHeight();
+        final boolean isVertical = isVertical();
+        final double position = getPosition();
+
+        // if the width and/or height is 0, then there is no point doing
+        // any of this work. In particular, this can happen during startup
+        if (width <= 0 || height <= 0) {
+            addAllToPile();
+            lastWidth = width;
+            lastHeight = height;
+            hbar.setVisible(false);
+            vbar.setVisible(false);
+            corner.setVisible(false);
+            return;
+        }
+
+        // we check if any of the cells in the cells list need layout. This is a
+        // sign that they are perhaps animating their sizes. Without this check,
+        // we may not perform a layout here, meaning that the cell will likely
+        // 'jump' (in height normally) when the user drags the virtual thumb as
+        // that is the first time the layout would occur otherwise.
+        boolean cellNeedsLayout = false;
+        boolean thumbNeedsLayout = false;
+
+        if (Properties.IS_TOUCH_SUPPORTED) {
+            if ((tempVisibility == true && (hbar.isVisible() == false || vbar.isVisible() == false)) ||
+                (tempVisibility == false && (hbar.isVisible() == true || vbar.isVisible() == true))) {
+                thumbNeedsLayout = true;
+            }
+        }
+
+        if (!cellNeedsLayout) {
+            for (int i = 0; i < cells.size(); i++) {
+                Cell<?> cell = cells.get(i);
+                cellNeedsLayout = cell.isNeedsLayout();
+                if (cellNeedsLayout) break;
+            }
+        }
+
+        final int cellCount = getCellCount();
+        final T firstCell = getFirstVisibleCell();
+
+        // If no cells need layout, we check other criteria to see if this
+        // layout call is even necessary. If it is found that no layout is
+        // needed, we just punt.
+        if (! cellNeedsLayout && !thumbNeedsLayout) {
+            boolean cellSizeChanged = false;
+            if (firstCell != null) {
+                double breadth = getCellBreadth(firstCell);
+                double length = getCellLength(firstCell);
+                cellSizeChanged = (breadth != lastCellBreadth) || (length != lastCellLength);
+                lastCellBreadth = breadth;
+                lastCellLength = length;
+            }
+
+            if (width == lastWidth &&
+                height == lastHeight &&
+                cellCount == lastCellCount &&
+                isVertical == lastVertical &&
+                position == lastPosition &&
+                ! cellSizeChanged)
+            {
+                // TODO this happens to work around the problem tested by
+                // testCellLayout_LayoutWithoutChangingThingsUsesCellsInSameOrderAsBefore
+                // but isn't a proper solution. Really what we need to do is, when
+                // laying out cells, we need to make sure that if a cell is pressed
+                // AND we are doing a full rebuild then we need to make sure we
+                // use that cell in the same physical location as before so that
+                // it gets the mouse release event.
+                return;
+            }
+        }
+
+        /*
+         * This function may get called under a variety of circumstances.
+         * It will determine what has changed from the last time it was laid
+         * out, and will then take one of several execution paths based on
+         * what has changed so as to perform minimal layout work and also to
+         * give the expected behavior. One or more of the following may have
+         * happened:
+         *
+         *  1) width/height has changed
+         *      - If the width and/or height has been reduced (but neither of
+         *        them has been expanded), then we simply have to reposition and
+         *        resize the scroll bars
+         *      - If the width (in the vertical case) has expanded, then we
+         *        need to resize the existing cells and reposition and resize
+         *        the scroll bars
+         *      - If the height (in the vertical case) has expanded, then we
+         *        need to resize and reposition the scroll bars and add
+         *        any trailing cells
+         *
+         *  2) cell count has changed
+         *      - If the number of cells is bigger, or it is smaller but not
+         *        so small as to move the position then we can just update the
+         *        cells in place without performing layout and update the
+         *        scroll bars.
+         *      - If the number of cells has been reduced and it affects the
+         *        position, then move the position and rebuild all the cells
+         *        and update the scroll bars
+         *
+         *  3) size of the cell has changed
+         *      - If the size changed in the virtual direction (ie: height
+         *        in the case of vertical) then layout the cells, adding
+         *        trailing cells as necessary and updating the scroll bars
+         *      - If the size changed in the non virtual direction (ie: width
+         *        in the case of vertical) then simply adjust the widths of
+         *        the cells as appropriate and adjust the scroll bars
+         *
+         *  4) vertical changed, cells is empty, maxPrefBreadth == -1, etc
+         *      - Full rebuild.
+         *
+         * Each of the conditions really resolves to several of a handful of
+         * possible outcomes:
+         *  a) reposition & rebuild scroll bars
+         *  b) resize cells in non-virtual direction
+         *  c) add trailing cells
+         *  d) update cells
+         *  e) resize cells in the virtual direction
+         *  f) all of the above
+         *
+         * So this function first determines what outcomes need to occur, and
+         * then will execute all the ones that really need to happen. Every code
+         * path ends up touching the "reposition & rebuild scroll bars" outcome,
+         * so that one will be executed every time.
+         */
+        boolean needTrailingCells = false;
+        boolean rebuild = cellNeedsLayout  ||
+                isVertical != lastVertical ||
+                cells.isEmpty()            ||
+                getMaxPrefBreadth() == -1  ||
+                position != lastPosition   ||
+                cellCount != lastCellCount ||
+                hasSizeChange ||
+                (isVertical && height < lastHeight) || (! isVertical && width < lastWidth);
+
+        if (!rebuild) {
+            // Check if maxPrefBreadth didn't change
+            double maxPrefBreadth = getMaxPrefBreadth();
+            boolean foundMax = false;
+            for (int i = 0; i < cells.size(); ++i) {
+                double breadth = getCellBreadth(cells.get(i));
+                if (maxPrefBreadth == breadth) {
+                    foundMax = true;
+                } else if (breadth > maxPrefBreadth) {
+                    rebuild = true;
+                    break;
+                }
+            }
+            if (!foundMax) { // All values were lower
+                rebuild = true;
+            }
+        }
+
+        if (! rebuild) {
+            if ((isVertical && height > lastHeight) || (! isVertical && width > lastWidth)) {
+                // resized in the virtual direction
+                needTrailingCells = true;
+            }
+        }
+
+        initViewport();
+
+        // Get the index of the "current" cell
+        int currentIndex = computeCurrentIndex();
+        if (lastCellCount != cellCount) {
+            // The cell count has changed. We want to keep the viewport
+            // stable if possible. If position was 0 or 1, we want to keep
+            // the position in the same place. If the new cell count is >=
+            // the currentIndex, then we will adjust the position to be 1.
+            // Otherwise, our goal is to leave the index of the cell at the
+            // top consistent, with the same translation etc.
+            if (position == 0 || position == 1) {
+                // Update the item count
+//                setItemCount(cellCount);
+            } else if (currentIndex >= cellCount) {
+                setPosition(1.0f);
+//                setItemCount(cellCount);
+            } else if (firstCell != null) {
+                double firstCellOffset = getCellPosition(firstCell);
+                int firstCellIndex = getCellIndex(firstCell);
+//                setItemCount(cellCount);
+                adjustPositionToIndex(firstCellIndex);
+                double viewportTopToCellTop = -computeOffsetForCell(firstCellIndex);
+                adjustByPixelAmount(viewportTopToCellTop - firstCellOffset);
+            }
+
+            // Update the current index
+            currentIndex = computeCurrentIndex();
+        }
+
+        if (rebuild) {
+            setMaxPrefBreadth(-1);
+            // Start by dumping all the cells into the pile
+            addAllToPile();
+
+            // The distance from the top of the viewport to the top of the
+            // cell for the current index.
+            double offset = -computeViewportOffset(getPosition());
+
+            // Add all the leading and trailing cells (the call to add leading
+            // cells will add the current cell as well -- that is, the one that
+            // represents the current position on the mapper).
+            addLeadingCells(currentIndex, offset);
+
+            // Force filling of space with empty cells if necessary
+            addTrailingCells(true);
+        } else if (needTrailingCells) {
+            addTrailingCells(true);
+        }
+
+        computeBarVisiblity();
+        updateScrollBarsAndCells(recreatedOrRebuilt);
+
+        lastWidth = getWidth();
+        lastHeight = getHeight();
+        lastCellCount = getCellCount();
+        lastVertical = isVertical();
+        lastPosition = getPosition();
+
+        cleanPile();
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void setWidth(double value) {
+        if (value != lastWidth) {
+            super.setWidth(value);
+            sizeChanged = true;
+            setNeedsLayout(true);
+            requestLayout();
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override protected void setHeight(double value) {
+        if (value != lastHeight) {
+            super.setHeight(value);
+            sizeChanged = true;
+            setNeedsLayout(true);
+            requestLayout();
+        }
+    }
+
+    /**
+     * Get a cell which can be used in the layout. This function will reuse
+     * cells from the pile where possible, and will create new cells when
+     * necessary.
+     */
+    protected T getAvailableCell(int prefIndex) {
+        T cell = null;
+
+        // Fix for RT-12822. We try to retrieve the cell from the pile rather
+        // than just grab a random cell from the pile (or create another cell).
+        for (int i = 0, max = pile.size(); i < max; i++) {
+            T _cell = pile.get(i);
+            assert _cell != null;
+
+            if (getCellIndex(_cell) == prefIndex) {
+                cell = _cell;
+                pile.remove(i);
+                break;
+            }
+            cell = null;
+        }
+
+        if (cell == null) {
+            if (pile.size() > 0) {
+                // we try to get a cell with an index that is the same even/odd
+                // as the prefIndex. This saves us from having to run so much
+                // css on the cell as it will not change from even to odd, or
+                // vice versa
+                final boolean prefIndexIsEven = (prefIndex & 1) == 0;
+                for (int i = 0, max = pile.size(); i < max; i++) {
+                    final T c = pile.get(i);
+                    final int cellIndex = getCellIndex(c);
+
+                    if ((cellIndex & 1) == 0 && prefIndexIsEven) {
+                        cell = c;
+                        pile.remove(i);
+                        break;
+                    } else if ((cellIndex & 1) == 1 && ! prefIndexIsEven) {
+                        cell = c;
+                        pile.remove(i);
+                        break;
+                    }
+                }
+
+                if (cell == null) {
+                    cell = pile.removeFirst();
+                }
+            } else {
+                cell = getCellFactory().call(this);
+                cell.getProperties().put(NEW_CELL, null);
+            }
+        }
+
+        if (cell.getParent() == null) {
+            sheetChildren.add(cell);
+        }
+
+        return cell;
+    }
+
+    /**
+     * This method will remove all cells from the VirtualFlow and remove them,
+     * adding them to the 'pile' (that is, a place from where cells can be used
+     * at a later date). This method is protected to allow subclasses to clean up
+     * appropriately.
+     */
+    protected void addAllToPile() {
+        for (int i = 0, max = cells.size(); i < max; i++) {
+            addToPile(cells.removeFirst());
+        }
+    }
+
+    /**
+     * Gets a cell for the given index if the cell has been created and laid out.
+     * "Visible" is a bit of a misnomer, the cell might not be visible in the
+     * viewport (it may be clipped), but does distinguish between cells that
+     * have been created and are in use vs. those that are in the pile or
+     * not created.
+     */
+    public T getVisibleCell(int index) {
+        if (cells.isEmpty()) return null;
+
+        // check the last index
+        T lastCell = cells.getLast();
+        int lastIndex = getCellIndex(lastCell);
+        if (index == lastIndex) return lastCell;
+
+        // check the first index
+        T firstCell = cells.getFirst();
+        int firstIndex = getCellIndex(firstCell);
+        if (index == firstIndex) return firstCell;
+
+        // if index is > firstIndex and < lastIndex then we can get the index
+        if (index > firstIndex && index < lastIndex) {
+            T cell = cells.get(index - firstIndex);
+            if (getCellIndex(cell) == index) return cell;
+        }
+
+        // there is no visible cell for the specified index
+        return null;
+    }
+
+    /**
+     * Locates and returns the last non-empty IndexedCell that is currently
+     * partially or completely visible. This function may return null if there
+     * are no cells, or if the viewport length is 0.
+     */
+    public T getLastVisibleCell() {
+        if (cells.isEmpty() || getViewportLength() <= 0) return null;
+
+        T cell;
+        for (int i = cells.size() - 1; i >= 0; i--) {
+            cell = cells.get(i);
+            if (! cell.isEmpty()) {
+                return cell;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Locates and returns the first non-empty IndexedCell that is partially or
+     * completely visible. This really only ever returns null if there are no
+     * cells or the viewport length is 0.
+     */
+    public T getFirstVisibleCell() {
+        if (cells.isEmpty() || getViewportLength() <= 0) return null;
+        T cell = cells.getFirst();
+        return cell.isEmpty() ? null : cell;
+    }
+
+    /**
+     * Adjust the position of cells so that the specified cell
+     * will be positioned at the start of the viewport. The given cell must
+     * already be "live".
+     */
+    public void scrollToTop(T firstCell) {
+        if (firstCell != null) {
+            scrollPixels(getCellPosition(firstCell));
+        }
+    }
+
+    /**
+     * Adjust the position of cells so that the specified cell
+     * will be positioned at the end of the viewport. The given cell must
+     * already be "live".
+     */
+    public void scrollToBottom(T lastCell) {
+        if (lastCell != null) {
+            scrollPixels(getCellPosition(lastCell) + getCellLength(lastCell) - getViewportLength());
+        }
+    }
+
+    /**
+     * Adjusts the cells such that the selected cell will be fully visible in
+     * the viewport (but only just).
+     */
+    public void scrollTo(T cell) {
+        if (cell != null) {
+            final double start = getCellPosition(cell);
+            final double length = getCellLength(cell);
+            final double end = start + length;
+            final double viewportLength = getViewportLength();
+
+            if (start < 0) {
+                scrollPixels(start);
+            } else if (end > viewportLength) {
+                scrollPixels(end - viewportLength);
+            }
+        }
+    }
+
+    /**
+     * Adjusts the cells such that the cell in the given index will be fully visible in
+     * the viewport.
+     */
+    public void scrollTo(int index) {
+        T cell = getVisibleCell(index);
+        if (cell != null) {
+            scrollTo(cell);
+        } else {
+            adjustPositionToIndex(index);
+            addAllToPile();
+            requestLayout();
+        }
+    }
+
+    /**
+     * Adjusts the cells such that the cell in the given index will be fully visible in
+     * the viewport, and positioned at the very top of the viewport.
+     */
+    public void scrollToTop(int index) {
+        boolean posSet = false;
+
+        if (index >= getCellCount() - 1) {
+            setPosition(1);
+            posSet = true;
+        } else if (index < 0) {
+            setPosition(0);
+            posSet = true;
+        }
+
+        if (! posSet) {
+            adjustPositionToIndex(index);
+            double offset = - computeOffsetForCell(index);
+            adjustByPixelAmount(offset);
+        }
+
+        requestLayout();
+    }
+
+//    //TODO We assume all the cell have the same length.  We will need to support
+//    // cells of different lengths.
+//    public void scrollToOffset(int offset) {
+//        scrollPixels(offset * getCellLength(0));
+//    }
+
+    /**
+     * Given a delta value representing a number of pixels, this method attempts
+     * to move the VirtualFlow in the given direction (positive is down/right,
+     * negative is up/left) the given number of pixels. It returns the number of
+     * pixels actually moved.
+     */
+    public double scrollPixels(final double delta) {
+        // Short cut this method for cases where nothing should be done
+        if (delta == 0) return 0;
+
+        final boolean isVertical = isVertical();
+        if (((isVertical && (tempVisibility ? !needLengthBar : !vbar.isVisible())) ||
+                (! isVertical && (tempVisibility ? !needLengthBar : !hbar.isVisible())))) return 0;
+
+        double pos = getPosition();
+        if (pos == 0.0f && delta < 0) return 0;
+        if (pos == 1.0f && delta > 0) return 0;
+
+        adjustByPixelAmount(delta);
+        if (pos == getPosition()) {
+            // The pos hasn't changed, there's nothing to do. This is likely
+            // to occur when we hit either extremity
+            return 0;
+        }
+
+        // Now move stuff around. Translating by pixels fundamentally means
+        // moving the cells by the delta. However, after having
+        // done that, we need to go through the cells and see which cells,
+        // after adding in the translation factor, now fall off the viewport.
+        // Also, we need to add cells as appropriate to the end (or beginning,
+        // depending on the direction of travel).
+        //
+        // One simplifying assumption (that had better be true!) is that we
+        // will only make it this far in the function if the virtual scroll
+        // bar is visible. Otherwise, we never will pixel scroll. So as we go,
+        // if we find that the maxPrefBreadth exceeds the viewportBreadth,
+        // then we will be sure to show the breadthBar and update it
+        // accordingly.
+        if (cells.size() > 0) {
+            for (int i = 0; i < cells.size(); i++) {
+                T cell = cells.get(i);
+                assert cell != null;
+                positionCell(cell, getCellPosition(cell) - delta);
+            }
+
+            // Fix for RT-32908
+            T firstCell = cells.getFirst();
+            double layoutY = firstCell == null ? 0 : getCellPosition(firstCell);
+            for (int i = 0; i < cells.size(); i++) {
+                T cell = cells.get(i);
+                assert cell != null;
+                double actualLayoutY = getCellPosition(cell);
+                if (actualLayoutY != layoutY) {
+                    // we need to shift the cell to layoutY
+                    positionCell(cell, layoutY);
+                }
+
+                layoutY += getCellLength(cell);
+            }
+            // end of fix for RT-32908
+            cull();
+            firstCell = cells.getFirst();
+
+            // Add any necessary leading cells
+            if (firstCell != null) {
+                int firstIndex = getCellIndex(firstCell);
+                double prevIndexSize = getCellLength(firstIndex - 1);
+                addLeadingCells(firstIndex - 1, getCellPosition(firstCell) - prevIndexSize);
+            } else {
+                int currentIndex = computeCurrentIndex();
+
+                // The distance from the top of the viewport to the top of the
+                // cell for the current index.
+                double offset = -computeViewportOffset(getPosition());
+
+                // Add all the leading and trailing cells (the call to add leading
+                // cells will add the current cell as well -- that is, the one that
+                // represents the current position on the mapper).
+                addLeadingCells(currentIndex, offset);
+            }
+
+            // Starting at the tail of the list, loop adding cells until
+            // all the space on the table is filled up. We want to make
+            // sure that we DO NOT add empty trailing cells (since we are
+            // in the full virtual case and so there are no trailing empty
+            // cells).
+            if (! addTrailingCells(false)) {
+                // Reached the end, but not enough cells to fill up to
+                // the end. So, remove the trailing empty space, and translate
+                // the cells down
+                final T lastCell = getLastVisibleCell();
+                final double lastCellSize = getCellLength(lastCell);
+                final double cellEnd = getCellPosition(lastCell) + lastCellSize;
+                final double viewportLength = getViewportLength();
+
+                if (cellEnd < viewportLength) {
+                    // Reposition the nodes
+                    double emptySize = viewportLength - cellEnd;
+                    for (int i = 0; i < cells.size(); i++) {
+                        T cell = cells.get(i);
+                        positionCell(cell, getCellPosition(cell) + emptySize);
+                    }
+                    setPosition(1.0f);
+                    // fill the leading empty space
+                    firstCell = cells.getFirst();
+                    int firstIndex = getCellIndex(firstCell);
+                    double prevIndexSize = getCellLength(firstIndex - 1);
+                    addLeadingCells(firstIndex - 1, getCellPosition(firstCell) - prevIndexSize);
+                }
+            }
+        }
+
+        // Now throw away any cells that don't fit
+        cull();
+
+        // Finally, update the scroll bars
+        updateScrollBarsAndCells(false);
+        lastPosition = getPosition();
+
+        // notify
+        return delta; // TODO fake
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefWidth(double height) {
+        double w = isVertical() ? getPrefBreadth(height) : getPrefLength();
+        return w + vbar.prefWidth(-1);
+    }
+
+    /** {@inheritDoc} */
+    @Override protected double computePrefHeight(double width) {
+        double h = isVertical() ? getPrefLength() : getPrefBreadth(width);
+        return h + hbar.prefHeight(-1);
+    }
+
+    /**
+     * Return a cell for the given index. This may be called for any cell,
+     * including beyond the range defined by cellCount, in which case an
+     * empty cell will be returned. The returned value should not be stored for
+     * any reason.
+     */
+    public T getCell(int index) {
+        // If there are cells, then we will attempt to get an existing cell
+        if (! cells.isEmpty()) {
+            // First check the cells that have already been created and are
+            // in use. If this call returns a value, then we can use it
+            T cell = getVisibleCell(index);
+            if (cell != null) return cell;
+        }
+
+        // check the pile
+        for (int i = 0; i < pile.size(); i++) {
+            T cell = pile.get(i);
+            if (getCellIndex(cell) == index) {
+                // Note that we don't remove from the pile: if we do it leads
+                // to a severe performance decrease. This seems to be OK, as
+                // getCell() is only used for cell measurement purposes.
+                // pile.remove(i);
+                return cell;
+            }
+        }
+
+        if (pile.size() > 0) {
+            return pile.get(0);
+        }
+
+        // We need to use the accumCell and return that
+        if (accumCell == null) {
+            Callback<VirtualFlow<T>,T> cellFactory = getCellFactory();
+            if (cellFactory != null) {
+                accumCell = cellFactory.call(this);
+                accumCell.getProperties().put(NEW_CELL, null);
+                accumCellParent.getChildren().setAll(accumCell);
+
+                // Note the screen reader will attempt to find all
+                // the items inside the view to calculate the item count.
+                // Having items under different parents (sheet and accumCellParent)
+                // leads the screen reader to compute wrong values.
+                // The regular scheme to provide items to the screen reader
+                // uses getPrivateCell(), which places the item in the sheet.
+                // The accumCell, and its children, should be ignored by the
+                // screen reader.
+                accumCell.setAccessibleRole(AccessibleRole.NODE);
+                accumCell.getChildrenUnmodifiable().addListener((Observable c) -> {
+                    for (Node n : accumCell.getChildrenUnmodifiable()) {
+                        n.setAccessibleRole(AccessibleRole.NODE);
+                    }
+                });
+            }
+        }
+        setCellIndex(accumCell, index);
+        resizeCellSize(accumCell);
+        return accumCell;
+    }
+
+    /**
+     * The VirtualFlow uses this method to set a cells index (rather than calling
+     * {@link IndexedCell#updateIndex(int)} directly), so it is a perfect place
+     * for subclasses to override if this if of interest.
+     *
+     * @param cell The cell whose index will be updated.
+     * @param index The new index for the cell.
+     */
+    protected void setCellIndex(T cell, int index) {
+        assert cell != null;
+
+        cell.updateIndex(index);
+
+        // make sure the cell is sized correctly. This is important for both
+        // general layout of cells in a VirtualFlow, but also in cases such as
+        // RT-34333, where the sizes were being reported incorrectly to the
+        // ComboBox popup.
+        if ((cell.isNeedsLayout() && cell.getScene() != null) || cell.getProperties().containsKey(NEW_CELL)) {
+            cell.applyCss();
+            cell.getProperties().remove(NEW_CELL);
+        }
+    }
+
+    /**
+     * Return the index for a given cell. This allows subclasses to customise
+     * how cell indices are retrieved.
+     */
+    protected int getCellIndex(T cell){
+        return cell.getIndex();
+    }
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Private implementation                                                  *
+     *                                                                         *
+     **************************************************************************/
+
+    final VirtualScrollBar getHbar() {
+        return hbar;
+    }
+    final VirtualScrollBar getVbar() {
+        return vbar;
+    }
+
+    /**
+     * The maximum preferred size in the non-virtual direction. For example,
+     * if vertical, then this is the max pref width of all cells encountered.
+     * <p>
+     * In general, this is the largest preferred size in the non-virtual
+     * direction that we have ever encountered. We don't reduce this size
+     * unless instructed to do so, so as to reduce the amount of scroll bar
+     * jitter. The access on this variable is package ONLY FOR TESTING.
+     */
+    private double maxPrefBreadth;
+    private final void setMaxPrefBreadth(double value) {
+        this.maxPrefBreadth = value;
+    }
+    final double getMaxPrefBreadth() {
+        return maxPrefBreadth;
+    }
+
+    /**
+     * The breadth of the viewport portion of the VirtualFlow as computed during
+     * the layout pass. In a vertical flow this would be the same as the clip
+     * view width. In a horizontal flow this is the clip view height.
+     * The access on this variable is package ONLY FOR TESTING.
+     */
+    private double viewportBreadth;
+    private final void setViewportBreadth(double value) {
+        this.viewportBreadth = value;
+    }
+    private final double getViewportBreadth() {
+        return viewportBreadth;
+    }
+
+    /**
+     * The length of the viewport portion of the VirtualFlow as computed
+     * during the layout pass. In a vertical flow this would be the same as the
+     * clip view height. In a horizontal flow this is the clip view width.
+     * The access on this variable is package ONLY FOR TESTING.
+     */
+    private double viewportLength;
+    void setViewportLength(double value) {
+        this.viewportLength = value;
+    }
+    double getViewportLength() {
+        return viewportLength;
+    }
+
+    /**
+     * Compute and return the length of the cell for the given index. This is
+     * called both internally when adjusting by pixels, and also at times
+     * by PositionMapper (see the getItemSize callback). When called by
+     * PositionMapper, it is possible that it will be called for some index
+     * which is not associated with any cell, so we have to do a bit of work
+     * to use a cell as a helper for computing cell size in some cases.
+     */
+    double getCellLength(int index) {
+        if (fixedCellSizeEnabled) return getFixedCellSize();
+
+        T cell = getCell(index);
+        double length = getCellLength(cell);
+        releaseCell(cell);
+        return length;
+    }
+
+    /**
+     */
+    double getCellBreadth(int index) {
+        T cell = getCell(index);
+        double b = getCellBreadth(cell);
+        releaseCell(cell);
+        return b;
+    }
+
+    /**
+     * Gets the length of a specific cell
+     */
+    double getCellLength(T cell) {
+        if (cell == null) return 0;
+        if (fixedCellSizeEnabled) return getFixedCellSize();
+
+        return isVertical() ?
+                cell.getLayoutBounds().getHeight()
+                : cell.getLayoutBounds().getWidth();
+    }
+
+    /**
+     * Gets the breadth of a specific cell
+     */
+    double getCellBreadth(Cell cell) {
+        return isVertical() ?
+                cell.prefWidth(-1)
+                : cell.prefHeight(-1);
+    }
+
+    /**
+     * Gets the layout position of the cell along the length axis
+     */
+    double getCellPosition(T cell) {
+        if (cell == null) return 0;
+
+        return isVertical() ?
+                cell.getLayoutY()
+                : cell.getLayoutX();
+    }
+
+    private void positionCell(T cell, double position) {
+        if (isVertical()) {
+            cell.setLayoutX(0);
+            cell.setLayoutY(snapSize(position));
+        } else {
+            cell.setLayoutX(snapSize(position));
+            cell.setLayoutY(0);
+        }
+    }
+
+    private void resizeCellSize(T cell) {
+        if (cell == null) return;
+
+        if (isVertical()) {
+            double width = Math.max(getMaxPrefBreadth(), getViewportBreadth());
+            cell.resize(width, fixedCellSizeEnabled ? getFixedCellSize() : Utils.boundedSize(cell.prefHeight(width), cell.minHeight(width), cell.maxHeight(width)));
+        } else {
+            double height = Math.max(getMaxPrefBreadth(), getViewportBreadth());
+            cell.resize(fixedCellSizeEnabled ? getFixedCellSize() : Utils.boundedSize(cell.prefWidth(height), cell.minWidth(height), cell.maxWidth(height)), height);
+        }
+    }
+
+    private List<T> getCells() {
+        return cells;
+    }
+
+    // Returns last visible cell whose bounds are entirely within the viewport
+    T getLastVisibleCellWithinViewPort() {
+        if (cells.isEmpty() || getViewportLength() <= 0) return null;
+
+        T cell;
+        final double max = getViewportLength();
+        for (int i = cells.size() - 1; i >= 0; i--) {
+            cell = cells.get(i);
+            if (cell.isEmpty()) continue;
+
+            final double cellStart = getCellPosition(cell);
+            final double cellEnd = cellStart + getCellLength(cell);
+
+            // we use the magic +2 to allow for a little bit of fuzziness,
+            // this is to help in situations such as RT-34407
+            if (cellEnd <= (max + 2)) {
+                return cell;
+            }
+        }
+
+        return null;
+    }
+
+    // Returns first visible cell whose bounds are entirely within the viewport
+    T getFirstVisibleCellWithinViewPort() {
+        if (cells.isEmpty() || getViewportLength() <= 0) return null;
+
+        T cell;
+        for (int i = 0; i < cells.size(); i++) {
+            cell = cells.get(i);
+            if (cell.isEmpty()) continue;
+
+            final double cellStart = getCellPosition(cell);
+            if (cellStart >= 0) {
+                return cell;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Adds all the cells prior to and including the given currentIndex, until
+     * no more can be added without falling off the flow. The startOffset
+     * indicates the distance from the leading edge (top) of the viewport to
+     * the leading edge (top) of the currentIndex.
+     */
+    void addLeadingCells(int currentIndex, double startOffset) {
+        // The offset will keep track of the distance from the top of the
+        // viewport to the top of the current index. We will increment it
+        // as we lay out leading cells.
+        double offset = startOffset;
+        // The index is the absolute index of the cell being laid out
+        int index = currentIndex;
+
+        // Offset should really be the bottom of the current index
+        boolean first = true; // first time in, we just fudge the offset and let
+        // it be the top of the current index then redefine
+        // it as the bottom of the current index thereafter
+        // while we have not yet laid out so many cells that they would fall
+        // off the flow, we will continue to create and add cells. The
+        // offset is our indication of whether we can lay out additional
+        // cells. If the offset is ever < 0, except in the case of the very
+        // first cell, then we must quit.
+        T cell = null;
+
+        // special case for the position == 1.0, skip adding last invisible cell
+        if (index == getCellCount() && offset == getViewportLength()) {
+            index--;
+            first = false;
+        }
+        while (index >= 0 && (offset > 0 || first)) {
+            cell = getAvailableCell(index);
+            setCellIndex(cell, index);
+            resizeCellSize(cell); // resize must be after config
+            cells.addFirst(cell);
+
+            // A little gross but better than alternatives because it reduces
+            // the number of times we have to update a cell or compute its
+            // size. The first time into this loop "offset" is actually the
+            // top of the current index. On all subsequent visits, it is the
+            // bottom of the current index.
+            if (first) {
+                first = false;
+            } else {
+                offset -= getCellLength(cell);
+            }
+
+            // Position the cell, and update the maxPrefBreadth variable as we go.
+            positionCell(cell, offset);
+            setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
+            cell.setVisible(true);
+            --index;
+        }
+
+        // There are times when after laying out the cells we discover that
+        // the top of the first cell which represents index 0 is below the top
+        // of the viewport. In these cases, we have to adjust the cells up
+        // and reset the mapper position. This might happen when items got
+        // removed at the top or when the viewport size increased.
+        if (cells.size() > 0) {
+            cell = cells.getFirst();
+            int firstIndex = getCellIndex(cell);
+            double firstCellPos = getCellPosition(cell);
+            if (firstIndex == 0 && firstCellPos > 0) {
+                setPosition(0.0f);
+                offset = 0;
+                for (int i = 0; i < cells.size(); i++) {
+                    cell = cells.get(i);
+                    positionCell(cell, offset);
+                    offset += getCellLength(cell);
+                }
+            }
+        } else {
+            // reset scrollbar to top, so if the flow sees cells again it starts at the top
+            vbar.setValue(0);
+            hbar.setValue(0);
+        }
+    }
+
+    /**
+     * Adds all the trailing cells that come <em>after</em> the last index in
+     * the cells ObservableList.
+     */
+    boolean addTrailingCells(boolean fillEmptyCells) {
+        // If cells is empty then addLeadingCells bailed for some reason and
+        // we're hosed, so just punt
+        if (cells.isEmpty()) return false;
+
+        // While we have not yet laid out so many cells that they would fall
+        // off the flow, so we will continue to create and add cells. When the
+        // offset becomes greater than the width/height of the flow, then we
+        // know we cannot add any more cells.
+        T startCell = cells.getLast();
+        double offset = getCellPosition(startCell) + getCellLength(startCell);
+        int index = getCellIndex(startCell) + 1;
+        final int cellCount = getCellCount();
+        boolean filledWithNonEmpty = index <= cellCount;
+
+        final double viewportLength = getViewportLength();
+
+        // Fix for RT-37421, which was a regression caused by RT-36556
+        if (offset < 0 && !fillEmptyCells) {
+            return false;
+        }
+
+        //
+        // RT-36507: viewportLength - offset gives the maximum number of
+        // additional cells that should ever be able to fit in the viewport if
+        // every cell had a height of 1. If index ever exceeds this count,
+        // then offset is not incrementing fast enough, or at all, which means
+        // there is something wrong with the cell size calculation.
+        //
+        final double maxCellCount = viewportLength - offset;
+        while (offset < viewportLength) {
+            if (index >= cellCount) {
+                if (offset < viewportLength) filledWithNonEmpty = false;
+                if (! fillEmptyCells) return filledWithNonEmpty;
+                // RT-36507 - return if we've exceeded the maximum
+                if (index > maxCellCount) {
+                    final PlatformLogger logger = Logging.getControlsLogger();
+                    if (logger.isLoggable(PlatformLogger.Level.INFO)) {
+                        if (startCell != null) {
+                            logger.info("index exceeds maxCellCount. Check size calculations for " + startCell.getClass());
+                        } else {
+                            logger.info("index exceeds maxCellCount");
+                        }
+                    }
+                    return filledWithNonEmpty;
+                }
+            }
+            T cell = getAvailableCell(index);
+            setCellIndex(cell, index);
+            resizeCellSize(cell); // resize happens after config!
+            cells.addLast(cell);
+
+            // Position the cell and update the max pref
+            positionCell(cell, offset);
+            setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
+
+            offset += getCellLength(cell);
+            cell.setVisible(true);
+            ++index;
+        }
+
+        // Discover whether the first cell coincides with index #0. If after
+        // adding all the trailing cells we find that a) the first cell was
+        // not index #0 and b) there are trailing cells, then we have a
+        // problem. We need to shift all the cells down and add leading cells,
+        // one at a time, until either the very last non-empty cells is aligned
+        // with the bottom OR we have laid out cell index #0 at the first
+        // position.
+        T firstCell = cells.getFirst();
+        index = getCellIndex(firstCell);
+        T lastNonEmptyCell = getLastVisibleCell();
+        double start = getCellPosition(firstCell);
+        double end = getCellPosition(lastNonEmptyCell) + getCellLength(lastNonEmptyCell);
+        if ((index != 0 || (index == 0 && start < 0)) && fillEmptyCells &&
+                lastNonEmptyCell != null && getCellIndex(lastNonEmptyCell) == cellCount - 1 && end < viewportLength) {
+
+            double prospectiveEnd = end;
+            double distance = viewportLength - end;
+            while (prospectiveEnd < viewportLength && index != 0 && (-start) < distance) {
+                index--;
+                T cell = getAvailableCell(index);
+                setCellIndex(cell, index);
+                resizeCellSize(cell); // resize must be after config
+                cells.addFirst(cell);
+                double cellLength = getCellLength(cell);
+                start -= cellLength;
+                prospectiveEnd += cellLength;
+                positionCell(cell, start);
+                setMaxPrefBreadth(Math.max(getMaxPrefBreadth(), getCellBreadth(cell)));
+                cell.setVisible(true);
+            }
+
+            // The amount by which to translate the cells down
+            firstCell = cells.getFirst();
+            start = getCellPosition(firstCell);
+            double delta = viewportLength - end;
+            if (getCellIndex(firstCell) == 0 && delta > (-start)) {
+                delta = (-start);
+            }
+            // Move things
+            for (int i = 0; i < cells.size(); i++) {
+                T cell = cells.get(i);
+                positionCell(cell, getCellPosition(cell) + delta);
+            }
+
+            // Check whether the first cell, subsequent to our adjustments, is
+            // now index #0 and aligned with the top. If so, change the position
+            // to be at 0 instead of 1.
+            start = getCellPosition(firstCell);
+            if (getCellIndex(firstCell) == 0 && start == 0) {
+                setPosition(0);
+            } else if (getPosition() != 1) {
+                setPosition(1);
+            }
+        }
+
+        return filledWithNonEmpty;
+    }
+
+    void reconfigureCells() {
+        needsReconfigureCells = true;
+        requestLayout();
+    }
+
+    void recreateCells() {
+        needsRecreateCells = true;
+        requestLayout();
+    }
+
+    void rebuildCells() {
+        needsRebuildCells = true;
+        requestLayout();
+    }
+
+    void requestCellLayout() {
+        needsCellsLayout = true;
+        requestLayout();
+    }
+
+    void setCellDirty(int index) {
+        dirtyCells.set(index);
+        requestLayout();
+    }
+
+    private void startSBReleasedAnimation() {
+        if (sbTouchTimeline == null) {
+            /*
+            ** timeline to leave the scrollbars visible for a short
+            ** while after a scroll/drag
+            */
+            sbTouchTimeline = new Timeline();
+            sbTouchKF1 = new KeyFrame(Duration.millis(0), event -> {
+                tempVisibility = true;
+                requestLayout();
+            });
+
+            sbTouchKF2 = new KeyFrame(Duration.millis(1000), event -> {
+                if (touchDetected == false && mouseDown == false) {
+                    tempVisibility = false;
+                    requestLayout();
+                }
+            });
+            sbTouchTimeline.getKeyFrames().addAll(sbTouchKF1, sbTouchKF2);
+        }
+        sbTouchTimeline.playFromStart();
+    }
+
+    private void scrollBarOn() {
+        tempVisibility = true;
+        requestLayout();
+    }
+
+    void updateHbar() {
+        // Bring the clipView.clipX back to 0 if control is vertical or
+        // the hbar isn't visible (fix for RT-11666)
+        if (! isVisible() || getScene() == null) return;
+
+        if (isVertical()) {
+            if (hbar.isVisible()) {
+                clipView.setClipX(hbar.getValue());
+            } else {
+                // all cells are now less than the width of the flow,
+                // so we should shift the hbar/clip such that
+                // everything is visible in the viewport.
+                clipView.setClipX(0);
+                hbar.setValue(0);
+            }
+        }
+    }
+
+    /**
+     * @return true if bar visibility changed
+     */
+    private boolean computeBarVisiblity() {
+        if (cells.isEmpty()) {
+            // In case no cells are set yet, we assume no bars are needed
+            needLengthBar = false;
+            needBreadthBar = false;
+            return true;
+        }
+
+        final boolean isVertical = isVertical();
+        boolean barVisibilityChanged = false;
+
+        VirtualScrollBar breadthBar = isVertical ? hbar : vbar;
+        VirtualScrollBar lengthBar = isVertical ? vbar : hbar;
+
+        final double viewportBreadth = getViewportBreadth();
+
+        final int cellsSize = cells.size();
+        final int cellCount = getCellCount();
+        for (int i = 0; i < 2; i++) {
+            final boolean lengthBarVisible = getPosition() > 0
+                    || cellCount > cellsSize
+                    || (cellCount == cellsSize && (getCellPosition(cells.getLast()) + getCellLength(cells.getLast())) > getViewportLength())
+                    || (cellCount == cellsSize - 1 && barVisibilityChanged && needBreadthBar);
+
+            if (lengthBarVisible ^ needLengthBar) {
+                needLengthBar = lengthBarVisible;
+                barVisibilityChanged = true;
+            }
+
+            // second conditional removed for RT-36669.
+            final boolean breadthBarVisible = (maxPrefBreadth > viewportBreadth);// || (needLengthBar && maxPrefBreadth > (viewportBreadth - lengthBarBreadth));
+            if (breadthBarVisible ^ needBreadthBar) {
+                needBreadthBar = breadthBarVisible;
+                barVisibilityChanged = true;
+            }
+        }
+
+        // Start by optimistically deciding whether the length bar and
+        // breadth bar are needed and adjust the viewport dimensions
+        // accordingly. If during layout we find that one or the other of the
+        // bars actually is needed, then we will perform a cleanup pass
+
+        if (!Properties.IS_TOUCH_SUPPORTED) {
+            updateViewportDimensions();
+            breadthBar.setVisible(needBreadthBar);
+            lengthBar.setVisible(needLengthBar);
+        } else {
+            breadthBar.setVisible(needBreadthBar && tempVisibility);
+            lengthBar.setVisible(needLengthBar && tempVisibility);
+        }
+
+        return barVisibilityChanged;
+    }
+
+    private void updateViewportDimensions() {
+        final boolean isVertical = isVertical();
+        final double breadthBarLength = snapSize(isVertical ? hbar.prefHeight(-1) : vbar.prefWidth(-1));
+        final double lengthBarBreadth = snapSize(isVertical ? vbar.prefWidth(-1) : hbar.prefHeight(-1));
+
+        setViewportBreadth((isVertical ? getWidth() : getHeight()) - (needLengthBar ? lengthBarBreadth : 0));
+        setViewportLength((isVertical ? getHeight() : getWidth()) - (needBreadthBar ? breadthBarLength : 0));
+    }
+
+    private void initViewport() {
+        // Initialize the viewportLength and viewportBreadth to match the
+        // width/height of the flow
+        final boolean isVertical = isVertical();
+
+        updateViewportDimensions();
+
+        VirtualScrollBar breadthBar = isVertical ? hbar : vbar;
+        VirtualScrollBar lengthBar = isVertical ? vbar : hbar;
+
+        // If there has been a switch between the virtualized bar, then we
+        // will want to do some stuff TODO.
+        breadthBar.setVirtual(false);
+        lengthBar.setVirtual(true);
+    }
+
+    private void updateScrollBarsAndCells(boolean recreate) {
+        // Assign the hbar and vbar to the breadthBar and lengthBar so as
+        // to make some subsequent calculations easier.
+        final boolean isVertical = isVertical();
+        VirtualScrollBar breadthBar = isVertical ? hbar : vbar;
+        VirtualScrollBar lengthBar = isVertical ? vbar : hbar;
+
+        // We may have adjusted the viewport length and breadth after the
+        // layout due to scroll bars becoming visible. So we need to perform
+        // a follow up pass and resize and shift all the cells to fit the
+        // viewport. Note that the prospective viewport size is always >= the
+        // final viewport size, so we don't have to worry about adding
+        // cells during this cleanup phase.
+        fitCells();
+
+        // Update cell positions.
+        // When rebuilding the cells, we add the cells and along the way compute
+        // the maxPrefBreadth. Based on the computed value, we may add
+        // the breadth scrollbar which changes viewport length, so we need
+        // to re-position the cells.
+        if (!cells.isEmpty()) {
+            final double currOffset = -computeViewportOffset(getPosition());
+            final int currIndex = computeCurrentIndex() - cells.getFirst().getIndex();
+            final int size = cells.size();
+
+            // position leading cells
+            double offset = currOffset;
+
+            for (int i = currIndex - 1; i >= 0 && i < size; i--) {
+                final T cell = cells.get(i);
+
+                offset -= getCellLength(cell);
+
+                positionCell(cell, offset);
+            }
+
+            // position trailing cells
+            offset = currOffset;
+            for (int i = currIndex; i >= 0 && i < size; i++) {
+                final T cell = cells.get(i);
+                positionCell(cell, offset);
+
+                offset += getCellLength(cell);
+            }
+        }
+
+        // Toggle visibility on the corner
+        corner.setVisible(breadthBar.isVisible() && lengthBar.isVisible());
+
+        double sumCellLength = 0;
+        double flowLength = (isVertical ? getHeight() : getWidth()) -
+                (breadthBar.isVisible() ? breadthBar.prefHeight(-1) : 0);
+
+        final double viewportBreadth = getViewportBreadth();
+        final double viewportLength = getViewportLength();
+
+        // Now position and update the scroll bars
+        if (breadthBar.isVisible()) {
+            /*
+            ** Positioning the ScrollBar
+            */
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                if (isVertical) {
+                    hbar.resizeRelocate(0, viewportLength,
+                            viewportBreadth, hbar.prefHeight(viewportBreadth));
+                } else {
+                    vbar.resizeRelocate(viewportLength, 0,
+                            vbar.prefWidth(viewportBreadth), viewportBreadth);
+                }
+            }
+            else {
+                if (isVertical) {
+                    hbar.resizeRelocate(0, (viewportLength-hbar.getHeight()),
+                            viewportBreadth, hbar.prefHeight(viewportBreadth));
+                } else {
+                    vbar.resizeRelocate((viewportLength-vbar.getWidth()), 0,
+                            vbar.prefWidth(viewportBreadth), viewportBreadth);
+                }
+            }
+
+            if (getMaxPrefBreadth() != -1) {
+                double newMax = Math.max(1, getMaxPrefBreadth() - viewportBreadth);
+                if (newMax != breadthBar.getMax()) {
+                    breadthBar.setMax(newMax);
+
+                    double breadthBarValue = breadthBar.getValue();
+                    boolean maxed = breadthBarValue != 0 && newMax == breadthBarValue;
+                    if (maxed || breadthBarValue > newMax) {
+                        breadthBar.setValue(newMax);
+                    }
+
+                    breadthBar.setVisibleAmount((viewportBreadth / getMaxPrefBreadth()) * newMax);
+                }
+            }
+        }
+
+        // determine how many cells there are on screen so that the scrollbar
+        // thumb can be appropriately sized
+        if (recreate && (lengthBar.isVisible() || Properties.IS_TOUCH_SUPPORTED)) {
+            final int cellCount = getCellCount();
+            int numCellsVisibleOnScreen = 0;
+            for (int i = 0, max = cells.size(); i < max; i++) {
+                T cell = cells.get(i);
+                if (cell != null && !cell.isEmpty()) {
+                    sumCellLength += (isVertical ? cell.getHeight() : cell.getWidth());
+                    if (sumCellLength > flowLength) {
+                        break;
+                    }
+
+                    numCellsVisibleOnScreen++;
+                }
+            }
+
+            lengthBar.setMax(1);
+            if (numCellsVisibleOnScreen == 0 && cellCount == 1) {
+                // special case to help resolve RT-17701 and the case where we have
+                // only a single row and it is bigger than the viewport
+                lengthBar.setVisibleAmount(flowLength / sumCellLength);
+            } else {
+                lengthBar.setVisibleAmount(numCellsVisibleOnScreen / (float) cellCount);
+            }
+        }
+
+        if (lengthBar.isVisible()) {
+            // Fix for RT-11873. If this isn't here, we can have a situation where
+            // the scrollbar scrolls endlessly. This is possible when the cell
+            // count grows as the user hits the maximal position on the scrollbar
+            // (i.e. the list size dynamically grows as the user needs more).
+            //
+            // This code was commented out to resolve RT-14477 after testing
+            // whether RT-11873 can be recreated. It could not, and therefore
+            // for now this code will remained uncommented until it is deleted
+            // following further testing.
+//            if (lengthBar.getValue() == 1.0 && lastCellCount != cellCount) {
+//                lengthBar.setValue(0.99);
+//            }
+
+            /*
+            ** Positioning the ScrollBar
+            */
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                if (isVertical) {
+                    vbar.resizeRelocate(viewportBreadth, 0, vbar.prefWidth(viewportLength), viewportLength);
+                } else {
+                    hbar.resizeRelocate(0, viewportBreadth, viewportLength, hbar.prefHeight(-1));
+                }
+            }
+            else {
+                if (isVertical) {
+                    vbar.resizeRelocate((viewportBreadth-vbar.getWidth()), 0, vbar.prefWidth(viewportLength), viewportLength);
+                } else {
+                    hbar.resizeRelocate(0, (viewportBreadth-hbar.getHeight()), viewportLength, hbar.prefHeight(-1));
+                }
+            }
+        }
+
+        if (corner.isVisible()) {
+            if (!Properties.IS_TOUCH_SUPPORTED) {
+                corner.resize(vbar.getWidth(), hbar.getHeight());
+                corner.relocate(hbar.getLayoutX() + hbar.getWidth(), vbar.getLayoutY() + vbar.getHeight());
+            }
+            else {
+                corner.resize(vbar.getWidth(), hbar.getHeight());
+                corner.relocate(hbar.getLayoutX() + (hbar.getWidth()-vbar.getWidth()), vbar.getLayoutY() + (vbar.getHeight()-hbar.getHeight()));
+                hbar.resize(hbar.getWidth()-vbar.getWidth(), hbar.getHeight());
+                vbar.resize(vbar.getWidth(), vbar.getHeight()-hbar.getHeight());
+            }
+        }
+
+        clipView.resize(snapSize(isVertical ? viewportBreadth : viewportLength),
+                snapSize(isVertical ? viewportLength : viewportBreadth));
+
+        // If the viewportLength becomes large enough that all cells fit
+        // within the viewport, then we want to update the value to match.
+        if (getPosition() != lengthBar.getValue()) {
+            lengthBar.setValue(getPosition());
+        }
+    }
+
+    /**
+     * Adjusts the cells location and size if necessary. The breadths of all
+     * cells will be adjusted to fit the viewportWidth or maxPrefBreadth, and
+     * the layout position will be updated if necessary based on index and
+     * offset.
+     */
+    private void fitCells() {
+        double size = Math.max(getMaxPrefBreadth(), getViewportBreadth());
+        boolean isVertical = isVertical();
+
+        // Note: Do not optimise this loop by pre-calculating the cells size and
+        // storing that into a int value - this can lead to RT-32828
+        for (int i = 0; i < cells.size(); i++) {
+            Cell<?> cell = cells.get(i);
+            if (isVertical) {
+                cell.resize(size, cell.prefHeight(size));
+            } else {
+                cell.resize(cell.prefWidth(size), size);
+            }
+        }
+    }
+
+    private void cull() {
+        final double viewportLength = getViewportLength();
+        for (int i = cells.size() - 1; i >= 0; i--) {
+            T cell = cells.get(i);
+            double cellSize = getCellLength(cell);
+            double cellStart = getCellPosition(cell);
+            double cellEnd = cellStart + cellSize;
+            if (cellStart >= viewportLength || cellEnd < 0) {
+                addToPile(cells.remove(i));
+            }
+        }
+    }
+
+    /**
+     * After using the accum cell, it needs to be released!
+     */
+    private void releaseCell(T cell) {
+        if (accumCell != null && cell == accumCell) {
+            accumCell.updateIndex(-1);
+        }
+    }
+
+    /**
+     * This method is an experts-only method - if the requested index is not
+     * already an existing visible cell, it will create a cell for the
+     * given index and insert it into the sheet. From that point on it will be
+     * unmanaged, and is up to the caller of this method to manage it.
+     */
+    T getPrivateCell(int index)  {
+        T cell = null;
+
+        // If there are cells, then we will attempt to get an existing cell
+        if (! cells.isEmpty()) {
+            // First check the cells that have already been created and are
+            // in use. If this call returns a value, then we can use it
+            cell = getVisibleCell(index);
+            if (cell != null) {
+                // Force the underlying text inside the cell to be updated
+                // so that when the screen reader runs, it will match the
+                // text in the cell (force updateDisplayedText())
+                cell.layout();
+                return cell;
+            }
+        }
+
+        // check the existing sheet children
+        if (cell == null) {
+            for (int i = 0; i < sheetChildren.size(); i++) {
+                T _cell = (T) sheetChildren.get(i);
+                if (getCellIndex(_cell) == index) {
+                    return _cell;
+                }
+            }
+        }
+
+        if (cell == null) {
+            Callback<VirtualFlow<T>, T> cellFactory = getCellFactory();
+            if (cellFactory != null) {
+                cell = cellFactory.call(this);
+            }
+        }
+
+        if (cell != null) {
+            setCellIndex(cell, index);
+            resizeCellSize(cell);
+            cell.setVisible(false);
+            sheetChildren.add(cell);
+            privateCells.add(cell);
+        }
+
+        return cell;
+    }
+
+    private final List<T> privateCells = new ArrayList<>();
+
+    private void releaseAllPrivateCells() {
+        sheetChildren.removeAll(privateCells);
+    }
+
+    /**
+     * Puts the given cell onto the pile. This is called whenever a cell has
+     * fallen off the flow's start.
+     */
+    private void addToPile(T cell) {
+        assert cell != null;
+        pile.addLast(cell);
+    }
+
+    private void cleanPile() {
+        boolean wasFocusOwner = false;
+
+        for (int i = 0, max = pile.size(); i < max; i++) {
+            T cell = pile.get(i);
+            wasFocusOwner = wasFocusOwner || doesCellContainFocus(cell);
+            cell.setVisible(false);
+        }
+
+        // Fix for RT-35876: Rather than have the cells do weird things with
+        // focus (in particular, have focus jump between cells), we return focus
+        // to the VirtualFlow itself.
+        if (wasFocusOwner) {
+            requestFocus();
+        }
+    }
+
+    private boolean doesCellContainFocus(Cell<?> c) {
+        Scene scene = c.getScene();
+        final Node focusOwner = scene == null ? null : scene.getFocusOwner();
+
+        if (focusOwner != null) {
+            if (c.equals(focusOwner)) {
+                return true;
+            }
+
+            Parent p = focusOwner.getParent();
+            while (p != null && ! (p instanceof VirtualFlow)) {
+                if (c.equals(p)) {
+                    return true;
+                }
+                p = p.getParent();
+            }
+        }
+
+        return false;
+    }
+
+    private double getPrefBreadth(double oppDimension) {
+        double max = getMaxCellWidth(10);
+
+        // This primarily exists for the case where we do not want the breadth
+        // to grow to ensure a golden ratio between width and height (for example,
+        // when a ListView is used in a ComboBox - the width should not grow
+        // just because items are being added to the ListView)
+        if (oppDimension > -1) {
+            double prefLength = getPrefLength();
+            max = Math.max(max, prefLength * GOLDEN_RATIO_MULTIPLIER);
+        }
+
+        return max;
+    }
+
+    private double getPrefLength() {
+        double sum = 0.0;
+        int rows = Math.min(10, getCellCount());
+        for (int i = 0; i < rows; i++) {
+            sum += getCellLength(i);
+        }
+        return sum;
+    }
+
+    double getMaxCellWidth(int rowsToCount) {
+        double max = 0.0;
+
+        // we always measure at least one row
+        int rows = Math.max(1, rowsToCount == -1 ? getCellCount() : rowsToCount);
+        for (int i = 0; i < rows; i++) {
+            max = Math.max(max, getCellBreadth(i));
+        }
+        return max;
+    }
+
+    // Old PositionMapper
+    /**
+     * Given a position value between 0 and 1, compute and return the viewport
+     * offset from the "current" cell associated with that position value.
+     * That is, if the return value of this function where used as a translation
+     * factor for a sheet that contained all the items, then the current
+     * item would end up positioned correctly.
+     */
+    private double computeViewportOffset(double position) {
+        double p = com.sun.javafx.util.Utils.clamp(0, position, 1);
+        double fractionalPosition = p * getCellCount();
+        int cellIndex = (int) fractionalPosition;
+        double fraction = fractionalPosition - cellIndex;
+        double cellSize = getCellLength(cellIndex);
+        double pixelOffset = cellSize * fraction;
+        double viewportOffset = getViewportLength() * p;
+        return pixelOffset - viewportOffset;
+    }
+
+    private void adjustPositionToIndex(int index) {
+        int cellCount = getCellCount();
+        if (cellCount <= 0) {
+            setPosition(0.0f);
+        } else {
+            setPosition(((double)index) / cellCount);
+        }
+    }
+
+    /**
+     * Adjust the position based on a delta of pixels. If negative, then the
+     * position will be adjusted negatively. If positive, then the position will
+     * be adjusted positively. If the pixel amount is too great for the range of
+     * the position, then it will be clamped such that position is always
+     * strictly between 0 and 1
+     */
+    private void adjustByPixelAmount(double numPixels) {
+        if (numPixels == 0) return;
+        // Starting from the current cell, we move in the direction indicated
+        // by numPixels one cell at a team. For each cell, we discover how many
+        // pixels the "position" line would move within that cell, and adjust
+        // our count of numPixels accordingly. When we come to the "final" cell,
+        // then we can take the remaining number of pixels and multiply it by
+        // the "travel rate" of "p" within that cell to get the delta. Add
+        // the delta to "p" to get position.
+
+        // get some basic info about the list and the current cell
+        boolean forward = numPixels > 0;
+        int cellCount = getCellCount();
+        double fractionalPosition = getPosition() * cellCount;
+        int cellIndex = (int) fractionalPosition;
+        if (forward && cellIndex == cellCount) return;
+        double cellSize = getCellLength(cellIndex);
+        double fraction = fractionalPosition - cellIndex;
+        double pixelOffset = cellSize * fraction;
+
+        // compute the percentage of "position" that represents each cell
+        double cellPercent = 1.0 / cellCount;
+
+        // To help simplify the algorithm, we pretend as though the current
+        // position is at the beginning of the current cell. This reduces some
+        // of the corner cases and provides a simpler algorithm without adding
+        // any overhead to performance.
+        double start = computeOffsetForCell(cellIndex);
+        double end = cellSize + computeOffsetForCell(cellIndex + 1);
+
+        // We need to discover the distance that the fictional "position line"
+        // would travel within this cell, from its current position to the end.
+        double remaining = end - start;
+
+        // Keep track of the number of pixels left to travel
+        double n = forward ?
+              numPixels + pixelOffset - (getViewportLength() * getPosition()) - start
+            : -numPixels + end - (pixelOffset - (getViewportLength() * getPosition()));
+
+        // "p" represents the most recent value for position. This is always
+        // based on the edge between two cells, except at the very end of the
+        // algorithm where it is added to the computed "p" offset for the final
+        // value of Position.
+        double p = cellPercent * cellIndex;
+
+        // Loop over the cells one at a time until either we reach the end of
+        // the cells, or we find that the "n" will fall within the cell we're on
+        while (n > remaining && ((forward && cellIndex < cellCount - 1) || (! forward && cellIndex > 0))) {
+            if (forward) cellIndex++; else cellIndex--;
+            n -= remaining;
+            cellSize = getCellLength(cellIndex);
+            start = computeOffsetForCell(cellIndex);
+            end = cellSize + computeOffsetForCell(cellIndex + 1);
+            remaining = end - start;
+            p = cellPercent * cellIndex;
+        }
+
+        // if remaining is < n, then we must have hit an end, so as a
+        // fast path, we can just set position to 1.0 or 0.0 and return
+        // because we know we hit the end
+        if (n > remaining) {
+            setPosition(forward ? 1.0f : 0.0f);
+        } else if (forward) {
+            double rate = cellPercent / Math.abs(end - start);
+            setPosition(p + (rate * n));
+        } else {
+            double rate = cellPercent / Math.abs(end - start);
+            setPosition((p + cellPercent) - (rate * n));
+        }
+    }
+
+    private int computeCurrentIndex() {
+        return (int) (getPosition() * getCellCount());
+    }
+
+    /**
+     * Given an item index, this function will compute and return the viewport
+     * offset from the beginning of the specified item. Notice that because each
+     * item has the same percentage of the position dedicated to it, and since
+     * we are measuring from the start of each item, this is a very simple
+     * calculation.
+     */
+    private double computeOffsetForCell(int itemIndex) {
+        double cellCount = getCellCount();
+        double p = com.sun.javafx.util.Utils.clamp(0, itemIndex, cellCount) / cellCount;
+        return -(getViewportLength() * p);
+    }
+
+//    /**
+//     * Adjust the position based on a chunk of pixels. The position is based
+//     * on the start of the scrollbar position.
+//     */
+//    private void adjustByPixelChunk(double numPixels) {
+//        setPosition(0);
+//        adjustByPixelAmount(numPixels);
+//    }
+    // end of old PositionMapper code
+
+
+
+
+    /***************************************************************************
+     *                                                                         *
+     * Support classes                                                         *
+     *                                                                         *
+     **************************************************************************/
+
+    /**
+     * A simple extension to Region that ensures that anything wanting to flow
+     * outside of the bounds of the Region is clipped.
+     */
+    static class ClippedContainer extends Region {
+
+        /**
+         * The Node which is embedded within this {@code ClipView}.
+         */
+        private Node node;
+        public Node getNode() { return this.node; }
+        public void setNode(Node n) {
+            this.node = n;
+
+            getChildren().clear();
+            getChildren().add(node);
+        }
+
+        public void setClipX(double clipX) {
+            setLayoutX(-clipX);
+            clipRect.setLayoutX(clipX);
+        }
+
+        public void setClipY(double clipY) {
+            setLayoutY(-clipY);
+            clipRect.setLayoutY(clipY);
+        }
+
+        private final Rectangle clipRect;
+
+        public ClippedContainer(final VirtualFlow<?> flow) {
+            if (flow == null) {
+                throw new IllegalArgumentException("VirtualFlow can not be null");
+            }
+
+            getStyleClass().add("clipped-container");
+
+            // clipping
+            clipRect = new Rectangle();
+            clipRect.setSmooth(false);
+            setClip(clipRect);
+            // --- clipping
+
+            super.widthProperty().addListener(valueModel -> {
+                clipRect.setWidth(getWidth());
+            });
+            super.heightProperty().addListener(valueModel -> {
+                clipRect.setHeight(getHeight());
+            });
+        }
+    }
+
+    /**
+     * A List-like implementation that is exceedingly efficient for the purposes
+     * of the VirtualFlow. Typically there is not much variance in the number of
+     * cells -- it is always some reasonably consistent number. Yet for efficiency
+     * in code, we like to use a linked list implementation so as to append to
+     * start or append to end. However, at times when we need to iterate, LinkedList
+     * is expensive computationally as well as requiring the construction of
+     * temporary iterators.
+     * <p>
+     * This linked list like implementation is done using an array. It begins by
+     * putting the first item in the center of the allocated array, and then grows
+     * outward (either towards the first or last of the array depending on whether
+     * we are inserting at the head or tail). It maintains an index to the start
+     * and end of the array, so that it can efficiently expose iteration.
+     * <p>
+     * This class is package private solely for the sake of testing.
+     */
+    static class ArrayLinkedList<T> extends AbstractList<T> {
+        /**
+         * The array list backing this class. We default the size of the array
+         * list to be fairly large so as not to require resizing during normal
+         * use, and since that many ArrayLinkedLists won't be created it isn't
+         * very painful to do so.
+         */
+        private final ArrayList<T> array;
+
+        private int firstIndex = -1;
+        private int lastIndex = -1;
+
+        public ArrayLinkedList() {
+            array = new ArrayList<T>(50);
+
+            for (int i = 0; i < 50; i++) {
+                array.add(null);
+            }
+        }
+
+        public T getFirst() {
+            return firstIndex == -1 ? null : array.get(firstIndex);
+        }
+
+        public T getLast() {
+            return lastIndex == -1 ? null : array.get(lastIndex);
+        }
+
+        public void addFirst(T cell) {
+            // if firstIndex == -1 then that means this is the first item in the
+            // list and we need to initialize firstIndex and lastIndex
+            if (firstIndex == -1) {
+                firstIndex = lastIndex = array.size() / 2;
+                array.set(firstIndex, cell);
+            } else if (firstIndex == 0) {
+                // we're already at the head of the array, so insert at position
+                // 0 and then increment the lastIndex to compensate
+                array.add(0, cell);
+                lastIndex++;
+            } else {
+                // we're not yet at the head of the array, so insert at the
+                // firstIndex - 1 position and decrement first position
+                array.set(--firstIndex, cell);
+            }
+        }
+
+        public void addLast(T cell) {
+            // if lastIndex == -1 then that means this is the first item in the
+            // list and we need to initialize the firstIndex and lastIndex
+            if (firstIndex == -1) {
+                firstIndex = lastIndex = array.size() / 2;
+                array.set(lastIndex, cell);
+            } else if (lastIndex == array.size() - 1) {
+                // we're at the end of the array so need to "add" so as to force
+                // the array to be expanded in size
+                array.add(++lastIndex, cell);
+            } else {
+                array.set(++lastIndex, cell);
+            }
+        }
+
+        public int size() {
+            return firstIndex == -1 ? 0 : lastIndex - firstIndex + 1;
+        }
+
+        public boolean isEmpty() {
+            return firstIndex == -1;
+        }
+
+        public T get(int index) {
+            if (index > (lastIndex - firstIndex) || index < 0) {
+                // Commented out exception due to RT-29111
+                // throw new java.lang.ArrayIndexOutOfBoundsException();
+                return null;
+            }
+
+            return array.get(firstIndex + index);
+        }
+
+        public void clear() {
+            for (int i = 0; i < array.size(); i++) {
+                array.set(i, null);
+            }
+
+            firstIndex = lastIndex = -1;
+        }
+
+        public T removeFirst() {
+            if (isEmpty()) return null;
+            return remove(0);
+        }
+
+        public T removeLast() {
+            if (isEmpty()) return null;
+            return remove(lastIndex - firstIndex);
+        }
+
+        public T remove(int index) {
+            if (index > lastIndex - firstIndex || index < 0) {
+                throw new ArrayIndexOutOfBoundsException();
+            }
+
+            // if the index == 0, then we're removing the first
+            // item and can simply set it to null in the array and increment
+            // the firstIndex unless there is only one item, in which case
+            // we have to also set first & last index to -1.
+            if (index == 0) {
+                T cell = array.get(firstIndex);
+                array.set(firstIndex, null);
+                if (firstIndex == lastIndex) {
+                    firstIndex = lastIndex = -1;
+                } else {
+                    firstIndex++;
+                }
+                return cell;
+            } else if (index == lastIndex - firstIndex) {
+                // if the index == lastIndex - firstIndex, then we're removing the
+                // last item and can simply set it to null in the array and
+                // decrement the lastIndex
+                T cell = array.get(lastIndex);
+                array.set(lastIndex--, null);
+                return cell;
+            } else {
+                // if the index is somewhere in between, then we have to remove the
+                // item and decrement the lastIndex
+                T cell = array.get(firstIndex + index);
+                array.set(firstIndex + index, null);
+                for (int i = (firstIndex + index + 1); i <= lastIndex; i++) {
+                    array.set(i - 1, array.get(i));
+                }
+                array.set(lastIndex--, null);
+                return cell;
+            }
+        }
+    }
+}
--- /dev/null	2015-09-03 15:25:18.000000000 -0700
+++ new/modules/controls/src/main/java/javafx/scene/control/skin/package.html	2015-09-03 15:25:16.474732000 -0700
@@ -0,0 +1,11 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+  <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
+  <title>javafx.scene.control</title>
+</head>
+<body>
+  <p>The javafx.scene.control.skin package is where the skin classes, typically
+    one for each UI control, are located</p>
+</body>
+</html>
--- old/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/EmailBoard.txt	2015-09-03 15:25:22.473075100 -0700
+++ /dev/null	2015-09-03 15:25:23.000000000 -0700
@@ -1,8 +0,0 @@
-#removed unsupported ymacron, yhook
-[q|1|\[ ][w|2|\] ][e|3|{|egrave|eacute|ecirc|euml ][r|4|}|reg ][t|5|<|tm ][y|6|>|ygrave|yacute|ycirc|yuml ][u|7|laquo|ugrave|uacute|ucirc|uuml ][i|8|raquo|igrave|iacute|icirc|iuml ][o|9|`|ograve|oacute|ocirc|otilde|ouml|oslash|deg ][p|0|~|para|pi ]
-
- [a|#|agrave|aacute|acirc|atilde|auml|aring ][s|\$|euro|pound|yen|scedil|scaron|szlig|sigma ][d|%|eth ][f|& ][g|*|sect ][h|(|middot ][j|)|deg ][k|_|neq ][l|" ]
-
-[$shift ][z|/|iexcl ][x|\\|iquest ][c|;|permil|ccedil|copy|cent ][v|:|reg ][b|=|tm ][n|+|ntilde ][m|-|micro ][@|' ][$backspace ]
-
-[$hide][$SymbolABC ][$space       ][,|! ][.|? ][.com|.org|.net ][$enter  ]
--- /dev/null	2015-09-03 15:25:23.000000000 -0700
+++ new/modules/controls/src/main/resources/javafx/scene/control/skin/EmailBoard.txt	2015-09-03 15:25:21.689030200 -0700
@@ -0,0 +1,8 @@
+#removed unsupported ymacron, yhook
+[q|1|\[ ][w|2|\] ][e|3|{|egrave|eacute|ecirc|euml ][r|4|}|reg ][t|5|<|tm ][y|6|>|ygrave|yacute|ycirc|yuml ][u|7|laquo|ugrave|uacute|ucirc|uuml ][i|8|raquo|igrave|iacute|icirc|iuml ][o|9|`|ograve|oacute|ocirc|otilde|ouml|oslash|deg ][p|0|~|para|pi ]
+
+ [a|#|agrave|aacute|acirc|atilde|auml|aring ][s|\$|euro|pound|yen|scedil|scaron|szlig|sigma ][d|%|eth ][f|& ][g|*|sect ][h|(|middot ][j|)|deg ][k|_|neq ][l|" ]
+
+[$shift ][z|/|iexcl ][x|\\|iquest ][c|;|permil|ccedil|copy|cent ][v|:|reg ][b|=|tm ][n|+|ntilde ][m|-|micro ][@|' ][$backspace ]
+
+[$hide][$SymbolABC ][$space       ][,|! ][.|? ][.com|.org|.net ][$enter  ]
--- old/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/NumericBoard.txt	2015-09-03 15:25:27.232347300 -0700
+++ /dev/null	2015-09-03 15:25:28.000000000 -0700
@@ -1,9 +0,0 @@
-[1 ][2 ][3 ][/ ]
-
-[4 ][5 ][6 ][- ]
-
-[7 ][8 ][9 ][$backspace ]
-
-[$hide][+][0 ][.|' ][$enter ]
-
-
--- /dev/null	2015-09-03 15:25:28.000000000 -0700
+++ new/modules/controls/src/main/resources/javafx/scene/control/skin/NumericBoard.txt	2015-09-03 15:25:26.493305000 -0700
@@ -0,0 +1,9 @@
+[1 ][2 ][3 ][/ ]
+
+[4 ][5 ][6 ][- ]
+
+[7 ][8 ][9 ][$backspace ]
+
+[$hide][+][0 ][.|' ][$enter ]
+
+
--- old/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/TextBoard.txt	2015-09-03 15:25:31.992619600 -0700
+++ /dev/null	2015-09-03 15:25:33.000000000 -0700
@@ -1,8 +0,0 @@
-#removed unsupported ymacron, yhook
-[q|1|\[ ][w|2|\] ][e|3|{|egrave|eacute|ecirc|euml ][r|4|}|reg ][t|5|<|tm ][y|6|>|ygrave|yacute|ycirc|yuml ][u|7|laquo|ugrave|uacute|ucirc|uuml ][i|8|raquo|igrave|iacute|icirc|iuml ][o|9|`|ograve|oacute|ocirc|otilde|ouml|oslash|deg ][p|0|~|para|pi ]
-
- [a|#|agrave|aacute|acirc|atilde|auml|aring ][s|\$|euro|pound|yen|scedil|scaron|szlig|sigma ][d|%|eth ][f|& ][g|*|sect ][h|(|middot ][j|)|deg ][k|_|neq ][l|@ ]
-
-[$shift ][z|/|iexcl ][x|\\|iquest ][c|;|permil|ccedil|copy|cent ][v|:|reg ][b|=|tm ][n|+|ntilde ][m|-|micro ]['|" ][$backspace ]
-
-[$hide][$SymbolABC ][$space         ][,|! ][.|? ][$enter  ]
--- /dev/null	2015-09-03 15:25:33.000000000 -0700
+++ new/modules/controls/src/main/resources/javafx/scene/control/skin/TextBoard.txt	2015-09-03 15:25:31.215575100 -0700
@@ -0,0 +1,8 @@
+#removed unsupported ymacron, yhook
+[q|1|\[ ][w|2|\] ][e|3|{|egrave|eacute|ecirc|euml ][r|4|}|reg ][t|5|<|tm ][y|6|>|ygrave|yacute|ycirc|yuml ][u|7|laquo|ugrave|uacute|ucirc|uuml ][i|8|raquo|igrave|iacute|icirc|iuml ][o|9|`|ograve|oacute|ocirc|otilde|ouml|oslash|deg ][p|0|~|para|pi ]
+
+ [a|#|agrave|aacute|acirc|atilde|auml|aring ][s|\$|euro|pound|yen|scedil|scaron|szlig|sigma ][d|%|eth ][f|& ][g|*|sect ][h|(|middot ][j|)|deg ][k|_|neq ][l|@ ]
+
+[$shift ][z|/|iexcl ][x|\\|iquest ][c|;|permil|ccedil|copy|cent ][v|:|reg ][b|=|tm ][n|+|ntilde ][m|-|micro ]['|" ][$backspace ]
+
+[$hide][$SymbolABC ][$space         ][,|! ][.|? ][$enter  ]
--- old/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/UrlBoard.txt	2015-09-03 15:25:36.731890600 -0700
+++ /dev/null	2015-09-03 15:25:37.000000000 -0700
@@ -1,9 +0,0 @@
-#removed unsupported ymacron, yhook
-[q|1|\[ ][w|2|\] ][e|3|{|egrave|eacute|ecirc|euml ][r|4|}|reg ][t|5|<|tm ][y|6|>|ygrave|yacute|ycirc|yuml ][u|7|laquo|ugrave|uacute|ucirc|uuml ][i|8|raquo|igrave|iacute|icirc|iuml ][o|9|`|ograve|oacute|ocirc|otilde|ouml|oslash|deg ][p|0|~|para|pi ]
-
- [a|#|agrave|aacute|acirc|atilde|auml|aring ][s|\$|euro|pound|yen|scedil|scaron|szlig|sigma ][d|%|eth ][f|& ][g|*|sect ][h|(|middot ][j|)|deg ][k|"|neq ][l|@ ]
-
-[$shift ][z|iexcl ][x|iquest ][c|;|permil|ccedil|copy|cent ][v|:|reg ][b|=|tm ][n|+|ntilde ][m|'|micro ][-|_ ][$backspace ]
-
-[$hide ][$SymbolABC  ][www.|http://  ][.|,  ][.com|.org|.net  ][/|\\  ][$enter  ]
-
--- /dev/null	2015-09-03 15:25:37.000000000 -0700
+++ new/modules/controls/src/main/resources/javafx/scene/control/skin/UrlBoard.txt	2015-09-03 15:25:35.920844200 -0700
@@ -0,0 +1,9 @@
+#removed unsupported ymacron, yhook
+[q|1|\[ ][w|2|\] ][e|3|{|egrave|eacute|ecirc|euml ][r|4|}|reg ][t|5|<|tm ][y|6|>|ygrave|yacute|ycirc|yuml ][u|7|laquo|ugrave|uacute|ucirc|uuml ][i|8|raquo|igrave|iacute|icirc|iuml ][o|9|`|ograve|oacute|ocirc|otilde|ouml|oslash|deg ][p|0|~|para|pi ]
+
+ [a|#|agrave|aacute|acirc|atilde|auml|aring ][s|\$|euro|pound|yen|scedil|scaron|szlig|sigma ][d|%|eth ][f|& ][g|*|sect ][h|(|middot ][j|)|deg ][k|"|neq ][l|@ ]
+
+[$shift ][z|iexcl ][x|iquest ][c|;|permil|ccedil|copy|cent ][v|:|reg ][b|=|tm ][n|+|ntilde ][m|'|micro ][-|_ ][$backspace ]
+
+[$hide ][$SymbolABC  ][www.|http://  ][.|,  ][.com|.org|.net  ][/|\\  ][$enter  ]
+
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ContextMenuContentRetriever.java	2015-09-03 15:25:41.415158500 -0700
+++ /dev/null	2015-09-03 15:25:42.000000000 -0700
@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 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 com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import javafx.collections.ObservableList;
-import javafx.scene.Node;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.CustomMenuItem;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuItem;
-import javafx.scene.input.KeyCode;
-
-import java.util.Optional;
-
-public class ContextMenuContentRetriever {
-
-    private ContextMenuContentRetriever() {
-        // no-op
-    }
-
-    public static Menu getOpenSubMenu(ContextMenu menu) {
-        ContextMenuContent content = getMenuContent(menu);
-        return content.getOpenSubMenu();
-    }
-
-    public static Menu getShowingSubMenu(ContextMenu menu) {
-        ContextMenuContent content = getMenuContent(menu);
-        Menu showingSubMenu = content.getOpenSubMenu();
-        ContextMenu subContextMenu = content.getSubMenu();
-
-        while (showingSubMenu != null) {
-            content = getMenuContent(subContextMenu);
-
-            Menu newShowingMenu = content == null ? null : content.getOpenSubMenu();
-            subContextMenu = content == null ? null : content.getSubMenu();
-
-            if (newShowingMenu == null) {
-                break;
-            }
-        }
-        return showingSubMenu;
-    }
-
-    public static ObservableList<MenuItem> getShowingMenuItems(ContextMenu menu) {
-        ContextMenuContent content = getMenuContent(menu);
-        Menu showingSubMenu = content.getOpenSubMenu();
-        ContextMenu subContextMenu = content.getSubMenu();
-
-        if (showingSubMenu == null || subContextMenu == null) {
-            return menu.getItems();
-        }
-
-        while (showingSubMenu != null) {
-            content = getMenuContent(subContextMenu);
-
-            Menu newShowingMenu = content == null ? null : content.getOpenSubMenu();
-            subContextMenu = content == null ? null : content.getSubMenu();
-
-            if (newShowingMenu == null) {
-                break;
-            }
-        }
-        return showingSubMenu.getItems();
-    }
-
-    public static Optional<ContextMenuContent> getShowingMenuContent(ContextMenu menu) {
-        ContextMenuContent content = getMenuContent(menu);
-        Menu showingSubMenu = content.getOpenSubMenu();
-        ContextMenu subContextMenu = content.getSubMenu();
-        return showingSubMenu != null &&
-               subContextMenu != null &&
-               subContextMenu.isShowing() ? getShowingMenuContent(subContextMenu) : Optional.of(content);
-    }
-
-    private static ContextMenuContent getMenuContent(ContextMenu menu) {
-        ContextMenuSkin skin = (ContextMenuSkin) menu.getSkin();
-        Node node = skin.getNode();
-        if (node instanceof ContextMenuContent) {
-            return (ContextMenuContent) node;
-        }
-        return null;
-    }
-
-    public static int getCurrentFocusedIndex(ContextMenu menu) {
-//        Optional<Integer> index = getShowingMenuContent(menu).flatMap(content -> Optional.of(content.getCurrentFocusIndex()));
-//        return index.orElse(-1);
-
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            return content.getCurrentFocusIndex();
-        }
-
-        return -1;
-    }
-
-    public static MenuItem getCurrentFocusedItem(ContextMenu menu) {
-        ObservableList<MenuItem> showingMenuItems = getShowingMenuItems(menu);
-
-//        Optional<MenuItem> item = getShowingMenuContent(menu)
-//                .flatMap(content -> Optional.of(content.getCurrentFocusIndex()))
-//                .flatMap(index   -> Optional.of(showingMenuItems.get(index)));
-//        return item.orElse(null);
-
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            int currentFocusIndex = content.getCurrentFocusIndex();
-            return showingMenuItems.get(currentFocusIndex);
-        }
-
-        return null;
-    }
-
-    public static void pressDownKey(ContextMenu menu) {
-//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doDownArrowPress());
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            new KeyEventFirer(content).doDownArrowPress();
-        }
-    }
-
-    public static void pressUpKey(ContextMenu menu) {
-//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doUpArrowPress());
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            new KeyEventFirer(content).doUpArrowPress();
-        }
-    }
-
-    public static void pressLeftKey(ContextMenu menu) {
-//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doLeftArrowPress());
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            new KeyEventFirer(content).doLeftArrowPress();
-        }
-    }
-
-    public static void pressRightKey(ContextMenu menu) {
-//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doRightArrowPress());
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            new KeyEventFirer(content).doRightArrowPress();
-        }
-    }
-
-    public static void pressEnterKey(ContextMenu menu) {
-//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doKeyPress(KeyCode.ENTER));
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent content = showingMenuContent.get();
-            new KeyEventFirer(content).doKeyPress(KeyCode.ENTER);
-        }
-    }
-
-    public static void pressMouseButton(ContextMenu menu) {
-        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
-        if (showingMenuContent.isPresent()) {
-            ContextMenuContent.MenuItemContainer itemContainer =
-                    (ContextMenuContent.MenuItemContainer) showingMenuContent.get().selectedBackground;
-
-            MenuItem item = itemContainer.getItem();
-            if (item instanceof CustomMenuItem) {
-                // If the item is a CustomMenuItem, we fire the event on the
-                // content of that CustomMenuItem.
-                // Also, note that we firea mouse _clicked_ event, as opposed to
-                // a press and release. I'm not sure why this is what the
-                // ContextMenuContent code expects, but I didn't want to mess with
-                // it at this point.
-                Node customContent = ((CustomMenuItem)item).getContent();
-                new MouseEventFirer(customContent).fireMouseClicked();
-            } else {
-                new MouseEventFirer(itemContainer).fireMousePressAndRelease();
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:25:42.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/ContextMenuContentRetriever.java	2015-09-03 15:25:40.632113700 -0700
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 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;
+
+import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.CustomMenuItem;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.skin.ContextMenuSkin;
+import javafx.scene.input.KeyCode;
+
+import java.util.Optional;
+
+public class ContextMenuContentRetriever {
+
+    private ContextMenuContentRetriever() {
+        // no-op
+    }
+
+    public static Menu getOpenSubMenu(ContextMenu menu) {
+        ContextMenuContent content = getMenuContent(menu);
+        return content.getOpenSubMenu();
+    }
+
+    public static Menu getShowingSubMenu(ContextMenu menu) {
+        ContextMenuContent content = getMenuContent(menu);
+        Menu showingSubMenu = content.getOpenSubMenu();
+        ContextMenu subContextMenu = content.getSubMenu();
+
+        while (showingSubMenu != null) {
+            content = getMenuContent(subContextMenu);
+
+            Menu newShowingMenu = content == null ? null : content.getOpenSubMenu();
+            subContextMenu = content == null ? null : content.getSubMenu();
+
+            if (newShowingMenu == null) {
+                break;
+            }
+        }
+        return showingSubMenu;
+    }
+
+    public static ObservableList<MenuItem> getShowingMenuItems(ContextMenu menu) {
+        ContextMenuContent content = getMenuContent(menu);
+        Menu showingSubMenu = content.getOpenSubMenu();
+        ContextMenu subContextMenu = content.getSubMenu();
+
+        if (showingSubMenu == null || subContextMenu == null) {
+            return menu.getItems();
+        }
+
+        while (showingSubMenu != null) {
+            content = getMenuContent(subContextMenu);
+
+            Menu newShowingMenu = content == null ? null : content.getOpenSubMenu();
+            subContextMenu = content == null ? null : content.getSubMenu();
+
+            if (newShowingMenu == null) {
+                break;
+            }
+        }
+        return showingSubMenu.getItems();
+    }
+
+    public static Optional<ContextMenuContent> getShowingMenuContent(ContextMenu menu) {
+        ContextMenuContent content = getMenuContent(menu);
+        Menu showingSubMenu = content.getOpenSubMenu();
+        ContextMenu subContextMenu = content.getSubMenu();
+        return showingSubMenu != null &&
+               subContextMenu != null &&
+               subContextMenu.isShowing() ? getShowingMenuContent(subContextMenu) : Optional.of(content);
+    }
+
+    private static ContextMenuContent getMenuContent(ContextMenu menu) {
+        ContextMenuSkin skin = (ContextMenuSkin) menu.getSkin();
+        Node node = skin.getNode();
+        if (node instanceof ContextMenuContent) {
+            return (ContextMenuContent) node;
+        }
+        return null;
+    }
+
+    public static int getCurrentFocusedIndex(ContextMenu menu) {
+//        Optional<Integer> index = getShowingMenuContent(menu).flatMap(content -> Optional.of(content.getCurrentFocusIndex()));
+//        return index.orElse(-1);
+
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            return content.getCurrentFocusIndex();
+        }
+
+        return -1;
+    }
+
+    public static MenuItem getCurrentFocusedItem(ContextMenu menu) {
+        ObservableList<MenuItem> showingMenuItems = getShowingMenuItems(menu);
+
+//        Optional<MenuItem> item = getShowingMenuContent(menu)
+//                .flatMap(content -> Optional.of(content.getCurrentFocusIndex()))
+//                .flatMap(index   -> Optional.of(showingMenuItems.get(index)));
+//        return item.orElse(null);
+
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            int currentFocusIndex = content.getCurrentFocusIndex();
+            return showingMenuItems.get(currentFocusIndex);
+        }
+
+        return null;
+    }
+
+    public static void pressDownKey(ContextMenu menu) {
+//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doDownArrowPress());
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            new KeyEventFirer(content).doDownArrowPress();
+        }
+    }
+
+    public static void pressUpKey(ContextMenu menu) {
+//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doUpArrowPress());
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            new KeyEventFirer(content).doUpArrowPress();
+        }
+    }
+
+    public static void pressLeftKey(ContextMenu menu) {
+//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doLeftArrowPress());
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            new KeyEventFirer(content).doLeftArrowPress();
+        }
+    }
+
+    public static void pressRightKey(ContextMenu menu) {
+//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doRightArrowPress());
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            new KeyEventFirer(content).doRightArrowPress();
+        }
+    }
+
+    public static void pressEnterKey(ContextMenu menu) {
+//        getShowingMenuContent(menu).ifPresent(content -> new KeyEventFirer(content).doKeyPress(KeyCode.ENTER));
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent content = showingMenuContent.get();
+            new KeyEventFirer(content).doKeyPress(KeyCode.ENTER);
+        }
+    }
+
+    public static void pressMouseButton(ContextMenu menu) {
+        Optional<ContextMenuContent> showingMenuContent = getShowingMenuContent(menu);
+        if (showingMenuContent.isPresent()) {
+            ContextMenuContent.MenuItemContainer itemContainer =
+                    (ContextMenuContent.MenuItemContainer) showingMenuContent.get().selectedBackground;
+
+            MenuItem item = itemContainer.getItem();
+            if (item instanceof CustomMenuItem) {
+                // If the item is a CustomMenuItem, we fire the event on the
+                // content of that CustomMenuItem.
+                // Also, note that we firea mouse _clicked_ event, as opposed to
+                // a press and release. I'm not sure why this is what the
+                // ContextMenuContent code expects, but I didn't want to mess with
+                // it at this point.
+                Node customContent = ((CustomMenuItem)item).getContent();
+                new MouseEventFirer(customContent).fireMouseClicked();
+            } else {
+                new MouseEventFirer(itemContainer).fireMousePressAndRelease();
+            }
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/LabeledImplTest.java	2015-09-03 15:25:49.786637300 -0700
+++ /dev/null	2015-09-03 15:25:50.000000000 -0700
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-import com.sun.javafx.pgstub.StubImageLoaderFactory;
-import com.sun.javafx.pgstub.StubPlatformImageInfo;
-import com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
-import javafx.css.StyleConverter;
-import javafx.css.CssMetaData;
-import java.util.ArrayList;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import javafx.beans.value.WritableValue;
-import javafx.css.Styleable;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.Cursor;
-import javafx.scene.Node;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.control.Labeled;
-import javafx.scene.control.OverrunStyle;
-import javafx.scene.effect.BlendMode;
-import javafx.scene.effect.ColorAdjust;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import javafx.scene.text.TextAlignment;
-import javax.swing.GroupLayout;
-
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class LabeledImplTest {
-
-    @BeforeClass
-    public static void configureImageLoaderFactory() {
-        final StubImageLoaderFactory imageLoaderFactory =
-                ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
-        imageLoaderFactory.reset();
-        imageLoaderFactory.registerImage(LabeledImpl.class.getResource("caspian/center-btn.png").toExternalForm(),
-                new StubPlatformImageInfo(32, 32));
-    }
-
-    private static final Labeled LABELED = new Label("label");
-    private static final LabeledImpl LABELED_IMPL = new LabeledImpl(LABELED);
-    
-    private static class Configuration {
-        final WritableValue source;
-        final WritableValue mirror;
-        final Object value;
-        Configuration(WritableValue source, WritableValue mirror, Object value) {
-            this.source = source;
-            this.mirror = mirror;
-            this.value = value;
-        }        
-    }
-    
-    private static Configuration config(CssMetaData styleable) {
-        WritableValue source = styleable.getStyleableProperty(LABELED);
-        WritableValue mirror   = styleable.getStyleableProperty(LABELED_IMPL);
-        Object value = null;
-        if (source != null && mirror != null) {
-            final String prop = styleable.getProperty();
-            if ("-fx-cursor".equals(prop)) {
-                value = Cursor.HAND;                
-            } else if ("-fx-effect".equals(prop)) {
-                value = new ColorAdjust(.5, .5, .5, .5);
-            } else if ("-fx-focus-traversable".equals(prop)) {
-                value = Boolean.FALSE;
-            } else if ("-fx-opacity".equals(prop)) {
-                value = .5;
-            } else if ("-fx-blend-mode".equals(prop)) {
-                value = BlendMode.RED;
-            } else if ("-fx-rotate".equals(prop)) {
-                value = .5;
-            } else if ("-fx-scale-x".equals(prop)) {
-                value = .5;
-            } else if ("-fx-scale-y".equals(prop)) {
-                value = .5;
-            } else if ("-fx-scale-z".equals(prop)) {
-                value = .5;
-            } else if ("-fx-translate-x".equals(prop)) {
-                value = .5;
-            } else if ("-fx-translate-y".equals(prop)) {
-                value = .5;
-            } else if ("-fx-translate-z".equals(prop)) {
-                value = .5;
-            } else if ("visibility".equals(prop)) {
-                value = Boolean.FALSE;
-            } else if ("-fx-font".equals(prop)) {
-                value = Font.font("Amble", 15);
-            } else if ("-fx-alignment".equals(prop)) {
-                value = Pos.TOP_CENTER;
-            } else if ("-fx-text-alignment".equals(prop)) {
-                value = TextAlignment.RIGHT;
-            } else if ("-fx-text-fill".equals(prop)) {
-                value = Color.RED;
-            } else if ("-fx-text-overrun".equals(prop)) {
-                value = OverrunStyle.LEADING_WORD_ELLIPSIS;
-            } else if ("-fx-wrap-text".equals(prop)) {
-                value = Boolean.TRUE;
-            } else if ("-fx-graphic".equals(prop)) {
-                value = LabeledImpl.class.getResource("caspian/center-btn.png").toExternalForm();
-            } else if ("-fx-underline".equals(prop)) {
-                value = Boolean.TRUE;
-            } else if ("-fx-content-display".equals(prop)) {
-                value = ContentDisplay.GRAPHIC_ONLY;
-            } else if ("-fx-label-padding".equals(prop)) {
-                value = new Insets(1,2,3,4);
-            } else if ("-fx-graphic-text-gap".equals(prop)) {
-                value = .5;
-            } else if ("-fx-ellipsis-string".equals(prop)) {
-                value = "...";
-            } else if ("-fx-line-spacing".equals(prop)) {
-                value = 0.0;
-            } else {
-                fail(prop + " not accounted for");
-                return null;
-            }          
-            
-            return new Configuration(source, mirror, value);
-        }
-
-        fail();
-        return null;
-    }
-    
-    private final Configuration configuration;
-
-    @Parameters
-    public static Collection<Configuration[]> data() {
-
-        Collection<Configuration[]> data = new ArrayList<Configuration[]>();
-        
-        List<CssMetaData<? extends Styleable, ?>> styleables = LabeledImpl.StyleableProperties.STYLEABLES_TO_MIRROR;
-        for(CssMetaData<? extends Styleable, ?> styleable : styleables) {
-            
-            // LabeledImpl doesn't track -fx-skin since the Labeled
-            // isn't necessarily a Label
-            if ("-fx-skin".equals(styleable.getProperty())) continue;
-            
-            Configuration[] config = new Configuration[] { config(styleable) };
-            if (config != null) data.add(config);
-        }
-        
-        data.add( new Configuration[] { 
-            new Configuration(LABELED.textProperty(), LABELED_IMPL.textProperty(), "TEST 1 2 3")
-        });
-        
-        return data;
-    }
-    
-    @Test 
-    public void testMirrorReflectsSource() {
-        final WritableValue source = configuration.source;
-        final WritableValue mirror = configuration.mirror;
-        final Object expected = configuration.value;
-        
-        source.setValue(expected);
-        assertEquals(mirror.toString(), expected, mirror.getValue());
-    }
-
-    public LabeledImplTest(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    static {
-    }
-}
--- /dev/null	2015-09-03 15:25:50.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/LabeledImplTest.java	2015-09-03 15:25:48.998592200 -0700
@@ -0,0 +1,201 @@
+/*
+ * Copyright (c) 2012, 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.scene.control;
+
+import com.sun.javafx.pgstub.StubImageLoaderFactory;
+import com.sun.javafx.pgstub.StubPlatformImageInfo;
+import com.sun.javafx.pgstub.StubToolkit;
+import com.sun.javafx.scene.control.LabeledImpl;
+import com.sun.javafx.scene.control.skin.FXVK;
+import com.sun.javafx.tk.Toolkit;
+import javafx.css.CssMetaData;
+import java.util.ArrayList;
+
+import java.util.Collection;
+import java.util.List;
+import javafx.beans.value.WritableValue;
+import javafx.css.Styleable;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Cursor;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Label;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.OverrunStyle;
+import javafx.scene.effect.BlendMode;
+import javafx.scene.effect.ColorAdjust;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.TextAlignment;
+
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+@RunWith(Parameterized.class)
+public class LabeledImplTest {
+
+    @BeforeClass
+    public static void configureImageLoaderFactory() {
+        final StubImageLoaderFactory imageLoaderFactory =
+                ((StubToolkit) Toolkit.getToolkit()).getImageLoaderFactory();
+        imageLoaderFactory.reset();
+        imageLoaderFactory.registerImage(FXVK.class.getResource("caspian/center-btn.png").toExternalForm(),
+                new StubPlatformImageInfo(32, 32));
+    }
+
+    private static final Labeled LABELED = new Label("label");
+    private static final LabeledImpl LABELED_IMPL = new LabeledImpl(LABELED);
+    
+    private static class Configuration {
+        final WritableValue source;
+        final WritableValue mirror;
+        final Object value;
+        Configuration(WritableValue source, WritableValue mirror, Object value) {
+            this.source = source;
+            this.mirror = mirror;
+            this.value = value;
+        }        
+    }
+    
+    private static Configuration config(CssMetaData styleable) {
+        WritableValue source = styleable.getStyleableProperty(LABELED);
+        WritableValue mirror   = styleable.getStyleableProperty(LABELED_IMPL);
+        Object value = null;
+        if (source != null && mirror != null) {
+            final String prop = styleable.getProperty();
+            if ("-fx-cursor".equals(prop)) {
+                value = Cursor.HAND;                
+            } else if ("-fx-effect".equals(prop)) {
+                value = new ColorAdjust(.5, .5, .5, .5);
+            } else if ("-fx-focus-traversable".equals(prop)) {
+                value = Boolean.FALSE;
+            } else if ("-fx-opacity".equals(prop)) {
+                value = .5;
+            } else if ("-fx-blend-mode".equals(prop)) {
+                value = BlendMode.RED;
+            } else if ("-fx-rotate".equals(prop)) {
+                value = .5;
+            } else if ("-fx-scale-x".equals(prop)) {
+                value = .5;
+            } else if ("-fx-scale-y".equals(prop)) {
+                value = .5;
+            } else if ("-fx-scale-z".equals(prop)) {
+                value = .5;
+            } else if ("-fx-translate-x".equals(prop)) {
+                value = .5;
+            } else if ("-fx-translate-y".equals(prop)) {
+                value = .5;
+            } else if ("-fx-translate-z".equals(prop)) {
+                value = .5;
+            } else if ("visibility".equals(prop)) {
+                value = Boolean.FALSE;
+            } else if ("-fx-font".equals(prop)) {
+                value = Font.font("Amble", 15);
+            } else if ("-fx-alignment".equals(prop)) {
+                value = Pos.TOP_CENTER;
+            } else if ("-fx-text-alignment".equals(prop)) {
+                value = TextAlignment.RIGHT;
+            } else if ("-fx-text-fill".equals(prop)) {
+                value = Color.RED;
+            } else if ("-fx-text-overrun".equals(prop)) {
+                value = OverrunStyle.LEADING_WORD_ELLIPSIS;
+            } else if ("-fx-wrap-text".equals(prop)) {
+                value = Boolean.TRUE;
+            } else if ("-fx-graphic".equals(prop)) {
+                // FXVK is used here as it is located within com.sun.javafx.scene.control.skin,
+                // which is useful when trying to load caspian / modena resources.
+                value = FXVK.class.getResource("caspian/center-btn.png").toExternalForm();
+            } else if ("-fx-underline".equals(prop)) {
+                value = Boolean.TRUE;
+            } else if ("-fx-content-display".equals(prop)) {
+                value = ContentDisplay.GRAPHIC_ONLY;
+            } else if ("-fx-label-padding".equals(prop)) {
+                value = new Insets(1,2,3,4);
+            } else if ("-fx-graphic-text-gap".equals(prop)) {
+                value = .5;
+            } else if ("-fx-ellipsis-string".equals(prop)) {
+                value = "...";
+            } else if ("-fx-line-spacing".equals(prop)) {
+                value = 0.0;
+            } else {
+                fail(prop + " not accounted for");
+                return null;
+            }          
+            
+            return new Configuration(source, mirror, value);
+        }
+
+        fail();
+        return null;
+    }
+    
+    private final Configuration configuration;
+
+    @Parameters
+    public static Collection<Configuration[]> data() {
+
+        Collection<Configuration[]> data = new ArrayList<Configuration[]>();
+        
+        List<CssMetaData<? extends Styleable, ?>> styleables = LabeledImpl.StyleableProperties.STYLEABLES_TO_MIRROR;
+        for(CssMetaData<? extends Styleable, ?> styleable : styleables) {
+            
+            // LabeledImpl doesn't track -fx-skin since the Labeled
+            // isn't necessarily a Label
+            if ("-fx-skin".equals(styleable.getProperty())) continue;
+            
+            Configuration[] config = new Configuration[] { config(styleable) };
+            if (config != null) data.add(config);
+        }
+        
+        data.add( new Configuration[] { 
+            new Configuration(LABELED.textProperty(), LABELED_IMPL.textProperty(), "TEST 1 2 3")
+        });
+        
+        return data;
+    }
+    
+    @Test 
+    public void testMirrorReflectsSource() {
+        final WritableValue source = configuration.source;
+        final WritableValue mirror = configuration.mirror;
+        final Object expected = configuration.value;
+        
+        source.setValue(expected);
+        assertEquals(mirror.toString(), expected, mirror.getValue());
+    }
+
+    public LabeledImplTest(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
+    static {
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/LabeledImplTestOther.java	2015-09-03 15:25:57.203061500 -0700
+++ /dev/null	2015-09-03 15:25:58.000000000 -0700
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control.skin;
-
-import javafx.css.StyleConverter;
-import javafx.css.CssMetaData;
-import java.net.URL;
-import java.util.ArrayList;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import javafx.beans.value.WritableValue;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.Cursor;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.effect.BlendMode;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import javafx.scene.text.TextAlignment;
-import javafx.stage.Stage;
-import javax.swing.GroupLayout;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class LabeledImplTestOther {
-    
-    
-    @Test public void test_RT_21357() {
-        
-        final Labeled labeled = new Label("label");
-        final LabeledImpl labeledImpl = new LabeledImpl(labeled);
-        
-        URL url = LabeledSkinBase.class.getResource("caspian/center-btn.png");
-        Image img = new Image(url.toExternalForm());
-        assertNotNull(img);
-        
-        ImageView iView = new ImageView(img);
-        labeled.setGraphic(iView);  
-        
-        assertEquals(labeled.getGraphic(), labeledImpl.getGraphic());
-        assertNotNull(labeled.getGraphic());
-    }
-
-    @Test public void test_RT_21617() {
-        
-        MenuButton mb = new MenuButton();
-        mb.setText("SomeText"); 
-        MenuButtonSkin mbs = new MenuButtonSkin(mb);
-        mb.setSkin(mbs);
-         
-        mb.setTranslateX(100);mb.setTranslateY(100); 
-        
-        Scene scene = new Scene(mb, 300, 300); 
-        scene.getStylesheets().add(LabeledImplTestOther.class.getResource("LabeledImplTest.css").toExternalForm());
-        Stage stage = new Stage();
-        stage.setScene(scene); 
-        stage.show(); 
-        
-        
-        LabeledImpl labeledImpl = (LabeledImpl)mb.lookup(".label");
-        assertNotNull(labeledImpl);
-        // LabeledImpl should not mirror the translateX/Y of the MenuButton
-        assertEquals(100, mb.getTranslateX(), 0.00001);
-        assertEquals(0, labeledImpl.getTranslateX(), 0.00001);
-        assertEquals(100, mb.getTranslateY(), 0.00001);
-        assertEquals(0, labeledImpl.getTranslateY(), 0.00001);
-        // opacity set to 50% in LabeledImplTest.css
-        assertEquals(1, mb.getOpacity(), 0.00001);
-        assertEquals(.5, labeledImpl.getOpacity(), 0.00001);
-    }
-    
-}
--- /dev/null	2015-09-03 15:25:58.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/LabeledImplTestOther.java	2015-09-03 15:25:56.473019800 -0700
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2012, 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.scene.control;
+
+import com.sun.javafx.scene.control.LabeledImpl;
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.control.Labeled;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.skin.MenuButtonSkin;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.stage.Stage;
+import org.junit.Test;
+
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class LabeledImplTestOther {
+    
+    
+    @Test public void test_RT_21357() {
+        
+        final Labeled labeled = new Label("label");
+        final LabeledImpl labeledImpl = new LabeledImpl(labeled);
+        
+        URL url = Utils.class.getResource("caspian/center-btn.png");
+        Image img = new Image(url.toExternalForm());
+        assertNotNull(img);
+        
+        ImageView iView = new ImageView(img);
+        labeled.setGraphic(iView);  
+        
+        assertEquals(labeled.getGraphic(), labeledImpl.getGraphic());
+        assertNotNull(labeled.getGraphic());
+    }
+
+    @Test public void test_RT_21617() {
+        
+        MenuButton mb = new MenuButton();
+        mb.setText("SomeText"); 
+        MenuButtonSkin mbs = new MenuButtonSkin(mb);
+        mb.setSkin(mbs);
+         
+        mb.setTranslateX(100);mb.setTranslateY(100); 
+        
+        Scene scene = new Scene(mb, 300, 300); 
+        scene.getStylesheets().add(LabeledImplTestOther.class.getResource("LabeledImplTest.css").toExternalForm());
+        Stage stage = new Stage();
+        stage.setScene(scene); 
+        stage.show(); 
+        
+        
+        LabeledImpl labeledImpl = (LabeledImpl)mb.lookup(".label");
+        assertNotNull(labeledImpl);
+        // LabeledImpl should not mirror the translateX/Y of the MenuButton
+        assertEquals(100, mb.getTranslateX(), 0.00001);
+        assertEquals(0, labeledImpl.getTranslateX(), 0.00001);
+        assertEquals(100, mb.getTranslateY(), 0.00001);
+        assertEquals(0, labeledImpl.getTranslateY(), 0.00001);
+        // opacity set to 50% in LabeledImplTest.css
+        assertEquals(1, mb.getOpacity(), 0.00001);
+        assertEquals(.5, labeledImpl.getOpacity(), 0.00001);
+    }
+    
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/LabeledTextTest.java	2015-09-03 15:26:05.208519400 -0700
+++ /dev/null	2015-09-03 15:26:06.000000000 -0700
@@ -1,416 +0,0 @@
-/*
- * Copyright (c) 2012, 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.css.CssMetaData;
-import com.sun.javafx.css.Stylesheet;
-import javafx.scene.Cursor;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.control.Label;
-import javafx.scene.effect.BlendMode;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import javafx.scene.text.TextAlignment;
-import javafx.stage.Stage;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author dgrieve
- */
-public class LabeledTextTest {
-    
-    Label label;
-    LabeledText labeledText;
-    Stage stage;
-    Scene scene;
-    Stylesheet stylesheet;
-    
-    public LabeledTextTest() {
-    }
-    
-    @Before public void setup() {
-        label = 
-            new Label("\"A computer once beat me at chess, "
-                + "but it was no match for me at kick boxing.\" Emo Philips");
-        stage = new Stage();
-        stage.setScene(scene = new Scene(label));
-        scene.getStylesheets().add(LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm());
-        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
-    }
-
-    @Test
-    public void testLabeledTextAlignmentStyleAffectsLabeledText() {
-        
-        label.setStyle("-fx-text-alignment: right;");
-        label.impl_processCSS(true);
-        assertEquals(TextAlignment.RIGHT, label.getTextAlignment());
-        assertEquals(TextAlignment.RIGHT, labeledText.getTextAlignment());
-    
-    }
-    
-    @Test
-    public void testLabeledTextAlignmentIsBound() {
-        try {
-            labeledText.setTextAlignment(TextAlignment.RIGHT);
-            fail();
-        } catch (RuntimeException re) {
-        }
-    }
-    
-
-    @Test
-    public void testLabeledFontStyleAffectsLabeledText() {
-        
-        label.setStyle("-fx-font: 10px Amble;");
-        label.impl_processCSS(true);
-        Font expected = Font.font("Amble", 10);
-        assertEquals(expected, label.getFont());
-        assertEquals(expected, labeledText.getFont());
-    
-    }
-    
-    @Test
-    public void testLabeledTextFontIsBound() {
-        try {
-            labeledText.setFont(Font.getDefault());
-            fail();
-        } catch (RuntimeException re) {
-        }
-    }
-    
-    
-    @Test
-    public void testLabeledTextFillStyleAffectsLabeledText() {
-        
-        label.setStyle("-fx-text-fill: rgb(255,0,0);");
-        label.impl_processCSS(true);
-        Color expected = Color.rgb(255, 0, 0);
-        assertEquals(expected, label.getTextFill());
-        assertEquals(expected, labeledText.getFill());
-    
-    }
-    
-    @Test
-    public void testLabeledTextFillIsBound() {
-        try {
-            labeledText.setFill(Color.RED);
-            fail();
-        } catch (RuntimeException re) {
-        }
-    }
-
-    
-    @Test
-    public void testLabeledUnderlineStyleAffectsLabeledText() {
-        
-        label.setStyle("-fx-underline: true;");
-        label.impl_processCSS(true);
-        assert(label.isUnderline() == true);
-        assert(labeledText.isUnderline() == true);
-    
-    }
-
-    @Test
-    public void testLabeledBlendModeStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-blend-mode: color-burn;");
-        label.impl_processCSS(true);
-        assertEquals(BlendMode.COLOR_BURN,label.getBlendMode());
-        assertFalse(BlendMode.COLOR_BURN.equals(labeledText.getBlendMode())); 
-    }
-    
-    @Test
-    public void testLabeledCursorStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-cursor: crosshair;");
-        label.impl_processCSS(true);
-        assertEquals(Cursor.CROSSHAIR,label.getCursor());
-        assertFalse(Cursor.CROSSHAIR.equals(labeledText.getCursor()));
-    }
-    
-    @Test
-    public void testLabeledEffectStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-effect: dropshadow(one-pass-box, red, 64, .5, 2, 3);");
-        label.impl_processCSS(true);
-        assertNotNull(label.getEffect());
-        assertNull(labeledText.getEffect()); 
-    }
-    
-    @Test
-    public void testLabeledFocusTraversableStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-focus-traversable: true;");
-        label.impl_processCSS(true);
-        assert(label.focusTraversableProperty().get() == true);   
-        assert(labeledText.focusTraversableProperty().get() == false);   
-    }
-    
-    @Test
-    public void testLabeledOpacityStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-opacity: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getOpacity(), .5, .0000001);   
-        assertEquals(labeledText.getOpacity(), 1, .0000001);   
-    }
-
-    @Test
-    public void testLabeledRotateStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-rotate: 180;");
-        label.impl_processCSS(true);
-        assertEquals(label.getRotate(), 180, .0000001);
-        assertEquals(labeledText.getRotate(), 0, .0000001);   
-    }
-    
-    @Test
-    public void testLabeledScaleXStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-scale-x: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getScaleX(), .5, .0000001);
-        assertEquals(labeledText.getScaleX(), 1, .0000001);   
-    }
-    
-    @Test
-    public void testLabeledScaleYStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-scale-y: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getScaleY(), .5, .0000001);
-        assertEquals(labeledText.getScaleY(), 1, .0000001);   
-    }
-
-    @Test
-    public void testLabeledScaleZStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-scale-z: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getScaleZ(), .5, .0000001);
-        assertEquals(labeledText.getScaleZ(), 1, .0000001);   
-    }
-    
-    @Test
-    public void testLabeledTranslateXStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-translate-x: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getTranslateX(), .5, .0000001);
-        assertEquals(labeledText.getTranslateX(), 0, .0000001);   
-    }
-    
-    @Test
-    public void testLabeledTranslateYStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-translate-y: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getTranslateY(), .5, .0000001);
-        assertEquals(labeledText.getTranslateY(), 0, .0000001);   
-    }
-    
-    @Test
-    public void testLabeledTranslateZStyleDoesNotAffectLabeledText() {
-        label.setStyle("-fx-translate-z: .5;");
-        label.impl_processCSS(true);
-        assertEquals(label.getTranslateZ(), .5, .0000001);
-        assertEquals(labeledText.getTranslateZ(), 0, .0000001);   
-    }
-    
-    @Test
-    public void testLabeledVisibilityStyleDoesNotAffectLabeledText() {
-        label.setStyle("visibility: false;");
-        label.impl_processCSS(true);
-        assert(label.visibleProperty().get() == false);   
-        assert(labeledText.visibleProperty().get() == true);   
-    }
-    
-    private static CssMetaData getCssMetaData(String prop) {
-        for (CssMetaData styleable : LabeledText.getClassCssMetaData()) {
-            if (styleable.getProperty().equals(prop)) return styleable;
-        }
-        return null;
-    }
-    
-    @Test
-    public void testLabeledTextFillIsSettableByCss() {
-        
-        CssMetaData sp = getCssMetaData("-fx-fill");
-        assertTrue(sp.isSettable(labeledText));
-    }
-    
-    @Test
-    public void testCanStyleFillOnLabeledText() {
-        assertEquals(Color.GREEN, labeledText.getFill());    
-    }
-
-    
-    @Test
-    public void testLabeledTextTextAlignmentIsSettableByCss() {
-        
-        CssMetaData sp = getCssMetaData("-fx-text-alignment");
-        assertTrue(sp.isSettable(labeledText));
-    }
-    
-    @Test
-    public void testCanStyleTextAlignmentOnLabeledText() {
-        assertEquals(TextAlignment.RIGHT, labeledText.getTextAlignment());
-    }
-    
-    
-    @Test
-    public void testLabeledTextFontIsSettableByCss() {
-        
-        CssMetaData sp = getCssMetaData("-fx-font");
-        assertTrue(sp.isSettable(labeledText));
-    }
-    
-    @Test
-    public void testCanStyleFontOnLabeledText() {
-        assertEquals(Font.font("Amble", 10), labeledText.getFont());
-    }
-    
-    
-    @Test
-    public void testLabeledTextUnderlineIsSettableByCss() {
-        
-        CssMetaData sp = getCssMetaData("-fx-underline");
-        assertTrue(sp.isSettable(labeledText));
-    }
-    
-    @Test
-    public void testCanStyleUnderlineOnLabeledText() {
-        assertTrue(labeledText.isUnderline());
-    }
-    
-    @Test
-    public void testLabeledSetTextFillNotOverridenByUAStyleOnLabeledText() {
-        label = 
-            new Label("\"A computer once beat me at chess, "
-                + "but it was no match for me at kick boxing.\" Emo Philips") {
-                    @Override public String getUserAgentStylesheet() {
-                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
-                    }
-                };
-        label.setTextFill(Color.YELLOW);
-        stage.setScene(scene = new Scene(label));
-        stage.show();
-//        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
-        assertEquals(Color.YELLOW, labeledText.getFill());
-    }
-    
-    @Test
-    public void testLabeledSetFontNotOverridenByUAStyleOnLabeledText() {
-        label = 
-            new Label("\"A computer once beat me at chess, "
-                + "but it was no match for me at kick boxing.\" Emo Philips") {
-                    @Override public String getUserAgentStylesheet() {
-                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
-                    }
-                };
-        Font font = Font.font("Amble", 30);
-        label.setFont(font);
-        stage.setScene(scene = new Scene(label));
-        stage.show();
-//        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
-        assertEquals(font, labeledText.getFont());
-    }
-    
-    @Test
-    public void testLabeledSetTextAlignmentNotOverridenByUAStyleOnLabeledText() {
-        label = 
-            new Label("\"A computer once beat me at chess, "
-                + "but it was no match for me at kick boxing.\" Emo Philips") {
-                    @Override public String getUserAgentStylesheet() {
-                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
-                    }
-                };
-        label.setTextAlignment(TextAlignment.JUSTIFY);
-        stage.setScene(scene = new Scene(label));
-        stage.show();
-//        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
-        assertEquals(TextAlignment.JUSTIFY, labeledText.getTextAlignment());
-    }
-    
-    @Test
-    public void testLabeledSetUnderlineNotOverridenByUAStyleOnLabeledText() {
-        label = 
-            new Label("\"A computer once beat me at chess, "
-                + "but it was no match for me at kick boxing.\" Emo Philips") {
-                    @Override public String getUserAgentStylesheet() {
-                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
-                    }
-                };
-        label.setUnderline(true);
-        stage.setScene(scene = new Scene(label));
-        stage.show();
-//        label.impl_processCSS(true);
-        labeledText = ((com.sun.javafx.scene.control.skin.LabeledSkinBase)label.getSkin()).text; 
-        assertTrue(labeledText.isUnderline());
-    }
-
-
-    @Test public void test_RT_37787() {
-
-        label = new Label("test_RT_37787");
-        label.getStyleClass().clear();
-        label.setId("test-rt-37787");
-
-        scene = new Scene(new Group(label));
-        String url = getClass().getResource("LabeledTextTest.css").toExternalForm();
-        scene.getStylesheets().add(url);
-
-        label.setFont(Font.font(10));
-        assertEquals(10, label.getFont().getSize(), .1);
-
-        stage.setScene(scene);
-        stage.show();
-
-        // If the actual size is 10 * 1.5 * 1.5 = 22.5, then we've encountered RT-37787!
-        double expected = Font.getDefault().getSize() * 1.5;
-        double actual = label.getFont().getSize();
-        assertEquals(expected, actual, .1);
-
-    }
-
-    @Test public void test_RT_37787_with_inline_style() {
-
-        label = new Label("test_RT_37787_with_inline_style");
-        label.setStyle("-fx-font-size: 1.231em;");
-        label.getStyleClass().clear();
-
-        VBox root = new VBox();
-        root.setStyle("-fx-font-size: 1.5em");
-        root.getChildren().add(label);
-
-        scene = new Scene(root);
-        stage.setScene(scene);
-        stage.show();
-
-        double expected = Font.getDefault().getSize() * 1.5 * 1.231;
-        double actual = label.getFont().getSize();
-        assertEquals(expected, actual, .1);
-
-    }
-
-}
--- /dev/null	2015-09-03 15:26:06.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/LabeledTextTest.java	2015-09-03 15:26:04.390472600 -0700
@@ -0,0 +1,419 @@
+/*
+ * Copyright (c) 2012, 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;
+
+import com.sun.javafx.scene.control.LabeledText;
+import javafx.css.CssMetaData;
+import javafx.css.Stylesheet;
+import javafx.scene.Cursor;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.control.Label;
+import javafx.scene.control.skin.LabelSkinBaseRetriever;
+import javafx.scene.control.skin.LabeledSkinBase;
+import javafx.scene.effect.BlendMode;
+import javafx.scene.layout.VBox;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.TextAlignment;
+import javafx.stage.Stage;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author dgrieve
+ */
+public class LabeledTextTest {
+    
+    Label label;
+    LabeledText labeledText;
+    Stage stage;
+    Scene scene;
+    Stylesheet stylesheet;
+    
+    public LabeledTextTest() {
+    }
+    
+    @Before public void setup() {
+        label = 
+            new Label("\"A computer once beat me at chess, "
+                + "but it was no match for me at kick boxing.\" Emo Philips");
+        stage = new Stage();
+        stage.setScene(scene = new Scene(label));
+        scene.getStylesheets().add(LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm());
+        label.impl_processCSS(true);
+        labeledText = LabelSkinBaseRetriever.getText(label);
+    }
+
+    @Test
+    public void testLabeledTextAlignmentStyleAffectsLabeledText() {
+        
+        label.setStyle("-fx-text-alignment: right;");
+        label.impl_processCSS(true);
+        assertEquals(TextAlignment.RIGHT, label.getTextAlignment());
+        assertEquals(TextAlignment.RIGHT, labeledText.getTextAlignment());
+    
+    }
+    
+    @Test
+    public void testLabeledTextAlignmentIsBound() {
+        try {
+            labeledText.setTextAlignment(TextAlignment.RIGHT);
+            fail();
+        } catch (RuntimeException re) {
+        }
+    }
+    
+
+    @Test
+    public void testLabeledFontStyleAffectsLabeledText() {
+        
+        label.setStyle("-fx-font: 10px Amble;");
+        label.impl_processCSS(true);
+        Font expected = Font.font("Amble", 10);
+        assertEquals(expected, label.getFont());
+        assertEquals(expected, labeledText.getFont());
+    
+    }
+    
+    @Test
+    public void testLabeledTextFontIsBound() {
+        try {
+            labeledText.setFont(Font.getDefault());
+            fail();
+        } catch (RuntimeException re) {
+        }
+    }
+    
+    
+    @Test
+    public void testLabeledTextFillStyleAffectsLabeledText() {
+        
+        label.setStyle("-fx-text-fill: rgb(255,0,0);");
+        label.impl_processCSS(true);
+        Color expected = Color.rgb(255, 0, 0);
+        assertEquals(expected, label.getTextFill());
+        assertEquals(expected, labeledText.getFill());
+    
+    }
+    
+    @Test
+    public void testLabeledTextFillIsBound() {
+        try {
+            labeledText.setFill(Color.RED);
+            fail();
+        } catch (RuntimeException re) {
+        }
+    }
+
+    
+    @Test
+    public void testLabeledUnderlineStyleAffectsLabeledText() {
+        
+        label.setStyle("-fx-underline: true;");
+        label.impl_processCSS(true);
+        assert(label.isUnderline() == true);
+        assert(labeledText.isUnderline() == true);
+    
+    }
+
+    @Test
+    public void testLabeledBlendModeStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-blend-mode: color-burn;");
+        label.impl_processCSS(true);
+        assertEquals(BlendMode.COLOR_BURN,label.getBlendMode());
+        assertFalse(BlendMode.COLOR_BURN.equals(labeledText.getBlendMode())); 
+    }
+    
+    @Test
+    public void testLabeledCursorStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-cursor: crosshair;");
+        label.impl_processCSS(true);
+        assertEquals(Cursor.CROSSHAIR,label.getCursor());
+        assertFalse(Cursor.CROSSHAIR.equals(labeledText.getCursor()));
+    }
+    
+    @Test
+    public void testLabeledEffectStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-effect: dropshadow(one-pass-box, red, 64, .5, 2, 3);");
+        label.impl_processCSS(true);
+        assertNotNull(label.getEffect());
+        assertNull(labeledText.getEffect()); 
+    }
+    
+    @Test
+    public void testLabeledFocusTraversableStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-focus-traversable: true;");
+        label.impl_processCSS(true);
+        assert(label.focusTraversableProperty().get() == true);   
+        assert(labeledText.focusTraversableProperty().get() == false);   
+    }
+    
+    @Test
+    public void testLabeledOpacityStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-opacity: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getOpacity(), .5, .0000001);   
+        assertEquals(labeledText.getOpacity(), 1, .0000001);   
+    }
+
+    @Test
+    public void testLabeledRotateStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-rotate: 180;");
+        label.impl_processCSS(true);
+        assertEquals(label.getRotate(), 180, .0000001);
+        assertEquals(labeledText.getRotate(), 0, .0000001);   
+    }
+    
+    @Test
+    public void testLabeledScaleXStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-scale-x: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getScaleX(), .5, .0000001);
+        assertEquals(labeledText.getScaleX(), 1, .0000001);   
+    }
+    
+    @Test
+    public void testLabeledScaleYStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-scale-y: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getScaleY(), .5, .0000001);
+        assertEquals(labeledText.getScaleY(), 1, .0000001);   
+    }
+
+    @Test
+    public void testLabeledScaleZStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-scale-z: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getScaleZ(), .5, .0000001);
+        assertEquals(labeledText.getScaleZ(), 1, .0000001);   
+    }
+    
+    @Test
+    public void testLabeledTranslateXStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-translate-x: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getTranslateX(), .5, .0000001);
+        assertEquals(labeledText.getTranslateX(), 0, .0000001);   
+    }
+    
+    @Test
+    public void testLabeledTranslateYStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-translate-y: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getTranslateY(), .5, .0000001);
+        assertEquals(labeledText.getTranslateY(), 0, .0000001);   
+    }
+    
+    @Test
+    public void testLabeledTranslateZStyleDoesNotAffectLabeledText() {
+        label.setStyle("-fx-translate-z: .5;");
+        label.impl_processCSS(true);
+        assertEquals(label.getTranslateZ(), .5, .0000001);
+        assertEquals(labeledText.getTranslateZ(), 0, .0000001);   
+    }
+    
+    @Test
+    public void testLabeledVisibilityStyleDoesNotAffectLabeledText() {
+        label.setStyle("visibility: false;");
+        label.impl_processCSS(true);
+        assert(label.visibleProperty().get() == false);   
+        assert(labeledText.visibleProperty().get() == true);   
+    }
+    
+    private static CssMetaData getCssMetaData(String prop) {
+        for (CssMetaData styleable : LabeledText.getClassCssMetaData()) {
+            if (styleable.getProperty().equals(prop)) return styleable;
+        }
+        return null;
+    }
+    
+    @Test
+    public void testLabeledTextFillIsSettableByCss() {
+        
+        CssMetaData sp = getCssMetaData("-fx-fill");
+        assertTrue(sp.isSettable(labeledText));
+    }
+    
+    @Test
+    public void testCanStyleFillOnLabeledText() {
+        assertEquals(Color.GREEN, labeledText.getFill());    
+    }
+
+    
+    @Test
+    public void testLabeledTextTextAlignmentIsSettableByCss() {
+        
+        CssMetaData sp = getCssMetaData("-fx-text-alignment");
+        assertTrue(sp.isSettable(labeledText));
+    }
+    
+    @Test
+    public void testCanStyleTextAlignmentOnLabeledText() {
+        assertEquals(TextAlignment.RIGHT, labeledText.getTextAlignment());
+    }
+    
+    
+    @Test
+    public void testLabeledTextFontIsSettableByCss() {
+        
+        CssMetaData sp = getCssMetaData("-fx-font");
+        assertTrue(sp.isSettable(labeledText));
+    }
+    
+    @Test
+    public void testCanStyleFontOnLabeledText() {
+        assertEquals(Font.font("Amble", 10), labeledText.getFont());
+    }
+    
+    
+    @Test
+    public void testLabeledTextUnderlineIsSettableByCss() {
+        
+        CssMetaData sp = getCssMetaData("-fx-underline");
+        assertTrue(sp.isSettable(labeledText));
+    }
+    
+    @Test
+    public void testCanStyleUnderlineOnLabeledText() {
+        assertTrue(labeledText.isUnderline());
+    }
+    
+    @Test
+    public void testLabeledSetTextFillNotOverridenByUAStyleOnLabeledText() {
+        label = 
+            new Label("\"A computer once beat me at chess, "
+                + "but it was no match for me at kick boxing.\" Emo Philips") {
+                    @Override public String getUserAgentStylesheet() {
+                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
+                    }
+                };
+        label.setTextFill(Color.YELLOW);
+        stage.setScene(scene = new Scene(label));
+        stage.show();
+//        label.impl_processCSS(true);
+        labeledText = LabelSkinBaseRetriever.getText(label);
+        assertEquals(Color.YELLOW, labeledText.getFill());
+    }
+    
+    @Test
+    public void testLabeledSetFontNotOverridenByUAStyleOnLabeledText() {
+        label = 
+            new Label("\"A computer once beat me at chess, "
+                + "but it was no match for me at kick boxing.\" Emo Philips") {
+                    @Override public String getUserAgentStylesheet() {
+                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
+                    }
+                };
+        Font font = Font.font("Amble", 30);
+        label.setFont(font);
+        stage.setScene(scene = new Scene(label));
+        stage.show();
+//        label.impl_processCSS(true);
+        labeledText = LabelSkinBaseRetriever.getText(label);
+        assertEquals(font, labeledText.getFont());
+    }
+    
+    @Test
+    public void testLabeledSetTextAlignmentNotOverridenByUAStyleOnLabeledText() {
+        label = 
+            new Label("\"A computer once beat me at chess, "
+                + "but it was no match for me at kick boxing.\" Emo Philips") {
+                    @Override public String getUserAgentStylesheet() {
+                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
+                    }
+                };
+        label.setTextAlignment(TextAlignment.JUSTIFY);
+        stage.setScene(scene = new Scene(label));
+        stage.show();
+//        label.impl_processCSS(true);
+        labeledText = LabelSkinBaseRetriever.getText(label);
+        assertEquals(TextAlignment.JUSTIFY, labeledText.getTextAlignment());
+    }
+    
+    @Test
+    public void testLabeledSetUnderlineNotOverridenByUAStyleOnLabeledText() {
+        label = 
+            new Label("\"A computer once beat me at chess, "
+                + "but it was no match for me at kick boxing.\" Emo Philips") {
+                    @Override public String getUserAgentStylesheet() {
+                        return LabeledTextTest.class.getResource("LabeledTextTest.css").toExternalForm();
+                    }
+                };
+        label.setUnderline(true);
+        stage.setScene(scene = new Scene(label));
+        stage.show();
+//        label.impl_processCSS(true);
+        labeledText = LabelSkinBaseRetriever.getText(label);
+        assertTrue(labeledText.isUnderline());
+    }
+
+
+    @Test public void test_RT_37787() {
+
+        label = new Label("test_RT_37787");
+        label.getStyleClass().clear();
+        label.setId("test-rt-37787");
+
+        scene = new Scene(new Group(label));
+        String url = getClass().getResource("LabeledTextTest.css").toExternalForm();
+        scene.getStylesheets().add(url);
+
+        label.setFont(Font.font(10));
+        assertEquals(10, label.getFont().getSize(), .1);
+
+        stage.setScene(scene);
+        stage.show();
+
+        // If the actual size is 10 * 1.5 * 1.5 = 22.5, then we've encountered RT-37787!
+        double expected = Font.getDefault().getSize() * 1.5;
+        double actual = label.getFont().getSize();
+        assertEquals(expected, actual, .1);
+
+    }
+
+    @Test public void test_RT_37787_with_inline_style() {
+
+        label = new Label("test_RT_37787_with_inline_style");
+        label.setStyle("-fx-font-size: 1.231em;");
+        label.getStyleClass().clear();
+
+        VBox root = new VBox();
+        root.setStyle("-fx-font-size: 1.5em");
+        root.getChildren().add(label);
+
+        scene = new Scene(root);
+        stage.setScene(scene);
+        stage.show();
+
+        double expected = Font.getDefault().getSize() * 1.5 * 1.231;
+        double actual = label.getFont().getSize();
+        assertEquals(expected, actual, .1);
+
+    }
+
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/MenuBarMenuButtonRetriever.java	2015-09-03 15:26:13.348985000 -0700
+++ /dev/null	2015-09-03 15:26:14.000000000 -0700
@@ -1,78 +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.scene.control.skin;
-
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.Skin;
-import javafx.scene.layout.VBox;
-
-
-/**
- *
- * @author paru
- */
-public class MenuBarMenuButtonRetriever {
-    
-    // can only access the getNodeForMenu method in MenuBarSkin from this package.
-    public static MenuButton getNodeForMenu(MenuBarSkin skin, int i) {
-        return skin.getNodeForMenu(i);
-    }
-    
-    public static ContextMenu getSubMenu(ContextMenuContent cmc) {
-      return cmc.getSubMenu();
-    }
-    
-    public static Skin getPopupSkin(MenuButton mb) {
-        return ((MenuButtonSkinBase)mb.getSkin()).popup.getSkin();
-    }
-    
-    public static ContextMenuContent getMenuContent(MenuButton mb) {
-        ContextMenuContent cmc = (ContextMenuContent)getPopupSkin(mb).getNode();
-        return cmc;
-    }
-    
-    public static ContextMenuContent getSubMenuContent(ContextMenuContent cmc) {
-        ContextMenu cm = cmc.getSubMenu();
-        return (cm != null) ? (ContextMenuContent)cm.getSkin().getNode() : null;
-    }
-    
-    public static ContextMenuContent.MenuItemContainer getDisplayNodeForMenuItem(ContextMenuContent cmc, int i) {
-        VBox itemsContainer = cmc.getItemsContainer();
-        return (i < itemsContainer.getChildren().size()) ? 
-            (ContextMenuContent.MenuItemContainer)itemsContainer.getChildren().get(i) : null;
-    }
-    
-    public static void setCurrentFocusedIndex(ContextMenuContent cmc, int i) {
-        cmc.setCurrentFocusedIndex(i);
-    }
-    
-    public static int getFocusedIndex(MenuBarSkin skin) {
-        return skin.getFocusedMenuIndex();
-    }
-}
--- /dev/null	2015-09-03 15:26:14.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/MenuBarMenuButtonRetriever.java	2015-09-03 15:26:12.588941500 -0700
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2011, 2015, 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;
+
+import com.sun.javafx.scene.control.ContextMenuContent;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.Skin;
+import javafx.scene.control.skin.MenuBarSkin;
+import javafx.scene.control.skin.MenuButtonSkinBase;
+import javafx.scene.layout.VBox;
+
+
+/**
+ *
+ */
+public class MenuBarMenuButtonRetriever {
+    
+//    // can only access the getNodeForMenu method in MenuBarSkin from this package.
+//    public static MenuButton getNodeForMenu(MenuBarSkin skin, int i) {
+//        return skin.getNodeForMenu(i);
+//    }
+    
+    public static ContextMenu getSubMenu(ContextMenuContent cmc) {
+      return cmc.getSubMenu();
+    }
+    
+//    public static Skin getPopupSkin(MenuButton mb) {
+//        return ((MenuButtonSkinBase)mb.getSkin()).popup.getSkin();
+//    }
+    
+//    public static ContextMenuContent getMenuContent(MenuButton mb) {
+//        ContextMenuContent cmc = (ContextMenuContent)getPopupSkin(mb).getNode();
+//        return cmc;
+//    }
+    
+    public static ContextMenuContent getSubMenuContent(ContextMenuContent cmc) {
+        ContextMenu cm = cmc.getSubMenu();
+        return (cm != null) ? (ContextMenuContent)cm.getSkin().getNode() : null;
+    }
+    
+    public static ContextMenuContent.MenuItemContainer getDisplayNodeForMenuItem(ContextMenuContent cmc, int i) {
+        VBox itemsContainer = cmc.getItemsContainer();
+        return (i < itemsContainer.getChildren().size()) ? 
+            (ContextMenuContent.MenuItemContainer)itemsContainer.getChildren().get(i) : null;
+    }
+    
+    public static void setCurrentFocusedIndex(ContextMenuContent cmc, int i) {
+        cmc.setCurrentFocusedIndex(i);
+    }
+    
+//    public static int getFocusedIndex(MenuBarSkin skin) {
+//        return skin.getFocusedMenuIndex();
+//    }
+}
--- /dev/null	2015-09-03 15:26:22.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/inputmap/InputMapTest.java	2015-09-03 15:26:20.728407100 -0700
@@ -0,0 +1,810 @@
+/*
+ * Copyright (c) 2015, 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.inputmap;
+
+import javafx.event.Event;
+import javafx.event.EventType;
+import javafx.scene.Node;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.PickResult;
+import javafx.scene.layout.Region;
+import javafx.scene.shape.Rectangle;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import static org.junit.Assert.*;
+import static javafx.scene.input.KeyCode.*;
+
+/**
+ * Thoughts / Considerations (search for [1], etc in comments below):
+ *  [1] It is possible that there are multiple mappings for a single key. This
+ *      could for example happen when there are a hierarchy of InputMaps.
+ *      Should lookupMapping return just the best (most specific) result, or a
+ *      list of all applicable mappings? A case where a list is useful is if you
+ *      want to remove all mappings of a certain type.
+ *  [2] If we add an event for, say, MouseEvent.MOUSE_PRESSED, and lookup for
+ *      mappings for MOUSE_EVENT.ANY, should we get the MOUSE_PRESSED mapping
+ *      or not?
+ */
+
+public class InputMapTest {
+
+    @Test public void dummy() {
+        // no-op
+    }
+
+//    private Thread.UncaughtExceptionHandler exceptionHandler;
+//    private int exceptionCount;
+//
+//    private int counter = 0;
+//
+//    private InputMap<Node> createDummyInputMap() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        return inputMap;
+//    }
+//
+//    private Region createInputMapOnNode() {
+//        Region dummy = new Region();
+//        dummy.setInputMap(new InputMap<>(dummy));
+//        return dummy;
+//    }
+//
+//    private void installExceptionHandler(Class<? extends Exception> expected) {
+//        // get the current exception handler before replacing with our own,
+//        // as ListListenerHelp intercepts the exception otherwise
+//        exceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
+//        Thread.currentThread().setUncaughtExceptionHandler((t, e) -> {
+//            exceptionCount++;
+//            if (e.getClass() != expected) {
+//                fail("We don't expect any exceptions in this test!");
+//            }
+//        });
+//    }
+//
+//    private int removeExceptionHandler() {
+//        Thread.currentThread().setUncaughtExceptionHandler(exceptionHandler);
+//        return exceptionCount;
+//    }
+//
+//    @Before public void setup() {
+//        counter = 0;
+//        exceptionCount = 0;
+//    }
+//
+//    private MouseEvent createMouseEvent(Node target, EventType<MouseEvent> evtType) {
+//        double x, y, screenX, screenY;
+//        x = y = screenX = screenY = 0;
+//        int clickCount = 0;
+//        MouseButton button = MouseButton.PRIMARY;
+//        final PickResult pickResult = new PickResult(target, 0, 0);
+//
+//        MouseEvent evt = new MouseEvent(
+//                target,
+//                target,
+//                evtType,
+//                x, y,
+//                screenX, screenY,
+//                button,
+//                clickCount,
+//                false,                             // shiftDown
+//                false,                             // ctrlDown
+//                false,                             // altDown
+//                false,                             // metaData
+//                button == MouseButton.PRIMARY,     // primary button
+//                button == MouseButton.MIDDLE,      // middle button
+//                button == MouseButton.SECONDARY,   // secondary button
+//                false,                             // synthesized
+//                button == MouseButton.SECONDARY,   // is popup trigger
+//                true,                              // still since pick
+//                pickResult);                       // pick result
+//
+//        return evt;
+//    }
+//
+//    private KeyEvent createKeyEvent(Node target, EventType<KeyEvent> evtType, KeyCode keyCode) {
+//        return new KeyEvent(null,
+//                target,                            // EventTarget
+//                evtType,                           // eventType
+//                evtType == KeyEvent.KEY_TYPED ? keyCode.impl_getChar() : null,  // Character (unused unless evtType == KEY_TYPED)
+//                keyCode.impl_getChar(),            // text
+//                keyCode,                           // KeyCode
+//                false,                             // shiftDown
+//                false,                             // ctrlDown
+//                false,                             // altDown
+//                false                              // metaData
+//        );
+//    }
+//
+//    /***************************************************************************
+//     *
+//     * Misc
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testNodeIsSet() {
+//        assertNotNull(createDummyInputMap().getNode());
+//    }
+//
+//    @Test(expected = IllegalArgumentException.class)
+//    public void testNullNodeIsException() {
+//        new InputMap<>(null);
+//    }
+//
+//    @Test public void testNodeHasNullInputMap() {
+//        Region r = new Region();
+//        assertNull(r.getInputMap());
+//    }
+//
+//
+//    /***************************************************************************
+//     *
+//     * Child InputMap
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testDefault_childMapIsNotNullAndEmpty() {
+//        InputMap<?> map = createDummyInputMap();
+//        assertNotNull(map.getChildInputMaps());
+//        assertTrue(map.getChildInputMaps().isEmpty());
+//    }
+//
+//    @Test public void testWrite_childInputMap_sameNode() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//
+//        inputMap.getChildInputMaps().add(childMap);
+//        assertFalse(inputMap.getChildInputMaps().isEmpty());
+//        assertEquals(1, inputMap.getChildInputMaps().size());
+//        assertEquals(childMap, inputMap.getChildInputMaps().get(0));
+//    }
+//
+//    @Test public void testWrite_childInputMap_differentNode() {
+//        installExceptionHandler(IllegalArgumentException.class);
+//        Rectangle dummy = new Rectangle();
+//        Rectangle dummy2 = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy2);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        // we expect an exception, and we also expect the bad child input map
+//        // to be removed
+//        assertTrue(inputMap.getChildInputMaps().isEmpty());
+//
+//        removeExceptionHandler();
+//        assertEquals(1, exceptionCount);
+//    }
+//
+//
+//    /***************************************************************************
+//     *
+//     * Mappings
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testDefault_mappingsIsNotNullAndEmpty() {
+//        InputMap<?> map = createDummyInputMap();
+//        assertNotNull(map.getMappings());
+//        assertTrue(map.getMappings().isEmpty());
+//    }
+//
+//    @Test public void testWrite_mappings() {
+//        InputMap<?> map = createDummyInputMap();
+//
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(J, e -> { });
+//        map.getMappings().add(mapping);
+//        assertFalse(map.getMappings().isEmpty());
+//        assertEquals(1, map.getMappings().size());
+//        assertEquals(mapping, map.getMappings().get(0));
+//    }
+//
+//    @Test public void testWrite_mappings_nullMapping() {
+//        installExceptionHandler(IllegalArgumentException.class);
+//        InputMap<?> map = createDummyInputMap();
+//        map.getMappings().add(null);
+//
+//        // we expect an exception, and we also expect the bad mapping to be removed
+//        assertTrue(map.getMappings().isEmpty());
+//
+//        removeExceptionHandler();
+//        assertEquals(1, exceptionCount);
+//    }
+//
+//
+//
+//    /***************************************************************************
+//     *
+//     * Interceptor
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testDefault_interceptorIsNull() {
+//        InputMap<?> map = createDummyInputMap();
+//        assertNull(map.getInterceptor());
+//    }
+//
+//    @Test public void testWrite_interceptors() {
+//        InputMap<?> map = createDummyInputMap();
+//
+//        Predicate<Event> p = e -> {
+//            System.out.println("Hello Interceptor");
+//            return true;
+//        };
+//        map.setInterceptor(p);
+//        assertEquals(p, map.getInterceptor());
+//    }
+//
+//
+//
+//    /***************************************************************************
+//     *
+//     * Mapping lookup
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testLookup_nullObject() {
+//        InputMap<?> map = createDummyInputMap();
+//        Optional<InputMap.Mapping<?>> returnedMapping = map.lookupMapping(null);
+//        assertNotNull(returnedMapping);
+//        assertFalse(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_mappingThatIsNotInstalled() {
+//        InputMap<?> map = createDummyInputMap();
+//        Optional<InputMap.Mapping<?>> returnedMapping = map.lookupMapping(J);
+//        assertNotNull(returnedMapping);
+//        assertFalse(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_keyMapping_mappingThatIsInstalled() {
+//        InputMap<?> map = createDummyInputMap();
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(J, e -> { });
+//        map.getMappings().add(mapping);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = map.lookupMapping(new KeyBinding(J));
+//        assertNotNull(returnedMapping);
+//        assertTrue(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_mouseMapping_mappingThatIsInstalled_usingSpecificEventType() {
+//        InputMap<?> map = createDummyInputMap();
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> { });
+//        map.getMappings().add(mapping);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = map.lookupMapping(MouseEvent.MOUSE_PRESSED);
+//        assertNotNull(returnedMapping);
+//        assertTrue(returnedMapping.isPresent());
+//    }
+//
+//    // TODO [1], [2]
+////    @Test public void testLookup_mouseMapping_mappingThatIsInstalled_usingAnyEventType() {
+////        InputMap<?> map = createDummyInputMap();
+////        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> { });
+////        map.getMappings().add(mapping);
+////
+////        Optional<InputMap.Mapping<?>> returnedMapping = map.lookupMapping(MouseEvent.ANY);
+////        assertNotNull(returnedMapping);
+////        assertTrue(returnedMapping.isPresent());
+////    }
+//
+//    @Test public void testLookup_keyMapping_mappingThatIsInstalledOnChildMap() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(J, e -> { });
+//        childMap.getMappings().add(mapping);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = inputMap.lookupMapping(new KeyBinding(J));
+//        assertNotNull(returnedMapping);
+//        assertTrue(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_keyMapping_mappingThatIsInstalledOnChildMap_thenDetachedFromParent_lookAtParent() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(J, e -> { });
+//        childMap.getMappings().add(mapping);
+//
+//        inputMap.getChildInputMaps().remove(childMap);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = inputMap.lookupMapping(new KeyBinding(J));
+//        assertNotNull(returnedMapping);
+//        assertFalse(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_keyMapping_mappingThatIsInstalledOnChildMap_thenDetachedFromParent_lookAtChild() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(J, e -> { });
+//        childMap.getMappings().add(mapping);
+//
+//        inputMap.getChildInputMaps().remove(childMap);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = childMap.lookupMapping(new KeyBinding(J));
+//        assertNotNull(returnedMapping);
+//        assertTrue(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_keyMapping_mappingThatIsInstalledOnParentMapShouldNotBeVisibleToChildMap() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(J, e -> { });
+//        inputMap.getMappings().add(mapping);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = childMap.lookupMapping(new KeyBinding(J));
+//        assertNotNull(returnedMapping);
+//        assertFalse(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_getMostSpecificMapping_inParent() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping1 = new InputMap.KeyMapping(new KeyBinding(J).shift(), e -> { });
+//        inputMap.getMappings().add(mapping1);
+//        InputMap.KeyMapping mapping2 = new InputMap.KeyMapping(J, e -> { });
+//        childMap.getMappings().add(mapping2);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = inputMap.lookupMapping(new KeyBinding(J).shift());
+//        assertEquals(mapping1, returnedMapping.get());
+//    }
+//
+//    @Test public void testLookup_getMostSpecificMapping_inChild() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping1 = new InputMap.KeyMapping(J, e -> { });
+//        inputMap.getMappings().add(mapping1);
+//        InputMap.KeyMapping mapping2 = new InputMap.KeyMapping(new KeyBinding(J).shift(), e -> { });
+//        childMap.getMappings().add(mapping2);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = inputMap.lookupMapping(new KeyBinding(J).shift());
+//        assertEquals(mapping2, returnedMapping.get());
+//    }
+//
+//    @Test public void testLookup_getMostSpecificMapping_inParent_butMappingDisabled() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping1 = new InputMap.KeyMapping(new KeyBinding(J).shift(), e -> { });
+//        mapping1.setDisabled(true);
+//        inputMap.getMappings().add(mapping1);
+//        InputMap.KeyMapping mapping2 = new InputMap.KeyMapping(J, e -> { });
+//        childMap.getMappings().add(mapping2);
+//
+//        // parent mapping is disabled, and child mapping doesn't match entirely
+//        Optional<InputMap.Mapping<?>> returnedMapping = inputMap.lookupMapping(new KeyBinding(J).shift());
+//        assertFalse(returnedMapping.isPresent());
+//    }
+//
+//    @Test public void testLookup_getMostSpecificMapping_inChild_butMappingDisabled() {
+//        Rectangle dummy = new Rectangle();
+//        InputMap<Node> inputMap = new InputMap<>(dummy);
+//        InputMap<Node> childMap = new InputMap<>(dummy);
+//        inputMap.getChildInputMaps().add(childMap);
+//
+//        InputMap.KeyMapping mapping1 = new InputMap.KeyMapping(J, e -> { });
+//        inputMap.getMappings().add(mapping1);
+//        InputMap.KeyMapping mapping2 = new InputMap.KeyMapping(new KeyBinding(J).shift(), e -> { });
+//        mapping2.setDisabled(true);
+//        childMap.getMappings().add(mapping2);
+//
+//        Optional<InputMap.Mapping<?>> returnedMapping = inputMap.lookupMapping(new KeyBinding(J).shift());
+//        assertFalse(returnedMapping.isPresent());
+//    }
+//
+//
+//
+//    /***************************************************************************
+//     *
+//     * Event Handling
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testEventHandlerIsCreatedAndRemovedOnNode_mouseMapping() {
+//        Node n = createInputMapOnNode();
+//
+//        // test before the mapping is added, counter will not increment
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        n.getInputMap().getMappings().add(mapping);
+//
+//        // fire event again, counter should increment
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//
+//        // remove mapping, fire event, counter should not increment any longer
+//        n.getInputMap().getMappings().remove(mapping);
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//    }
+//
+//    @Test public void testEventHandlerIsCreatedAndRemovedOnNode_mouseMapping_onChildMap() {
+//        Node n = createInputMapOnNode();
+//        InputMap childInputMap = new InputMap<>(n);
+//        n.getInputMap().getChildInputMaps().add(childInputMap);
+//
+//        // test before the mapping is added, counter will not increment
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping to child input map
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        childInputMap.getMappings().add(mapping);
+//
+//        // fire event again, counter should increment
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//
+//        // remove mapping, fire event, counter should not increment any longer
+//        childInputMap.getMappings().remove(mapping);
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//    }
+//
+//    @Test public void testInterceptorBlocksMapping_mouseMapping() {
+//        Node n = createInputMapOnNode();
+//
+//        // test before the mapping is added, counter will not increment
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        n.getInputMap().getMappings().add(mapping);
+//        n.getInputMap().setInterceptor(new InputMap.MouseMappingInterceptor(MouseEvent.MOUSE_PRESSED));
+//
+//        // fire event again, counter should not increment
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // remove mapping, fire event, counter should still not increment
+//        n.getInputMap().getMappings().remove(mapping);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//    }
+//
+//    @Test public void testInterceptorBlocksMapping_keyMapping() {
+//        Node n = createInputMapOnNode();
+//
+//        // test before the mapping is added, counter will not increment
+//        KeyEvent event = createKeyEvent(n, KeyEvent.KEY_PRESSED, KeyCode.J);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        n.getInputMap().getMappings().add(mapping);
+//        n.getInputMap().setInterceptor(new InputMap.KeyMappingInterceptor(new KeyBinding(J)));
+//
+//        // fire event again, counter should not increment
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // remove mapping, fire event, counter should still not increment
+//        n.getInputMap().getMappings().remove(mapping);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//    }
+//
+//    @Test public void testDisabledMapping_mouseMapping() {
+//        Node n = createInputMapOnNode();
+//
+//        // test before the mapping is added, counter will not increment
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        mapping.setDisabled(true);
+//        n.getInputMap().getMappings().add(mapping);
+//
+//        // fire event again, counter should not increment
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // remove mapping, fire event, counter should still not increment
+//        n.getInputMap().getMappings().remove(mapping);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//    }
+//
+//    @Test public void testEventHandler_autoConsumeIsTrue() {
+//        Node n = createInputMapOnNode();
+//
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        assertFalse(event.isConsumed());
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        mapping.setAutoConsume(true);
+//        n.getInputMap().getMappings().add(mapping);
+//
+//        // fire event, counter should increment, and event should be consumed
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//        assertTrue(event.isConsumed());
+//    }
+//
+//    @Test public void testEventHandler_autoConsumeIsFalse() {
+//        Node n = createInputMapOnNode();
+//
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        assertFalse(event.isConsumed());
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        mapping.setAutoConsume(false);
+//        n.getInputMap().getMappings().add(mapping);
+//
+//        // fire event, counter should increment, and event should be consumed
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//        assertFalse(event.isConsumed());
+//    }
+//
+//    @Test public void testEventHandlerDisposesProperly_noChildMappings_mouseMapping() {
+//        Node n = createInputMapOnNode();
+//
+//        // test before the mapping is added, counter will not increment
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        n.getInputMap().getMappings().add(mapping);
+//
+//        // fire event again, counter should increment
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//
+//        // dispose of input map, fire event, counter should not increment any longer
+//        n.getInputMap().dispose();
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//    }
+//
+//    @Test public void testEventHandlerDisposesProperly_withChildMappings_mouseMapping() {
+//        Node n = createInputMapOnNode();
+//        InputMap childInputMap = new InputMap<>(n);
+//        n.getInputMap().getChildInputMaps().add(childInputMap);
+//
+//        // test before the mapping is added, counter will not increment
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        n.fireEvent(event);
+//        assertEquals(0, counter);
+//
+//        // add mapping
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        n.getInputMap().getMappings().add(mapping);
+//
+//        // fire event again, counter should increment
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//
+//        // dispose of input map, fire event, counter should not increment any longer
+//        n.getInputMap().dispose();
+//        n.fireEvent(event);
+//        assertEquals(1, counter);
+//    }
+//
+//
+//    /***************************************************************************
+//     *
+//     * MouseMapping
+//     *
+//     **************************************************************************/
+//
+//    private final int mouseEvent_maxSpecificity = 9;
+//
+//    @Test(expected = IllegalArgumentException.class)
+//    public void testMouseMapping_nullEventTypeIsIllegal() {
+//        new InputMap.MouseMapping(null, e -> counter++);
+//    }
+//
+//    @Test public void testMouseMapping_mappingKey() {
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        assertEquals(MouseEvent.MOUSE_PRESSED, mapping.getMappingKey());
+//    }
+//
+//    @Test public void testMouseMapping_hashCode() {
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        assertTrue(mapping.hashCode() != 0);
+//    }
+//
+//    @Test public void testMouseMapping_eventType() {
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        assertEquals(MouseEvent.MOUSE_PRESSED, mapping.getEventType());
+//    }
+//
+//    @Test public void testMouseMapping_interceptors() {
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        assertNull(mapping.getInterceptor());
+//    }
+//
+//    @Test public void testMouseMappingSpecificity() {
+//        Node n = createInputMapOnNode();
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//
+//        assertEquals(mouseEvent_maxSpecificity, mapping.getSpecificity(event));
+//    }
+//
+//    @Test public void testMouseMappingSpecificity_disabledMapping() {
+//        Node n = createInputMapOnNode();
+//        MouseEvent event = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        mapping.setDisabled(true);
+//
+//        assertEquals(0, mapping.getSpecificity(event));
+//    }
+//
+//    @Test public void testMouseMappingSpecificity_nullEvent() {
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        assertEquals(0, mapping.getSpecificity(null));
+//    }
+//
+//    @Test public void testMouseMappingSpecificity_notMouseEvent() {
+//        Node n = createInputMapOnNode();
+//        KeyEvent keyEvent = createKeyEvent(n, KeyEvent.KEY_PRESSED, J);
+//        InputMap.MouseMapping mapping = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        assertEquals(0, mapping.getSpecificity(keyEvent));
+//    }
+//
+//    @Test public void testMouseMapping_equals_1() {
+//        InputMap.MouseMapping mapping1 = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        InputMap.MouseMapping mapping2 = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter--);
+//        assertEquals(mapping1, mapping2);
+//    }
+//
+//    @Test public void testMouseMapping_equals_2() {
+//        InputMap.MouseMapping mapping1 = new InputMap.MouseMapping(MouseEvent.MOUSE_PRESSED, e -> counter++);
+//        InputMap.MouseMapping mapping2 = new InputMap.MouseMapping(MouseEvent.MOUSE_RELEASED, e -> counter++);
+//        assertFalse(mapping1.equals(mapping2));
+//    }
+//
+//
+//
+//    /***************************************************************************
+//     *
+//     * KeyMapping
+//     *
+//     **************************************************************************/
+//
+//    private final int keyEvent_maxSpecificity = 6;
+//
+//    @Test(expected = IllegalArgumentException.class)
+//    public void testKeyMapping_nullKeyBindingIsIllegal() {
+//        new InputMap.KeyMapping((KeyBinding)null, e -> counter++);
+//    }
+//
+//    @Test public void testKeyMapping_hashCode() {
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J, KeyEvent.KEY_RELEASED), e -> counter++);
+//        assertTrue(mapping.hashCode() != 0);
+//    }
+//
+//    @Test public void testKeyMapping_mappingKey() {
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J, KeyEvent.KEY_RELEASED), e -> counter++);
+//        assertEquals(new KeyBinding(J, KeyEvent.KEY_RELEASED), mapping.getMappingKey());
+//    }
+//
+//    @Test public void testKeyMapping_eventType_defaultIsKeyPressed() {
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        assertEquals(KeyEvent.KEY_PRESSED, mapping.getEventType());
+//    }
+//
+//    @Test public void testKeyMapping_eventType() {
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J, KeyEvent.KEY_RELEASED), e -> counter++);
+//        assertEquals(KeyEvent.KEY_RELEASED, mapping.getEventType());
+//    }
+//
+//    @Test public void testKeyMapping_interceptor() {
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J, KeyEvent.KEY_RELEASED), e -> counter++);
+//        assertNull(mapping.getInterceptor());
+//    }
+//
+//    @Test public void testKeyMappingSpecificity() {
+//        Node n = createInputMapOnNode();
+//        KeyEvent event = createKeyEvent(n, KeyEvent.KEY_PRESSED, KeyCode.J);
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//
+//        assertEquals(keyEvent_maxSpecificity, mapping.getSpecificity(event));
+//    }
+//
+//    @Test public void testKeyMappingSpecificity_disabledMapping() {
+//        Node n = createInputMapOnNode();
+//        KeyEvent event = createKeyEvent(n, KeyEvent.KEY_PRESSED, KeyCode.J);
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        mapping.setDisabled(true);
+//
+//        assertEquals(0, mapping.getSpecificity(event));
+//    }
+//
+//    @Test public void testKeyMappingSpecificity_nullEvent() {
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        assertEquals(0, mapping.getSpecificity(null));
+//    }
+//
+//    @Test public void testKeyMappingSpecificity_notKeyEvent() {
+//        Node n = createInputMapOnNode();
+//        MouseEvent mouseEvent = createMouseEvent(n, MouseEvent.MOUSE_PRESSED);
+//        InputMap.KeyMapping mapping = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        assertEquals(0, mapping.getSpecificity(mouseEvent));
+//    }
+//
+//    @Test public void testKeyMapping_equals_1() {
+//        InputMap.KeyMapping mapping1 = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        InputMap.KeyMapping mapping2 = new InputMap.KeyMapping(new KeyBinding(J), e -> counter--);
+//        assertEquals(mapping1, mapping2);
+//    }
+//
+//    @Test public void testKeyMapping_equals_2() {
+//        InputMap.KeyMapping mapping1 = new InputMap.KeyMapping(new KeyBinding(J, KeyEvent.KEY_RELEASED), e -> counter++);
+//        InputMap.KeyMapping mapping2 = new InputMap.KeyMapping(new KeyBinding(J), e -> counter++);
+//        assertFalse(mapping1.equals(mapping2));
+//    }
+//
+//
+//    /***************************************************************************
+//     *
+//     * Control InputMap population / removal
+//     *
+//     **************************************************************************/
+//
+//    // These tests are located in javafx.scene.control.InputMapTest, due to
+//    // module visibility (the graphics module can not instantiate UI controls).
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/KeyBindingTest.java	2015-09-03 15:26:27.019766900 -0700
+++ /dev/null	2015-09-03 15:26:28.000000000 -0700
@@ -1,39 +0,0 @@
-package com.sun.javafx.scene.control.behavior;
-
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class KeyBindingTest {
-
-    @Test public void getSpecificity() {
-        final KeyCode code = KeyCode.ENTER;
-
-        // Expected answer:
-        // 1 pt for matching key code
-        // 1 pt for matching key event type
-        // 1 pt for matching no alt
-        // 1 pt for matching no meta
-        // 1 pt for matching shift or control
-        // 0 pt for the other optional value of control/shift
-        //
-        // Total = 5.
-        //
-        int expect = 5;
-
-        KeyBinding uut = new KeyBinding(code, "ShiftEnter").shift().ctrl(OptionalBoolean.ANY);
-
-        KeyEvent event = new KeyEvent(KeyEvent.KEY_PRESSED, null,
-                null, code, true, false, false, false);
-
-        assertEquals(expect, uut.getSpecificity(null, event)); // Gets 6 (fx 2.2, fx 8)
-
-        uut = new KeyBinding(code, "CtrlEnter").shift(OptionalBoolean.ANY).ctrl();
-
-        event = new KeyEvent(KeyEvent.KEY_PRESSED, null,
-                null, code, false, true, false, false);
-
-        assertEquals(expect, uut.getSpecificity(null, event)); // Gets 2 (fx 2.2, fx 8)
-    }
-} 
\ No newline at end of file
--- /dev/null	2015-09-03 15:26:28.000000000 -0700
+++ new/modules/controls/src/test/java/com/sun/javafx/scene/control/inputmap/KeyBindingTest.java	2015-09-03 15:26:26.235722100 -0700
@@ -0,0 +1,39 @@
+package com.sun.javafx.scene.control.inputmap;
+
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class KeyBindingTest {
+
+    @Test public void getSpecificity() {
+        final KeyCode code = KeyCode.ENTER;
+
+        // Expected answer:
+        // 1 pt for matching key code
+        // 1 pt for matching key event type
+        // 1 pt for matching no alt
+        // 1 pt for matching no meta
+        // 1 pt for matching shift or control
+        // 0 pt for the other optional value of control/shift
+        //
+        // Total = 5.
+        //
+        int expect = 5;
+
+        KeyBinding uut = new KeyBinding(code).shift().ctrl(KeyBinding.OptionalBoolean.ANY);
+
+        KeyEvent event = new KeyEvent(KeyEvent.KEY_PRESSED, null,
+                null, code, true, false, false, false);
+
+        assertEquals(expect, uut.getSpecificity(event)); // Gets 6 (fx 2.2, fx 8)
+
+        uut = new KeyBinding(code).shift(KeyBinding.OptionalBoolean.ANY).ctrl();
+
+        event = new KeyEvent(KeyEvent.KEY_PRESSED, null,
+                null, code, false, true, false, false);
+
+        assertEquals(expect, uut.getSpecificity(event)); // Gets 2 (fx 2.2, fx 8)
+    }
+} 
\ No newline at end of file
--- /dev/null	2015-09-03 15:26:35.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/InputMapTest.java	2015-09-03 15:26:34.334185300 -0700
@@ -0,0 +1,220 @@
+package javafx.scene.control;
+
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+import com.sun.javafx.scene.control.infrastructure.StageLoader;
+import com.sun.javafx.scene.control.inputmap.InputMap;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import static javafx.scene.input.KeyCode.*;
+
+public class InputMapTest {
+
+    @Test public void dummy() {
+        // no-op
+    }
+
+//    /***************************************************************************
+//     *
+//     * Control InputMap mappings population / removal
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testControlHasNonNullInputMap() {
+//        Button btn = new Button();
+//        assertNotNull(btn.getInputMap());
+//    }
+//
+//    @Test public void testDefaultInputMapIsEmpty() {
+//        Button btn = new Button();
+//        assertEquals(0, btn.getInputMap().getMappings().size());
+//    }
+//
+//    @Test public void addControlToSceneAndCheckInputMapIsPopulated() {
+//        Button btn = new Button();
+//        assertEquals(0, btn.getInputMap().getMappings().size());
+//        StageLoader sl = new StageLoader(btn);
+//        assertFalse(btn.getInputMap().getMappings().isEmpty());
+//        sl.dispose();
+//    }
+//
+//    @Test public void testSkinDoesNotOverrideUserDefinedMappings() {
+//        Button btn = new Button();
+//        assertEquals(0, btn.getInputMap().getMappings().size());
+//
+//        // ENTER is not a default mapping, but SPACE is
+//        InputMap.KeyMapping customEnterMapping = new InputMap.KeyMapping(ENTER, e -> {
+//            // no-op
+//        });
+//        InputMap.KeyMapping customSpaceMapping = new InputMap.KeyMapping(SPACE, e -> {
+//            // no-op
+//        });
+//        btn.getInputMap().getMappings().addAll(customEnterMapping, customSpaceMapping);
+//        assertEquals(2, btn.getInputMap().getMappings().size());
+//
+//        StageLoader sl = new StageLoader(btn);
+//
+//        // There are 18 mappings provided by ButtonBehavior. We add two above,
+//        // but one of them displaces a default mapping, so we expect 19.
+//        assertEquals(19, btn.getInputMap().getMappings().size());
+//
+//        // we want to ensure that our two mappings still exist
+//        assertTrue(btn.getInputMap().getMappings().contains(customEnterMapping));
+//        assertTrue(btn.getInputMap().getMappings().contains(customSpaceMapping));
+//
+//        // we also look up the mappings using their key codes, to double check
+//        // that they are there
+//        assertNotNull(btn.getInputMap().lookupMapping(ENTER));
+//        assertNotNull(btn.getInputMap().lookupMapping(SPACE));
+//
+//        sl.dispose();
+//    }
+//
+//    @Test public void removeSkinAndEnsureSkinMappingsAreRemoved() {
+//        Button btn = new Button();
+//        assertEquals(0, btn.getInputMap().getMappings().size());
+//
+//        StageLoader sl = new StageLoader(btn);
+//
+//        // There are 18 mappings provided by ButtonBehavior.
+//        assertEquals(18, btn.getInputMap().getMappings().size());
+//        btn.setSkin(null);
+//        assertEquals(0, btn.getInputMap().getMappings().size());
+//
+//        sl.dispose();
+//    }
+//
+//    @Test public void removeSkinAndEnsureSkinMappingsAreRemoved_shouldNotRemoveUserDefinedMappings() {
+//        Button btn = new Button();
+//        assertEquals(0, btn.getInputMap().getMappings().size());
+//
+//        // ENTER is not a default mapping, but SPACE is
+//        InputMap.KeyMapping customEnterMapping = new InputMap.KeyMapping(ENTER, e -> {
+//            // no-op
+//        });
+//        InputMap.KeyMapping customSpaceMapping = new InputMap.KeyMapping(SPACE, e -> {
+//            // no-op
+//        });
+//        btn.getInputMap().getMappings().addAll(customEnterMapping, customSpaceMapping);
+//        assertEquals(2, btn.getInputMap().getMappings().size());
+//
+//        StageLoader sl = new StageLoader(btn);
+//
+//        // There are 18 mappings provided by ButtonBehavior. We add two above,
+//        // but one of them displaces a default mapping, so we expect 19.
+//        assertEquals(19, btn.getInputMap().getMappings().size());
+//
+//        // remove the skin - we expect our two mappings to still exist - but that is it
+//        btn.setSkin(null);
+//        assertEquals(2, btn.getInputMap().getMappings().size());
+//
+//        // we want to ensure that our two mappings still exist
+//        assertTrue(btn.getInputMap().getMappings().contains(customEnterMapping));
+//        assertTrue(btn.getInputMap().getMappings().contains(customSpaceMapping));
+//
+//        // we also look up the mappings using their key codes, to double check
+//        // that they are there
+//        assertNotNull(btn.getInputMap().lookupMapping(ENTER));
+//        assertNotNull(btn.getInputMap().lookupMapping(SPACE));
+//
+//        sl.dispose();
+//    }
+//
+//
+//    /***************************************************************************
+//     *
+//     * Control InputMap childMap population / removal
+//     *
+//     **************************************************************************/
+//
+//    @Test public void testButtonControlHasNoInputMapChildMaps_afterSkinLoaded() {
+//        Button btn = new Button();
+//
+//        assertNotNull(btn.getInputMap().getChildInputMaps());
+//        assertTrue(btn.getInputMap().getChildInputMaps().isEmpty());
+//
+//        StageLoader sl = new StageLoader(btn);
+//        assertNotNull(btn.getInputMap().getChildInputMaps());
+//        assertTrue(btn.getInputMap().getChildInputMaps().isEmpty());
+//        sl.dispose();
+//    }
+//
+//    @Test public void testListViewControlHasInputMapChildMaps_afterSkinLoaded() {
+//        ListView listView = new ListView();
+//
+//        assertNotNull(listView.getInputMap().getChildInputMaps());
+//        assertTrue(listView.getInputMap().getChildInputMaps().isEmpty());
+//
+//        StageLoader sl = new StageLoader(listView);
+//        assertNotNull(listView.getInputMap().getChildInputMaps());
+//        assertFalse(listView.getInputMap().getChildInputMaps().isEmpty());
+//        sl.dispose();
+//    }
+//
+//    @Test public void removeSkinAndEnsureSkinChildInputMapsAreRemoved() {
+//        ListView listView = new ListView();
+//
+//        StageLoader sl = new StageLoader(listView);
+//
+//        assertNotNull(listView.getInputMap().getChildInputMaps());
+//        assertFalse(listView.getInputMap().getChildInputMaps().isEmpty());
+//
+//        listView.setSkin(null);
+//        assertTrue(listView.getInputMap().getChildInputMaps().isEmpty());
+//
+//        sl.dispose();
+//    }
+//
+//    @Test public void removeSkinAndEnsureSkinChildInputMapsAreRemoved_shouldNotRemoveUserDefinedInputMaps() {
+//        ListView<?> listView = new ListView<>();
+//
+//        InputMap<ListView<?>> dummyMap = new InputMap<>(listView);
+//        dummyMap.getMappings().add(new InputMap.KeyMapping(ENTER, e -> {
+//            // no-op
+//        }));
+//        ((InputMap<ListView<?>>)listView.getInputMap()).getChildInputMaps().add(dummyMap);
+//
+//        assertEquals(1, listView.getInputMap().getChildInputMaps().size());
+//
+//        StageLoader sl = new StageLoader(listView);
+//
+//        assertNotNull(listView.getInputMap().getChildInputMaps());
+//        assertFalse(listView.getInputMap().getChildInputMaps().isEmpty());
+//
+//        listView.setSkin(null);
+//        assertEquals(1, listView.getInputMap().getChildInputMaps().size());
+//        assertEquals(dummyMap, listView.getInputMap().getChildInputMaps().get(0));
+//
+//        sl.dispose();
+//    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ArrayLinkedListTest.java	2015-09-03 15:26:40.577542400 -0700
+++ /dev/null	2015-09-03 15:26:41.000000000 -0700
@@ -1,312 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.scene.control.skin.VirtualFlow.ArrayLinkedList;
-
-public class ArrayLinkedListTest {
-    private ArrayLinkedList<String> list;
-    private String a = "a";
-    private String b = "b";
-    private String c = "c";
-
-    @Before public void setUp() {
-        list = new ArrayLinkedList<String>();
-    }
-    
-    @Test public void testArrayLinkedList_Empty_GetFirstReturnsNull() {
-        assertNull(list.getFirst());
-    }
-
-    @Test public void testArrayLinkedList_Empty_GetLastReturnsNull() {
-        assertNull(list.getLast());
-    }
-
-    @Test public void testArrayLinkedList_Empty_AddFirst() {
-        list.addFirst(a);
-        assertEquals(1, list.size());
-        assertEquals(a, list.getFirst());
-        assertEquals(a, list.getLast());
-        assertEquals(a, list.get(0));
-        assertFalse(list.isEmpty());
-    }
-
-    @Test public void testArrayLinkedList_Empty_AddLast() {
-        list.addLast(c);
-        assertEquals(1, list.size());
-        assertEquals(c, list.getFirst());
-        assertEquals(c, list.getLast());
-        assertEquals(c, list.get(0));
-        assertFalse(list.isEmpty());
-    }
-
-    @Test public void testArrayLinkedList_Empty_SizeIsZero() {
-        assertEquals(0, list.size());
-    }
-
-    @Test public void testArrayLinkedList_Empty_IsEmpty() {
-        assertTrue(list.isEmpty());
-    }
-
-    @Test public void testArrayLinkedList_Empty_ClearHasNoEffect() {
-        list.clear();
-        assertTrue(list.isEmpty());
-        assertEquals(0, list.size());
-    }
-
-    @Test public void testArrayLinkedList_Empty_GetResultsInArrayIndexOutOfBounds() {
-        try {
-            list.get(0);
-            assertTrue("get didn't return an ArrayIndexOutOfBoundsException", false);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            assertTrue(true);
-        }
-    }
-
-    @Test public void testArrayLinkedList_Empty_RemoveFirstIsNoOp() {
-        list.removeFirst();
-    }
-
-    @Test public void testArrayLinkedList_Empty_RemoveLastIsNoOp() {
-        list.removeLast();
-    }
-
-    @Test public void testArrayLinkedList_Empty_RemoveResultsInArrayIndexOutOfBounds() {
-        try {
-            list.remove(0);
-            assertTrue("remove didn't return an ArrayIndexOutOfBoundsException", false);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            assertTrue(true);
-        }
-    }
-
-    @Test public void testArrayLinkedList_GetFirst_AfterAddLast() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        assertEquals(a, list.getFirst());
-    }
-
-    @Test public void testArrayLinkedList_GetFirst_AfterAddFirst() {
-        list.addFirst(c);
-        list.addFirst(b);
-        list.addFirst(a);
-        assertEquals(a, list.getFirst());
-    }
-
-    @Test public void testArrayLinkedList_GetFirst_AfterAddFirstAndAddLast() {
-        list.addFirst(b);
-        list.addLast(c);
-        list.addFirst(a);
-        assertEquals(a, list.getFirst());
-    }
-
-    @Test public void testArrayLinkedList_GetFirst_AfterRemoveFirst() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        list.removeFirst();
-        assertEquals(b, list.getFirst());
-        list.removeFirst();
-        assertEquals(c, list.getFirst());
-        list.removeFirst();
-        assertNull(list.getFirst());
-    }
-
-    @Test public void testArrayLinkedList_GetFirst_AfterRemoveLast() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        list.removeLast();
-        assertEquals(a, list.getFirst());
-        list.removeLast();
-        assertEquals(a, list.getFirst());
-        list.removeLast();
-        assertNull(list.getFirst());
-    }
-
-    @Test public void testArrayLinkedList_GetLast_AfterAddLast() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        assertEquals(c, list.getLast());
-    }
-
-    @Test public void testArrayLinkedList_GetLast_AfterAddFirst() {
-        list.addFirst(c);
-        list.addFirst(b);
-        list.addFirst(a);
-        assertEquals(c, list.getLast());
-    }
-
-    @Test public void testArrayLinkedList_GetLast_AfterAddFirstAndAddLast() {
-        list.addFirst(b);
-        list.addLast(c);
-        list.addFirst(a);
-        assertEquals(c, list.getLast());
-    }
-
-    @Test public void testArrayLinkedList_GetLast_AfterRemoveFirst() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        list.removeFirst();
-        assertEquals(c, list.getLast());
-        list.removeFirst();
-        assertEquals(c, list.getLast());
-        list.removeFirst();
-        assertNull(list.getLast());
-    }
-
-    @Test public void testArrayLinkedList_GetLast_AfterRemoveLast() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        list.removeLast();
-        assertEquals(b, list.getLast());
-        list.removeLast();
-        assertEquals(a, list.getLast());
-        list.removeLast();
-        assertNull(list.getLast());
-    }
-
-    @Test public void testArrayLinkedList_Get_AfterAddLast() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        assertEquals(a, list.get(0));
-        assertEquals(b, list.get(1));
-        assertEquals(c, list.get(2));
-    }
-
-    @Test public void testArrayLinkedList_Get_AfterAddFirst() {
-        list.addFirst(c);
-        list.addFirst(b);
-        list.addFirst(a);
-        assertEquals(a, list.get(0));
-        assertEquals(b, list.get(1));
-        assertEquals(c, list.get(2));
-    }
-
-    @Test public void testArrayLinkedList_Get_AfterAddFirstAndAddLast() {
-        list.addFirst(b);
-        list.addLast(c);
-        list.addFirst(a);
-        assertEquals(a, list.get(0));
-        assertEquals(b, list.get(1));
-        assertEquals(c, list.get(2));
-    }
-
-    @Test public void testArrayLinkedList_Get_AfterRemoveFirst() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        list.removeFirst();
-        assertEquals(b, list.get(0));
-        assertEquals(c, list.get(1));
-        list.removeFirst();
-        assertEquals(c, list.get(0));
-    }
-
-    @Test public void testArrayLinkedList_Get_AfterRemoveLast() {
-        list.addLast(a);
-        list.addLast(b);
-        list.addLast(c);
-        list.removeLast();
-        assertEquals(a, list.get(0));
-        assertEquals(b, list.get(1));
-        list.removeLast();
-        assertEquals(a, list.get(0));
-    }
-
-//    // using a combination of addFirst, addLast, removeFirst, removeLast,
-//    // and remove calls, check the status of the list and ensure it is
-//    // always in the expected state
-//    @Test public void testArrayLinkedList_StressTest() {
-//        // This is our "control" in the classical scientific testing sense.
-//        // If the values / sizes / results in the list match the control, then
-//        // we know the VirtualFlow.ArrayLinkedList implementation is working
-//        List control = new LinkedList();
-//        // Iterate a bunch of times
-//        for (int i = 0; i < 5000; i++) {
-//            // there are 1 of 6 different possible outcomes here:
-//            //  1) addFirst
-//            //  2) addLast
-//            //  3) removeFirst
-//            //  4) removeLast
-//            //  5) remove
-//            //  6) clear
-//            // but since I want to clear very infrequently, I weight everything
-//            // between 0 and 60 and the "clear" option has to be an even 59.
-//            int choice = (int) (Math.random() * 50);
-//            if (choice < 10) {
-//                char input = Character.toChars((Math.random() * 26) + 65)[0];
-//                IndexedCell cell = new CellStub("input");
-//                control.addFirst(cell);
-//                list.addFirst(cell);
-//                assertMatch(control, list);
-//            } else if (choice < 20) {
-//                char input = Character.toChars((Math.random() * 26) + 65)[0];
-//                IndexedCell cell = new CellStub("input");
-//                control.addLast(cell);
-//                list.addLast(cell);
-//                assertMatch(control, list);
-//            } else if (choice < 30) {
-//                if (control.size() == 0) continue;
-//                IndexedCell cell = (IndexedCell) control.removeFirst();
-//                IndexedCell cell2 = list.removeFirst();
-//                assertSame(cell, cell2);
-//                assertMatch(control, list);
-//            } else if (choice < 40) {
-//                if (control.size() == 0) continue;
-//                IndexedCell cell = control.removeLast();
-//                IndexedCell cell2 = list.removeLast();
-//                assertSame(cell, cell2);
-//                assertMatch(control, list);
-//            } else if (choice < 49) {
-//                if (control.size() == 0) continue;
-//                int index = (Math.random() * control.size());
-//                if (index == control.size()) index--;
-//                IndexedCell cell = control.remove(index);
-//                def cell2 = list.remove(index);
-//                assertSame(cell, cell2);
-//                assertMatch(control, list);
-//            } else if (choice < 50) {
-//                control.clear();
-//                list.clear();
-//                assertMatch(control, list);
-//            }
-//        }
-//    }
-}
--- /dev/null	2015-09-03 15:26:41.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ArrayLinkedListTest.java	2015-09-03 15:26:39.774496500 -0700
@@ -0,0 +1,312 @@
+/*
+ * Copyright (c) 2011, 2015, 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static javafx.scene.control.skin.VirtualFlow.ArrayLinkedList;
+
+public class ArrayLinkedListTest {
+    private ArrayLinkedList<String> list;
+    private String a = "a";
+    private String b = "b";
+    private String c = "c";
+
+    @Before public void setUp() {
+        list = new ArrayLinkedList<String>();
+    }
+    
+    @Test public void testArrayLinkedList_Empty_GetFirstReturnsNull() {
+        assertNull(list.getFirst());
+    }
+
+    @Test public void testArrayLinkedList_Empty_GetLastReturnsNull() {
+        assertNull(list.getLast());
+    }
+
+    @Test public void testArrayLinkedList_Empty_AddFirst() {
+        list.addFirst(a);
+        assertEquals(1, list.size());
+        assertEquals(a, list.getFirst());
+        assertEquals(a, list.getLast());
+        assertEquals(a, list.get(0));
+        assertFalse(list.isEmpty());
+    }
+
+    @Test public void testArrayLinkedList_Empty_AddLast() {
+        list.addLast(c);
+        assertEquals(1, list.size());
+        assertEquals(c, list.getFirst());
+        assertEquals(c, list.getLast());
+        assertEquals(c, list.get(0));
+        assertFalse(list.isEmpty());
+    }
+
+    @Test public void testArrayLinkedList_Empty_SizeIsZero() {
+        assertEquals(0, list.size());
+    }
+
+    @Test public void testArrayLinkedList_Empty_IsEmpty() {
+        assertTrue(list.isEmpty());
+    }
+
+    @Test public void testArrayLinkedList_Empty_ClearHasNoEffect() {
+        list.clear();
+        assertTrue(list.isEmpty());
+        assertEquals(0, list.size());
+    }
+
+    @Test public void testArrayLinkedList_Empty_GetResultsInArrayIndexOutOfBounds() {
+        try {
+            list.get(0);
+            assertTrue("get didn't return an ArrayIndexOutOfBoundsException", false);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            assertTrue(true);
+        }
+    }
+
+    @Test public void testArrayLinkedList_Empty_RemoveFirstIsNoOp() {
+        list.removeFirst();
+    }
+
+    @Test public void testArrayLinkedList_Empty_RemoveLastIsNoOp() {
+        list.removeLast();
+    }
+
+    @Test public void testArrayLinkedList_Empty_RemoveResultsInArrayIndexOutOfBounds() {
+        try {
+            list.remove(0);
+            assertTrue("remove didn't return an ArrayIndexOutOfBoundsException", false);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            assertTrue(true);
+        }
+    }
+
+    @Test public void testArrayLinkedList_GetFirst_AfterAddLast() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        assertEquals(a, list.getFirst());
+    }
+
+    @Test public void testArrayLinkedList_GetFirst_AfterAddFirst() {
+        list.addFirst(c);
+        list.addFirst(b);
+        list.addFirst(a);
+        assertEquals(a, list.getFirst());
+    }
+
+    @Test public void testArrayLinkedList_GetFirst_AfterAddFirstAndAddLast() {
+        list.addFirst(b);
+        list.addLast(c);
+        list.addFirst(a);
+        assertEquals(a, list.getFirst());
+    }
+
+    @Test public void testArrayLinkedList_GetFirst_AfterRemoveFirst() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        list.removeFirst();
+        assertEquals(b, list.getFirst());
+        list.removeFirst();
+        assertEquals(c, list.getFirst());
+        list.removeFirst();
+        assertNull(list.getFirst());
+    }
+
+    @Test public void testArrayLinkedList_GetFirst_AfterRemoveLast() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        list.removeLast();
+        assertEquals(a, list.getFirst());
+        list.removeLast();
+        assertEquals(a, list.getFirst());
+        list.removeLast();
+        assertNull(list.getFirst());
+    }
+
+    @Test public void testArrayLinkedList_GetLast_AfterAddLast() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        assertEquals(c, list.getLast());
+    }
+
+    @Test public void testArrayLinkedList_GetLast_AfterAddFirst() {
+        list.addFirst(c);
+        list.addFirst(b);
+        list.addFirst(a);
+        assertEquals(c, list.getLast());
+    }
+
+    @Test public void testArrayLinkedList_GetLast_AfterAddFirstAndAddLast() {
+        list.addFirst(b);
+        list.addLast(c);
+        list.addFirst(a);
+        assertEquals(c, list.getLast());
+    }
+
+    @Test public void testArrayLinkedList_GetLast_AfterRemoveFirst() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        list.removeFirst();
+        assertEquals(c, list.getLast());
+        list.removeFirst();
+        assertEquals(c, list.getLast());
+        list.removeFirst();
+        assertNull(list.getLast());
+    }
+
+    @Test public void testArrayLinkedList_GetLast_AfterRemoveLast() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        list.removeLast();
+        assertEquals(b, list.getLast());
+        list.removeLast();
+        assertEquals(a, list.getLast());
+        list.removeLast();
+        assertNull(list.getLast());
+    }
+
+    @Test public void testArrayLinkedList_Get_AfterAddLast() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        assertEquals(a, list.get(0));
+        assertEquals(b, list.get(1));
+        assertEquals(c, list.get(2));
+    }
+
+    @Test public void testArrayLinkedList_Get_AfterAddFirst() {
+        list.addFirst(c);
+        list.addFirst(b);
+        list.addFirst(a);
+        assertEquals(a, list.get(0));
+        assertEquals(b, list.get(1));
+        assertEquals(c, list.get(2));
+    }
+
+    @Test public void testArrayLinkedList_Get_AfterAddFirstAndAddLast() {
+        list.addFirst(b);
+        list.addLast(c);
+        list.addFirst(a);
+        assertEquals(a, list.get(0));
+        assertEquals(b, list.get(1));
+        assertEquals(c, list.get(2));
+    }
+
+    @Test public void testArrayLinkedList_Get_AfterRemoveFirst() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        list.removeFirst();
+        assertEquals(b, list.get(0));
+        assertEquals(c, list.get(1));
+        list.removeFirst();
+        assertEquals(c, list.get(0));
+    }
+
+    @Test public void testArrayLinkedList_Get_AfterRemoveLast() {
+        list.addLast(a);
+        list.addLast(b);
+        list.addLast(c);
+        list.removeLast();
+        assertEquals(a, list.get(0));
+        assertEquals(b, list.get(1));
+        list.removeLast();
+        assertEquals(a, list.get(0));
+    }
+
+//    // using a combination of addFirst, addLast, removeFirst, removeLast,
+//    // and remove calls, check the status of the list and ensure it is
+//    // always in the expected state
+//    @Test public void testArrayLinkedList_StressTest() {
+//        // This is our "control" in the classical scientific testing sense.
+//        // If the values / sizes / results in the list match the control, then
+//        // we know the VirtualFlow.ArrayLinkedList implementation is working
+//        List control = new LinkedList();
+//        // Iterate a bunch of times
+//        for (int i = 0; i < 5000; i++) {
+//            // there are 1 of 6 different possible outcomes here:
+//            //  1) addFirst
+//            //  2) addLast
+//            //  3) removeFirst
+//            //  4) removeLast
+//            //  5) remove
+//            //  6) clear
+//            // but since I want to clear very infrequently, I weight everything
+//            // between 0 and 60 and the "clear" option has to be an even 59.
+//            int choice = (int) (Math.random() * 50);
+//            if (choice < 10) {
+//                char input = Character.toChars((Math.random() * 26) + 65)[0];
+//                IndexedCell cell = new CellStub("input");
+//                control.addFirst(cell);
+//                list.addFirst(cell);
+//                assertMatch(control, list);
+//            } else if (choice < 20) {
+//                char input = Character.toChars((Math.random() * 26) + 65)[0];
+//                IndexedCell cell = new CellStub("input");
+//                control.addLast(cell);
+//                list.addLast(cell);
+//                assertMatch(control, list);
+//            } else if (choice < 30) {
+//                if (control.size() == 0) continue;
+//                IndexedCell cell = (IndexedCell) control.removeFirst();
+//                IndexedCell cell2 = list.removeFirst();
+//                assertSame(cell, cell2);
+//                assertMatch(control, list);
+//            } else if (choice < 40) {
+//                if (control.size() == 0) continue;
+//                IndexedCell cell = control.removeLast();
+//                IndexedCell cell2 = list.removeLast();
+//                assertSame(cell, cell2);
+//                assertMatch(control, list);
+//            } else if (choice < 49) {
+//                if (control.size() == 0) continue;
+//                int index = (Math.random() * control.size());
+//                if (index == control.size()) index--;
+//                IndexedCell cell = control.remove(index);
+//                def cell2 = list.remove(index);
+//                assertSame(cell, cell2);
+//                assertMatch(control, list);
+//            } else if (choice < 50) {
+//                control.clear();
+//                list.clear();
+//                assertMatch(control, list);
+//            }
+//        }
+//    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ButtonSkinTest.java	2015-09-03 15:26:49.101029900 -0700
+++ /dev/null	2015-09-03 15:26:50.000000000 -0700
@@ -1,157 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import javafx.geometry.Insets;
-import javafx.scene.control.Button;
-
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import javafx.scene.input.Mnemonic;
-import javafx.collections.ObservableList;
-import javafx.scene.input.KeyCombination;
-
-import com.sun.javafx.scene.control.behavior.TextBinding.MnemonicKeyCombination;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ButtonSkinTest {
-    private Button button;
-    private ButtonSkinMock skin;
-
-    @Before public void setup() {
-        button = new Button("Test");
-        skin = new ButtonSkinMock(button);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        button.setPadding(new Insets(10, 10, 10, 10));
-        button.setSkin(skin);
-
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        button.setPrefWidth(500);
-        assertEquals(500, button.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        button.setPrefHeight(500);
-        assertEquals(500, button.maxHeight(-1), 0);
-    }
-
-    @Test
-    public void testMnemonicAutoParseAddition() {
-        if(!com.sun.javafx.PlatformUtil.isMac()) {
-            boolean nodeFound = false;
-            Stage stage = new Stage();
-            Scene scene = new Scene(new Group(), 500, 500);
-            stage.setScene(scene);
-            
-            button.setMnemonicParsing(true);
-            button.setText("_Mnemonic");
-            
-            ((Group)scene.getRoot()).getChildren().add(button);
-        
-            stage.show();
-        
-            KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("M");
-
-            ObservableList<Mnemonic> mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo);
-            if (mnemonicsList != null) {
-                for (int i = 0 ; i < mnemonicsList.size() ; i++) {
-                    if (mnemonicsList.get(i).getNode() == button) {
-                        nodeFound = true;
-                    }
-                }
-            }
-            assertTrue(nodeFound);
-        }
-    }
-
-   
-    @Test
-    public void testMnemonicAutoParseAdditionRemovalOnParentChange() {
-        if(!com.sun.javafx.PlatformUtil.isMac()) {
-            boolean nodeFound = false;
-            Stage stage = new Stage();
-            Scene scene = new Scene(new Group(), 500, 500);
-            stage.setScene(scene);
-            
-            button.setMnemonicParsing(true);
-            button.setText("_AnotherMnemonic");
-            
-            ((Group)scene.getRoot()).getChildren().add(button);
-        
-            stage.show();
-        
-            KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("A");
-
-            ObservableList<Mnemonic> mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo);
-            if (mnemonicsList != null) {
-                for (int i = 0 ; i < mnemonicsList.size() ; i++) {
-                    if (mnemonicsList.get(i).getNode() == button) {
-                        nodeFound = true;
-                    }
-                }
-            }
-            assertTrue(nodeFound);
-
-            nodeFound = false;
-
-            ((Group)scene.getRoot()).getChildren().remove(button);
-  
-            mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo);
-            if (mnemonicsList != null) {
-                for (int i = 0 ; i < mnemonicsList.size() ; i++) {
-                    if (mnemonicsList.get(i).getNode() == button) {
-                        nodeFound = true;
-                    }
-                }
-            }
-            assertTrue(!nodeFound);
-        }
-    }
-
-    public static final class ButtonSkinMock extends ButtonSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ButtonSkinMock(Button button) {
-            super(button);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:26:50.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ButtonSkinTest.java	2015-09-03 15:26:48.266982200 -0700
@@ -0,0 +1,161 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.Button;
+
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.control.skin.ButtonSkin;
+import javafx.stage.Stage;
+import javafx.scene.input.Mnemonic;
+import javafx.collections.ObservableList;
+import javafx.scene.input.KeyCombination;
+
+import com.sun.javafx.scene.control.behavior.TextBinding.MnemonicKeyCombination;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class ButtonSkinTest {
+    private Button button;
+    private ButtonSkinMock skin;
+
+    @Before public void setup() {
+        button = new Button("Test");
+        skin = new ButtonSkinMock(button);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        button.setPadding(new Insets(10, 10, 10, 10));
+        button.setSkin(skin);
+
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        button.setPrefWidth(500);
+        assertEquals(500, button.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        button.setPrefHeight(500);
+        assertEquals(500, button.maxHeight(-1), 0);
+    }
+
+    @Test
+    public void testMnemonicAutoParseAddition() {
+        if(!com.sun.javafx.PlatformUtil.isMac()) {
+            boolean nodeFound = false;
+            Stage stage = new Stage();
+            Scene scene = new Scene(new Group(), 500, 500);
+            stage.setScene(scene);
+            
+            button.setMnemonicParsing(true);
+            button.setText("_Mnemonic");
+            
+            ((Group)scene.getRoot()).getChildren().add(button);
+        
+            stage.show();
+        
+            KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("M");
+
+            ObservableList<Mnemonic> mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo);
+            if (mnemonicsList != null) {
+                for (int i = 0 ; i < mnemonicsList.size() ; i++) {
+                    if (mnemonicsList.get(i).getNode() == button) {
+                        nodeFound = true;
+                    }
+                }
+            }
+            assertTrue(nodeFound);
+        }
+    }
+
+   
+    @Test
+    public void testMnemonicAutoParseAdditionRemovalOnParentChange() {
+        if(!com.sun.javafx.PlatformUtil.isMac()) {
+            boolean nodeFound = false;
+            Stage stage = new Stage();
+            Scene scene = new Scene(new Group(), 500, 500);
+            stage.setScene(scene);
+            
+            button.setMnemonicParsing(true);
+            button.setText("_AnotherMnemonic");
+            
+            ((Group)scene.getRoot()).getChildren().add(button);
+        
+            stage.show();
+        
+            KeyCombination mnemonicKeyCombo = new MnemonicKeyCombination("A");
+
+            ObservableList<Mnemonic> mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo);
+            if (mnemonicsList != null) {
+                for (int i = 0 ; i < mnemonicsList.size() ; i++) {
+                    if (mnemonicsList.get(i).getNode() == button) {
+                        nodeFound = true;
+                    }
+                }
+            }
+            assertTrue(nodeFound);
+
+            nodeFound = false;
+
+            ((Group)scene.getRoot()).getChildren().remove(button);
+  
+            mnemonicsList = scene.getMnemonics().get(mnemonicKeyCombo);
+            if (mnemonicsList != null) {
+                for (int i = 0 ; i < mnemonicsList.size() ; i++) {
+                    if (mnemonicsList.get(i).getNode() == button) {
+                        nodeFound = true;
+                    }
+                }
+            }
+            assertTrue(!nodeFound);
+        }
+    }
+
+    public static final class ButtonSkinMock extends ButtonSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ButtonSkinMock(Button button) {
+            super(button);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/CheckBoxSkinTest.java	2015-09-03 15:26:57.293498500 -0700
+++ /dev/null	2015-09-03 15:26:58.000000000 -0700
@@ -1,74 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.CheckBox;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class CheckBoxSkinTest {
-    private CheckBox checkbox;
-    private CheckBoxSkinMock skin;
-
-    @Before public void setup() {
-        checkbox = new CheckBox("Test");
-        skin = new CheckBoxSkinMock(checkbox);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        checkbox.setPadding(new Insets(10, 10, 10, 10));
-        checkbox.setSkin(skin);
-
-    }
-
-    @Test public void maxWidthTracksPreferred() {        
-        checkbox.setPrefWidth(500);
-        assertEquals(500, checkbox.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        checkbox.setPrefHeight(500);
-        assertEquals(500, checkbox.maxHeight(-1), 0);
-    }
-    
-    public static final class CheckBoxSkinMock extends CheckBoxSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public CheckBoxSkinMock(CheckBox checkbox) {
-            super(checkbox);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:26:58.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/CheckBoxSkinTest.java	2015-09-03 15:26:56.552456100 -0700
@@ -0,0 +1,78 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.CheckBox;
+
+import javafx.scene.control.skin.CheckBoxSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class CheckBoxSkinTest {
+    private CheckBox checkbox;
+    private CheckBoxSkinMock skin;
+
+    @Before public void setup() {
+        checkbox = new CheckBox("Test");
+        skin = new CheckBoxSkinMock(checkbox);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        checkbox.setPadding(new Insets(10, 10, 10, 10));
+        checkbox.setSkin(skin);
+
+    }
+
+    @Test public void maxWidthTracksPreferred() {        
+        checkbox.setPrefWidth(500);
+        assertEquals(500, checkbox.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        checkbox.setPrefHeight(500);
+        assertEquals(500, checkbox.maxHeight(-1), 0);
+    }
+    
+    public static final class CheckBoxSkinMock extends CheckBoxSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public CheckBoxSkinMock(CheckBox checkbox) {
+            super(checkbox);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ChoiceBoxSkinNodesRetriever.java	2015-09-03 15:27:05.269954700 -0700
+++ /dev/null	2015-09-03 15:27:06.000000000 -0700
@@ -1,39 +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.scene.control.skin;
-
-/**
- *
- * @author paru
- */
-public class ChoiceBoxSkinNodesRetriever {
-    
-    // can only access the getChoiceBoxSelectedText method in ChoiceBoxSkin 
-    // from this package.
-    public static String getChoiceBoxSelectedText(ChoiceBoxSkin skin) {
-        return skin.getChoiceBoxSelectedText();
-    }
-}
--- /dev/null	2015-09-03 15:27:06.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ChoiceBoxSkinNodesRetriever.java	2015-09-03 15:27:04.565914400 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2011, 2015, 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;
+
+/**
+ *
+ * @author paru
+ */
+public class ChoiceBoxSkinNodesRetriever {
+    
+    // can only access the getChoiceBoxSelectedText method in ChoiceBoxSkin 
+    // from this package.
+    public static String getChoiceBoxSelectedText(ChoiceBoxSkin skin) {
+        return skin.getChoiceBoxSelectedText();
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ChoiceBoxSkinTest.java	2015-09-03 15:27:13.347416700 -0700
+++ /dev/null	2015-09-03 15:27:14.000000000 -0700
@@ -1,75 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.ChoiceBox;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This fails with IllegalStateException because of the toolkit's check for the FX application thread
- */
-public class ChoiceBoxSkinTest {
-    private ChoiceBox choicebox;
-    private ChoiceBoxSkinMock skin;
-
-    @Before public void setup() {
-        choicebox = new ChoiceBox();
-        skin = new ChoiceBoxSkinMock(choicebox);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        choicebox.setPadding(new Insets(10, 10, 10, 10));
-        choicebox.setSkin(skin);
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        choicebox.setPrefWidth(500);
-        assertEquals(500, choicebox.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        choicebox.setPrefHeight(500);
-        assertEquals(500, choicebox.maxHeight(-1), 0);
-    }
-    
-    public static final class ChoiceBoxSkinMock extends ChoiceBoxSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ChoiceBoxSkinMock(ChoiceBox choicebox) {
-            super(choicebox);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:27:14.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ChoiceBoxSkinTest.java	2015-09-03 15:27:12.572372400 -0700
@@ -0,0 +1,78 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.ChoiceBox;
+
+import javafx.scene.control.skin.ChoiceBoxSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This fails with IllegalStateException because of the toolkit's check for the FX application thread
+ */
+public class ChoiceBoxSkinTest {
+    private ChoiceBox choicebox;
+    private ChoiceBoxSkinMock skin;
+
+    @Before public void setup() {
+        choicebox = new ChoiceBox();
+        skin = new ChoiceBoxSkinMock(choicebox);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        choicebox.setPadding(new Insets(10, 10, 10, 10));
+        choicebox.setSkin(skin);
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        choicebox.setPrefWidth(500);
+        assertEquals(500, choicebox.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        choicebox.setPrefHeight(500);
+        assertEquals(500, choicebox.maxHeight(-1), 0);
+    }
+    
+    public static final class ChoiceBoxSkinMock extends ChoiceBoxSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ChoiceBoxSkinMock(ChoiceBox choicebox) {
+            super(choicebox);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- 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;
+    }
+}
--- /dev/null	2015-09-03 15:27:30.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ColorPickerSkinTest.java	2015-09-03 15:27:28.348274700 -0700
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015, 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 com.sun.javafx.pgstub.StubToolkit;
+import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
+import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
+import com.sun.javafx.scene.control.infrastructure.MouseEventGenerator;
+import com.sun.javafx.tk.Toolkit;
+import javafx.scene.Scene;
+import javafx.scene.control.ColorPicker;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import javafx.stage.Stage;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class ColorPickerSkinTest {
+    private ColorPicker colorPicker;
+    private Toolkit tk;
+    private Stage stage;
+
+    @Before public void setup() {
+        tk = Toolkit.getToolkit();
+        colorPicker = new ColorPicker();
+        Scene scene = new Scene(new VBox(20), 800, 600);
+        VBox box = (VBox)scene.getRoot();
+        box.getChildren().add(colorPicker);
+        stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+        tk.firePulse();
+    }
+
+
+    @Test public void ensureCanSelectColorFromPalette() {
+         final MouseEventGenerator generator = new MouseEventGenerator();
+         ColorPickerSkin skin = (ColorPickerSkin)colorPicker.getSkin();
+         assertTrue(skin != null);
+         ColorPalette colorPalette = ColorPickerPaletteRetriever.getColorPalette(colorPicker);
+         colorPicker.show();
+         tk.firePulse();
+         assertTrue(colorPicker.isShowing());
+         GridPane grid = colorPalette.getColorGrid();
+         double xval = grid.getBoundsInLocal().getMinX();
+         double yval = grid.getBoundsInLocal().getMinY();
+        
+        Scene paletteScene = ColorPickerPaletteRetriever.getPopup(colorPicker).getScene();
+        paletteScene.getWindow().requestFocus();
+        
+        paletteScene.impl_processMouseEvent(
+                generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, xval+85, yval+40));
+        
+        paletteScene.impl_processMouseEvent(
+                generator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, xval+85, yval+40));
+        tk.firePulse();
+        
+        assertEquals(colorPicker.getValue().toString(), "0x330033ff");
+    }
+    
+    @Test public void testEscapeClosesCustomColorDialog() {
+//        final MouseEventGenerator generator = new MouseEventGenerator();
+        ColorPickerSkin skin = (ColorPickerSkin)colorPicker.getSkin();
+        assertTrue(skin != null);
+        ColorPalette colorPalette = ColorPickerPaletteRetriever.getColorPalette(colorPicker);
+        colorPicker.show();
+        tk.firePulse();
+        assertTrue(colorPicker.isShowing());
+        Hyperlink link = ColorPickerPaletteRetriever.getCustomColorLink(colorPalette);
+         
+        Scene paletteScene = ColorPickerPaletteRetriever.getPopup(colorPicker).getScene();
+        paletteScene.getWindow().requestFocus();
+        
+        //Click on CustomColor hyperlink to show the custom color dialog.
+        Hyperlink hyperlink = ColorPickerPaletteRetriever.getCustomColorLink(colorPalette);
+        MouseEventFirer mouse = new MouseEventFirer(hyperlink);
+        mouse.fireMousePressAndRelease();
+        mouse.dispose();
+
+        Stage dialog = ColorPickerPaletteRetriever.getCustomColorDialog(colorPalette);
+        assertNotNull(dialog);
+        assertTrue(dialog.isShowing());
+        
+        dialog.requestFocus();
+        tk.firePulse();
+        
+        // fire KeyEvent (Escape) on custom color dialog to close it
+        KeyEventFirer keyboard = new KeyEventFirer(dialog);
+        keyboard.doKeyPress(KeyCode.ESCAPE);
+        tk.firePulse();   
+        assertTrue(!dialog.isShowing());
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ComboBoxListViewSkinTest.java	2015-09-03 15:27:35.200666700 -0700
+++ /dev/null	2015-09-03 15:27:36.000000000 -0700
@@ -1,72 +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.scene.control.skin;
-
-import static org.junit.Assert.*;
-import javafx.geometry.Insets;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.ListView;
-import javafx.scene.control.SelectionModel;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class ComboBoxListViewSkinTest {
-    private ComboBox<String> comboBox;
-    private SelectionModel<String> sm;
-    private ListView<String> listView;
-    private SelectionModel<String> listSm;
-    private ComboBoxListViewSkin<String> skin;
-
-    @Before public void setup() {
-        comboBox = new ComboBox();
-        skin = new ComboBoxListViewSkin(comboBox);
-        comboBox.setSkin(skin);
-        
-        sm = comboBox.getSelectionModel();
-        listView = skin.getListView();
-        listSm = listView.getSelectionModel();
-    }
-    
-    @Test public void testListViewSelectionEqualsComboBox() {
-        comboBox.getItems().addAll("Apple", "Orange", "Banana");
-        sm.select("Orange");
-        assertEquals("Orange", comboBox.getValue());
-        assertEquals("Orange", sm.getSelectedItem());
-        assertEquals("Orange", listSm.getSelectedItem());
-    }
-    
-    @Test public void test_rt19431_ListViewSelectionIsNullWhenComBoxChangesEditableProperty() {
-        comboBox.getItems().addAll("Apple", "Orange", "Banana");
-        sm.select("Orange");
-        comboBox.setEditable(true);
-        assertNull(comboBox.getValue());
-        assertNull(sm.getSelectedItem());
-        assertNull(listSm.getSelectedItem());
-    }
-    
-}
--- /dev/null	2015-09-03 15:27:36.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ComboBoxListViewSkinTest.java	2015-09-03 15:27:34.274613700 -0700
@@ -0,0 +1,72 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.*;
+
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.ListView;
+import javafx.scene.control.SelectionModel;
+
+import javafx.scene.control.skin.ComboBoxListViewSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ComboBoxListViewSkinTest {
+    private ComboBox<String> comboBox;
+    private SelectionModel<String> sm;
+    private ListView<String> listView;
+    private SelectionModel<String> listSm;
+    private ComboBoxListViewSkin<String> skin;
+
+    @Before public void setup() {
+        comboBox = new ComboBox();
+        skin = new ComboBoxListViewSkin(comboBox);
+        comboBox.setSkin(skin);
+        
+        sm = comboBox.getSelectionModel();
+        listView = (ListView)skin.getPopupContent();
+        listSm = listView.getSelectionModel();
+    }
+    
+    @Test public void testListViewSelectionEqualsComboBox() {
+        comboBox.getItems().addAll("Apple", "Orange", "Banana");
+        sm.select("Orange");
+        assertEquals("Orange", comboBox.getValue());
+        assertEquals("Orange", sm.getSelectedItem());
+        assertEquals("Orange", listSm.getSelectedItem());
+    }
+    
+    @Test public void test_rt19431_ListViewSelectionIsNullWhenComBoxChangesEditableProperty() {
+        comboBox.getItems().addAll("Apple", "Orange", "Banana");
+        sm.select("Orange");
+        comboBox.setEditable(true);
+        assertNull(comboBox.getValue());
+        assertNull(sm.getSelectedItem());
+        assertNull(listSm.getSelectedItem());
+    }
+    
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/HyperlinkSkinTest.java	2015-09-03 15:27:43.579145900 -0700
+++ /dev/null	2015-09-03 15:27:44.000000000 -0700
@@ -1,73 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.Hyperlink;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class HyperlinkSkinTest {
-    private Hyperlink hyperlink;
-    private HyperlinkSkinMock skin;
-
-    @Before public void setup() {
-        hyperlink = new Hyperlink("Test");
-        skin = new HyperlinkSkinMock(hyperlink);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        hyperlink.setPadding(new Insets(10, 10, 10, 10));
-        hyperlink.setSkin(skin);
-
-    }
-    @Test public void maxWidthTracksPreferred() {
-        hyperlink.setPrefWidth(500);
-        assertEquals(500, hyperlink.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        hyperlink.setPrefHeight(500);
-        assertEquals(500, hyperlink.maxHeight(-1), 0);
-    }
-    
-    public static final class HyperlinkSkinMock extends HyperlinkSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public HyperlinkSkinMock(Hyperlink hyperlink) {
-            super(hyperlink);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:27:44.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/HyperlinkSkinTest.java	2015-09-03 15:27:42.736097700 -0700
@@ -0,0 +1,77 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.Hyperlink;
+
+import javafx.scene.control.skin.HyperlinkSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class HyperlinkSkinTest {
+    private Hyperlink hyperlink;
+    private HyperlinkSkinMock skin;
+
+    @Before public void setup() {
+        hyperlink = new Hyperlink("Test");
+        skin = new HyperlinkSkinMock(hyperlink);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        hyperlink.setPadding(new Insets(10, 10, 10, 10));
+        hyperlink.setSkin(skin);
+
+    }
+    @Test public void maxWidthTracksPreferred() {
+        hyperlink.setPrefWidth(500);
+        assertEquals(500, hyperlink.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        hyperlink.setPrefHeight(500);
+        assertEquals(500, hyperlink.maxHeight(-1), 0);
+    }
+    
+    public static final class HyperlinkSkinMock extends HyperlinkSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public HyperlinkSkinMock(Hyperlink hyperlink) {
+            super(hyperlink);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- /dev/null	2015-09-03 15:27:52.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/LabelSkinBaseRetriever.java	2015-09-03 15:27:50.999570300 -0700
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2012, 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 com.sun.javafx.scene.control.LabeledText;
+import javafx.scene.control.Label;
+
+public class LabelSkinBaseRetriever {
+
+    public static LabeledText getText(Label label) {
+        return ((LabeledSkinBase)label.getSkin()).text;
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/LabelSkinCreationTest.java	2015-09-03 15:27:57.677952300 -0700
+++ /dev/null	2015-09-03 15:27:58.000000000 -0700
@@ -1,185 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import javafx.scene.Node;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextAlignment;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import static javafx.scene.control.ContentDisplay.*;
-import javafx.scene.control.SkinBaseAccessor;
-
-
-/**
- * A parameterized test suite for testing that a LabelSkin,
- * created with various different configurations, is setup
- * correctly.
- */
-@RunWith(Parameterized.class)
-public class LabelSkinCreationTest {
-    private Paint fill;
-    private Font font;
-    private TextAlignment align;
-    private boolean underline;
-    private boolean wrapText;
-    private ContentDisplay contentDisplay;
-    private Node graphic;
-    
-    private Label label;
-    private LabelSkin skin;
-    private Text text;
-
-    @SuppressWarnings("rawtypes")
-    @Parameters public static Collection implementations() {
-        Rectangle rect = new Rectangle();
-        rect.setWidth(25);
-        rect.setHeight(25);
-        return Arrays.asList(new Object[][] {
-            // standard configuration
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
-            // specify only the fill
-            { Color.RED,   Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
-            // specify only the font
-            { Color.BLACK, Font.font("Arial", 64), TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
-            // specify only the align
-            { Color.BLACK, Font.getDefault(),      TextAlignment.JUSTIFY, false, false, ContentDisplay.LEFT,   null },
-            // specify only the underline
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    true,  false, ContentDisplay.LEFT,   null },
-            // specify only the wrapText
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, true,  ContentDisplay.LEFT,   null },
-            // specify only the contentDisplay
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM, null },
-            // specify only the graphic
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   rect },
-            // specify every type of content display with null graphic
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    null },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          null },
-            // specify every type of content display with non-null graphic
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    rect },
-            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          rect },
-        });
-    }
-
-    public LabelSkinCreationTest(
-            Paint fill,
-            Font font,
-            TextAlignment align,
-            boolean underline,
-            boolean wrapText,
-            ContentDisplay contentDisplay,
-            Node graphic)
-    {
-        this.fill = fill;
-        this.font = font;
-        this.align = align;
-        this.underline = underline;
-        this.wrapText = wrapText;
-        this.contentDisplay = contentDisplay;
-        this.graphic = graphic;
-    }
-    
-    @Before public void setup() {
-        label = new Label();
-        label.setTextFill(fill);
-        label.setFont(font);
-        label.setTextAlignment(align);
-        label.setUnderline(underline);
-        label.setWrapText(wrapText);
-        label.setContentDisplay(contentDisplay);
-        label.setGraphic(graphic);
-        label.setText("*");
-        label.resize(30, 30);
-        skin = new LabelSkin(label);
-        label.setSkin(skin);
-        text = skin.text;
-    }
-    
-    @Test public void labelWasInitializedCorrectly() {
-        assertSame(label.getTextFill(), text.getFill());
-        assertSame(label.getFont(), text.getFont());
-        assertSame(label.getTextAlignment(), text.getTextAlignment());
-        assertEquals(label.isUnderline(), text.isUnderline());
-
-        // The wrapping width is based on layout after updateDisplayedText() is called from layoutChildren().
-        //assertTrue(label.isWrapText() ? text.getWrappingWidth() > 0 : text.getWrappingWidth() == 0);
-        
-        // Now test the children
-        if (label.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) {
-            // 1 child, graphic, if it is not null, otherwise 0
-            if (label.getGraphic() == null) {
-                assertEquals(0, SkinBaseAccessor.getChildren(skin).size());
-            } else {
-                assertEquals(1, SkinBaseAccessor.getChildren(skin).size());
-                assertEquals(label.getGraphic(), SkinBaseAccessor.getChildren(skin).get(0));
-            }
-        } else if (label.getContentDisplay() == ContentDisplay.TEXT_ONLY) {
-            // 1 child, text
-            assertEquals(1, SkinBaseAccessor.getChildren(skin).size());
-            assertEquals(text, SkinBaseAccessor.getChildren(skin).get(0));
-        } else {
-            if (label.getGraphic() == null) {
-                // 1 child, text
-                assertEquals(1, SkinBaseAccessor.getChildren(skin).size());
-                assertEquals(text, SkinBaseAccessor.getChildren(skin).get(0));
-            } else {
-                // 2 children, graphic + text
-                assertEquals(2, SkinBaseAccessor.getChildren(skin).size());
-                assertEquals(label.getGraphic(), SkinBaseAccessor.getChildren(skin).get(0));
-                assertEquals(text, SkinBaseAccessor.getChildren(skin).get(1));
-            }
-        }
-        
-        // TODO test that if there is a graphic, that the appropriate listeners are added
-    }
-}
--- /dev/null	2015-09-03 15:27:59.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/LabelSkinCreationTest.java	2015-09-03 15:27:56.870906100 -0700
@@ -0,0 +1,185 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javafx.scene.Node;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Label;
+import javafx.scene.control.skin.LabelSkin;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import javafx.scene.control.SkinBaseAccessor;
+
+
+/**
+ * A parameterized test suite for testing that a LabelSkin,
+ * created with various different configurations, is setup
+ * correctly.
+ */
+@RunWith(Parameterized.class)
+public class LabelSkinCreationTest {
+    private Paint fill;
+    private Font font;
+    private TextAlignment align;
+    private boolean underline;
+    private boolean wrapText;
+    private ContentDisplay contentDisplay;
+    private Node graphic;
+    
+    private Label label;
+    private LabelSkin skin;
+    private Text text;
+
+    @SuppressWarnings("rawtypes")
+    @Parameters public static Collection implementations() {
+        Rectangle rect = new Rectangle();
+        rect.setWidth(25);
+        rect.setHeight(25);
+        return Arrays.asList(new Object[][] {
+            // standard configuration
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
+            // specify only the fill
+            { Color.RED,   Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
+            // specify only the font
+            { Color.BLACK, Font.font("Arial", 64), TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   null },
+            // specify only the align
+            { Color.BLACK, Font.getDefault(),      TextAlignment.JUSTIFY, false, false, ContentDisplay.LEFT,   null },
+            // specify only the underline
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    true,  false, ContentDisplay.LEFT,   null },
+            // specify only the wrapText
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, true,  ContentDisplay.LEFT,   null },
+            // specify only the contentDisplay
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM, null },
+            // specify only the graphic
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,   rect },
+            // specify every type of content display with null graphic
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       null },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       null },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, null },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         null },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        null },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    null },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          null },
+            // specify every type of content display with non-null graphic
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.BOTTOM,       rect },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.CENTER,       rect },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.GRAPHIC_ONLY, rect },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.LEFT,         rect },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.RIGHT,        rect },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TEXT_ONLY,    rect },
+            { Color.BLACK, Font.getDefault(),      TextAlignment.LEFT,    false, false, ContentDisplay.TOP,          rect },
+        });
+    }
+
+    public LabelSkinCreationTest(
+            Paint fill,
+            Font font,
+            TextAlignment align,
+            boolean underline,
+            boolean wrapText,
+            ContentDisplay contentDisplay,
+            Node graphic)
+    {
+        this.fill = fill;
+        this.font = font;
+        this.align = align;
+        this.underline = underline;
+        this.wrapText = wrapText;
+        this.contentDisplay = contentDisplay;
+        this.graphic = graphic;
+    }
+    
+    @Before public void setup() {
+        label = new Label();
+        label.setTextFill(fill);
+        label.setFont(font);
+        label.setTextAlignment(align);
+        label.setUnderline(underline);
+        label.setWrapText(wrapText);
+        label.setContentDisplay(contentDisplay);
+        label.setGraphic(graphic);
+        label.setText("*");
+        label.resize(30, 30);
+        skin = new LabelSkin(label);
+        label.setSkin(skin);
+        text = skin.text;
+    }
+    
+    @Test public void labelWasInitializedCorrectly() {
+        assertSame(label.getTextFill(), text.getFill());
+        assertSame(label.getFont(), text.getFont());
+        assertSame(label.getTextAlignment(), text.getTextAlignment());
+        assertEquals(label.isUnderline(), text.isUnderline());
+
+        // The wrapping width is based on layout after updateDisplayedText() is called from layoutChildren().
+        //assertTrue(label.isWrapText() ? text.getWrappingWidth() > 0 : text.getWrappingWidth() == 0);
+        
+        // Now test the children
+        if (label.getContentDisplay() == ContentDisplay.GRAPHIC_ONLY) {
+            // 1 child, graphic, if it is not null, otherwise 0
+            if (label.getGraphic() == null) {
+                assertEquals(0, SkinBaseAccessor.getChildren(skin).size());
+            } else {
+                assertEquals(1, SkinBaseAccessor.getChildren(skin).size());
+                assertEquals(label.getGraphic(), SkinBaseAccessor.getChildren(skin).get(0));
+            }
+        } else if (label.getContentDisplay() == ContentDisplay.TEXT_ONLY) {
+            // 1 child, text
+            assertEquals(1, SkinBaseAccessor.getChildren(skin).size());
+            assertEquals(text, SkinBaseAccessor.getChildren(skin).get(0));
+        } else {
+            if (label.getGraphic() == null) {
+                // 1 child, text
+                assertEquals(1, SkinBaseAccessor.getChildren(skin).size());
+                assertEquals(text, SkinBaseAccessor.getChildren(skin).get(0));
+            } else {
+                // 2 children, graphic + text
+                assertEquals(2, SkinBaseAccessor.getChildren(skin).size());
+                assertEquals(label.getGraphic(), SkinBaseAccessor.getChildren(skin).get(0));
+                assertEquals(text, SkinBaseAccessor.getChildren(skin).get(1));
+            }
+        }
+        
+        // TODO test that if there is a graphic, that the appropriate listeners are added
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/LabelSkinLayoutTest.java	2015-09-03 15:28:05.751414100 -0700
+++ /dev/null	2015-09-03 15:28:06.000000000 -0700
@@ -1,1012 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import javafx.geometry.BoundingBox;
-import javafx.geometry.Bounds;
-import javafx.scene.Node;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.control.SkinBaseAccessor;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/**
- */
-@RunWith(Parameterized.class)
-public class LabelSkinLayoutTest {
-    private static final double GRAPHIC_WIDTH = 23;
-    private static final double GRAPHIC_HEIGHT = 32;
-    private static final double LABEL_WIDTH = 300;
-    private static final double LABEL_HEIGHT = 300;
-    
-    @SuppressWarnings("rawtypes")
-    @Parameters public static Collection implementations() {
-        return Arrays.asList(new Object[][] {
-                {-10},
-                {0},
-                {10}
-//            { HPos.CENTER, VPos.BOTTOM, -10 },
-//            { HPos.CENTER, VPos.BOTTOM, 0 },
-//            { HPos.CENTER, VPos.BOTTOM, 10 },
-//            { HPos.CENTER, VPos.CENTER, -10 },
-//            { HPos.CENTER, VPos.CENTER, 0 },
-//            { HPos.CENTER, VPos.CENTER, 10 },
-//            { HPos.CENTER, VPos.TOP, -10 },
-//            { HPos.CENTER, VPos.TOP, 0 },
-//            { HPos.CENTER, VPos.TOP, 10 },
-//            { HPos.LEFT, VPos.BOTTOM, -10 },
-//            { HPos.LEFT, VPos.BOTTOM, 0 },
-//            { HPos.LEFT, VPos.BOTTOM, 10 },
-//            { HPos.LEFT, VPos.CENTER, -10 },
-//            { HPos.LEFT, VPos.CENTER, 0 },
-//            { HPos.LEFT, VPos.CENTER, 10 },
-//            { HPos.LEFT, VPos.TOP, -10 },
-//            { HPos.LEFT, VPos.TOP, 0 },
-//            { HPos.LEFT, VPos.TOP, 10 },
-//            { HPos.RIGHT, VPos.BOTTOM, -10 },
-//            { HPos.RIGHT, VPos.BOTTOM, 0 },
-//            { HPos.RIGHT, VPos.BOTTOM, 10 },
-//            { HPos.RIGHT, VPos.CENTER, -10 },
-//            { HPos.RIGHT, VPos.CENTER, 0 },
-//            { HPos.RIGHT, VPos.CENTER, 10 },
-//            { HPos.RIGHT, VPos.TOP, -10 },
-//            { HPos.RIGHT, VPos.TOP, 0 },
-//            { HPos.RIGHT, VPos.TOP, 10 },
-        });
-    }
-
-    private int graphicTextGap = 0;
-//    private VPos vpos;
-//    private HPos hpos;
-    private Label label;
-    private LabelSkin skin;
-    private Text text;
-    
-    public LabelSkinLayoutTest(int graphicTextGap) {
-//    public LabelSkinLayoutTest(HPos hpos, VPos vpos, int graphicTextGap) {
-        this.graphicTextGap = graphicTextGap;
-//        this.hpos = hpos;
-//        this.vpos = vpos;
-    }
-
-    // We will parameterize the hpos and vpos to use, but all of the other tests
-    // are all done manually.
-    
-    @Before public void setup() {
-        label = new Label();
-        label.resize(LABEL_WIDTH, LABEL_HEIGHT);
-        label.setGraphicTextGap(graphicTextGap);
-//        label.setHpos(hpos);
-//        label.setVpos(vpos);
-        skin = new LabelSkin(label);
-        label.setSkin(skin);
-        text = skin.text;
-    }
-
-    private Bounds getContentBounds() {
-        Bounds b = null;
-        for (Node child : SkinBaseAccessor.getChildren(skin)) {
-            if (child.isManaged()) {
-                Bounds childBounds = child.getBoundsInParent();
-                if (b == null) {
-                    b = childBounds;
-                } else {
-                    final double minX = Math.min(b.getMinX(), childBounds.getMinX());
-                    final double minY = Math.min(b.getMinY(), childBounds.getMinY());
-                    final double maxX = Math.max(b.getMaxX(), childBounds.getMaxX());
-                    final double maxY = Math.max(b.getMaxY(), childBounds.getMaxY());
-                    b = new BoundingBox(minX, minY, maxX - minX, maxY - minY);
-                }
-            }
-        }
-        return b;
-    }
-    
-    private Bounds getNormalizedBounds(Bounds contentBounds, Node graphic) {
-        Bounds b = graphic.getBoundsInParent();
-        return new BoundingBox(
-                b.getMinX() - contentBounds.getMinX(),
-                b.getMinY() - contentBounds.getMinY(),
-                b.getWidth(),
-                b.getHeight());
-    }
-    
-    // Note that in Label, we pixel align so that the text is crisp, so do so here
-    private void assertCenteredHorizontally(Bounds totalSpace, Bounds b) {
-        if (b.getWidth() != totalSpace.getWidth()) {
-            final double expected = Math.round((totalSpace.getWidth() - b.getWidth()) / 2.0);
-            assertEquals(expected, b.getMinX(), 0.001);
-        }
-    }
-
-    // Note that in Label, we pixel align (snap to pixel)
-    private void assertCenteredVertically(Bounds totalSpace, Bounds b) {
-        if (b.getHeight() != totalSpace.getHeight()) {
-            final double expected = Math.round((totalSpace.getHeight() - b.getHeight()) / 2.0);
-            assertEquals(expected, b.getMinY(), 0.001);
-        }
-    }
-    
-    private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
-//        switch (label.getVpos()) {
-//            //case BASELINE:
-//            case CENTER:
-//                assertCenteredVertically(label.getBoundsInLocal(), contentBounds);
-//                break;
-//            case BOTTOM:
-//                assertEquals(label.getBoundsInLocal().getHeight(), contentBounds.getMaxY(), 0.001);
-//                break;
-//            case TOP:
-//                assertEquals(0, contentBounds.getMinY(), 0);
-//                break;
-//            default:
-//                System.err.println("Unhandled vpos case for LabelSkinLayoutTest");
-//        }
-    }
-    
-    @Test public void graphic_nullText_TOP() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.TOP);        
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_emptyText_TOP() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_Text_TOP() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setFont(new Font("Amble Condensed", 12));
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        // There is both a graphic & text node in this case. So we need to
-        // compare their positions. Since this is TOP, the graphic should
-        // be above the text by the amount specified in graphic-text-gap
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        final double expected = Math.round(textBounds.getMinY() - (GRAPHIC_HEIGHT + label.getGraphicTextGap()));
-        assertEquals(expected, graphicBounds.getMinY(), 0);
-        // And they should both be centered horizontally
-        assertCenteredHorizontally(contentBounds, graphicBounds);
-        assertCenteredHorizontally(contentBounds, textBounds);
-    }
-
-    @Test public void unmanagedGraphic_nullText_TOP() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_TOP() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_TOP() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void noGraphic_nullText_TOP() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_TOP() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_TOP() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    /** */
-    @Test public void graphic_nullText_RIGHT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_emptyText_RIGHT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_Text_RIGHT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        // There is both a graphic & text node in this case. So we need to
-        // compare their positions. Since this is RIGHT, the graphic should
-        // be right of the text by the amount specified in graphic-text-gap
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        final double expected = Math.round(textBounds.getMaxX() + label.getGraphicTextGap());
-        assertEquals(expected, graphicBounds.getMinX(), 0.001);
-        // And they should both be centered vertically
-        assertCenteredVertically(contentBounds, graphicBounds);
-        assertCenteredVertically(contentBounds, textBounds);
-    }
-
-    @Test public void unmanagedGraphic_nullText_RIGHT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_RIGHT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_RIGHT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void noGraphic_nullText_RIGHT() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_RIGHT() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_RIGHT() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    /** */
-    @Test public void graphic_nullText_BOTTOM() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_emptyText_BOTTOM() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_Text_BOTTOM() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setFont(new Font("Amble Condensed", 12));
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        // There is both a graphic & text node in this case. So we need to
-        // compare their positions. Since this is BOTTOM, the graphic should
-        // be below the text by the amount specified in graphic-text-gap
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        final double expected = Math.round(textBounds.getMaxY() + label.getGraphicTextGap());
-        assertEquals(expected, graphicBounds.getMinY(), 0);
-        // And they should both be centered horizontally
-        assertCenteredHorizontally(contentBounds, graphicBounds);
-        assertCenteredHorizontally(contentBounds, textBounds);
-    }
-
-    @Test public void unmanagedGraphic_nullText_BOTTOM() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_BOTTOM() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_BOTTOM() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void noGraphic_nullText_BOTTOM() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_BOTTOM() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_BOTTOM() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    /** */
-    @Test public void graphic_nullText_LEFT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_emptyText_LEFT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_Text_LEFT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        // There is both a graphic & text node in this case. So we need to
-        // compare their positions. Since this is LEFT, the graphic should
-        // be left of the text by the amount specified in graphic-text-gap
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        final double expected = Math.round(graphicBounds.getMaxX() + label.getGraphicTextGap());
-        assertEquals(expected, textBounds.getMinX(), 0.001);
-        // And they should both be centered vertically
-        assertCenteredVertically(contentBounds, graphicBounds);
-        assertCenteredVertically(contentBounds, textBounds);
-    }
-
-    @Test public void unmanagedGraphic_nullText_LEFT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_LEFT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_LEFT() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void noGraphic_nullText_LEFT() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_LEFT() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_LEFT() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    /** */
-    @Test public void graphic_nullText_CENTER() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_emptyText_CENTER() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_Text_CENTER() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setFont(new Font("Amble Condensed", 12));
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        // There is both a graphic & text node in this case. So we need to
-        // compare their positions. Since this is CENTER, the graphic and
-        // text should overlap each other and be directly centered
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // And they should both be centered vertically
-        assertCenteredVertically(contentBounds, graphicBounds);
-        assertCenteredVertically(contentBounds, textBounds);
-        assertCenteredHorizontally(contentBounds, graphicBounds);
-        assertCenteredHorizontally(contentBounds, textBounds);
-    }
-
-    @Test public void unmanagedGraphic_nullText_CENTER() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_CENTER() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_CENTER() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void noGraphic_nullText_CENTER() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_CENTER() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_CENTER() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    /** */
-    @Test public void graphic_nullText_GRAPHIC_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_emptyText_GRAPHIC_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void graphic_Text_GRAPHIC_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Graphic alone makes up the content bounds, so contentBounds and
-        // graphic bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
-    }
-
-    @Test public void unmanagedGraphic_nullText_GRAPHIC_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_GRAPHIC_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_GRAPHIC_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_nullText_GRAPHIC_ONLY() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_GRAPHIC_ONLY() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_GRAPHIC_ONLY() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    /** */
-    @Test public void graphic_nullText_TEXT_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void graphic_emptyText_TEXT_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void graphic_Text_TEXT_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void unmanagedGraphic_nullText_TEXT_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_emptyText_TEXT_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void unmanagedGraphic_Text_TEXT_ONLY() {
-        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
-        graphic.setManaged(false);
-        label.setGraphic(graphic);
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-
-    @Test public void noGraphic_nullText_TEXT_ONLY() {
-        label.setText(null);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_emptyText_TEXT_ONLY() {
-        label.setText("");
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        assertNull(getContentBounds());
-    }
-
-    @Test public void noGraphic_Text_TEXT_ONLY() {
-        label.setText("Falcon");
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.layout();
-        
-        Bounds contentBounds = getContentBounds();
-        Bounds textBounds = getNormalizedBounds(contentBounds, text);
-        assertContentAreaPositionedCorrectly(contentBounds);
-        // Text alone makes up the content bounds, so contentBounds and
-        // text bounds should have the same width and height
-        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
-        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
-    }
-}
--- /dev/null	2015-09-03 15:28:06.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/LabelSkinLayoutTest.java	2015-09-03 15:28:05.066374900 -0700
@@ -0,0 +1,1013 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import javafx.geometry.BoundingBox;
+import javafx.geometry.Bounds;
+import javafx.scene.Node;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Label;
+import javafx.scene.control.SkinBaseAccessor;
+import javafx.scene.control.skin.LabelSkin;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ */
+@RunWith(Parameterized.class)
+public class LabelSkinLayoutTest {
+    private static final double GRAPHIC_WIDTH = 23;
+    private static final double GRAPHIC_HEIGHT = 32;
+    private static final double LABEL_WIDTH = 300;
+    private static final double LABEL_HEIGHT = 300;
+    
+    @SuppressWarnings("rawtypes")
+    @Parameters public static Collection implementations() {
+        return Arrays.asList(new Object[][] {
+                {-10},
+                {0},
+                {10}
+//            { HPos.CENTER, VPos.BOTTOM, -10 },
+//            { HPos.CENTER, VPos.BOTTOM, 0 },
+//            { HPos.CENTER, VPos.BOTTOM, 10 },
+//            { HPos.CENTER, VPos.CENTER, -10 },
+//            { HPos.CENTER, VPos.CENTER, 0 },
+//            { HPos.CENTER, VPos.CENTER, 10 },
+//            { HPos.CENTER, VPos.TOP, -10 },
+//            { HPos.CENTER, VPos.TOP, 0 },
+//            { HPos.CENTER, VPos.TOP, 10 },
+//            { HPos.LEFT, VPos.BOTTOM, -10 },
+//            { HPos.LEFT, VPos.BOTTOM, 0 },
+//            { HPos.LEFT, VPos.BOTTOM, 10 },
+//            { HPos.LEFT, VPos.CENTER, -10 },
+//            { HPos.LEFT, VPos.CENTER, 0 },
+//            { HPos.LEFT, VPos.CENTER, 10 },
+//            { HPos.LEFT, VPos.TOP, -10 },
+//            { HPos.LEFT, VPos.TOP, 0 },
+//            { HPos.LEFT, VPos.TOP, 10 },
+//            { HPos.RIGHT, VPos.BOTTOM, -10 },
+//            { HPos.RIGHT, VPos.BOTTOM, 0 },
+//            { HPos.RIGHT, VPos.BOTTOM, 10 },
+//            { HPos.RIGHT, VPos.CENTER, -10 },
+//            { HPos.RIGHT, VPos.CENTER, 0 },
+//            { HPos.RIGHT, VPos.CENTER, 10 },
+//            { HPos.RIGHT, VPos.TOP, -10 },
+//            { HPos.RIGHT, VPos.TOP, 0 },
+//            { HPos.RIGHT, VPos.TOP, 10 },
+        });
+    }
+
+    private int graphicTextGap = 0;
+//    private VPos vpos;
+//    private HPos hpos;
+    private Label label;
+    private LabelSkin skin;
+    private Text text;
+    
+    public LabelSkinLayoutTest(int graphicTextGap) {
+//    public LabelSkinLayoutTest(HPos hpos, VPos vpos, int graphicTextGap) {
+        this.graphicTextGap = graphicTextGap;
+//        this.hpos = hpos;
+//        this.vpos = vpos;
+    }
+
+    // We will parameterize the hpos and vpos to use, but all of the other tests
+    // are all done manually.
+    
+    @Before public void setup() {
+        label = new Label();
+        label.resize(LABEL_WIDTH, LABEL_HEIGHT);
+        label.setGraphicTextGap(graphicTextGap);
+//        label.setHpos(hpos);
+//        label.setVpos(vpos);
+        skin = new LabelSkin(label);
+        label.setSkin(skin);
+        text = skin.text;
+    }
+
+    private Bounds getContentBounds() {
+        Bounds b = null;
+        for (Node child : SkinBaseAccessor.getChildren(skin)) {
+            if (child.isManaged()) {
+                Bounds childBounds = child.getBoundsInParent();
+                if (b == null) {
+                    b = childBounds;
+                } else {
+                    final double minX = Math.min(b.getMinX(), childBounds.getMinX());
+                    final double minY = Math.min(b.getMinY(), childBounds.getMinY());
+                    final double maxX = Math.max(b.getMaxX(), childBounds.getMaxX());
+                    final double maxY = Math.max(b.getMaxY(), childBounds.getMaxY());
+                    b = new BoundingBox(minX, minY, maxX - minX, maxY - minY);
+                }
+            }
+        }
+        return b;
+    }
+    
+    private Bounds getNormalizedBounds(Bounds contentBounds, Node graphic) {
+        Bounds b = graphic.getBoundsInParent();
+        return new BoundingBox(
+                b.getMinX() - contentBounds.getMinX(),
+                b.getMinY() - contentBounds.getMinY(),
+                b.getWidth(),
+                b.getHeight());
+    }
+    
+    // Note that in Label, we pixel align so that the text is crisp, so do so here
+    private void assertCenteredHorizontally(Bounds totalSpace, Bounds b) {
+        if (b.getWidth() != totalSpace.getWidth()) {
+            final double expected = Math.round((totalSpace.getWidth() - b.getWidth()) / 2.0);
+            assertEquals(expected, b.getMinX(), 0.001);
+        }
+    }
+
+    // Note that in Label, we pixel align (snap to pixel)
+    private void assertCenteredVertically(Bounds totalSpace, Bounds b) {
+        if (b.getHeight() != totalSpace.getHeight()) {
+            final double expected = Math.round((totalSpace.getHeight() - b.getHeight()) / 2.0);
+            assertEquals(expected, b.getMinY(), 0.001);
+        }
+    }
+    
+    private void assertContentAreaPositionedCorrectly(Bounds contentBounds) {
+//        switch (label.getVpos()) {
+//            //case BASELINE:
+//            case CENTER:
+//                assertCenteredVertically(label.getBoundsInLocal(), contentBounds);
+//                break;
+//            case BOTTOM:
+//                assertEquals(label.getBoundsInLocal().getHeight(), contentBounds.getMaxY(), 0.001);
+//                break;
+//            case TOP:
+//                assertEquals(0, contentBounds.getMinY(), 0);
+//                break;
+//            default:
+//                System.err.println("Unhandled vpos case for LabelSkinLayoutTest");
+//        }
+    }
+    
+    @Test public void graphic_nullText_TOP() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.TOP);        
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_emptyText_TOP() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_Text_TOP() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setFont(new Font("Amble Condensed", 12));
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        // There is both a graphic & text node in this case. So we need to
+        // compare their positions. Since this is TOP, the graphic should
+        // be above the text by the amount specified in graphic-text-gap
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        final double expected = Math.round(textBounds.getMinY() - (GRAPHIC_HEIGHT + label.getGraphicTextGap()));
+        assertEquals(expected, graphicBounds.getMinY(), 0);
+        // And they should both be centered horizontally
+        assertCenteredHorizontally(contentBounds, graphicBounds);
+        assertCenteredHorizontally(contentBounds, textBounds);
+    }
+
+    @Test public void unmanagedGraphic_nullText_TOP() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_TOP() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_TOP() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void noGraphic_nullText_TOP() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_TOP() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_TOP() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    /** */
+    @Test public void graphic_nullText_RIGHT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_emptyText_RIGHT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_Text_RIGHT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        // There is both a graphic & text node in this case. So we need to
+        // compare their positions. Since this is RIGHT, the graphic should
+        // be right of the text by the amount specified in graphic-text-gap
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        final double expected = Math.round(textBounds.getMaxX() + label.getGraphicTextGap());
+        assertEquals(expected, graphicBounds.getMinX(), 0.001);
+        // And they should both be centered vertically
+        assertCenteredVertically(contentBounds, graphicBounds);
+        assertCenteredVertically(contentBounds, textBounds);
+    }
+
+    @Test public void unmanagedGraphic_nullText_RIGHT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_RIGHT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_RIGHT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void noGraphic_nullText_RIGHT() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_RIGHT() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_RIGHT() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    /** */
+    @Test public void graphic_nullText_BOTTOM() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_emptyText_BOTTOM() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_Text_BOTTOM() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setFont(new Font("Amble Condensed", 12));
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        // There is both a graphic & text node in this case. So we need to
+        // compare their positions. Since this is BOTTOM, the graphic should
+        // be below the text by the amount specified in graphic-text-gap
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        final double expected = Math.round(textBounds.getMaxY() + label.getGraphicTextGap());
+        assertEquals(expected, graphicBounds.getMinY(), 0);
+        // And they should both be centered horizontally
+        assertCenteredHorizontally(contentBounds, graphicBounds);
+        assertCenteredHorizontally(contentBounds, textBounds);
+    }
+
+    @Test public void unmanagedGraphic_nullText_BOTTOM() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_BOTTOM() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_BOTTOM() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void noGraphic_nullText_BOTTOM() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_BOTTOM() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_BOTTOM() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    /** */
+    @Test public void graphic_nullText_LEFT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_emptyText_LEFT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_Text_LEFT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        // There is both a graphic & text node in this case. So we need to
+        // compare their positions. Since this is LEFT, the graphic should
+        // be left of the text by the amount specified in graphic-text-gap
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        final double expected = Math.round(graphicBounds.getMaxX() + label.getGraphicTextGap());
+        assertEquals(expected, textBounds.getMinX(), 0.001);
+        // And they should both be centered vertically
+        assertCenteredVertically(contentBounds, graphicBounds);
+        assertCenteredVertically(contentBounds, textBounds);
+    }
+
+    @Test public void unmanagedGraphic_nullText_LEFT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_LEFT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_LEFT() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void noGraphic_nullText_LEFT() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_LEFT() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_LEFT() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    /** */
+    @Test public void graphic_nullText_CENTER() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_emptyText_CENTER() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_Text_CENTER() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setFont(new Font("Amble Condensed", 12));
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        // There is both a graphic & text node in this case. So we need to
+        // compare their positions. Since this is CENTER, the graphic and
+        // text should overlap each other and be directly centered
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // And they should both be centered vertically
+        assertCenteredVertically(contentBounds, graphicBounds);
+        assertCenteredVertically(contentBounds, textBounds);
+        assertCenteredHorizontally(contentBounds, graphicBounds);
+        assertCenteredHorizontally(contentBounds, textBounds);
+    }
+
+    @Test public void unmanagedGraphic_nullText_CENTER() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_CENTER() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_CENTER() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void noGraphic_nullText_CENTER() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_CENTER() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_CENTER() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    /** */
+    @Test public void graphic_nullText_GRAPHIC_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_emptyText_GRAPHIC_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void graphic_Text_GRAPHIC_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds graphicBounds = getNormalizedBounds(contentBounds, graphic);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Graphic alone makes up the content bounds, so contentBounds and
+        // graphic bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), graphicBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), graphicBounds.getHeight(), 0);
+    }
+
+    @Test public void unmanagedGraphic_nullText_GRAPHIC_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_GRAPHIC_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_GRAPHIC_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_nullText_GRAPHIC_ONLY() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_GRAPHIC_ONLY() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_GRAPHIC_ONLY() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    /** */
+    @Test public void graphic_nullText_TEXT_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void graphic_emptyText_TEXT_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void graphic_Text_TEXT_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void unmanagedGraphic_nullText_TEXT_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_emptyText_TEXT_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void unmanagedGraphic_Text_TEXT_ONLY() {
+        Rectangle graphic = new Rectangle(GRAPHIC_WIDTH, GRAPHIC_HEIGHT);
+        graphic.setManaged(false);
+        label.setGraphic(graphic);
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+
+    @Test public void noGraphic_nullText_TEXT_ONLY() {
+        label.setText(null);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_emptyText_TEXT_ONLY() {
+        label.setText("");
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        assertNull(getContentBounds());
+    }
+
+    @Test public void noGraphic_Text_TEXT_ONLY() {
+        label.setText("Falcon");
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.layout();
+        
+        Bounds contentBounds = getContentBounds();
+        Bounds textBounds = getNormalizedBounds(contentBounds, text);
+        assertContentAreaPositionedCorrectly(contentBounds);
+        // Text alone makes up the content bounds, so contentBounds and
+        // text bounds should have the same width and height
+        assertEquals(contentBounds.getWidth(), textBounds.getWidth(), 0);
+        assertEquals(contentBounds.getHeight(), textBounds.getHeight(), 0);
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/LabelSkinTest.java	2015-09-03 15:28:14.141894000 -0700
+++ /dev/null	2015-09-03 15:28:15.000000000 -0700
@@ -1,1990 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Label;
-import javafx.scene.control.OverrunStyle;
-import javafx.scene.control.SkinBaseAccessor;
-import javafx.scene.effect.BlendMode;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-import javafx.scene.text.TextAlignment;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Need to test:
- *  - String truncation works correctly
- *  - min/max/pref width/height when multiline text is turned on
- */
-public class LabelSkinTest {
-    private Label label;
-    private LabelSkinMock skin;
-    private Text text;
-    
-    @Before public void setup() {
-        label = new Label();
-        skin = new LabelSkinMock(label);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        label.setPadding(new Insets(10, 10, 10, 10));
-        label.setSkin(skin);
-        // It so happens that a brand new LabelSkin on a plain Label
-        // will have as its only child the Text node
-        text = (Text) SkinBaseAccessor.getChildren(skin).get(0);
-    }
-    
-    /****************************************************************************
-     *                                                                          *
-     * Tests for change notification                                            *
-     *                                                                          *
-     ***************************************************************************/
-    
-    @Test public void sizeChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        assertFalse(skin.propertyChanged); // sanity check
-        label.resize(500, label.getHeight());
-        assertTrue(skin.propertyChanged);
-        assertEquals(1, skin.propertyChangeCount); // sanity check
-        label.resize(label.getWidth(), label.prefHeight(label.getWidth()));
-        assertEquals(2, skin.propertyChangeCount); // sanity check
-    }
-    
-    @Test public void textFillChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setTextFill(Color.PURPLE);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void fontChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        final Font f = Font.font("Arial", 64);
-        label.setFont(f);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void graphicChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setGraphic(new Rectangle());
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void contentDisplayChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void graphicTextGapChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setGraphicTextGap(60.34);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void hposChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setAlignment(Pos.CENTER_RIGHT);
-        label.setAlignment(Pos.CENTER_RIGHT);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void vposChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setAlignment(Pos.TOP_CENTER);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void textChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setText("Bust my buffers!");
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void textAlignmentChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setTextAlignment(TextAlignment.JUSTIFY);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void textOverrunChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void wrapTextChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setWrapText(true);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void underlineChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
-        label.setUnderline(true);
-        assertTrue(skin.propertyChanged);
-    }
-    
-    @Test public void uninterestingChangesOnLabelShouldNotInvoke_handleControlPropertyChanged() {
-        label.setBlendMode(BlendMode.BLUE);
-        assertFalse(skin.propertyChanged);
-    }
-    
-    /****************************************************************************
-     *                                                                          *
-     * Tests for invalidation. When each of various properties change, we need  *
-     * to invalidate some state, such as via requestLayout().                   *
-     *                                                                          *
-     ***************************************************************************/
-    
-    @Test public void graphicLayoutBoundsChangeShouldInvalidateLayoutAndDisplayText() {
-        final Rectangle r = new Rectangle(20, 20);
-        label.setGraphic(r);
-        label.layout();
-        skin.updateDisplayedText();
-        
-        r.setWidth(30);
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-    
-    @Test public void widthChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
-        label.layout();
-        skin.updateDisplayedText();
-
-        label.resize(500, label.getHeight());
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-    
-    @Test public void widthChangesWhenWrapTextIsTrueUpdatesTheWrappingWidth() {
-        // Assert that the wrapping width changes with the label width if wrapText is true.
-        // However, this will only be required if the longest line in the text is itself
-        // wider than the label's available width.
-        label.setText("A long line which is wider than 100 pixels.");
-        label.setWrapText(true);
-        label.autosize();
-        //label.layout();
-        skin.updateDisplayedText();
-        
-        final double oldWrappingWidth = text.getWrappingWidth();
-        label.resize(100, label.getHeight());
-        skin.updateDisplayedText();
-        assertFalse(oldWrappingWidth == text.getWrappingWidth());
-        assertTrue(text.getWrappingWidth() > 0);
-    }
-    
-    @Test public void widthChangesWhenWrapTextIsFalseKeepsWrappingWidthAtZero() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.resize(500, label.getHeight());
-        assertEquals(0, text.getWrappingWidth(), 0);
-    }
-    
-    @Test public void fontChangesOnLabelShouldInvalidateLayoutAndDisplayTextAndEllipsesWidthAndTextWidth() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setFont(Font.font("Arial", 37));
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-        assertEquals(Double.NEGATIVE_INFINITY, skin.textWidth, 0);
-        assertEquals(Double.NEGATIVE_INFINITY, skin.ellipsisWidth, 0);
-    }
-
-    @Test public void graphicChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setGraphic(new Rectangle(20, 20));
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-
-    @Test public void contentDisplayChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-
-    @Test public void graphicTextGapChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setGraphicTextGap(8.37);
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-
-    @Test public void hposChangesOnLabelShouldInvalidateLayout() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setAlignment(Pos.CENTER_RIGHT);
-        assertTrue(label.isNeedsLayout());
-        assertFalse(skin.invalidText);
-    }
-
-    @Test public void vposChangesOnLabelShouldInvalidateLayout() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setAlignment(Pos.TOP_CENTER);
-        assertTrue(label.isNeedsLayout());
-        assertFalse(skin.invalidText);
-    }
-
-    @Test public void textChangesOnLabelShouldInvalidateLayoutAndDisplayTextAndTextWidth() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setText("Apples and Oranges");
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-        assertEquals(Double.NEGATIVE_INFINITY, skin.textWidth, 0);
-    }
-// TODO(aim): changing textAlignment doesn't actually change Text layoutBounds
-//
-//    @Test public void textAlignmentChangesOnLabelShouldInvalidateLayout() {
-//        label.layout();
-//        skin.updateDisplayedText();
-//
-//        label.setTextAlignment(TextAlignment.JUSTIFY);
-//        assertTrue(label.isNeedsLayout());
-//        assertFalse(skin.invalidText);
-//    }
-
-    @Test public void textOverrunChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-
-    @Test public void wrapTextChangesOnLabelShouldInvalidateLayoutAndDisplayTextAndWrappingWidth() {
-        label.setText("A long line which is wider than 100 pixels.");
-        label.resize(100, 30);
-        label.layout();
-        skin.updateDisplayedText();
-
-        final double oldWrappingWidth = text.getWrappingWidth();
-        label.setWrapText(true);
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-        assertFalse(oldWrappingWidth == text.getWrappingWidth());
-        assertTrue(text.getWrappingWidth() > 0);
-    }
-
-    @Test public void underlineChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
-        label.layout();
-        skin.updateDisplayedText();
-        
-        label.setUnderline(true);
-        assertTrue(label.isNeedsLayout());
-        assertTrue(skin.invalidText);
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for minWidth                                                       *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void whenTextIsNullAndNoGraphic_computeMinWidth_ReturnsZero() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        label.setText(null);
-        assertEquals(0.0 + 14, label.minWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndNoGraphic_computeMinWidth_ReturnsZero() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        label.setText("");
-        assertEquals(0.0 + 14, label.minWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsShorterThanEllipsisAndNoGraphic_computeMinWidth_ReturnsTextWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(skin.textWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsGreaterThanEllipsisAndNoGraphic_computeMinWidth_ReturnsEllipsisWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        label.setText("These are the times that try men's souls.");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(skin.ellipsisWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsUnmanaged_computeMinWidth_ReturnsZero() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setText(null);
-        assertEquals(0.0 + 14, label.minWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsUnmanaged_computeMinWidth_ReturnsZero() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setText("");
-        assertEquals(0.0 + 14, label.minWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsUnmanaged_computeMinWidth_ReturnsTextWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(skin.textWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsGreaterThanEllipsisAndGraphicIsUnmanaged_computeMinWidth_ReturnsEllipsisWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setText("These are the times that try men's souls.");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(skin.ellipsisWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSet_computeMinWidth_ReturnsGraphicWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setText(null);
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(23 + 14, label.minWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSet_computeMinWidth_ReturnsGraphicWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setText("");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(23 + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsLEFT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusTextWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(23 + 2 + skin.textWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsLEFT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusEllipsisWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(23 + 2 + skin.ellipsisWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsRIGHT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusTextWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(23 + 2 + skin.textWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsRIGHT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusEllipsisWidth() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(23 + 2 + skin.ellipsisWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsCENTER_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(Math.max(23, skin.textWidth) + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsCENTER_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(Math.max(23, skin.ellipsisWidth) + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsTOP_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(Math.max(23, skin.textWidth) + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsTOP_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(Math.max(23, skin.ellipsisWidth) + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsBOTTOM_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(Math.max(23, skin.textWidth) + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsBOTTOM_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(Math.max(23, skin.ellipsisWidth) + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsGRAPHIC_ONLY_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(3, 3);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(3 + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsGRAPHIC_ONLY_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(3, 3);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(3 + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsTEXT_ONLY_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(230, 230);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setText(".");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(skin.textWidth + 14, label.minWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsTEXT_ONLY_computeMinWidth_ReturnsRightAnswer() {
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(230, 230);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setText("Wherefore art thou Romeo?");
-        assertTrue(label.minWidth(-1) >= 0);
-        assertEquals(skin.ellipsisWidth + 14, label.minWidth(-1), 0);
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for minHeight                                                      *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void whenTextIsNullAndNoGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndNoGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndNoGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
-        label.setText("Howdy Pardner");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertTrue(label.minHeight(-1) >= 0);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndUnmanagedGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndUnmanagedGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
-        label.setText("Howdy Pardner");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertTrue(label.minHeight(-1) >= 0);
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setGraphicTextGap(2);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setGraphicTextGap(2);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(23 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(23 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(23 + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
-    }
-    
-    /****************************************************************************
-     *                                                                          *
-     * Tests for prefWidth                                                      *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void whenTextIsNullAndNoGraphic_computePrefWidth_ReturnsPadding() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndNoGraphic_computePrefWidth_ReturnsPadding() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndNoGraphic_computePrefWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
-        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndUnmanagedGraphic_computePrefWidth_ReturnsPadding() {
-        label.setText(null);
-        Rectangle r = new Rectangle(0, 0, 50, 50);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computePrefWidth_ReturnsPadding() {
-        label.setText("");
-        Rectangle r = new Rectangle(0, 0, 50, 50);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndUnmanagedGraphic_computePrefWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("Lollipop");
-        Rectangle r = new Rectangle(0, 0, 50, 50);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
-        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndTextIsWider_computePrefWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("This is the right place");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
-        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.prefWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computePrefWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
-        label.setText("Howdy");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
-        assertEquals(14 + textWidth + 6.5 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndTextIsWider_computePrefWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("This is the right place");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
-        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.prefWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computePrefWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
-        label.setText("Howdy");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
-        assertEquals(14 + textWidth + 6.5 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndTextIsWider_computePrefWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("This is the right place");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
-        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Howdy");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndTextIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Tally ho, off to the races");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.prefWidth(-1), 0);
-    }
-    
-    // TODO should this include the gap??
-    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefWidth_ReturnsPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.prefWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefWidth_ReturnsPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.prefWidth(-1), 0);
-    }
-    
-    // TODO should this include the gap? I guess not, otherwise our gap would have to default to 0
-    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("Yippee Skippee");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Yippee Skippee", 0);
-        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
-    }
-    
-    /****************************************************************************
-     *                                                                          *
-     * Tests for prefHeight                                                     *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void whenTextHasNewlines_computePrefHeight_IncludesTheMultipleLinesInThePrefHeight() {
-        label.setText("This\nis a test\nof the emergency\nbroadcast system.\nThis is only a test");
-        label.setPadding(new Insets(0, 0, 0, 0));
-        final double singleLineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        final double height = label.prefHeight(-1);
-        assertTrue(height >= singleLineHeight * 5);
-    }
-    
-    @Test public void whenTextHasNewlinesAfterPreviousComputationOf_computePrefHeight_IncludesTheMultipleLinesInThePrefHeight() {
-        label.setText("This is a test");
-        final double oldPrefHeight = label.prefHeight(-1);
-        label.setText("This\nis a test\nof the emergency\nbroadcast system.\nThis is only a test");
-        final double newPrefHeight = label.prefHeight(-1);
-        assertTrue(oldPrefHeight != newPrefHeight);
-    }
-    
-    @Test public void whenTextIsNullAndNoGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndNoGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndNoGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("Howdy Pardner");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertTrue(label.prefHeight(-1) >= 0);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndUnmanagedGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndUnmanagedGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("Howdy Pardner");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertTrue(label.prefHeight(-1) >= 0);
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setGraphicTextGap(2);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setGraphicTextGap(2);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(14 + 23, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(14 + 23, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(14 + 23, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
-    }
-        
-    /****************************************************************************
-     *                                                                          *
-     * Tests maxWidth                                                           *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void whenTextIsNullAndNoGraphic_computeMaxWidth_ReturnsPadding() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndNoGraphic_computeMaxWidth_ReturnsPadding() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndNoGraphic_computeMaxWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
-        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndUnmanagedGraphic_computeMaxWidth_ReturnsPadding() {
-        label.setText(null);
-        Rectangle r = new Rectangle(0, 0, 50, 50);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computeMaxWidth_ReturnsPadding() {
-        label.setText("");
-        Rectangle r = new Rectangle(0, 0, 50, 50);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndUnmanagedGraphic_computeMaxWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("Lollipop");
-        Rectangle r = new Rectangle(0, 0, 50, 50);
-        r.setManaged(false);
-        label.setGraphic(r);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
-        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndTextIsWider_computeMaxWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("This is the right place");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TOP);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
-        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.maxWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computeMaxWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
-        label.setText("Howdy");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
-        assertEquals(14 + textWidth + 6.5 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndTextIsWider_computeMaxWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("This is the right place");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
-        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.maxWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(20 + 14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computeMaxWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
-        label.setText("Howdy");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
-        assertEquals(14 + textWidth + 6.5 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Lollipop");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndTextIsWider_computeMaxWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("This is the right place");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
-        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
-    }
-
-    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Howdy");
-        label.setGraphic(new Rectangle(0, 0, 200, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 200, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndTextIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
-        label.setText("Tally ho, off to the races");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14 + 20, label.maxWidth(-1), 0);
-    }
-    
-    // TODO should this include the gap??
-    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxWidth_ReturnsPadding() {
-        label.setText(null);
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.maxWidth(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxWidth_ReturnsPadding() {
-        label.setText("");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertEquals(14, label.maxWidth(-1), 0);
-    }
-    
-    // TODO should this include the gap? I guess not, otherwise our gap would have to default to 0
-    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxWidth_ReturnsTextWidthPlusPadding() {
-        label.setText("Yippee Skippee");
-        label.setGraphic(new Rectangle(0, 0, 20, 20));
-        label.setGraphicTextGap(6.5);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double textWidth = Utils.computeTextWidth(label.getFont(), "Yippee Skippee", 0);
-        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
-    }
-    
-    /****************************************************************************
-     *                                                                          *
-     * Tests for maxHeight.                                                     *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void whenTextIsNullAndNoGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndNoGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndNoGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("Howdy Pardner");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        assertTrue(label.maxHeight(-1) >= 0);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndUnmanagedGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndUnmanagedGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
-        label.setText("Howdy Pardner");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 500);
-        r.setManaged(false);
-        label.setGraphic(r);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertTrue(label.maxHeight(-1) >= 0);
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setGraphicTextGap(2);
-        label.setContentDisplay(ContentDisplay.TOP);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.RIGHT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphicTextGap(2);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setGraphicTextGap(2);
-        label.setContentDisplay(ContentDisplay.BOTTOM);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.LEFT);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.CENTER);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(14 + 23, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(14 + 23, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-        assertEquals(14 + 23, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText(null);
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-    
-    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
-        label.setText("For crying in the mud");
-        label.setPadding(new Insets(7, 7, 7, 7));
-        Rectangle r = new Rectangle(23, 23);
-        label.setGraphic(r);
-        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
-        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
-        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        label.setPrefWidth(500);
-        assertEquals(500, label.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        label.setPrefHeight(500);
-        assertEquals(500, label.maxHeight(-1), 0);
-    }
-    
-    /****************************************************************************
-     *                                                                          *
-     * Tests for updateDisplayedText                                            *
-     *                                                                          *
-     ***************************************************************************/
-
-    // tests for updateDisplayedText (not even sure how to test it exactly yet)
-    
-    
-    public static final class LabelSkinMock extends LabelSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public LabelSkinMock(Label label) {
-            super(label);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:28:15.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/LabelSkinTest.java	2015-09-03 15:28:13.223841500 -0700
@@ -0,0 +1,2008 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.sun.javafx.scene.control.skin.Utils;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Label;
+import javafx.scene.control.OverrunStyle;
+import javafx.scene.control.SkinBaseAccessor;
+import javafx.scene.effect.BlendMode;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.scene.text.TextAlignment;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Need to test:
+ *  - String truncation works correctly
+ *  - min/max/pref width/height when multiline text is turned on
+ */
+public class LabelSkinTest {
+    private Label label;
+    private LabelSkinMock skin;
+    private Text text;
+    
+    @Before public void setup() {
+        label = new Label();
+        skin = new LabelSkinMock(label);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        label.setPadding(new Insets(10, 10, 10, 10));
+        label.setSkin(skin);
+        // It so happens that a brand new LabelSkin on a plain Label
+        // will have as its only child the Text node
+        text = (Text) SkinBaseAccessor.getChildren(skin).get(0);
+    }
+    
+    /****************************************************************************
+     *                                                                          *
+     * Tests for change notification                                            *
+     *                                                                          *
+     ***************************************************************************/
+    
+    @Test public void sizeChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.widthProperty());
+        skin.addWatchedProperty(label.heightProperty());
+        assertFalse(skin.propertyChanged); // sanity check
+        label.resize(500, label.getHeight());
+        assertTrue(skin.propertyChanged);
+        assertEquals(1, skin.propertyChangeCount); // sanity check
+        label.resize(label.getWidth(), label.prefHeight(label.getWidth()));
+        assertEquals(2, skin.propertyChangeCount); // sanity check
+    }
+    
+    @Test public void textFillChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.textFillProperty());
+        label.setTextFill(Color.PURPLE);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void fontChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.fontProperty());
+        final Font f = Font.font("Arial", 64);
+        label.setFont(f);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void graphicChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.graphicProperty());
+        label.setGraphic(new Rectangle());
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void contentDisplayChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.contentDisplayProperty());
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void graphicTextGapChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.graphicTextGapProperty());
+        label.setGraphicTextGap(60.34);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void hposChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.alignmentProperty());
+        label.setAlignment(Pos.CENTER_RIGHT);
+        label.setAlignment(Pos.CENTER_RIGHT);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void vposChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.alignmentProperty());
+        label.setAlignment(Pos.TOP_CENTER);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void textChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.textProperty());
+        label.setText("Bust my buffers!");
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void textAlignmentChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.textAlignmentProperty());
+        label.setTextAlignment(TextAlignment.JUSTIFY);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void textOverrunChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.textOverrunProperty());
+        label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void wrapTextChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.wrapTextProperty());
+        label.setWrapText(true);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void underlineChangesOnLabelShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(label.underlineProperty());
+        label.setUnderline(true);
+        assertTrue(skin.propertyChanged);
+    }
+    
+    @Test public void uninterestingChangesOnLabelShouldNotInvoke_handleControlPropertyChanged() {
+        label.setBlendMode(BlendMode.BLUE);
+        assertFalse(skin.propertyChanged);
+    }
+    
+    /****************************************************************************
+     *                                                                          *
+     * Tests for invalidation. When each of various properties change, we need  *
+     * to invalidate some state, such as via requestLayout().                   *
+     *                                                                          *
+     ***************************************************************************/
+    
+    @Test public void graphicLayoutBoundsChangeShouldInvalidateLayoutAndDisplayText() {
+        final Rectangle r = new Rectangle(20, 20);
+        label.setGraphic(r);
+        label.layout();
+        skin.updateDisplayedText();
+        
+        r.setWidth(30);
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+    
+    @Test public void widthChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
+        label.layout();
+        skin.updateDisplayedText();
+
+        label.resize(500, label.getHeight());
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+    
+    @Test public void widthChangesWhenWrapTextIsTrueUpdatesTheWrappingWidth() {
+        // Assert that the wrapping width changes with the label width if wrapText is true.
+        // However, this will only be required if the longest line in the text is itself
+        // wider than the label's available width.
+        label.setText("A long line which is wider than 100 pixels.");
+        label.setWrapText(true);
+        label.autosize();
+        //label.layout();
+        skin.updateDisplayedText();
+        
+        final double oldWrappingWidth = text.getWrappingWidth();
+        label.resize(100, label.getHeight());
+        skin.updateDisplayedText();
+        assertFalse(oldWrappingWidth == text.getWrappingWidth());
+        assertTrue(text.getWrappingWidth() > 0);
+    }
+    
+    @Test public void widthChangesWhenWrapTextIsFalseKeepsWrappingWidthAtZero() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.resize(500, label.getHeight());
+        assertEquals(0, text.getWrappingWidth(), 0);
+    }
+    
+    @Test public void fontChangesOnLabelShouldInvalidateLayoutAndDisplayTextAndEllipsesWidthAndTextWidth() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setFont(Font.font("Arial", 37));
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+        assertEquals(Double.NEGATIVE_INFINITY, skin.textWidth, 0);
+        assertEquals(Double.NEGATIVE_INFINITY, skin.ellipsisWidth, 0);
+    }
+
+    @Test public void graphicChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setGraphic(new Rectangle(20, 20));
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+
+    @Test public void contentDisplayChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+
+    @Test public void graphicTextGapChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setGraphicTextGap(8.37);
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+
+    @Test public void hposChangesOnLabelShouldInvalidateLayout() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setAlignment(Pos.CENTER_RIGHT);
+        assertTrue(label.isNeedsLayout());
+        assertFalse(skin.invalidText);
+    }
+
+    @Test public void vposChangesOnLabelShouldInvalidateLayout() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setAlignment(Pos.TOP_CENTER);
+        assertTrue(label.isNeedsLayout());
+        assertFalse(skin.invalidText);
+    }
+
+    @Test public void textChangesOnLabelShouldInvalidateLayoutAndDisplayTextAndTextWidth() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setText("Apples and Oranges");
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+        assertEquals(Double.NEGATIVE_INFINITY, skin.textWidth, 0);
+    }
+// TODO(aim): changing textAlignment doesn't actually change Text layoutBounds
+//
+//    @Test public void textAlignmentChangesOnLabelShouldInvalidateLayout() {
+//        label.layout();
+//        skin.updateDisplayedText();
+//
+//        label.setTextAlignment(TextAlignment.JUSTIFY);
+//        assertTrue(label.isNeedsLayout());
+//        assertFalse(skin.invalidText);
+//    }
+
+    @Test public void textOverrunChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setTextOverrun(OverrunStyle.CENTER_WORD_ELLIPSIS);
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+
+    @Test public void wrapTextChangesOnLabelShouldInvalidateLayoutAndDisplayTextAndWrappingWidth() {
+        label.setText("A long line which is wider than 100 pixels.");
+        label.resize(100, 30);
+        label.layout();
+        skin.updateDisplayedText();
+
+        final double oldWrappingWidth = text.getWrappingWidth();
+        label.setWrapText(true);
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+        assertFalse(oldWrappingWidth == text.getWrappingWidth());
+        assertTrue(text.getWrappingWidth() > 0);
+    }
+
+    @Test public void underlineChangesOnLabelShouldInvalidateLayoutAndDisplayText() {
+        label.layout();
+        skin.updateDisplayedText();
+        
+        label.setUnderline(true);
+        assertTrue(label.isNeedsLayout());
+        assertTrue(skin.invalidText);
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for minWidth                                                       *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void whenTextIsNullAndNoGraphic_computeMinWidth_ReturnsZero() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        label.setText(null);
+        assertEquals(0.0 + 14, label.minWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndNoGraphic_computeMinWidth_ReturnsZero() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        label.setText("");
+        assertEquals(0.0 + 14, label.minWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsShorterThanEllipsisAndNoGraphic_computeMinWidth_ReturnsTextWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(skin.textWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsGreaterThanEllipsisAndNoGraphic_computeMinWidth_ReturnsEllipsisWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        label.setText("These are the times that try men's souls.");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(skin.ellipsisWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsUnmanaged_computeMinWidth_ReturnsZero() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setText(null);
+        assertEquals(0.0 + 14, label.minWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsUnmanaged_computeMinWidth_ReturnsZero() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setText("");
+        assertEquals(0.0 + 14, label.minWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsUnmanaged_computeMinWidth_ReturnsTextWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(skin.textWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsGreaterThanEllipsisAndGraphicIsUnmanaged_computeMinWidth_ReturnsEllipsisWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setText("These are the times that try men's souls.");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(skin.ellipsisWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSet_computeMinWidth_ReturnsGraphicWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setText(null);
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(23 + 14, label.minWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSet_computeMinWidth_ReturnsGraphicWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setText("");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(23 + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsLEFT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusTextWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(23 + 2 + skin.textWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsLEFT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusEllipsisWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(23 + 2 + skin.ellipsisWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsRIGHT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusTextWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(23 + 2 + skin.textWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsRIGHT_computeMinWidth_ReturnsGraphicWidthPlusGraphicTextGapPlusEllipsisWidth() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(23 + 2 + skin.ellipsisWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsCENTER_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(Math.max(23, skin.textWidth) + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsCENTER_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(Math.max(23, skin.ellipsisWidth) + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsTOP_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(Math.max(23, skin.textWidth) + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsTOP_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(Math.max(23, skin.ellipsisWidth) + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsBOTTOM_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(Math.max(23, skin.textWidth) + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsBOTTOM_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(Math.max(23, skin.ellipsisWidth) + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsGRAPHIC_ONLY_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(3, 3);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(3 + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsGRAPHIC_ONLY_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(3, 3);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(3 + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsShorterThanEllipsisAndGraphicIsSetAndContentDisplayIsTEXT_ONLY_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(230, 230);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setText(".");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(skin.textWidth + 14, label.minWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsLongThanEllipsisAndGraphicIsSetAndContentDisplayIsTEXT_ONLY_computeMinWidth_ReturnsRightAnswer() {
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(230, 230);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setText("Wherefore art thou Romeo?");
+        assertTrue(label.minWidth(-1) >= 0);
+        assertEquals(skin.ellipsisWidth + 14, label.minWidth(-1), 0);
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for minHeight                                                      *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void whenTextIsNullAndNoGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndNoGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndNoGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
+        label.setText("Howdy Pardner");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertTrue(label.minHeight(-1) >= 0);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndUnmanagedGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndUnmanagedGraphic_computeMinHeight_ReturnsSingleLineStringHeight() {
+        label.setText("Howdy Pardner");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertTrue(label.minHeight(-1) >= 0);
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setGraphicTextGap(2);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setGraphicTextGap(2);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(23 + lineHeight + 2 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(Math.max(23, lineHeight) + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(23 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(23 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(23 + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMinHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(lineHeight + 14, label.minHeight(-1), 0);
+    }
+    
+    /****************************************************************************
+     *                                                                          *
+     * Tests for prefWidth                                                      *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void whenTextIsNullAndNoGraphic_computePrefWidth_ReturnsPadding() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndNoGraphic_computePrefWidth_ReturnsPadding() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndNoGraphic_computePrefWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
+        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndUnmanagedGraphic_computePrefWidth_ReturnsPadding() {
+        label.setText(null);
+        Rectangle r = new Rectangle(0, 0, 50, 50);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computePrefWidth_ReturnsPadding() {
+        label.setText("");
+        Rectangle r = new Rectangle(0, 0, 50, 50);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndUnmanagedGraphic_computePrefWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("Lollipop");
+        Rectangle r = new Rectangle(0, 0, 50, 50);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
+        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndTextIsWider_computePrefWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("This is the right place");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
+        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.prefWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computePrefWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
+        label.setText("Howdy");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
+        assertEquals(14 + textWidth + 6.5 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndTextIsWider_computePrefWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("This is the right place");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
+        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.prefWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computePrefWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computePrefWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
+        label.setText("Howdy");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
+        assertEquals(14 + textWidth + 6.5 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndTextIsWider_computePrefWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("This is the right place");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
+        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndGraphicIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Howdy");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndTextIsWider_computePrefWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Tally ho, off to the races");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.prefWidth(-1), 0);
+    }
+    
+    // TODO should this include the gap??
+    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefWidth_ReturnsPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.prefWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefWidth_ReturnsPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.prefWidth(-1), 0);
+    }
+    
+    // TODO should this include the gap? I guess not, otherwise our gap would have to default to 0
+    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("Yippee Skippee");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Yippee Skippee", 0);
+        assertEquals(14 + textWidth, label.prefWidth(-1), 0);
+    }
+    
+    /****************************************************************************
+     *                                                                          *
+     * Tests for prefHeight                                                     *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void whenTextHasNewlines_computePrefHeight_IncludesTheMultipleLinesInThePrefHeight() {
+        label.setText("This\nis a test\nof the emergency\nbroadcast system.\nThis is only a test");
+        label.setPadding(new Insets(0, 0, 0, 0));
+        final double singleLineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        final double height = label.prefHeight(-1);
+        assertTrue(height >= singleLineHeight * 5);
+    }
+    
+    @Test public void whenTextHasNewlinesAfterPreviousComputationOf_computePrefHeight_IncludesTheMultipleLinesInThePrefHeight() {
+        label.setText("This is a test");
+        final double oldPrefHeight = label.prefHeight(-1);
+        label.setText("This\nis a test\nof the emergency\nbroadcast system.\nThis is only a test");
+        final double newPrefHeight = label.prefHeight(-1);
+        assertTrue(oldPrefHeight != newPrefHeight);
+    }
+    
+    @Test public void whenTextIsNullAndNoGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndNoGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndNoGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("Howdy Pardner");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertTrue(label.prefHeight(-1) >= 0);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndUnmanagedGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndUnmanagedGraphic_computePrefHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("Howdy Pardner");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertTrue(label.prefHeight(-1) >= 0);
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setGraphicTextGap(2);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setGraphicTextGap(2);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(14 + 23, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(14 + 23, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(14 + 23, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computePrefHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.prefHeight(-1), 0);
+    }
+        
+    /****************************************************************************
+     *                                                                          *
+     * Tests maxWidth                                                           *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void whenTextIsNullAndNoGraphic_computeMaxWidth_ReturnsPadding() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndNoGraphic_computeMaxWidth_ReturnsPadding() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndNoGraphic_computeMaxWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
+        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndUnmanagedGraphic_computeMaxWidth_ReturnsPadding() {
+        label.setText(null);
+        Rectangle r = new Rectangle(0, 0, 50, 50);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computeMaxWidth_ReturnsPadding() {
+        label.setText("");
+        Rectangle r = new Rectangle(0, 0, 50, 50);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndUnmanagedGraphic_computeMaxWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("Lollipop");
+        Rectangle r = new Rectangle(0, 0, 50, 50);
+        r.setManaged(false);
+        label.setGraphic(r);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Lollipop", 0);
+        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplayAndTextIsWider_computeMaxWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("This is the right place");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TOP);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
+        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.maxWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computeMaxWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
+        label.setText("Howdy");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
+        assertEquals(14 + textWidth + 6.5 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplayAndTextIsWider_computeMaxWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("This is the right place");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
+        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.maxWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computeMaxWidth_ReturnsGraphicPlusPaddingNotIncludingGap() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(20 + 14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computeMaxWidth_ReturnsTextWidthPlusGraphicWidthPlusGapPlusPadding() {
+        label.setText("Howdy");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Howdy", 0);
+        assertEquals(14 + textWidth + 6.5 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Lollipop");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplayAndTextIsWider_computeMaxWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("This is the right place");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "This is the right place", 0);
+        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
+    }
+
+    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndGraphicIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Howdy");
+        label.setGraphic(new Rectangle(0, 0, 200, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 200, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplayAndTextIsWider_computeMaxWidth_ReturnsGraphicWidthPlusPadding() {
+        label.setText("Tally ho, off to the races");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14 + 20, label.maxWidth(-1), 0);
+    }
+    
+    // TODO should this include the gap??
+    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxWidth_ReturnsPadding() {
+        label.setText(null);
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.maxWidth(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxWidth_ReturnsPadding() {
+        label.setText("");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertEquals(14, label.maxWidth(-1), 0);
+    }
+    
+    // TODO should this include the gap? I guess not, otherwise our gap would have to default to 0
+    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxWidth_ReturnsTextWidthPlusPadding() {
+        label.setText("Yippee Skippee");
+        label.setGraphic(new Rectangle(0, 0, 20, 20));
+        label.setGraphicTextGap(6.5);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double textWidth = Utils.computeTextWidth(label.getFont(), "Yippee Skippee", 0);
+        assertEquals(14 + textWidth, label.maxWidth(-1), 0);
+    }
+    
+    /****************************************************************************
+     *                                                                          *
+     * Tests for maxHeight.                                                     *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void whenTextIsNullAndNoGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndNoGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndNoGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("Howdy Pardner");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        assertTrue(label.maxHeight(-1) >= 0);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndUnmanagedGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndUnmanagedGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndUnmanagedGraphic_computeMaxHeight_ReturnsSingleLineStringHeightPlusPadding() {
+        label.setText("Howdy Pardner");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 500);
+        r.setManaged(false);
+        label.setGraphic(r);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertTrue(label.maxHeight(-1) >= 0);
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTOPContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTOPContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTOPContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setGraphicTextGap(2);
+        label.setContentDisplay(ContentDisplay.TOP);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithRIGHTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithRIGHTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithRIGHTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.RIGHT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphicTextGap(2);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithBOTTOMContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setGraphicTextGap(2);
+        label.setContentDisplay(ContentDisplay.BOTTOM);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + 23 + lineHeight + 2, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithLEFTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithLEFTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithLEFTContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.LEFT);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithCENTERContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithCENTERContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithCENTERContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.CENTER);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + Math.max(23, lineHeight), label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(14 + 23, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(14 + 23, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithGRAPHIC_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        assertEquals(14 + 23, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsNullAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText(null);
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsEmptyAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+    
+    @Test public void whenTextIsSetAndGraphicIsSetWithTEXT_ONLYContentDisplay_computeMaxHeight_ReturnsRightAnswer() {
+        label.setText("For crying in the mud");
+        label.setPadding(new Insets(7, 7, 7, 7));
+        Rectangle r = new Rectangle(23, 23);
+        label.setGraphic(r);
+        label.setContentDisplay(ContentDisplay.TEXT_ONLY);
+        final double lineHeight = Utils.computeTextHeight(label.getFont(), " ", 0, text.getBoundsType());
+        assertEquals(14 + lineHeight, label.maxHeight(-1), 0);
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        label.setPrefWidth(500);
+        assertEquals(500, label.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        label.setPrefHeight(500);
+        assertEquals(500, label.maxHeight(-1), 0);
+    }
+    
+    /****************************************************************************
+     *                                                                          *
+     * Tests for updateDisplayedText                                            *
+     *                                                                          *
+     ***************************************************************************/
+
+    // tests for updateDisplayedText (not even sure how to test it exactly yet)
+    
+    
+    public static final class LabelSkinMock extends LabelSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+
+        public LabelSkinMock(Label label) {
+            super(label);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/MenuBarMenuButtonRetriever.java	2015-09-03 15:28:22.409366800 -0700
+++ /dev/null	2015-09-03 15:28:23.000000000 -0700
@@ -1,78 +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.scene.control.skin;
-
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.Skin;
-import javafx.scene.layout.VBox;
-
-
-/**
- *
- * @author paru
- */
-public class MenuBarMenuButtonRetriever {
-    
-    // can only access the getNodeForMenu method in MenuBarSkin from this package.
-    public static MenuButton getNodeForMenu(MenuBarSkin skin, int i) {
-        return skin.getNodeForMenu(i);
-    }
-    
-    public static ContextMenu getSubMenu(ContextMenuContent cmc) {
-      return cmc.getSubMenu();
-    }
-    
-    public static Skin getPopupSkin(MenuButton mb) {
-        return ((MenuButtonSkinBase)mb.getSkin()).popup.getSkin();
-    }
-    
-    public static ContextMenuContent getMenuContent(MenuButton mb) {
-        ContextMenuContent cmc = (ContextMenuContent)getPopupSkin(mb).getNode();
-        return cmc;
-    }
-    
-    public static ContextMenuContent getSubMenuContent(ContextMenuContent cmc) {
-        ContextMenu cm = cmc.getSubMenu();
-        return (cm != null) ? (ContextMenuContent)cm.getSkin().getNode() : null;
-    }
-    
-    public static ContextMenuContent.MenuItemContainer getDisplayNodeForMenuItem(ContextMenuContent cmc, int i) {
-        VBox itemsContainer = cmc.getItemsContainer();
-        return (i < itemsContainer.getChildren().size()) ? 
-            (ContextMenuContent.MenuItemContainer)itemsContainer.getChildren().get(i) : null;
-    }
-    
-    public static void setCurrentFocusedIndex(ContextMenuContent cmc, int i) {
-        cmc.setCurrentFocusedIndex(i);
-    }
-    
-    public static int getFocusedIndex(MenuBarSkin skin) {
-        return skin.getFocusedMenuIndex();
-    }
-}
--- /dev/null	2015-09-03 15:28:23.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/MenuBarSkinRetriever.java	2015-09-03 15:28:21.614321400 -0700
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2015, 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 com.sun.javafx.scene.control.ContextMenuContent;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.Skin;
+import javafx.scene.control.skin.MenuBarSkin;
+import javafx.scene.control.skin.MenuButtonSkinBase;
+import javafx.scene.layout.VBox;
+
+
+/**
+ *
+ */
+public class MenuBarSkinRetriever {
+    
+    // can only access the getNodeForMenu method in MenuBarSkin from this package.
+    public static MenuButton getNodeForMenu(MenuBarSkin skin, int i) {
+        return skin.getNodeForMenu(i);
+    }
+    
+    public static Skin getPopupSkin(MenuButton mb) {
+        return ((MenuButtonSkinBase)mb.getSkin()).popup.getSkin();
+    }
+    
+    public static ContextMenuContent getMenuContent(MenuButton mb) {
+        ContextMenuContent cmc = (ContextMenuContent)getPopupSkin(mb).getNode();
+        return cmc;
+    }
+    
+    public static int getFocusedIndex(MenuBarSkin skin) {
+        return skin.getFocusedMenuIndex();
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/MenuBarSkinTest.java	2015-09-03 15:28:30.489829000 -0700
+++ /dev/null	2015-09-03 15:28:31.000000000 -0700
@@ -1,182 +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 static org.junit.Assert.assertEquals;
-
-import com.sun.javafx.menu.MenuBase;
-import com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
-import javafx.geometry.Insets;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuBar;
-import javafx.stage.Stage;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- * This fails with IllegalStateException because of the toolkit's check for the FX application thread
- */
-public class MenuBarSkinTest {
-    private MenuBar menubar;
-    private MenuBarSkinMock skin;
-    private static Toolkit tk;
-    private Scene scene;
-    private Stage stage;
-
-
-    @BeforeClass public static void initToolKit() {
-        tk = Toolkit.getToolkit();
-    }
-
-    @Before public void setup() {
-        menubar = new MenuBar();
-        menubar.setUseSystemMenuBar(false);
-        menubar.getMenus().addAll(new Menu("File"), new Menu("Edit"));
-
-        // Pending RT-37118, MenuBar needs to be in a scene in order to set the skin.
-        scene = new Scene(new Group(menubar));
-        skin = new MenuBarSkinMock(menubar);
-        menubar.setSkin(skin);
-
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        menubar.setPadding(new Insets(10, 10, 10, 10));
-
-        stage = new Stage();
-
-        // MenuBar needs to have a stage in order for system menus to work
-        stage.setScene(scene);
-
-        // Stage has to be focused in order for system menus to work
-        stage.setFocused(true);
-    }
-    
-    @Test public void maxHeightTracksPreferred() {
-        menubar.setPrefHeight(100);
-        assertEquals(100, menubar.maxHeight(-1), 0);
-    }
-
-    @Test public void testDispose() {
-
-        if (tk.getSystemMenu().isSupported()) {
-            // setting system menu bar true should create a sceneProperty listener for RT-36554
-            menubar.setUseSystemMenuBar(true);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-        }
-
-        // This will cause the dispose method to be called.
-        menubar.setSkin(null);
-
-        if (tk.getSystemMenu().isSupported()) {
-
-            // dispose should clean up the system menu.
-            assertEquals(0, getSystemMenus().size());
-
-        }
-
-    }
-
-    @Test public void testSetUseSystemMenuBar() {
-        if (tk.getSystemMenu().isSupported()) {
-            menubar.setUseSystemMenuBar(true);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-
-            menubar.setUseSystemMenuBar(false);
-            assertEquals(0, getSystemMenus().size());
-
-            menubar.setUseSystemMenuBar(true);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-        }
-    }
-
-    @Test public void testSystemMenuBarUpdatesWhenMenusChange() {
-
-        if (tk.getSystemMenu().isSupported()) {
-            menubar.setUseSystemMenuBar(true);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-
-            menubar.getMenus().add(new Menu("testSystemMenuBarUpdatesWhenMenusChange"));
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-        }
-    }
-
-    @Test public void testRT_36554() {
-
-        if (tk.getSystemMenu().isSupported()) {
-
-            menubar.setUseSystemMenuBar(true);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-
-            // removing the menubar from the scene should remove the system menus.
-            ((Group)scene.getRoot()).getChildren().remove(menubar);
-            assertEquals(0, getSystemMenus().size());
-
-            // adding the menubar from the scene should add back the system menus.
-            ((Group)scene.getRoot()).getChildren().add(menubar);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-
-            // remove, then set useSystemMenuBar to false. Upon re-adding,
-            // there should still be no system menu.
-            ((Group)scene.getRoot()).getChildren().remove(menubar);
-            assertEquals(0, getSystemMenus().size());
-
-            menubar.setUseSystemMenuBar(false);
-            ((Group)scene.getRoot()).getChildren().add(menubar);
-            assertEquals(0, getSystemMenus().size());
-
-            // setting useSystemMenuBar to true again, should add back the system menus.
-            menubar.setUseSystemMenuBar(true);
-            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
-        }
-    }
-
-    public static final class MenuBarSkinMock extends MenuBarSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public MenuBarSkinMock(MenuBar menubar) {
-            super(menubar);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-
-    private List<MenuBase> getSystemMenus() {
-        return ((StubToolkit.StubSystemMenu)tk.getSystemMenu()).getMenus();
-    }
-
-}
--- /dev/null	2015-09-03 15:28:31.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/MenuBarSkinTest.java	2015-09-03 15:28:29.767787700 -0700
@@ -0,0 +1,184 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import com.sun.javafx.menu.MenuBase;
+import com.sun.javafx.pgstub.StubToolkit;
+import com.sun.javafx.tk.Toolkit;
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.control.Menu;
+import javafx.scene.control.MenuBar;
+import javafx.scene.control.skin.MenuBarSkin;
+import javafx.stage.Stage;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * This fails with IllegalStateException because of the toolkit's check for the FX application thread
+ */
+public class MenuBarSkinTest {
+    private MenuBar menubar;
+    private MenuBarSkinMock skin;
+    private static Toolkit tk;
+    private Scene scene;
+    private Stage stage;
+
+
+    @BeforeClass public static void initToolKit() {
+        tk = Toolkit.getToolkit();
+    }
+
+    @Before public void setup() {
+        menubar = new MenuBar();
+        menubar.setUseSystemMenuBar(false);
+        menubar.getMenus().addAll(new Menu("File"), new Menu("Edit"));
+
+        // Pending RT-37118, MenuBar needs to be in a scene in order to set the skin.
+        scene = new Scene(new Group(menubar));
+        skin = new MenuBarSkinMock(menubar);
+        menubar.setSkin(skin);
+
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        menubar.setPadding(new Insets(10, 10, 10, 10));
+
+        stage = new Stage();
+
+        // MenuBar needs to have a stage in order for system menus to work
+        stage.setScene(scene);
+
+        // Stage has to be focused in order for system menus to work
+        stage.setFocused(true);
+    }
+    
+    @Test public void maxHeightTracksPreferred() {
+        menubar.setPrefHeight(100);
+        assertEquals(100, menubar.maxHeight(-1), 0);
+    }
+
+    @Test public void testDispose() {
+
+        if (tk.getSystemMenu().isSupported()) {
+            // setting system menu bar true should create a sceneProperty listener for RT-36554
+            menubar.setUseSystemMenuBar(true);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+        }
+
+        // This will cause the dispose method to be called.
+        menubar.setSkin(null);
+
+        if (tk.getSystemMenu().isSupported()) {
+
+            // dispose should clean up the system menu.
+            assertEquals(0, getSystemMenus().size());
+
+        }
+
+    }
+
+    @Test public void testSetUseSystemMenuBar() {
+        if (tk.getSystemMenu().isSupported()) {
+            menubar.setUseSystemMenuBar(true);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+
+            menubar.setUseSystemMenuBar(false);
+            assertEquals(0, getSystemMenus().size());
+
+            menubar.setUseSystemMenuBar(true);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+        }
+    }
+
+    @Test public void testSystemMenuBarUpdatesWhenMenusChange() {
+
+        if (tk.getSystemMenu().isSupported()) {
+            menubar.setUseSystemMenuBar(true);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+
+            menubar.getMenus().add(new Menu("testSystemMenuBarUpdatesWhenMenusChange"));
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+        }
+    }
+
+    @Test public void testRT_36554() {
+
+        if (tk.getSystemMenu().isSupported()) {
+
+            menubar.setUseSystemMenuBar(true);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+
+            // removing the menubar from the scene should remove the system menus.
+            ((Group)scene.getRoot()).getChildren().remove(menubar);
+            assertEquals(0, getSystemMenus().size());
+
+            // adding the menubar from the scene should add back the system menus.
+            ((Group)scene.getRoot()).getChildren().add(menubar);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+
+            // remove, then set useSystemMenuBar to false. Upon re-adding,
+            // there should still be no system menu.
+            ((Group)scene.getRoot()).getChildren().remove(menubar);
+            assertEquals(0, getSystemMenus().size());
+
+            menubar.setUseSystemMenuBar(false);
+            ((Group)scene.getRoot()).getChildren().add(menubar);
+            assertEquals(0, getSystemMenus().size());
+
+            // setting useSystemMenuBar to true again, should add back the system menus.
+            menubar.setUseSystemMenuBar(true);
+            assertEquals(menubar.getMenus().size(), getSystemMenus().size());
+        }
+    }
+
+    public static final class MenuBarSkinMock extends MenuBarSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public MenuBarSkinMock(MenuBar menubar) {
+            super(menubar);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+
+    private List<MenuBase> getSystemMenus() {
+        return ((StubToolkit.StubSystemMenu)tk.getSystemMenu()).getMenus();
+    }
+
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/MenuButtonSkinTest.java	2015-09-03 15:28:38.413282200 -0700
+++ /dev/null	2015-09-03 15:28:39.000000000 -0700
@@ -1,78 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.MenuButton;
-import javafx.scene.control.MenuItem;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This fails with IllegalStateException because of the toolkit's check for the FX application thread
- */
-public class MenuButtonSkinTest {
-    private MenuButton menubutton;
-    private MenuButtonSkinMock skin;
-
-    @Before public void setup() {
-        menubutton = new MenuButton();
-        menubutton.getItems().addAll(new MenuItem("Vanilla"), new MenuItem("Chocolate"));
-        skin = new MenuButtonSkinMock(menubutton);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        menubutton.setPadding(new Insets(10, 10, 10, 10));
-        menubutton.setSkin(skin);
-
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        menubutton.setPrefWidth(500);
-        assertEquals(500, menubutton.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        menubutton.setPrefHeight(100);
-        assertEquals(100, menubutton.maxHeight(-1), 0);
-    }
-    
-    public static final class MenuButtonSkinMock extends MenuButtonSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public MenuButtonSkinMock(MenuButton menubutton) {
-            super(menubutton);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:28:39.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/MenuButtonSkinTest.java	2015-09-03 15:28:37.584234800 -0700
@@ -0,0 +1,81 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.MenuButton;
+import javafx.scene.control.MenuItem;
+
+import javafx.scene.control.skin.MenuButtonSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This fails with IllegalStateException because of the toolkit's check for the FX application thread
+ */
+public class MenuButtonSkinTest {
+    private MenuButton menubutton;
+    private MenuButtonSkinMock skin;
+
+    @Before public void setup() {
+        menubutton = new MenuButton();
+        menubutton.getItems().addAll(new MenuItem("Vanilla"), new MenuItem("Chocolate"));
+        skin = new MenuButtonSkinMock(menubutton);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        menubutton.setPadding(new Insets(10, 10, 10, 10));
+        menubutton.setSkin(skin);
+
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        menubutton.setPrefWidth(500);
+        assertEquals(500, menubutton.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        menubutton.setPrefHeight(100);
+        assertEquals(100, menubutton.maxHeight(-1), 0);
+    }
+    
+    public static final class MenuButtonSkinMock extends MenuButtonSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public MenuButtonSkinMock(MenuButton menubutton) {
+            super(menubutton);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ProgressBarSkinTest.java	2015-09-03 15:28:46.543747200 -0700
+++ /dev/null	2015-09-03 15:28:47.000000000 -0700
@@ -1,69 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.scene.control.ProgressBar;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ProgressBarSkinTest {
-    private ProgressBar progressbar;
-    private ProgressBarSkinMock skin;
-
-    @Before public void setup() {
-        progressbar = new ProgressBar();
-        skin = new ProgressBarSkinMock(progressbar);
-        progressbar.setSkin(skin);
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        progressbar.setPrefWidth(500);
-        assertEquals(500, progressbar.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        progressbar.setPrefHeight(500);
-        assertEquals(500, progressbar.maxHeight(-1), 0);
-    }
-    
-    public static final class ProgressBarSkinMock extends ProgressBarSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ProgressBarSkinMock(ProgressBar progressbar) {
-            super(progressbar);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:28:47.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ProgressBarSkinTest.java	2015-09-03 15:28:45.688698300 -0700
@@ -0,0 +1,72 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.scene.control.ProgressBar;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class ProgressBarSkinTest {
+    private ProgressBar progressbar;
+    private ProgressBarSkinMock skin;
+
+    @Before public void setup() {
+        progressbar = new ProgressBar();
+        skin = new ProgressBarSkinMock(progressbar);
+        progressbar.setSkin(skin);
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        progressbar.setPrefWidth(500);
+        assertEquals(500, progressbar.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        progressbar.setPrefHeight(500);
+        assertEquals(500, progressbar.maxHeight(-1), 0);
+    }
+    
+    public static final class ProgressBarSkinMock extends ProgressBarSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ProgressBarSkinMock(ProgressBar progressbar) {
+            super(progressbar);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ProgressIndicatorSkinTest.java	2015-09-03 15:28:54.559205700 -0700
+++ /dev/null	2015-09-03 15:28:55.000000000 -0700
@@ -1,76 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.scene.control.ProgressIndicator;
-import javafx.scene.Group;
-import javafx.scene.paint.Color;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ProgressIndicatorSkinTest {
-    private ProgressIndicator progressindicator;
-    private ProgressIndicatorSkinMock skin;
-
-    @Before public void setup() {
-        progressindicator = new ProgressIndicator();
-        skin = new ProgressIndicatorSkinMock(progressindicator);
-        progressindicator.setSkin(skin);
-    }
-
-    @Test public void progressCSSTracksProgressColor() {
-        progressindicator.setStyle("-fx-progress-color: green;");
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(progressindicator);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        assertEquals(Color.GREEN, skin.getProgressColor());
-    }
-    
-    public static final class ProgressIndicatorSkinMock extends ProgressIndicatorSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ProgressIndicatorSkinMock(ProgressIndicator progressindicator) {
-            super(progressindicator);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:28:55.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ProgressIndicatorSkinTest.java	2015-09-03 15:28:53.901168100 -0700
@@ -0,0 +1,79 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.scene.control.ProgressIndicator;
+import javafx.scene.Group;
+import javafx.scene.paint.Color;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class ProgressIndicatorSkinTest {
+    private ProgressIndicator progressindicator;
+    private ProgressIndicatorSkinMock skin;
+
+    @Before public void setup() {
+        progressindicator = new ProgressIndicator();
+        skin = new ProgressIndicatorSkinMock(progressindicator);
+        progressindicator.setSkin(skin);
+    }
+
+    @Test public void progressCSSTracksProgressColor() {
+        progressindicator.setStyle("-fx-progress-color: green;");
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(progressindicator);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        assertEquals(Color.GREEN, skin.getProgressColor());
+    }
+    
+    public static final class ProgressIndicatorSkinMock extends ProgressIndicatorSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ProgressIndicatorSkinMock(ProgressIndicator progressindicator) {
+            super(progressindicator);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/RadioButtonSkinTest.java	2015-09-03 15:29:02.478658700 -0700
+++ /dev/null	2015-09-03 15:29:03.000000000 -0700
@@ -1,74 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.RadioButton;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class RadioButtonSkinTest {
-    private RadioButton radiobutton;
-    private RadioButtonSkinMock skin;
-
-    @Before public void setup() {
-        radiobutton = new RadioButton("Test");
-        skin = new RadioButtonSkinMock(radiobutton);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        radiobutton.setPadding(new Insets(10, 10, 10, 10));
-        radiobutton.setSkin(skin);
-
-    }
-
-    @Test public void maxWidthTracksPreferred() {        
-        radiobutton.setPrefWidth(500);
-        assertEquals(500, radiobutton.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        radiobutton.setPrefHeight(500);
-        assertEquals(500, radiobutton.maxHeight(-1), 0);
-    }
-    
-    public static final class RadioButtonSkinMock extends RadioButtonSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public RadioButtonSkinMock(RadioButton radiobutton) {
-            super(radiobutton);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:29:03.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/RadioButtonSkinTest.java	2015-09-03 15:29:01.736616200 -0700
@@ -0,0 +1,78 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.RadioButton;
+
+import javafx.scene.control.skin.RadioButtonSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class RadioButtonSkinTest {
+    private RadioButton radiobutton;
+    private RadioButtonSkinMock skin;
+
+    @Before public void setup() {
+        radiobutton = new RadioButton("Test");
+        skin = new RadioButtonSkinMock(radiobutton);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        radiobutton.setPadding(new Insets(10, 10, 10, 10));
+        radiobutton.setSkin(skin);
+
+    }
+
+    @Test public void maxWidthTracksPreferred() {        
+        radiobutton.setPrefWidth(500);
+        assertEquals(500, radiobutton.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        radiobutton.setPrefHeight(500);
+        assertEquals(500, radiobutton.maxHeight(-1), 0);
+    }
+    
+    public static final class RadioButtonSkinMock extends RadioButtonSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public RadioButtonSkinMock(RadioButton radiobutton) {
+            super(radiobutton);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ScrollBarSkinTest.java	2015-09-03 15:29:10.790134100 -0700
+++ /dev/null	2015-09-03 15:29:11.000000000 -0700
@@ -1,72 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Orientation;
-import javafx.scene.control.ScrollBar;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ScrollBarSkinTest {
-    private ScrollBar scrollbar;
-    private ScrollBarSkinMock skin;
-
-    @Before public void setup() {
-        scrollbar = new ScrollBar();
-        skin = new ScrollBarSkinMock(scrollbar);
-        scrollbar.setSkin(skin);
-    }
-
-    @Test public void onVerticalMaxWidthTracksPreferred() {        
-        scrollbar.setOrientation(Orientation.VERTICAL);
-        scrollbar.setPrefWidth(100);
-        assertEquals(100, scrollbar.maxWidth(-1), 0);
-    }
-
-    @Test public void onHorizontalMaxHeightTracksPreferred() {
-        scrollbar.setOrientation(Orientation.HORIZONTAL);
-        scrollbar.setPrefHeight(100);
-        assertEquals(100, scrollbar.maxHeight(-1), 0);
-    }
-    
-    public static final class ScrollBarSkinMock extends ScrollBarSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ScrollBarSkinMock(ScrollBar scrollbar) {
-            super(scrollbar);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:29:12.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ScrollBarSkinTest.java	2015-09-03 15:29:09.992088400 -0700
@@ -0,0 +1,76 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Orientation;
+import javafx.scene.control.ScrollBar;
+
+import javafx.scene.control.skin.ScrollBarSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class ScrollBarSkinTest {
+    private ScrollBar scrollbar;
+    private ScrollBarSkinMock skin;
+
+    @Before public void setup() {
+        scrollbar = new ScrollBar();
+        skin = new ScrollBarSkinMock(scrollbar);
+        scrollbar.setSkin(skin);
+    }
+
+    @Test public void onVerticalMaxWidthTracksPreferred() {        
+        scrollbar.setOrientation(Orientation.VERTICAL);
+        scrollbar.setPrefWidth(100);
+        assertEquals(100, scrollbar.maxWidth(-1), 0);
+    }
+
+    @Test public void onHorizontalMaxHeightTracksPreferred() {
+        scrollbar.setOrientation(Orientation.HORIZONTAL);
+        scrollbar.setPrefHeight(100);
+        assertEquals(100, scrollbar.maxHeight(-1), 0);
+    }
+    
+    public static final class ScrollBarSkinMock extends ScrollBarSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ScrollBarSkinMock(ScrollBar scrollbar) {
+            super(scrollbar);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ScrollPaneSkinTest.java	2015-09-03 15:29:18.919599000 -0700
+++ /dev/null	2015-09-03 15:29:20.000000000 -0700
@@ -1,825 +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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.event.Event;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.input.*;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Region;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.sun.javafx.pgstub.StubScene;
-import javafx.event.EventHandler;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-
-/**
- * @author mickf
- */
-public class ScrollPaneSkinTest {
-    private ScrollPane scrollPane;
-    private ScrollPaneSkinMock skin;
-
-    @Before public void setup() {
-        scrollPane = new ScrollPane();
-        skin = new ScrollPaneSkinMock(scrollPane);
-        scrollPane.setSkin(skin);
-    }
-
-    /*
-    ** RT-16641 : root cause, you shouldn't be able to drag
-    ** contents if they don't fill the scrollpane
-    */
-    @Test public void shouldntDragContentSmallerThanViewport() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-
-        scrollPane.setContent(sp);
-        scrollPane.setTranslateX(70);
-        scrollPane.setTranslateY(30);
-        scrollPane.setPrefWidth(100);
-        scrollPane.setPrefHeight(100);
-        scrollPane.setPannable(true);
-
-        MouseEventGenerator generator = new MouseEventGenerator();
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        double originalValue = scrollPane.getVvalue();
-
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, 50, 50));
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_DRAGGED, 75, 75));
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, 75, 75));
-
-        assertEquals(originalValue, scrollPane.getVvalue(), 0.01);
-
-    }
-
-    /*
-     * check we can drag contents that are larger than the scrollpane
-     */
-    @Test public void shouldDragContentLargerThanViewport() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(180);
-        sp.setPrefHeight(180);
-
-        scrollPane.setContent(sp);
-        scrollPane.setTranslateX(70);
-        scrollPane.setTranslateY(30);
-        scrollPane.setPrefWidth(100);
-        scrollPane.setPrefHeight(100);
-        scrollPane.setPannable(true);
-
-        MouseEventGenerator generator = new MouseEventGenerator();
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        double originalValue = scrollPane.getVvalue();
-
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, 75, 75));
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_DRAGGED, 50, 50));
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, 50, 50));
-
-        assertTrue(originalValue < scrollPane.getVvalue());
-    }
-
-
-    boolean continueTest;
-    class myPane extends Pane {
-        public void growH() {
-            setHeight(300);
-        }
-       public void growW() {
-            setWidth(300);
-        }
-
-    }
-    myPane pInner;
-
-    /*
-    ** check if scrollPane content vertical position compensates for content size change
-    */
-    @Test public void checkPositionOnContentSizeChangeHeight() {
-        pInner = new myPane();
-        pInner.setPrefWidth(200);
-        pInner.setPrefHeight(200);
-
-        scrollPane.setContent(pInner);
-        scrollPane.setPrefWidth(100);
-        scrollPane.setPrefHeight(100);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        double originalValue = 0.5;
-        scrollPane.setVvalue(originalValue);
-
-        continueTest = false;
-        scrollPane.vvalueProperty().addListener((observable, oldBounds, newBounds) -> {
-            continueTest = true;
-        });
-
-        /*
-        ** increase the height of the content
-        */
-        pInner.growH();
-
-        int count = 0;
-        while (continueTest == false && count < 10) {
-            try {
-                Thread.sleep(100);
-            }
-            catch (Exception e) {}
-            count++;
-        }
-
-        /*
-        ** did it work?
-        */
-        assertTrue(originalValue > scrollPane.getVvalue() && scrollPane.getVvalue() > 0.0);
-    }
-
-
-    /*
-    ** check if scrollPane content Horizontal position compensates for content size change
-    */
-    @Test public void checkPositionOnContentSizeChangeWidth() {
-
-        pInner = new myPane();
-        pInner.setPrefWidth(200);
-        pInner.setPrefHeight(200);
-
-        scrollPane.setContent(pInner);
-        scrollPane.setPrefWidth(100);
-        scrollPane.setPrefHeight(100);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        double originalValue = 0.5;
-        scrollPane.setHvalue(originalValue);
-
-        continueTest = false;
-        scrollPane.hvalueProperty().addListener((observable, oldBounds, newBounds) -> {
-            continueTest = true;
-        });
-
-        /*
-        ** increase the width of the content
-        */
-        pInner.growW();
-
-        int count = 0;
-        while (continueTest == false && count < 10) {
-            try {
-                Thread.sleep(100);
-            }
-            catch (Exception e) {}
-            count++;
-        }
-
-        /*
-        ** did it work?
-        */
-        assertTrue(originalValue > scrollPane.getHvalue() && scrollPane.getHvalue() > 0.0);
-    }
-
-
-    private boolean scrolled;
-    /*
-    ** check if scrollPane content Horizontal position compensates for content size change
-    */
-    @Test public void checkIfScrollPaneWithinScrollPaneGetsScrollEvents() {
-
-        scrolled = false;
-
-        Rectangle rect = new Rectangle(100, 100, 100, 100);
-        rect.setOnScroll(event -> {
-            scrolled = true;
-        });
-
-        final ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
-        scrollPaneInner.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPaneInner.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPaneInner.setPrefWidth(100);
-        scrollPaneInner.setPrefHeight(100);
-        scrollPaneInner.setPannable(true);
-        scrollPaneInner.setContent(rect);
-
-        Pane pOuter = new Pane();
-        pOuter.setPrefWidth(600);
-        pOuter.setPrefHeight(600);
-        pOuter.getChildren().add(scrollPaneInner);
-
-        final ScrollPane scrollPaneOuter = new ScrollPane();
-        scrollPaneOuter.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneOuter));
-        scrollPaneOuter.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPaneOuter.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPaneOuter.setPrefWidth(500);
-        scrollPaneOuter.setPrefHeight(500);
-        scrollPaneOuter.setPannable(true);
-        scrollPaneOuter.setOnScroll(event -> {
-            scrolled = true;
-        });
-        scrollPaneOuter.setContent(pOuter);
-
-        Scene scene = new Scene(new Group(), 700, 700);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPaneOuter);
-        scrolled = false;
-
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        Event.fireEvent(rect,
-              new ScrollEvent(ScrollEvent.SCROLL,
-                          50, 50,
-                          50, 50,
-                          false, false, false, false, true, false,
-                          0.0, -50.0, 0.0, -50.0,
-                          ScrollEvent.HorizontalTextScrollUnits.NONE, 10.0,
-                          ScrollEvent.VerticalTextScrollUnits.NONE, 10.0,
-                          0, null));
-
-        /*
-        ** did it work?
-        */
-        assertTrue(scrollPaneInner.getVvalue() > 0.0);
-    }
-
-
-    boolean sceneClicked = false;
-    /*
-    ** check if unconsumed MouseClicked events on a scrollPane reach it's parent.
-    */
-    @Test public void checkIfScrollPaneConsumesMouseClickedEvents() {
-        ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
-        scrollPaneInner.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPaneInner.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPaneInner.setTranslateX(70);
-        scrollPaneInner.setTranslateY(30);
-        scrollPaneInner.setPrefWidth(100);
-        scrollPaneInner.setPrefHeight(100);
-        scrollPaneInner.setPannable(true);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        scene.setOnMouseClicked(me -> {
-            sceneClicked = true;
-        });
-
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPaneInner);
-
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        Event.fireEvent(scrollPaneInner,
-              new MouseEvent(MouseEvent.MOUSE_CLICKED, 50.0, 50.0, 50.0, 50.0,
-                         MouseButton.PRIMARY, 1,
-                         false, false, false, false, false,
-                         true, false, false, false, false, null
-                         ));
-
-        /*
-        ** did it work?
-        */
-        assertTrue(sceneClicked == true);
-    }
-
-    /*
-    ** check if ScrollPane gets focus on unconsumed mousePressed
-    */
-    @Test public void checkIfScrollPaneFocusesPressedEvents() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-
-        scrollPane.setContent(sp);
-        scrollPane.setTranslateX(70);
-        scrollPane.setTranslateY(30);
-        scrollPane.setPrefWidth(100);
-        scrollPane.setPrefHeight(100);
-        scrollPane.setPannable(true);
-
-        MouseEventGenerator generator = new MouseEventGenerator();
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        double originalValue = scrollPane.getVvalue();
-
-        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, 50, 50));
-
-        /*
-        ** did it work?
-        */
-        assertTrue(scene.getFocusOwner() == scrollPane);
-    }
-
-    /*
-    ** check if ScrollPane gets focus on unconsumed mousePressed
-    */
-    @Test public void checkIfScrollPaneViewportIsRounded() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-
-        scrollPane.setContent(sp);
-        scrollPane.setTranslateX(70);
-        scrollPane.setTranslateY(30);
-        scrollPane.setPrefViewportWidth(100.5);
-        scrollPane.setPrefHeight(100);
-        scrollPane.setPannable(true);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        /*
-        ** did it work?
-        */
-        assertTrue(scrollPane.getViewportBounds().getWidth() == Math.ceil(100.5));
-    }
-
-    /*
-    ** check ScrollBars missing if fitToHeight is true but height is > minHeight
-    */
-    @Test public void checkNoScrollbarsWhenFitToAndSizeOK() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-        sp.setMinWidth(40);
-        sp.setMinHeight(40);
-
-        scrollPane.setPrefSize(50, 50);
-        scrollPane.setContent(sp);
-        scrollPane.setPannable(true);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setFitToHeight(true);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        /*
-        ** did it work?
-        */
-        assertTrue(!skin.isHSBarVisible() & !skin.isVSBarVisible());
-    }
-
-    /*
-    ** check if ScrollBars appear if fitToHeight is true but height is < minHeight
-    */
-    @Test public void checkIfScrollbarsWhenFitToHeightAndHeightLessMin() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-        sp.setMinWidth(40);
-        sp.setMinHeight(40);
-
-        // see comments in checkIfScrollbarsWhenFitToWidthAndWidthLessMin for why width is 60
-        scrollPane.setPrefSize(60, 30);
-        scrollPane.setContent(sp);
-        scrollPane.setPannable(true);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setFitToHeight(true);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        /*
-        ** did it work?
-        */
-        assertTrue(!skin.isHSBarVisible() & skin.isVSBarVisible());
-    }
-
-    /*
-    ** check if ScrollBars appear if fitToWidth is true but width is < minWidth
-    */
-    @Test public void checkIfScrollbarsWhenFitToWidthAndWidthLessMin() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-        sp.setMinWidth(40);
-        sp.setMinHeight(40);
-
-        // set width < content minWidth, should get horizontal scroll bar
-        // set height > content minHeight, should not get vertical scroll bar
-        // Note that the scrollPane's height has to be big enough to fit both the
-        // horizontal ScrollBar and the re-sized content. If the ScrollBar's height
-        // is 16, then the scrollPane's prefHeight needs to be 16 plus the content's
-        // minHeight of 40 plus one pixel (since the content and the ScrollBar don't
-        // overlap), all of which adds up to 57. Originally, this test had the height
-        // set to 50 which caused the vertical ScrollBar to be visible.
-        scrollPane.setPrefSize(30, 60);
-        scrollPane.setContent(sp);
-        scrollPane.setPannable(true);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setFitToHeight(true);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        /*
-        ** did it work?
-        */
-        assertTrue(skin.isHSBarVisible() & !skin.isVSBarVisible());
-    }
-
-    /*
-    ** check if ScrollBars appear if fitToHeight & fitToWidth are true but height is < minHeight & width is < minWidth
-    */
-    @Test public void checkIfScrollbarsWhenBothFitToAndBothLessMin() {
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-
-        StackPane sp = new StackPane();
-        sp.setPrefWidth(80);
-        sp.setPrefHeight(80);
-        sp.setMinWidth(40);
-        sp.setMinHeight(40);
-
-        scrollPane.setPrefSize(60, 30);
-        scrollPane.setContent(sp);
-        scrollPane.setPannable(true);
-        scrollPane.setFitToWidth(true);
-        scrollPane.setFitToHeight(true);
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        /*
-        ** did it work?
-        */
-        assertTrue(!skin.isHSBarVisible() & skin.isVSBarVisible());
-    }
-
-    /*
-    ** check if ScrollBars appear if fitToHeight & fitToWidth are true but height is < minHeight & width is < minWidth
-    */
-    @Test public void checkWeHandleNullContent() {
-
-
-        scrollPane.setFitToWidth(true);
-
-        Scene scene = new Scene(scrollPane);
-
-        Stage stage = new Stage();
-        stage.setScene(scene);
-
-        stage.setWidth(600);
-        stage.setHeight(600);
-
-        stage.show();
-
-    }
-
-
-    /*
-    ** check if 'reduced-size' scrollbars leave a gap
-    ** at the right edge
-    */
-    @Test public void checkForScrollBarGaps() {
-
-        HBox hbox1 = new HBox(20);
-        VBox vbox1a = new VBox(10);
-        vbox1a.getChildren().addAll(new Label("one"), new Button("two"), new CheckBox("three"), new RadioButton("four"), new Label("five"));
-        VBox vbox1b = new VBox(10);
-        vbox1b.getChildren().addAll(new Label("one"), new Button("two"), new CheckBox("three"), new RadioButton("four"), new Label("five"));
-        hbox1.getChildren().addAll(vbox1a, vbox1b);
-        scrollPane.setContent(hbox1);
-        scrollPane.setStyle("-fx-background-color: red;-fx-border-color:green;");
-        scrollPane.setFocusTraversable(false);
-        scrollPane.setPrefSize(50, 50);
-
-
-        Scene scene = new Scene(new Group(), 400, 400);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPane);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-
-        /*
-        ** did it work?
-        ** check that the scrollbar is right at the border of the scrollpane, and
-        ** not at the padding.
-        */
-        ScrollPaneSkinMock skin = (ScrollPaneSkinMock) scrollPane.getSkin();
-
-        double skinWidth = scrollPane.getWidth();
-        double right = scrollPane.getPadding().getRight();
-        // 1 px of padding is on the outside - see RT-21251
-        double vsbPosAndWidth = (right >= 1 ? 1 : 0) + skin.getVsbX()+skin.getVsbWidth()+(scrollPane.getInsets().getRight() - right);
-        assertEquals(skinWidth,  vsbPosAndWidth, 0.1);
-
-        double skinHeight = scrollPane.getHeight();
-        // 1 px of padding is on the outside - see RT-21251
-        double bottom = scrollPane.getPadding().getBottom();
-        double hsbPosAndHeight = (bottom >= 1 ? 1 : 0) + skin.getHsbY()+skin.getHsbHeight()+(scrollPane.getInsets().getBottom() - bottom);
-        assertEquals(skinHeight,  hsbPosAndHeight, 0.1);
-
-    }
-
-    /*
-    ** check if scrollPane content Horizontal position compensates for content size change
-    ** ignored, as we do swipe through ScrollEvents.
-    */
-    @Ignore
-    @Test public void checkIfSwipeDownEventsChangeAnything() {
-
-        scrolled = false;
-
-        Rectangle rect = new Rectangle(200, 200, 200, 200);
-
-        final ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
-        scrollPaneInner.setPrefWidth(100);
-        scrollPaneInner.setPrefHeight(100);
-        scrollPaneInner.setPannable(true);
-        scrollPaneInner.setContent(rect);
-        scrollPaneInner.setOnSwipeUp(event -> {
-            scrolled = true;
-        });
-        scrollPaneInner.setOnSwipeDown(event -> {
-            scrolled = true;
-        });
-        scrollPaneInner.setOnSwipeLeft(event -> {
-            scrolled = true;
-        });
-        scrollPaneInner.setOnSwipeRight(event -> {
-            scrolled = true;
-        });
-        Pane pOuter = new Pane();
-        pOuter.setPrefWidth(600);
-        pOuter.setPrefHeight(600);
-
-        Scene scene = new Scene(new Group(), 700, 700);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPaneInner);
-
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        Event.fireEvent(rect,
-         new SwipeEvent(SwipeEvent.SWIPE_DOWN,
-            0.0, -50.0,
-            0.0, -50.0,
-            false,
-            false,
-            false,
-            false,
-            false,
-            1,
-            null
-            ));
-
-        /*
-        ** did it work?
-        */
-        assertTrue(scrollPaneInner.getVvalue() > 0.0);
-    }
-
-    /*
-    ** check if scrollPane content Horizontal position compensates for content size change
-    ** ignored, as we do swipe through ScrollEvents.
-    */
-    @Ignore
-    @Test public void checkIfSwipeRightEventsChangeAnything() {
-
-        scrolled = false;
-
-        Rectangle rect = new Rectangle(200, 200, 200, 200);
-
-        final ScrollPane scrollPaneInner = new ScrollPane();
-        scrollPaneInner.setSkin(new com.sun.javafx.scene.control.skin.ScrollPaneSkin(scrollPaneInner));
-        scrollPaneInner.setPrefWidth(100);
-        scrollPaneInner.setPrefHeight(100);
-        scrollPaneInner.setPannable(true);
-        scrollPaneInner.setContent(rect);
-        scrollPaneInner.setOnSwipeUp(event -> {
-            scrolled = true;
-        });
-        scrollPaneInner.setOnSwipeDown(event -> {
-            scrolled = true;
-        });
-        scrollPaneInner.setOnSwipeLeft(event -> {
-            scrolled = true;
-        });
-        scrollPaneInner.setOnSwipeRight(event -> {
-            scrolled = true;
-        });
-        Pane pOuter = new Pane();
-        pOuter.setPrefWidth(600);
-        pOuter.setPrefHeight(600);
-
-        Scene scene = new Scene(new Group(), 700, 700);
-        ((Group) scene.getRoot()).getChildren().clear();
-        ((Group) scene.getRoot()).getChildren().add(scrollPaneInner);
-
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        Event.fireEvent(rect,
-            new SwipeEvent(SwipeEvent.SWIPE_RIGHT,
-            0.0, -50.0,
-            0.0, -50.0,
-            false,
-            false,
-            false,
-            false,
-            false,
-            1,
-            null
-            ));
-
-         /*
-         ** did it work?
-         */
-        assertTrue(scrollPaneInner.getHvalue() > 0.0);
-    }
-
-
-
-    public static final class ScrollPaneSkinMock extends ScrollPaneSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ScrollPaneSkinMock(ScrollPane scrollPane) {
-            super(scrollPane);
-        }
-
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-
-        boolean isHSBarVisible() {
-            return hsb.isVisible();
-        }
-
-        boolean isVSBarVisible() {
-            return vsb.isVisible();
-        }
-        double getVsbX() {
-            return vsb.getLayoutX();
-        }
-        double getVsbWidth() {
-            return vsb.getWidth();
-        }
-        double getHsbY() {
-            return hsb.getLayoutY();
-        }
-        double getHsbHeight() {
-            return hsb.getHeight();
-        }
-    }
-
-    private static class MouseEventGenerator {
-        private boolean primaryButtonDown = false;
-
-        public MouseEvent generateMouseEvent(EventType<MouseEvent> type,
-                double x, double y) {
-
-            MouseButton button = MouseButton.NONE;
-            if (type == MouseEvent.MOUSE_PRESSED ||
-                    type == MouseEvent.MOUSE_RELEASED ||
-                    type == MouseEvent.MOUSE_DRAGGED) {
-                button = MouseButton.PRIMARY;
-            }
-
-            if (type == MouseEvent.MOUSE_PRESSED ||
-                    type == MouseEvent.MOUSE_DRAGGED) {
-                primaryButtonDown = true;
-            }
-
-            if (type == MouseEvent.MOUSE_RELEASED) {
-                primaryButtonDown = false;
-            }
-
-            MouseEvent event = new MouseEvent(type, x, y, x, y, button,
-                    1, false, false, false, false, false, primaryButtonDown,
-                    false, false, false, false, null);
-
-            return event;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:29:20.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ScrollPaneSkinTest.java	2015-09-03 15:29:18.128553800 -0700
@@ -0,0 +1,815 @@
+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import javafx.beans.value.ObservableValue;
+import javafx.event.Event;
+import javafx.event.EventType;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.input.*;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Stage;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * @author mickf
+ */
+public class ScrollPaneSkinTest {
+    private ScrollPane scrollPane;
+    private ScrollPaneSkinMock skin;
+
+    @Before public void setup() {
+        scrollPane = new ScrollPane();
+        skin = new ScrollPaneSkinMock(scrollPane);
+        scrollPane.setSkin(skin);
+    }
+
+    /*
+    ** RT-16641 : root cause, you shouldn't be able to drag
+    ** contents if they don't fill the scrollpane
+    */
+    @Test public void shouldntDragContentSmallerThanViewport() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+
+        scrollPane.setContent(sp);
+        scrollPane.setTranslateX(70);
+        scrollPane.setTranslateY(30);
+        scrollPane.setPrefWidth(100);
+        scrollPane.setPrefHeight(100);
+        scrollPane.setPannable(true);
+
+        MouseEventGenerator generator = new MouseEventGenerator();
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        double originalValue = scrollPane.getVvalue();
+
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, 50, 50));
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_DRAGGED, 75, 75));
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, 75, 75));
+
+        assertEquals(originalValue, scrollPane.getVvalue(), 0.01);
+
+    }
+
+    /*
+     * check we can drag contents that are larger than the scrollpane
+     */
+    @Test public void shouldDragContentLargerThanViewport() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(180);
+        sp.setPrefHeight(180);
+
+        scrollPane.setContent(sp);
+        scrollPane.setTranslateX(70);
+        scrollPane.setTranslateY(30);
+        scrollPane.setPrefWidth(100);
+        scrollPane.setPrefHeight(100);
+        scrollPane.setPannable(true);
+
+        MouseEventGenerator generator = new MouseEventGenerator();
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        double originalValue = scrollPane.getVvalue();
+
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, 75, 75));
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_DRAGGED, 50, 50));
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_RELEASED, 50, 50));
+
+        assertTrue(originalValue < scrollPane.getVvalue());
+    }
+
+
+    boolean continueTest;
+    class myPane extends Pane {
+        public void growH() {
+            setHeight(300);
+        }
+       public void growW() {
+            setWidth(300);
+        }
+
+    }
+    myPane pInner;
+
+    /*
+    ** check if scrollPane content vertical position compensates for content size change
+    */
+    @Test public void checkPositionOnContentSizeChangeHeight() {
+        pInner = new myPane();
+        pInner.setPrefWidth(200);
+        pInner.setPrefHeight(200);
+
+        scrollPane.setContent(pInner);
+        scrollPane.setPrefWidth(100);
+        scrollPane.setPrefHeight(100);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        double originalValue = 0.5;
+        scrollPane.setVvalue(originalValue);
+
+        continueTest = false;
+        scrollPane.vvalueProperty().addListener((observable, oldBounds, newBounds) -> {
+            continueTest = true;
+        });
+
+        /*
+        ** increase the height of the content
+        */
+        pInner.growH();
+
+        int count = 0;
+        while (continueTest == false && count < 10) {
+            try {
+                Thread.sleep(100);
+            }
+            catch (Exception e) {}
+            count++;
+        }
+
+        /*
+        ** did it work?
+        */
+        assertTrue(originalValue > scrollPane.getVvalue() && scrollPane.getVvalue() > 0.0);
+    }
+
+
+    /*
+    ** check if scrollPane content Horizontal position compensates for content size change
+    */
+    @Test public void checkPositionOnContentSizeChangeWidth() {
+
+        pInner = new myPane();
+        pInner.setPrefWidth(200);
+        pInner.setPrefHeight(200);
+
+        scrollPane.setContent(pInner);
+        scrollPane.setPrefWidth(100);
+        scrollPane.setPrefHeight(100);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        double originalValue = 0.5;
+        scrollPane.setHvalue(originalValue);
+
+        continueTest = false;
+        scrollPane.hvalueProperty().addListener((observable, oldBounds, newBounds) -> {
+            continueTest = true;
+        });
+
+        /*
+        ** increase the width of the content
+        */
+        pInner.growW();
+
+        int count = 0;
+        while (continueTest == false && count < 10) {
+            try {
+                Thread.sleep(100);
+            }
+            catch (Exception e) {}
+            count++;
+        }
+
+        /*
+        ** did it work?
+        */
+        assertTrue(originalValue > scrollPane.getHvalue() && scrollPane.getHvalue() > 0.0);
+    }
+
+
+    private boolean scrolled;
+    /*
+    ** check if scrollPane content Horizontal position compensates for content size change
+    */
+    @Test public void checkIfScrollPaneWithinScrollPaneGetsScrollEvents() {
+
+        scrolled = false;
+
+        Rectangle rect = new Rectangle(100, 100, 100, 100);
+        rect.setOnScroll(event -> {
+            scrolled = true;
+        });
+
+        final ScrollPane scrollPaneInner = new ScrollPane();
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPaneInner.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPaneInner.setPrefWidth(100);
+        scrollPaneInner.setPrefHeight(100);
+        scrollPaneInner.setPannable(true);
+        scrollPaneInner.setContent(rect);
+
+        Pane pOuter = new Pane();
+        pOuter.setPrefWidth(600);
+        pOuter.setPrefHeight(600);
+        pOuter.getChildren().add(scrollPaneInner);
+
+        final ScrollPane scrollPaneOuter = new ScrollPane();
+        scrollPaneOuter.setSkin(new ScrollPaneSkin(scrollPaneOuter));
+        scrollPaneOuter.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPaneOuter.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPaneOuter.setPrefWidth(500);
+        scrollPaneOuter.setPrefHeight(500);
+        scrollPaneOuter.setPannable(true);
+        scrollPaneOuter.setOnScroll(event -> {
+            scrolled = true;
+        });
+        scrollPaneOuter.setContent(pOuter);
+
+        Scene scene = new Scene(new Group(), 700, 700);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPaneOuter);
+        scrolled = false;
+
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        Event.fireEvent(rect,
+              new ScrollEvent(ScrollEvent.SCROLL,
+                          50, 50,
+                          50, 50,
+                          false, false, false, false, true, false,
+                          0.0, -50.0, 0.0, -50.0,
+                          ScrollEvent.HorizontalTextScrollUnits.NONE, 10.0,
+                          ScrollEvent.VerticalTextScrollUnits.NONE, 10.0,
+                          0, null));
+
+        /*
+        ** did it work?
+        */
+        assertTrue(scrollPaneInner.getVvalue() > 0.0);
+    }
+
+
+    boolean sceneClicked = false;
+    /*
+    ** check if unconsumed MouseClicked events on a scrollPane reach it's parent.
+    */
+    @Test public void checkIfScrollPaneConsumesMouseClickedEvents() {
+        ScrollPane scrollPaneInner = new ScrollPane();
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPaneInner.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPaneInner.setTranslateX(70);
+        scrollPaneInner.setTranslateY(30);
+        scrollPaneInner.setPrefWidth(100);
+        scrollPaneInner.setPrefHeight(100);
+        scrollPaneInner.setPannable(true);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        scene.setOnMouseClicked(me -> {
+            sceneClicked = true;
+        });
+
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPaneInner);
+
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        Event.fireEvent(scrollPaneInner,
+              new MouseEvent(MouseEvent.MOUSE_CLICKED, 50.0, 50.0, 50.0, 50.0,
+                         MouseButton.PRIMARY, 1,
+                         false, false, false, false, false,
+                         true, false, false, false, false, null
+                         ));
+
+        /*
+        ** did it work?
+        */
+        assertTrue(sceneClicked == true);
+    }
+
+    /*
+    ** check if ScrollPane gets focus on unconsumed mousePressed
+    */
+    @Test public void checkIfScrollPaneFocusesPressedEvents() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+
+        scrollPane.setContent(sp);
+        scrollPane.setTranslateX(70);
+        scrollPane.setTranslateY(30);
+        scrollPane.setPrefWidth(100);
+        scrollPane.setPrefHeight(100);
+        scrollPane.setPannable(true);
+
+        MouseEventGenerator generator = new MouseEventGenerator();
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        double originalValue = scrollPane.getVvalue();
+
+        Event.fireEvent(sp, generator.generateMouseEvent(MouseEvent.MOUSE_PRESSED, 50, 50));
+
+        /*
+        ** did it work?
+        */
+        assertTrue(scene.getFocusOwner() == scrollPane);
+    }
+
+    /*
+    ** check if ScrollPane gets focus on unconsumed mousePressed
+    */
+    @Test public void checkIfScrollPaneViewportIsRounded() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.ALWAYS);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+
+        scrollPane.setContent(sp);
+        scrollPane.setTranslateX(70);
+        scrollPane.setTranslateY(30);
+        scrollPane.setPrefViewportWidth(100.5);
+        scrollPane.setPrefHeight(100);
+        scrollPane.setPannable(true);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        /*
+        ** did it work?
+        */
+        assertTrue(scrollPane.getViewportBounds().getWidth() == Math.ceil(100.5));
+    }
+
+    /*
+    ** check ScrollBars missing if fitToHeight is true but height is > minHeight
+    */
+    @Test public void checkNoScrollbarsWhenFitToAndSizeOK() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+        sp.setMinWidth(40);
+        sp.setMinHeight(40);
+
+        scrollPane.setPrefSize(50, 50);
+        scrollPane.setContent(sp);
+        scrollPane.setPannable(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        /*
+        ** did it work?
+        */
+        assertTrue(!skin.isHSBarVisible() & !skin.isVSBarVisible());
+    }
+
+    /*
+    ** check if ScrollBars appear if fitToHeight is true but height is < minHeight
+    */
+    @Test public void checkIfScrollbarsWhenFitToHeightAndHeightLessMin() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+        sp.setMinWidth(40);
+        sp.setMinHeight(40);
+
+        // see comments in checkIfScrollbarsWhenFitToWidthAndWidthLessMin for why width is 60
+        scrollPane.setPrefSize(60, 30);
+        scrollPane.setContent(sp);
+        scrollPane.setPannable(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        /*
+        ** did it work?
+        */
+        assertTrue(!skin.isHSBarVisible() & skin.isVSBarVisible());
+    }
+
+    /*
+    ** check if ScrollBars appear if fitToWidth is true but width is < minWidth
+    */
+    @Test public void checkIfScrollbarsWhenFitToWidthAndWidthLessMin() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+        sp.setMinWidth(40);
+        sp.setMinHeight(40);
+
+        // set width < content minWidth, should get horizontal scroll bar
+        // set height > content minHeight, should not get vertical scroll bar
+        // Note that the scrollPane's height has to be big enough to fit both the
+        // horizontal ScrollBar and the re-sized content. If the ScrollBar's height
+        // is 16, then the scrollPane's prefHeight needs to be 16 plus the content's
+        // minHeight of 40 plus one pixel (since the content and the ScrollBar don't
+        // overlap), all of which adds up to 57. Originally, this test had the height
+        // set to 50 which caused the vertical ScrollBar to be visible.
+        scrollPane.setPrefSize(30, 60);
+        scrollPane.setContent(sp);
+        scrollPane.setPannable(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        /*
+        ** did it work?
+        */
+        assertTrue(skin.isHSBarVisible() & !skin.isVSBarVisible());
+    }
+
+    /*
+    ** check if ScrollBars appear if fitToHeight & fitToWidth are true but height is < minHeight & width is < minWidth
+    */
+    @Test public void checkIfScrollbarsWhenBothFitToAndBothLessMin() {
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+
+        StackPane sp = new StackPane();
+        sp.setPrefWidth(80);
+        sp.setPrefHeight(80);
+        sp.setMinWidth(40);
+        sp.setMinHeight(40);
+
+        scrollPane.setPrefSize(60, 30);
+        scrollPane.setContent(sp);
+        scrollPane.setPannable(true);
+        scrollPane.setFitToWidth(true);
+        scrollPane.setFitToHeight(true);
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        /*
+        ** did it work?
+        */
+        assertTrue(!skin.isHSBarVisible() & skin.isVSBarVisible());
+    }
+
+    /*
+    ** check if ScrollBars appear if fitToHeight & fitToWidth are true but height is < minHeight & width is < minWidth
+    */
+    @Test public void checkWeHandleNullContent() {
+
+
+        scrollPane.setFitToWidth(true);
+
+        Scene scene = new Scene(scrollPane);
+
+        Stage stage = new Stage();
+        stage.setScene(scene);
+
+        stage.setWidth(600);
+        stage.setHeight(600);
+
+        stage.show();
+
+    }
+
+
+    /*
+    ** check if 'reduced-size' scrollbars leave a gap
+    ** at the right edge
+    */
+    @Test public void checkForScrollBarGaps() {
+
+        HBox hbox1 = new HBox(20);
+        VBox vbox1a = new VBox(10);
+        vbox1a.getChildren().addAll(new Label("one"), new Button("two"), new CheckBox("three"), new RadioButton("four"), new Label("five"));
+        VBox vbox1b = new VBox(10);
+        vbox1b.getChildren().addAll(new Label("one"), new Button("two"), new CheckBox("three"), new RadioButton("four"), new Label("five"));
+        hbox1.getChildren().addAll(vbox1a, vbox1b);
+        scrollPane.setContent(hbox1);
+        scrollPane.setStyle("-fx-background-color: red;-fx-border-color:green;");
+        scrollPane.setFocusTraversable(false);
+        scrollPane.setPrefSize(50, 50);
+
+
+        Scene scene = new Scene(new Group(), 400, 400);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPane);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+
+        /*
+        ** did it work?
+        ** check that the scrollbar is right at the border of the scrollpane, and
+        ** not at the padding.
+        */
+        ScrollPaneSkinMock skin = (ScrollPaneSkinMock) scrollPane.getSkin();
+
+        double skinWidth = scrollPane.getWidth();
+        double right = scrollPane.getPadding().getRight();
+        // 1 px of padding is on the outside - see RT-21251
+        double vsbPosAndWidth = (right >= 1 ? 1 : 0) + skin.getVsbX()+skin.getVsbWidth()+(scrollPane.getInsets().getRight() - right);
+        assertEquals(skinWidth,  vsbPosAndWidth, 0.1);
+
+        double skinHeight = scrollPane.getHeight();
+        // 1 px of padding is on the outside - see RT-21251
+        double bottom = scrollPane.getPadding().getBottom();
+        double hsbPosAndHeight = (bottom >= 1 ? 1 : 0) + skin.getHsbY()+skin.getHsbHeight()+(scrollPane.getInsets().getBottom() - bottom);
+        assertEquals(skinHeight,  hsbPosAndHeight, 0.1);
+
+    }
+
+    /*
+    ** check if scrollPane content Horizontal position compensates for content size change
+    ** ignored, as we do swipe through ScrollEvents.
+    */
+    @Ignore
+    @Test public void checkIfSwipeDownEventsChangeAnything() {
+
+        scrolled = false;
+
+        Rectangle rect = new Rectangle(200, 200, 200, 200);
+
+        final ScrollPane scrollPaneInner = new ScrollPane();
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setPrefWidth(100);
+        scrollPaneInner.setPrefHeight(100);
+        scrollPaneInner.setPannable(true);
+        scrollPaneInner.setContent(rect);
+        scrollPaneInner.setOnSwipeUp(event -> {
+            scrolled = true;
+        });
+        scrollPaneInner.setOnSwipeDown(event -> {
+            scrolled = true;
+        });
+        scrollPaneInner.setOnSwipeLeft(event -> {
+            scrolled = true;
+        });
+        scrollPaneInner.setOnSwipeRight(event -> {
+            scrolled = true;
+        });
+        Pane pOuter = new Pane();
+        pOuter.setPrefWidth(600);
+        pOuter.setPrefHeight(600);
+
+        Scene scene = new Scene(new Group(), 700, 700);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPaneInner);
+
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        Event.fireEvent(rect,
+         new SwipeEvent(SwipeEvent.SWIPE_DOWN,
+            0.0, -50.0,
+            0.0, -50.0,
+            false,
+            false,
+            false,
+            false,
+            false,
+            1,
+            null
+            ));
+
+        /*
+        ** did it work?
+        */
+        assertTrue(scrollPaneInner.getVvalue() > 0.0);
+    }
+
+    /*
+    ** check if scrollPane content Horizontal position compensates for content size change
+    ** ignored, as we do swipe through ScrollEvents.
+    */
+    @Ignore
+    @Test public void checkIfSwipeRightEventsChangeAnything() {
+
+        scrolled = false;
+
+        Rectangle rect = new Rectangle(200, 200, 200, 200);
+
+        final ScrollPane scrollPaneInner = new ScrollPane();
+        scrollPaneInner.setSkin(new ScrollPaneSkin(scrollPaneInner));
+        scrollPaneInner.setPrefWidth(100);
+        scrollPaneInner.setPrefHeight(100);
+        scrollPaneInner.setPannable(true);
+        scrollPaneInner.setContent(rect);
+        scrollPaneInner.setOnSwipeUp(event -> {
+            scrolled = true;
+        });
+        scrollPaneInner.setOnSwipeDown(event -> {
+            scrolled = true;
+        });
+        scrollPaneInner.setOnSwipeLeft(event -> {
+            scrolled = true;
+        });
+        scrollPaneInner.setOnSwipeRight(event -> {
+            scrolled = true;
+        });
+        Pane pOuter = new Pane();
+        pOuter.setPrefWidth(600);
+        pOuter.setPrefHeight(600);
+
+        Scene scene = new Scene(new Group(), 700, 700);
+        ((Group) scene.getRoot()).getChildren().clear();
+        ((Group) scene.getRoot()).getChildren().add(scrollPaneInner);
+
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        Event.fireEvent(rect,
+            new SwipeEvent(SwipeEvent.SWIPE_RIGHT,
+            0.0, -50.0,
+            0.0, -50.0,
+            false,
+            false,
+            false,
+            false,
+            false,
+            1,
+            null
+            ));
+
+         /*
+         ** did it work?
+         */
+        assertTrue(scrollPaneInner.getHvalue() > 0.0);
+    }
+
+
+
+    public static final class ScrollPaneSkinMock extends ScrollPaneSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ScrollPaneSkinMock(ScrollPane scrollPane) {
+            super(scrollPane);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+
+        boolean isHSBarVisible() {
+            return hsb.isVisible();
+        }
+
+        boolean isVSBarVisible() {
+            return vsb.isVisible();
+        }
+        double getVsbX() {
+            return vsb.getLayoutX();
+        }
+        double getVsbWidth() {
+            return vsb.getWidth();
+        }
+        double getHsbY() {
+            return hsb.getLayoutY();
+        }
+        double getHsbHeight() {
+            return hsb.getHeight();
+        }
+    }
+
+    private static class MouseEventGenerator {
+        private boolean primaryButtonDown = false;
+
+        public MouseEvent generateMouseEvent(EventType<MouseEvent> type,
+                double x, double y) {
+
+            MouseButton button = MouseButton.NONE;
+            if (type == MouseEvent.MOUSE_PRESSED ||
+                    type == MouseEvent.MOUSE_RELEASED ||
+                    type == MouseEvent.MOUSE_DRAGGED) {
+                button = MouseButton.PRIMARY;
+            }
+
+            if (type == MouseEvent.MOUSE_PRESSED ||
+                    type == MouseEvent.MOUSE_DRAGGED) {
+                primaryButtonDown = true;
+            }
+
+            if (type == MouseEvent.MOUSE_RELEASED) {
+                primaryButtonDown = false;
+            }
+
+            MouseEvent event = new MouseEvent(type, x, y, x, y, button,
+                    1, false, false, false, false, false, primaryButtonDown,
+                    false, false, false, false, null);
+
+            return event;
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/SeparatorSkinLayoutTest.java	2015-09-03 15:29:27.172071000 -0700
+++ /dev/null	2015-09-03 15:29:28.000000000 -0700
@@ -1,165 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Bounds;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.geometry.VPos;
-import javafx.scene.control.Separator;
-import javafx.scene.control.SkinBaseAccessor;
-import javafx.scene.layout.Region;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class SeparatorSkinLayoutTest {
-    private Separator separator;
-    private SeparatorSkin skin;
-    private Region line;
-
-    @Before public void setup() {
-        separator = new Separator();
-        skin = new SeparatorSkin(separator);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        separator.setPadding(new Insets(10, 8, 6, 4));
-        separator.setSkin(skin);
-        // It so happens that SeparatorSkin has exactly one child: line
-        line = (Region) SkinBaseAccessor.getChildren(skin).get(0);
-        line.setPadding((new Insets(4, 3, 2, 1)));
-        separator.resize(100, 100);
-        separator.layout();
-    }
-
-    private void assertLineWidthMatchesSkinWidth() {
-        Bounds lineBounds = line.getBoundsInParent();
-        assertEquals(separator.getWidth() - separator.getInsets().getRight(), lineBounds.getMaxX(), .1);
-        assertEquals(separator.getInsets().getLeft(), lineBounds.getMinX(), .1);
-    }
-
-    private void assertLineHeightMatchesSkinHeight() {
-        Bounds lineBounds = line.getBoundsInParent();
-        assertEquals(separator.getInsets().getTop(), lineBounds.getMinY(), .1);
-        assertEquals(separator.getHeight() - separator.getInsets().getBottom(), lineBounds.getMaxY(), .1);
-    }
-
-    // ----------------------- Horizontal Tests
-
-    /**
-     * The line should be as wide as the skin, and as tall as its prefHeight,
-     * and be positioned within the padding of the skin
-     */
-    @Test public void separatorWith_TOP_PositionsLineAtTopOfArea() {
-        separator.setValignment(VPos.TOP);
-        separator.layout();
-        Bounds lineBounds = line.getBoundsInParent();
-        assertEquals(separator.getInsets().getTop(), lineBounds.getMinY(), .1);
-        assertEquals(line.prefHeight(-1), lineBounds.getHeight(), .1);
-        assertLineWidthMatchesSkinWidth();
-    }
-
-    /**
-     * The line should be as wide as the skin, and as tall as its prefHeight,
-     * and be positioned centered vertically within the padding of the skin
-     */
-    @Test public void separatorWith_CENTER_PositionsLineAtCenterOfArea() {
-        separator.setValignment(VPos.CENTER);
-        separator.layout();
-        Bounds lineBounds = line.getBoundsInParent();
-        final double ch = separator.getHeight() - (separator.getInsets().getTop() + separator.getInsets().getBottom());
-        final double centerLine = separator.getInsets().getTop() + (ch / 2.0);
-        assertEquals(centerLine - (lineBounds.getHeight() / 2.0), lineBounds.getMinY(), .1);
-        assertEquals(line.prefHeight(-1), lineBounds.getHeight(), .1);
-        assertLineWidthMatchesSkinWidth();
-    }
-
-    /**
-     * The line should be as wide as the skin, and as tall as its prefHeight,
-     * and be positioned within the bottom padding of the skin
-     */
-    @Test public void separatorWith_BOTTOM_PositionsLineAtBottomOfArea() {
-        separator.setValignment(VPos.BOTTOM);
-        separator.layout();
-        Bounds lineBounds = line.getBoundsInParent();
-        final double y = separator.getHeight() - (separator.getInsets().getBottom() + line.prefHeight(-1));
-        assertEquals(y, lineBounds.getMinY(), .1);
-        assertEquals(line.prefHeight(-1), lineBounds.getHeight(), .1);
-        assertLineWidthMatchesSkinWidth();
-    }
-
-    // ----------------------- Vertical Tests
-
-    /**
-     * The line should be as tall as the skin, and as wide as its prefWidth,
-     * and be positioned within the left padding of the skin
-     */
-    @Test public void separatorWith_LEFT_PositionsLineAtLeftOfArea_vertical() {
-        separator.setHalignment(HPos.LEFT);
-        separator.setOrientation(Orientation.VERTICAL);
-        separator.layout();
-        Bounds lineBounds = line.getBoundsInParent();
-        assertEquals(separator.getInsets().getLeft(), lineBounds.getMinX(), .1);
-        assertEquals(line.prefWidth(-1), lineBounds.getWidth(), .1);
-        assertLineHeightMatchesSkinHeight();
-    }
-
-    /**
-     * The line should be as tall as the skin, and as wide as its prefWidth,
-     * and be positioned centered within the padding of the skin
-     */
-    @Test public void separatorWith_CENTER_PositionsLineAtCenterOfArea_vertical() {
-        separator.setHalignment(HPos.CENTER);
-        separator.setOrientation(Orientation.VERTICAL);
-        separator.layout();
-        Bounds lineBounds = line.getBoundsInParent();
-        final double cw = separator.getWidth() - (separator.getInsets().getLeft() + separator.getInsets().getRight());
-        final double centerLine = separator.getInsets().getLeft() + (cw / 2.0);
-        assertEquals(centerLine - (lineBounds.getWidth() / 2.0), lineBounds.getMinX(), .1);
-        assertEquals(line.prefWidth(-1), lineBounds.getWidth(), .1);
-        assertLineHeightMatchesSkinHeight();
-    }
-
-    /**
-     * The line should be as tall as the skin, and as wide as its prefWidth,
-     * and be positioned within the right padding of the skin
-     */
-    @Test public void separatorWith_RIGHT_PositionsLineAtRightOfArea_vertical() {
-        separator.setHalignment(HPos.RIGHT);
-        separator.setOrientation(Orientation.VERTICAL);
-        separator.layout();
-        Bounds lineBounds = line.getBoundsInParent();
-        final double x = separator.getWidth() - (separator.getInsets().getRight() + line.prefWidth(-1));
-        assertEquals(x, lineBounds.getMinX(), .1);
-        assertEquals(line.prefWidth(-1), lineBounds.getWidth(), .1);
-        assertLineHeightMatchesSkinHeight();
-    }
-
-}
--- /dev/null	2015-09-03 15:29:28.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/SeparatorSkinLayoutTest.java	2015-09-03 15:29:26.315022000 -0700
@@ -0,0 +1,165 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+import javafx.geometry.Bounds;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.VPos;
+import javafx.scene.control.Separator;
+import javafx.scene.control.SkinBaseAccessor;
+import javafx.scene.layout.Region;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class SeparatorSkinLayoutTest {
+    private Separator separator;
+    private SeparatorSkin skin;
+    private Region line;
+
+    @Before public void setup() {
+        separator = new Separator();
+        skin = new SeparatorSkin(separator);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        separator.setPadding(new Insets(10, 8, 6, 4));
+        separator.setSkin(skin);
+        // It so happens that SeparatorSkin has exactly one child: line
+        line = (Region) SkinBaseAccessor.getChildren(skin).get(0);
+        line.setPadding((new Insets(4, 3, 2, 1)));
+        separator.resize(100, 100);
+        separator.layout();
+    }
+
+    private void assertLineWidthMatchesSkinWidth() {
+        Bounds lineBounds = line.getBoundsInParent();
+        assertEquals(separator.getWidth() - separator.getInsets().getRight(), lineBounds.getMaxX(), .1);
+        assertEquals(separator.getInsets().getLeft(), lineBounds.getMinX(), .1);
+    }
+
+    private void assertLineHeightMatchesSkinHeight() {
+        Bounds lineBounds = line.getBoundsInParent();
+        assertEquals(separator.getInsets().getTop(), lineBounds.getMinY(), .1);
+        assertEquals(separator.getHeight() - separator.getInsets().getBottom(), lineBounds.getMaxY(), .1);
+    }
+
+    // ----------------------- Horizontal Tests
+
+    /**
+     * The line should be as wide as the skin, and as tall as its prefHeight,
+     * and be positioned within the padding of the skin
+     */
+    @Test public void separatorWith_TOP_PositionsLineAtTopOfArea() {
+        separator.setValignment(VPos.TOP);
+        separator.layout();
+        Bounds lineBounds = line.getBoundsInParent();
+        assertEquals(separator.getInsets().getTop(), lineBounds.getMinY(), .1);
+        assertEquals(line.prefHeight(-1), lineBounds.getHeight(), .1);
+        assertLineWidthMatchesSkinWidth();
+    }
+
+    /**
+     * The line should be as wide as the skin, and as tall as its prefHeight,
+     * and be positioned centered vertically within the padding of the skin
+     */
+    @Test public void separatorWith_CENTER_PositionsLineAtCenterOfArea() {
+        separator.setValignment(VPos.CENTER);
+        separator.layout();
+        Bounds lineBounds = line.getBoundsInParent();
+        final double ch = separator.getHeight() - (separator.getInsets().getTop() + separator.getInsets().getBottom());
+        final double centerLine = separator.getInsets().getTop() + (ch / 2.0);
+        assertEquals(centerLine - (lineBounds.getHeight() / 2.0), lineBounds.getMinY(), .1);
+        assertEquals(line.prefHeight(-1), lineBounds.getHeight(), .1);
+        assertLineWidthMatchesSkinWidth();
+    }
+
+    /**
+     * The line should be as wide as the skin, and as tall as its prefHeight,
+     * and be positioned within the bottom padding of the skin
+     */
+    @Test public void separatorWith_BOTTOM_PositionsLineAtBottomOfArea() {
+        separator.setValignment(VPos.BOTTOM);
+        separator.layout();
+        Bounds lineBounds = line.getBoundsInParent();
+        final double y = separator.getHeight() - (separator.getInsets().getBottom() + line.prefHeight(-1));
+        assertEquals(y, lineBounds.getMinY(), .1);
+        assertEquals(line.prefHeight(-1), lineBounds.getHeight(), .1);
+        assertLineWidthMatchesSkinWidth();
+    }
+
+    // ----------------------- Vertical Tests
+
+    /**
+     * The line should be as tall as the skin, and as wide as its prefWidth,
+     * and be positioned within the left padding of the skin
+     */
+    @Test public void separatorWith_LEFT_PositionsLineAtLeftOfArea_vertical() {
+        separator.setHalignment(HPos.LEFT);
+        separator.setOrientation(Orientation.VERTICAL);
+        separator.layout();
+        Bounds lineBounds = line.getBoundsInParent();
+        assertEquals(separator.getInsets().getLeft(), lineBounds.getMinX(), .1);
+        assertEquals(line.prefWidth(-1), lineBounds.getWidth(), .1);
+        assertLineHeightMatchesSkinHeight();
+    }
+
+    /**
+     * The line should be as tall as the skin, and as wide as its prefWidth,
+     * and be positioned centered within the padding of the skin
+     */
+    @Test public void separatorWith_CENTER_PositionsLineAtCenterOfArea_vertical() {
+        separator.setHalignment(HPos.CENTER);
+        separator.setOrientation(Orientation.VERTICAL);
+        separator.layout();
+        Bounds lineBounds = line.getBoundsInParent();
+        final double cw = separator.getWidth() - (separator.getInsets().getLeft() + separator.getInsets().getRight());
+        final double centerLine = separator.getInsets().getLeft() + (cw / 2.0);
+        assertEquals(centerLine - (lineBounds.getWidth() / 2.0), lineBounds.getMinX(), .1);
+        assertEquals(line.prefWidth(-1), lineBounds.getWidth(), .1);
+        assertLineHeightMatchesSkinHeight();
+    }
+
+    /**
+     * The line should be as tall as the skin, and as wide as its prefWidth,
+     * and be positioned within the right padding of the skin
+     */
+    @Test public void separatorWith_RIGHT_PositionsLineAtRightOfArea_vertical() {
+        separator.setHalignment(HPos.RIGHT);
+        separator.setOrientation(Orientation.VERTICAL);
+        separator.layout();
+        Bounds lineBounds = line.getBoundsInParent();
+        final double x = separator.getWidth() - (separator.getInsets().getRight() + line.prefWidth(-1));
+        assertEquals(x, lineBounds.getMinX(), .1);
+        assertEquals(line.prefWidth(-1), lineBounds.getWidth(), .1);
+        assertLineHeightMatchesSkinHeight();
+    }
+
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/SeparatorSkinTest.java	2015-09-03 15:29:34.932514900 -0700
+++ /dev/null	2015-09-03 15:29:35.000000000 -0700
@@ -1,234 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import javafx.geometry.HPos;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.geometry.VPos;
-import javafx.scene.control.Separator;
-import javafx.scene.control.SkinBaseAccessor;
-import javafx.scene.layout.Region;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- */
-public class SeparatorSkinTest {
-    private Separator separator;
-    private SeparatorSkinMock skin;
-    private Region line;
-
-    @Before public void setup() {
-        separator = new Separator();
-        skin = new SeparatorSkinMock(separator);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        separator.setPadding(new Insets(10, 8, 6, 4));
-        separator.setSkin(skin);
-        // It so happens that SeparatorSkin has exactly one child: line
-        line = (Region) SkinBaseAccessor.getChildren(skin).get(0);
-        line.setPadding((new Insets(4, 3, 2, 1)));
-        separator.layout();
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for change notification                                            *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void orientationChangesOnSeparatorShouldInvoke_handleControlPropertyChanged() {
-        assertFalse(skin.propertyChanged); // sanity check
-        separator.setOrientation(Orientation.VERTICAL);
-        assertTrue(skin.propertyChanged);
-        assertEquals(1, skin.propertyChangeCount); // sanity check
-    }
-
-    @Test public void halignmentChangesOnSeparatorShouldInvoke_handleControlPropertyChanged() {
-        assertFalse(skin.propertyChanged); // sanity check
-        separator.setHalignment(HPos.RIGHT);
-        assertTrue(skin.propertyChanged);
-        assertEquals(1, skin.propertyChangeCount); // sanity check
-    }
-
-    @Test public void valignmentChangesOnSeparatorShouldInvoke_handleControlPropertyChanged() {
-        assertFalse(skin.propertyChanged); // sanity check
-        separator.setValignment(VPos.BASELINE);
-        assertTrue(skin.propertyChanged);
-        assertEquals(1, skin.propertyChangeCount); // sanity check
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for invalidation. When each of various properties change, we need  *
-     * to invalidate some state, such as via requestLayout().                   *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void orientationChangeShouldInvalidateLayout() {
-        assertFalse(separator.isNeedsLayout());
-        separator.setOrientation(Orientation.VERTICAL);
-        assertTrue(separator.isNeedsLayout());
-    }
-
-    @Test public void halignmentChangeShouldInvalidateLayout() {
-        assertFalse(separator.isNeedsLayout());
-        separator.setHalignment(HPos.RIGHT);
-        assertTrue(separator.isNeedsLayout());
-    }
-
-    @Test public void valignmentChangeShouldInvalidateLayout() {
-        assertFalse(separator.isNeedsLayout());
-        separator.setValignment(VPos.BASELINE);
-        assertTrue(separator.isNeedsLayout());
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for minWidth                                                       *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void minWidthWhenVerticalShouldBePaddingOfLinePlusPaddingOfSeparator() {
-        separator.setOrientation(Orientation.VERTICAL);
-        final Insets linePadding = line.getInsets();
-        final Insets skinPadding = separator.getInsets();
-        assertEquals(linePadding.getLeft() + linePadding.getRight() +
-                skinPadding.getLeft() + skinPadding.getRight(),
-                separator.minWidth(-1), 0);
-    }
-
-    @Ignore
-    @Test public void minWidthWhenHorizontalShouldBePositiveNonZeroPlusPadding() {
-        separator.setOrientation(Orientation.HORIZONTAL);
-        final Insets linePadding = line.getInsets();
-        final Insets skinPadding = separator.getInsets();
-        assertTrue(separator.minWidth(-1) > 0);
-        assertEquals(linePadding.getLeft() + linePadding.getRight() +
-                skinPadding.getLeft() + skinPadding.getRight(),
-                separator.minWidth(-1), 0);
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for minHeight                                                       *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Ignore
-    @Test public void minHeightWhenVerticalShouldBePositiveNonZeroPlusPadding() {
-        separator.setOrientation(Orientation.VERTICAL);
-        final Insets linePadding = line.getInsets();
-        final Insets skinPadding = separator.getInsets();
-        assertTrue(separator.minHeight(-1) > 0);
-        assertEquals(linePadding.getTop() + linePadding.getBottom() +
-                skinPadding.getTop() + skinPadding.getBottom(),
-                separator.minHeight(-1), 0);
-    }
-
-    @Test public void minHeightWhenHorizontalShouldBePaddingOfLinePlusPaddingOfSeparator() {
-        separator.setOrientation(Orientation.HORIZONTAL);
-        final Insets linePadding = line.getInsets();
-        final Insets skinPadding = separator.getInsets();
-        assertEquals(linePadding.getTop() + linePadding.getBottom() +
-                skinPadding.getTop() + skinPadding.getBottom(),
-                separator.minHeight(-1), 0);
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for maxWidth                                                       *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void maxWidthWhenVerticalShouldBePaddingOfLinePlusPaddingOfSeparator() {
-        separator.setOrientation(Orientation.VERTICAL);
-        final Insets linePadding = line.getInsets();
-        final Insets skinPadding = separator.getInsets();
-        assertEquals(linePadding.getLeft() + linePadding.getRight() +
-                skinPadding.getLeft() + skinPadding.getRight(),
-                separator.maxWidth(-1), 0);
-    }
-
-    @Test public void maxWidthWhenHorizontalShouldBeMAX_VALUE() {
-        separator.setOrientation(Orientation.HORIZONTAL);
-        assertEquals(Double.MAX_VALUE, separator.maxWidth(-1), 0);
-    }
-
-    /****************************************************************************
-     *                                                                          *
-     * Tests for maxHeight                                                       *
-     *                                                                          *
-     ***************************************************************************/
-
-    @Test public void maxHeightWhenVerticalShouldBeMAX_VALUE() {
-        separator.setOrientation(Orientation.VERTICAL);
-        assertEquals(Double.MAX_VALUE, separator.maxHeight(-1), 0);
-    }
-
-    @Test public void maxHeightWhenHorizontalShouldBePaddingOfLinePlusPaddingOfSeparator() {
-        separator.setOrientation(Orientation.HORIZONTAL);
-        final Insets linePadding = line.getInsets();
-        final Insets skinPadding = separator.getInsets();
-        assertEquals(linePadding.getTop() + linePadding.getBottom() +
-                skinPadding.getTop() + skinPadding.getBottom(),
-                separator.maxHeight(-1), 0);
-    }
-
-    @Test public void onVerticalMaxWidthTracksPreferred() {
-        separator.setOrientation(Orientation.VERTICAL);
-        separator.setPrefWidth(100);
-        assertEquals(100, separator.maxWidth(-1), 0);
-    }
-
-    @Test public void onHorizontalMaxHeightTracksPreferred() {
-        separator.setOrientation(Orientation.HORIZONTAL);
-        separator.setPrefHeight(100);
-        assertEquals(100, separator.maxHeight(-1), 0);
-    }
-
-    public static final class SeparatorSkinMock extends SeparatorSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public SeparatorSkinMock(Separator sep) {
-            super(sep);
-        }
-
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-
-
-}
--- /dev/null	2015-09-03 15:29:36.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/SeparatorSkinTest.java	2015-09-03 15:29:34.097467200 -0700
@@ -0,0 +1,240 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.HPos;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.VPos;
+import javafx.scene.control.Separator;
+import javafx.scene.control.SkinBaseAccessor;
+import javafx.scene.layout.Region;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ */
+public class SeparatorSkinTest {
+    private Separator separator;
+    private SeparatorSkinMock skin;
+    private Region line;
+
+    @Before public void setup() {
+        separator = new Separator();
+        skin = new SeparatorSkinMock(separator);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        separator.setPadding(new Insets(10, 8, 6, 4));
+        separator.setSkin(skin);
+        // It so happens that SeparatorSkin has exactly one child: line
+        line = (Region) SkinBaseAccessor.getChildren(skin).get(0);
+        line.setPadding((new Insets(4, 3, 2, 1)));
+        separator.layout();
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for change notification                                            *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void orientationChangesOnSeparatorShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(separator.orientationProperty());
+        assertFalse(skin.propertyChanged); // sanity check
+        separator.setOrientation(Orientation.VERTICAL);
+        assertTrue(skin.propertyChanged);
+        assertEquals(1, skin.propertyChangeCount); // sanity check
+    }
+
+    @Test public void halignmentChangesOnSeparatorShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(separator.halignmentProperty());
+        assertFalse(skin.propertyChanged); // sanity check
+        separator.setHalignment(HPos.RIGHT);
+        assertTrue(skin.propertyChanged);
+        assertEquals(1, skin.propertyChangeCount); // sanity check
+    }
+
+    @Test public void valignmentChangesOnSeparatorShouldInvoke_handleControlPropertyChanged() {
+        skin.addWatchedProperty(separator.valignmentProperty());
+        assertFalse(skin.propertyChanged); // sanity check
+        separator.setValignment(VPos.BASELINE);
+        assertTrue(skin.propertyChanged);
+        assertEquals(1, skin.propertyChangeCount); // sanity check
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for invalidation. When each of various properties change, we need  *
+     * to invalidate some state, such as via requestLayout().                   *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void orientationChangeShouldInvalidateLayout() {
+        assertFalse(separator.isNeedsLayout());
+        separator.setOrientation(Orientation.VERTICAL);
+        assertTrue(separator.isNeedsLayout());
+    }
+
+    @Test public void halignmentChangeShouldInvalidateLayout() {
+        assertFalse(separator.isNeedsLayout());
+        separator.setHalignment(HPos.RIGHT);
+        assertTrue(separator.isNeedsLayout());
+    }
+
+    @Test public void valignmentChangeShouldInvalidateLayout() {
+        assertFalse(separator.isNeedsLayout());
+        separator.setValignment(VPos.BASELINE);
+        assertTrue(separator.isNeedsLayout());
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for minWidth                                                       *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void minWidthWhenVerticalShouldBePaddingOfLinePlusPaddingOfSeparator() {
+        separator.setOrientation(Orientation.VERTICAL);
+        final Insets linePadding = line.getInsets();
+        final Insets skinPadding = separator.getInsets();
+        assertEquals(linePadding.getLeft() + linePadding.getRight() +
+                skinPadding.getLeft() + skinPadding.getRight(),
+                separator.minWidth(-1), 0);
+    }
+
+    @Ignore
+    @Test public void minWidthWhenHorizontalShouldBePositiveNonZeroPlusPadding() {
+        separator.setOrientation(Orientation.HORIZONTAL);
+        final Insets linePadding = line.getInsets();
+        final Insets skinPadding = separator.getInsets();
+        assertTrue(separator.minWidth(-1) > 0);
+        assertEquals(linePadding.getLeft() + linePadding.getRight() +
+                skinPadding.getLeft() + skinPadding.getRight(),
+                separator.minWidth(-1), 0);
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for minHeight                                                       *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Ignore
+    @Test public void minHeightWhenVerticalShouldBePositiveNonZeroPlusPadding() {
+        separator.setOrientation(Orientation.VERTICAL);
+        final Insets linePadding = line.getInsets();
+        final Insets skinPadding = separator.getInsets();
+        assertTrue(separator.minHeight(-1) > 0);
+        assertEquals(linePadding.getTop() + linePadding.getBottom() +
+                skinPadding.getTop() + skinPadding.getBottom(),
+                separator.minHeight(-1), 0);
+    }
+
+    @Test public void minHeightWhenHorizontalShouldBePaddingOfLinePlusPaddingOfSeparator() {
+        separator.setOrientation(Orientation.HORIZONTAL);
+        final Insets linePadding = line.getInsets();
+        final Insets skinPadding = separator.getInsets();
+        assertEquals(linePadding.getTop() + linePadding.getBottom() +
+                skinPadding.getTop() + skinPadding.getBottom(),
+                separator.minHeight(-1), 0);
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for maxWidth                                                       *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void maxWidthWhenVerticalShouldBePaddingOfLinePlusPaddingOfSeparator() {
+        separator.setOrientation(Orientation.VERTICAL);
+        final Insets linePadding = line.getInsets();
+        final Insets skinPadding = separator.getInsets();
+        assertEquals(linePadding.getLeft() + linePadding.getRight() +
+                skinPadding.getLeft() + skinPadding.getRight(),
+                separator.maxWidth(-1), 0);
+    }
+
+    @Test public void maxWidthWhenHorizontalShouldBeMAX_VALUE() {
+        separator.setOrientation(Orientation.HORIZONTAL);
+        assertEquals(Double.MAX_VALUE, separator.maxWidth(-1), 0);
+    }
+
+    /****************************************************************************
+     *                                                                          *
+     * Tests for maxHeight                                                       *
+     *                                                                          *
+     ***************************************************************************/
+
+    @Test public void maxHeightWhenVerticalShouldBeMAX_VALUE() {
+        separator.setOrientation(Orientation.VERTICAL);
+        assertEquals(Double.MAX_VALUE, separator.maxHeight(-1), 0);
+    }
+
+    @Test public void maxHeightWhenHorizontalShouldBePaddingOfLinePlusPaddingOfSeparator() {
+        separator.setOrientation(Orientation.HORIZONTAL);
+        final Insets linePadding = line.getInsets();
+        final Insets skinPadding = separator.getInsets();
+        assertEquals(linePadding.getTop() + linePadding.getBottom() +
+                skinPadding.getTop() + skinPadding.getBottom(),
+                separator.maxHeight(-1), 0);
+    }
+
+    @Test public void onVerticalMaxWidthTracksPreferred() {
+        separator.setOrientation(Orientation.VERTICAL);
+        separator.setPrefWidth(100);
+        assertEquals(100, separator.maxWidth(-1), 0);
+    }
+
+    @Test public void onHorizontalMaxHeightTracksPreferred() {
+        separator.setOrientation(Orientation.HORIZONTAL);
+        separator.setPrefHeight(100);
+        assertEquals(100, separator.maxHeight(-1), 0);
+    }
+
+    public static final class SeparatorSkinMock extends SeparatorSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public SeparatorSkinMock(Separator sep) {
+            super(sep);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+
+
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/SliderSkinTest.java	2015-09-03 15:29:42.564951500 -0700
+++ /dev/null	2015-09-03 15:29:43.000000000 -0700
@@ -1,72 +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.scene.control.skin;
-
-import javafx.geometry.Orientation;
-import static org.junit.Assert.assertEquals;
-import javafx.scene.control.Slider;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class SliderSkinTest {
-    private Slider slider;
-    private SliderSkinMock skin;
-
-    @Before public void setup() {
-        slider = new Slider();
-        skin = new SliderSkinMock(slider);
-        slider.setSkin(skin);
-    }
-
-    @Test public void maxWidthTracksPreferred() {
-        slider.setOrientation(Orientation.VERTICAL);
-        slider.setPrefWidth(500);
-        assertEquals(500, slider.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        slider.setOrientation(Orientation.HORIZONTAL);
-        slider.setPrefHeight(500);
-        assertEquals(500, slider.maxHeight(-1), 0);
-    }
-    
-    public static final class SliderSkinMock extends SliderSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public SliderSkinMock(Slider slider) {
-            super(slider);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:29:43.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/SliderSkinTest.java	2015-09-03 15:29:41.719903100 -0700
@@ -0,0 +1,74 @@
+/*
+ * 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.control.skin;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Orientation;
+import static org.junit.Assert.assertEquals;
+import javafx.scene.control.Slider;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class SliderSkinTest {
+    private Slider slider;
+    private SliderSkinMock skin;
+
+    @Before public void setup() {
+        slider = new Slider();
+        skin = new SliderSkinMock(slider);
+        slider.setSkin(skin);
+    }
+
+    @Test public void maxWidthTracksPreferred() {
+        slider.setOrientation(Orientation.VERTICAL);
+        slider.setPrefWidth(500);
+        assertEquals(500, slider.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        slider.setOrientation(Orientation.HORIZONTAL);
+        slider.setPrefHeight(500);
+        assertEquals(500, slider.maxHeight(-1), 0);
+    }
+    
+    public static final class SliderSkinMock extends SliderSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public SliderSkinMock(Slider slider) {
+            super(slider);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/TableColumnHeaderRetriever.java	2015-09-03 15:29:50.781421400 -0700
+++ /dev/null	2015-09-03 15:29:51.000000000 -0700
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 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 com.sun.javafx.scene.control.infrastructure.StageLoader;
-import com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
-import javafx.scene.control.TableColumn;
-
-public class TableColumnHeaderRetriever {
-
-    public static int getColumnIndex(TableColumn col) {
-        TableColumnHeader colHeader = VirtualFlowTestUtils.getTableColumnHeader(col.getTableView(), col);
-        return colHeader == null ? -1 : colHeader.columnIndex;
-    }
-
-    public static int getColumnIndex(TableColumnHeader colHeader) {
-        return colHeader == null ? -1 : colHeader.columnIndex;
-    }
-
-    public static void moveColumn(TableColumn col, int newPos) {
-        TableColumnHeader colHeader = VirtualFlowTestUtils.getTableColumnHeader(col.getTableView(), col);
-        colHeader.moveColumn(col, newPos);
-    }
-
-    public static int getSortPos(TableColumnHeader header) {
-        return header.sortPos;
-    }
-
-    public static void moveColumn(TableColumn col, int dragOffset, int x) {
-        TableColumnHeader colHeader = VirtualFlowTestUtils.getTableColumnHeader(col.getTableView(), col);
-        colHeader.columnReorderingStarted(dragOffset);
-        colHeader.columnReordering(x, 0);
-        colHeader.columnReorderingComplete();
-    }
-}
--- /dev/null	2015-09-03 15:29:51.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/TableColumnHeaderRetriever.java	2015-09-03 15:29:49.980375600 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 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 com.sun.javafx.scene.control.infrastructure.VirtualFlowTestUtils;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.skin.TableColumnHeader;
+
+public class TableColumnHeaderRetriever {
+
+    public static int getColumnIndex(TableColumn col) {
+        TableColumnHeader colHeader = VirtualFlowTestUtils.getTableColumnHeader(col.getTableView(), col);
+        return colHeader == null ? -1 : colHeader.columnIndex;
+    }
+
+    public static int getColumnIndex(TableColumnHeader colHeader) {
+        return colHeader == null ? -1 : colHeader.columnIndex;
+    }
+
+    public static void moveColumn(TableColumn col, int newPos) {
+        TableColumnHeader colHeader = VirtualFlowTestUtils.getTableColumnHeader(col.getTableView(), col);
+        colHeader.moveColumn(col, newPos);
+    }
+
+    public static int getSortPos(TableColumnHeader header) {
+        return header.sortPos;
+    }
+
+    public static void moveColumn(TableColumn col, int dragOffset, int x) {
+        TableColumnHeader colHeader = VirtualFlowTestUtils.getTableColumnHeader(col.getTableView(), col);
+        colHeader.columnReorderingStarted(dragOffset);
+        colHeader.columnReordering(x, 0);
+        colHeader.columnReorderingComplete();
+    }
+}
--- /dev/null	2015-09-03 15:29:59.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/TableHeaderRowRetriever.java	2015-09-03 15:29:58.038836500 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015, 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.TableColumnBase;
+
+public class TableHeaderRowRetriever {
+
+    public static TableColumnHeader getColumnHeaderFor(final TableHeaderRow header, final TableColumnBase<?,?> col) {
+        return header.getColumnHeaderFor(col);
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/TextInputControlSkinTest.java	2015-09-03 15:30:04.269192900 -0700
+++ /dev/null	2015-09-03 15:30:05.000000000 -0700
@@ -1,104 +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.scene.control.skin;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.control.PasswordField;
-import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- *
- */
-public class TextInputControlSkinTest {
-    @Test public void caretStopsAnimatingWhenTextFieldLosesFocus() {
-        final AtomicBoolean caretAnimating = new AtomicBoolean(false);
-        FocusableTextField textField = new FocusableTextField();
-        TextFieldSkin skin = new TextFieldSkin(textField) {
-            @Override public void setCaretAnimating(boolean value) {
-                caretAnimating.set(value);
-                super.setCaretAnimating(value);
-            }
-        };
-        textField.setSkin(skin);
-        
-        textField.setFocus(true);
-        assertTrue(caretAnimating.get());
-        textField.setFocus(false);
-        assertFalse(caretAnimating.get());
-    }
-
-    @Test public void caretStopsAnimatingWhenTextAreaLosesFocus() {
-        final AtomicBoolean caretAnimating = new AtomicBoolean(false);
-        FocusableTextArea textArea = new FocusableTextArea();
-        TextAreaSkin skin = new TextAreaSkin(textArea) {
-            @Override public void setCaretAnimating(boolean value) {
-                caretAnimating.set(value);
-                super.setCaretAnimating(value);
-            }
-        };
-        textArea.setSkin(skin);
-
-        textArea.setFocus(true);
-        assertTrue(caretAnimating.get());
-        textArea.setFocus(false);
-        assertFalse(caretAnimating.get());
-    }
-
-    @Test public void skinsCanHandleNullValues_RT34178() {
-        // RT-34178: NPE in TextFieldSkin of PasswordField
-
-        // The skins should always use textProperty().getValueSafe()
-        // instead of getText().
-
-        TextArea textArea = new TextArea();
-        textArea.setSkin(new TextAreaSkin(textArea));
-        textArea.setText(null);
-
-        TextField textField = new TextField();
-        textField.setSkin(new TextFieldSkin(textField));
-        textField.setText(null);
-
-        PasswordField passwordField = new PasswordField();
-        passwordField.setSkin(new TextFieldSkin(passwordField));
-        passwordField.setText(null);
-    }
-
-    public class FocusableTextField extends TextField {
-        public void setFocus(boolean value) {
-            super.setFocused(value);
-        }
-    }
-
-    public class FocusableTextArea extends TextArea {
-        public void setFocus(boolean value) {
-            super.setFocused(value);
-        }
-    }
-}
--- /dev/null	2015-09-03 15:30:05.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/TextInputControlSkinTest.java	2015-09-03 15:30:03.545151500 -0700
@@ -0,0 +1,104 @@
+/*
+ * 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.control.skin;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.control.PasswordField;
+import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ *
+ */
+public class TextInputControlSkinTest {
+    @Test public void caretStopsAnimatingWhenTextFieldLosesFocus() {
+        final AtomicBoolean caretAnimating = new AtomicBoolean(false);
+        FocusableTextField textField = new FocusableTextField();
+        TextFieldSkin skin = new TextFieldSkin(textField) {
+            @Override public void setCaretAnimating(boolean value) {
+                caretAnimating.set(value);
+                super.setCaretAnimating(value);
+            }
+        };
+        textField.setSkin(skin);
+        
+        textField.setFocus(true);
+        assertTrue(caretAnimating.get());
+        textField.setFocus(false);
+        assertFalse(caretAnimating.get());
+    }
+
+    @Test public void caretStopsAnimatingWhenTextAreaLosesFocus() {
+        final AtomicBoolean caretAnimating = new AtomicBoolean(false);
+        FocusableTextArea textArea = new FocusableTextArea();
+        TextAreaSkin skin = new TextAreaSkin(textArea) {
+            @Override public void setCaretAnimating(boolean value) {
+                caretAnimating.set(value);
+                super.setCaretAnimating(value);
+            }
+        };
+        textArea.setSkin(skin);
+
+        textArea.setFocus(true);
+        assertTrue(caretAnimating.get());
+        textArea.setFocus(false);
+        assertFalse(caretAnimating.get());
+    }
+
+    @Test public void skinsCanHandleNullValues_RT34178() {
+        // RT-34178: NPE in TextFieldSkin of PasswordField
+
+        // The skins should always use textProperty().getValueSafe()
+        // instead of getText().
+
+        TextArea textArea = new TextArea();
+        textArea.setSkin(new TextAreaSkin(textArea));
+        textArea.setText(null);
+
+        TextField textField = new TextField();
+        textField.setSkin(new TextFieldSkin(textField));
+        textField.setText(null);
+
+        PasswordField passwordField = new PasswordField();
+        passwordField.setSkin(new TextFieldSkin(passwordField));
+        passwordField.setText(null);
+    }
+
+    public class FocusableTextField extends TextField {
+        public void setFocus(boolean value) {
+            super.setFocused(value);
+        }
+    }
+
+    public class FocusableTextArea extends TextArea {
+        public void setFocus(boolean value) {
+            super.setFocused(value);
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ToggleButtonSkinTest.java	2015-09-03 15:30:12.108641300 -0700
+++ /dev/null	2015-09-03 15:30:13.000000000 -0700
@@ -1,74 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.scene.control.ToggleButton;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ToggleButtonSkinTest {
-    private ToggleButton togglebutton;
-    private ToggleButtonSkinMock skin;
-
-    @Before public void setup() {
-        togglebutton = new ToggleButton("Test");
-        skin = new ToggleButtonSkinMock(togglebutton);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        togglebutton.setPadding(new Insets(10, 10, 10, 10));
-        togglebutton.setSkin(skin);
-
-    }
-
-    @Test public void maxWidthTracksPreferred() {        
-        togglebutton.setPrefWidth(500);
-        assertEquals(500, togglebutton.maxWidth(-1), 0);
-    }
-
-    @Test public void maxHeightTracksPreferred() {
-        togglebutton.setPrefHeight(500);
-        assertEquals(500, togglebutton.maxHeight(-1), 0);
-    }
-    
-    public static final class ToggleButtonSkinMock extends ToggleButtonSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ToggleButtonSkinMock(ToggleButton togglebutton) {
-            super(togglebutton);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:30:13.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ToggleButtonSkinTest.java	2015-09-03 15:30:11.395600500 -0700
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2011, 2015, 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 static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.scene.control.ToggleButton;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class ToggleButtonSkinTest {
+    private ToggleButton togglebutton;
+    private ToggleButtonSkinMock skin;
+
+    @Before public void setup() {
+        togglebutton = new ToggleButton("Test");
+        skin = new ToggleButtonSkinMock(togglebutton);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        togglebutton.setPadding(new Insets(10, 10, 10, 10));
+        togglebutton.setSkin(skin);
+
+    }
+
+    @Test public void maxWidthTracksPreferred() {        
+        togglebutton.setPrefWidth(500);
+        assertEquals(500, togglebutton.maxWidth(-1), 0);
+    }
+
+    @Test public void maxHeightTracksPreferred() {
+        togglebutton.setPrefHeight(500);
+        assertEquals(500, togglebutton.maxHeight(-1), 0);
+    }
+    
+    public static final class ToggleButtonSkinMock extends ToggleButtonSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ToggleButtonSkinMock(ToggleButton togglebutton) {
+            super(togglebutton);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/ToolBarSkinTest.java	2015-09-03 15:30:20.031094400 -0700
+++ /dev/null	2015-09-03 15:30:21.000000000 -0700
@@ -1,81 +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.scene.control.skin;
-
-import static org.junit.Assert.assertEquals;
-import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
-import javafx.scene.control.Button;
-import javafx.scene.control.ToolBar;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This fails with IllegalStateException because of the toolkit's check for the FX application thread
- */
-public class ToolBarSkinTest {
-    private ToolBar toolbar;
-    private ToolBarSkinMock skin;
-
-    @Before public void setup() {
-        toolbar = new ToolBar();
-        toolbar.getItems().addAll(new Button("Cut"), new Button("Copy"));
-        skin = new ToolBarSkinMock(toolbar);
-        // Set some padding so that any places where padding was being
-        // computed but wasn't expected will be caught.
-        toolbar.setPadding(new Insets(10, 10, 10, 10));
-        toolbar.setSkin(skin);
-
-    }
-
-    @Test public void horizontalMaxHeightTracksPreferred() {
-        toolbar.setOrientation(Orientation.HORIZONTAL);
-        toolbar.setPrefHeight(100);
-        assertEquals(100, toolbar.maxHeight(-1), 0);
-    }
-
-    @Test public void verticalMaxWidthTracksPreferred() {
-        toolbar.setOrientation(Orientation.VERTICAL);
-        toolbar.setPrefWidth(100);
-        assertEquals(100, toolbar.maxWidth(-1), 0);
-    }
-
-    public static final class ToolBarSkinMock extends ToolBarSkin {
-        boolean propertyChanged = false;
-        int propertyChangeCount = 0;
-        public ToolBarSkinMock(ToolBar toolbar) {
-            super(toolbar);
-        }
-        
-        @Override protected void handleControlPropertyChanged(String p) {
-            super.handleControlPropertyChanged(p);
-            propertyChanged = true;
-            propertyChangeCount++;
-        }
-    }
-}
--- /dev/null	2015-09-03 15:30:21.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/ToolBarSkinTest.java	2015-09-03 15:30:19.299052500 -0700
@@ -0,0 +1,84 @@
+/*
+ * 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.control.skin;
+
+import static org.junit.Assert.assertEquals;
+
+import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.scene.control.Button;
+import javafx.scene.control.ToolBar;
+
+import javafx.scene.control.skin.ToolBarSkin;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This fails with IllegalStateException because of the toolkit's check for the FX application thread
+ */
+public class ToolBarSkinTest {
+    private ToolBar toolbar;
+    private ToolBarSkinMock skin;
+
+    @Before public void setup() {
+        toolbar = new ToolBar();
+        toolbar.getItems().addAll(new Button("Cut"), new Button("Copy"));
+        skin = new ToolBarSkinMock(toolbar);
+        // Set some padding so that any places where padding was being
+        // computed but wasn't expected will be caught.
+        toolbar.setPadding(new Insets(10, 10, 10, 10));
+        toolbar.setSkin(skin);
+
+    }
+
+    @Test public void horizontalMaxHeightTracksPreferred() {
+        toolbar.setOrientation(Orientation.HORIZONTAL);
+        toolbar.setPrefHeight(100);
+        assertEquals(100, toolbar.maxHeight(-1), 0);
+    }
+
+    @Test public void verticalMaxWidthTracksPreferred() {
+        toolbar.setOrientation(Orientation.VERTICAL);
+        toolbar.setPrefWidth(100);
+        assertEquals(100, toolbar.maxWidth(-1), 0);
+    }
+
+    public static final class ToolBarSkinMock extends ToolBarSkin {
+        boolean propertyChanged = false;
+        int propertyChangeCount = 0;
+        public ToolBarSkinMock(ToolBar toolbar) {
+            super(toolbar);
+        }
+
+        public void addWatchedProperty(ObservableValue<?> p) {
+            p.addListener(o -> {
+                propertyChanged = true;
+                propertyChangeCount++;
+            });
+        }
+    }
+}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/VirtualFlowTest.java	2015-09-03 15:30:28.522580100 -0700
+++ /dev/null	2015-09-03 15:30:29.000000000 -0700
@@ -1,1084 +0,0 @@
-/*
- * Copyright (c) 2010, 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 static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import javafx.beans.InvalidationListener;
-import javafx.event.Event;
-import javafx.scene.control.IndexedCell;
-import javafx.scene.control.SkinStub;
-import javafx.scene.input.ScrollEvent;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.sun.javafx.scene.CssFlags;
-import com.sun.javafx.scene.control.skin.VirtualFlow.ArrayLinkedList;
-import java.util.List;
-import javafx.util.Callback;
-
-/**
- * Tests for the VirtualFlow class. VirtualFlow is the guts of the ListView,
- * TreeView, and TableView implementations.
- */
-public class VirtualFlowTest {
-    // The following 4 vars are used when testing the
-    private ArrayLinkedList<CellStub> list;
-    private CellStub a;
-    private CellStub b;
-    private CellStub c;
-
-    // The VirtualFlow we are going to test. By default, there are 100 cells
-    // and each cell is 100 wide and 25 tall, except for the 30th cell, which
-    // is 200 wide and 100 tall.
-    private VirtualFlow<IndexedCell> flow;
-//    private Scene scene;
-
-    @Before public void setUp() {
-        list = new ArrayLinkedList<CellStub>();
-        a = new CellStub(flow, "A");
-        b = new CellStub(flow, "B");
-        c = new CellStub(flow, "C");
-
-        flow = new VirtualFlow();
-//        flow.setManaged(false);
-        flow.setVertical(true);
-        flow.setCreateCell(p -> new CellStub(flow) {
-            @Override protected double computeMinWidth(double height) { return computePrefWidth(height); }
-            @Override protected double computeMaxWidth(double height) { return computePrefWidth(height); }
-            @Override protected double computePrefWidth(double height) {
-                return flow.isVertical() ? (c.getIndex() == 29 ? 200 : 100) : (c.getIndex() == 29 ? 100 : 25);
-            }
-
-            @Override protected double computeMinHeight(double width) { return computePrefHeight(width); }
-            @Override protected double computeMaxHeight(double width) { return computePrefHeight(width); }
-            @Override protected double computePrefHeight(double width) {
-                return flow.isVertical() ? (c.getIndex() == 29 ? 100 : 25) : (c.getIndex() == 29 ? 200 : 100);
-            }
-        });
-        flow.setCellCount(100);
-        flow.resize(300, 300);
-        pulse();
-    }
-
-    private void pulse() {
-//        flow.impl_processCSS(true);
-        flow.layout();
-    }
-
-    /**
-     * Asserts that the items in the control LinkedList and the ones in the
-     * list are exactly the same.
-     */
-    private void assertMatch(List<IndexedCell> control, ArrayLinkedList<IndexedCell> list) {
-        assertEquals("The control and list did not have the same sizes. " +
-                     "Expected " + control.size() + " but was " + list.size(),
-                     control.size(), list.size());
-        int index = 0;
-        Iterator<IndexedCell> itr = control.iterator();
-        while (itr.hasNext()) {
-            IndexedCell cell = itr.next();
-            IndexedCell cell2 = list.get(index);
-            assertSame("The control and list did not have the same item at " +
-                       "index " + index + ". Expected " + cell + " but was " + cell2,
-                       cell, cell2);
-            index++;
-        }
-    }
-
-    /**
-     * Asserts that only the minimal number of cells are used.
-     */
-    public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlow<T> flow) {
-        pulse();
-        IndexedCell firstCell = flow.cells.getFirst();
-        IndexedCell lastCell = flow.cells.getLast();
-        if (flow.isVertical()) {
-            // First make sure that enough cells were created
-            assertTrue("There is a gap between the top of the viewport and the first cell",
-                       firstCell.getLayoutY() <= 0);
-            assertTrue("There is a gap between the bottom of the last cell and the bottom of the viewport",
-                       lastCell.getLayoutY() + lastCell.getHeight() >= flow.getViewportLength());
-
-            // Now make sure that no extra cells were created.
-            if (flow.cells.size() > 3) {
-                IndexedCell secondLastCell = flow.cells.get(flow.cells.size() - 2);
-                IndexedCell secondCell = flow.cells.get(1);
-                assertFalse("There are more cells created before the start of " +
-                            "the flow than necessary",
-                            secondCell.getLayoutY() <= 0);
-                assertFalse("There are more cells created after the end of the " +
-                            "flow than necessary",
-                            secondLastCell.getLayoutY() + secondLastCell.getHeight() >= flow.getViewportLength());
-            }
-        } else {
-            // First make sure that enough cells were created
-            assertTrue("There is a gap between the left of the viewport and the first cell",
-                       firstCell.getLayoutX() <= 0);
-            assertTrue("There is a gap between the right of the last cell and the right of the viewport",
-                       lastCell.getLayoutX() + lastCell.getWidth() >= flow.getViewportLength());
-
-            // Now make sure that no extra cells were created.
-            if (flow.cells.size() > 3) {
-                IndexedCell secondLastCell = flow.cells.get(flow.cells.size() - 2);
-                IndexedCell secondCell = flow.cells.get(1);
-                assertFalse("There are more cells created before the start of " +
-                            "the flow than necessary",
-                            secondCell.getLayoutX() <= 0);
-                assertFalse("There are more cells created after the end of the " +
-                            "flow than necessary",
-                            secondLastCell.getLayoutX() + secondLastCell.getWidth() >= flow.getViewportLength());
-            }
-        }
-    }
-
-
-    /***************************************************************************
-     *                          Tests for VirtualFlow                          *
-     *                                                                         *
-     *  These tests are broken out into several broad categories:              *
-     *      - general layout (position of scroll bars, viewport, etc)          *
-     *      - cell layout                                                      *
-     *      - cell life cycle (creation, configuration, reuse, etc)            *
-     *      - position (stable view, adjusts when necessary, etc)              *
-     *      - pixel scrolling (cells are reused, position updated, etc)        *
-     *                                                                         *
-     *  - Test that the preferred width of a vertical flow takes into account  *
-     *    the preferred width of the cells that are visible                    *
-     *  - Test the same for horizontal when working with a horizontal flow     *
-     *  - Test that cells are laid out as expected in a vertical flow          *
-     *  - Test the same for a horizontal flow                                  *
-     *  - Test that the width of cells in a vertical flow adjusts based on the *
-     *    width of the flow's content area                                     *
-     *  - Test the same for the height of cells in a horizontal flow           *
-     *  - Test that changing the number of cells (up and down) also adjusts    *
-     *    the position such that it is "stable", unless that is not possible   *
-     *  - Test that after changing the cell factory, things are rebuilt        *
-     *  - Test that after changing the cell config function, things are        *
-     *    reconfigured.                                                        *
-     *  - Test that functions which add to the pile and so forth work as       *
-     *    expected.                                                            *
-     *  - Test the layout of the scroll bars in various combinations, along    *
-     *    with the corner region and so forth.                                 *
-     *                                                                         *
-     **************************************************************************/
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  General Layout
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * In this test there are no cells. The VirtualFlow should be laid out such
-     * that the scroll bars and corner are not visible, and the clip view fills
-     * the entire width/height of the VirtualFlow.
-     */
-    @Test public void testGeneralLayout_NoCells() {
-        flow.setCellCount(0);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * When we have a few cells, not enough to fill the viewport, then we need
-     * to make sure there is no virtual scroll bar. In this test case the cells
-     * are not wider than the viewport so no horizontal bar either.
-     */
-    @Test public void testGeneralLayout_FewCells() {
-        flow.setCellCount(3);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertEquals(12, flow.cells.size()); // we stil have 12 cells (300px / 25px), even if only three filled cells exist
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-//        assertEquals(3, flow.cells.size());
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Tests the case of a few cells (so not requiring a vertical scroll bar),
-     * but the cells are wider than the viewport so a horizontal scroll bar is
-     * required.
-     */
-    @Test public void testGeneralLayout_FewCellsButWide() {
-        flow.setCellCount(3);
-        flow.resize(50, flow.getHeight());
-        pulse();
-        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
-        assertEquals(flow.getHbar().getLayoutY(), flow.getHeight() - flow.getHbar().getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        flow.resize(300, 50);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Tests that having a situation where the hbar in a vertical flow is
-     * necessary (due to wide cells) will end up hiding the hbar if the flow
-     * becomes wide enough that the hbar is no longer necessary.
-     */
-    @Test public void testGeneralLayout_FewCellsButWide_ThenNarrow() {
-        flow.setCellCount(3);
-        flow.resize(50, flow.getHeight());
-        pulse();
-        flow.resize(300, flow.getHeight());
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        flow.resize(300, 50);
-        pulse();
-        flow.resize(flow.getWidth(), 300);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Tests that when there are many cells then the vbar in a vertical flow
-     * is used.
-     * <p>
-     * Note, this test uncovered a bug where the bottom of the last cell was
-     * exactly on the bottom edge of the flow and the vbar was not made visible.
-     * Be sure to test for this explicitly some time!
-     */
-    @Test public void testGeneralLayout_ManyCells() {
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        pulse();
-        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
-        assertEquals(flow.getHbar().getLayoutY(), flow.getHeight() - flow.getHbar().getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Test that after having only a few cells, if I then have many cells, that
-     * the vbar is shown appropriately.
-     */
-    @Test public void testGeneralLayout_FewCells_ThenMany() {
-        flow.setCellCount(3);
-        pulse();
-        flow.setCellCount(100);
-        pulse();
-        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
-        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        flow.setCellCount(3);
-        pulse();
-        flow.setCellCount(100);
-        pulse();
-        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
-        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
-        assertFalse("The corner should have been invisible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
-        assertEquals(flow.getHbar().getLayoutY(), flow.getHeight() - flow.getHbar().getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Test the case where there are many cells and they are wider than the
-     * viewport. We should have the hbar, vbar, and corner region in this case.
-     */
-    @Test public void testGeneralLayout_ManyCellsAndWide() {
-        flow.resize(50, flow.getHeight());
-        pulse();
-        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
-        assertTrue("The corner should have been visible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
-        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getVbar().getWidth(), flow.corner.getWidth(), 0.0);
-        assertEquals(flow.getHbar().getHeight(), flow.corner.getHeight(), 0.0);
-        assertEquals(flow.getHbar().getWidth(), flow.getWidth() - flow.corner.getWidth(), 0.0);
-        assertEquals(flow.getVbar().getHeight(), flow.getHeight() - flow.corner.getHeight(), 0.0);
-        assertEquals(flow.corner.getLayoutX(), flow.getWidth() - flow.corner.getWidth(), 0.0);
-        assertEquals(flow.corner.getLayoutY(), flow.getHeight() - flow.corner.getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-
-        flow.setVertical(false);
-        flow.resize(300, 50);
-        pulse();
-        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
-        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
-        assertTrue("The corner should have been visible", flow.corner.isVisible());
-        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
-        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
-        assertEquals(flow.getVbar().getWidth(), flow.corner.getWidth(), 0.0);
-        assertEquals(flow.getHbar().getHeight(), flow.corner.getHeight(), 0.0);
-        assertEquals(flow.getHbar().getWidth(), flow.getWidth() - flow.corner.getWidth(), 0.0);
-        assertEquals(flow.getVbar().getHeight(), flow.getHeight() - flow.corner.getHeight(), 0.0);
-        assertEquals(flow.corner.getLayoutX(), flow.getWidth() - flow.corner.getWidth(), 0.0);
-        assertEquals(flow.corner.getLayoutY(), flow.getHeight() - flow.corner.getHeight(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Tests that when the vertical flag changes, it results in layout
-     */
-    @Test public void testGeneralLayout_VerticalChangeResultsInNeedsLayout() {
-        assertFalse(flow.isNeedsLayout());
-        flow.setVertical(false);
-        assertTrue(flow.isNeedsLayout());
-    }
-
-    /**
-     * Tests that the range of the non-virtual scroll bar is valid
-     */
-    @Test public void testGeneralLayout_NonVirtualScrollBarRange() {
-        flow.resize(50, flow.getHeight());
-        pulse();
-        assertEquals(0, flow.getHbar().getMin(), 0.0);
-        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getWidth(), flow.getHbar().getMax(), 0.0);
-        assertEquals((flow.clipView.getWidth()/flow.getMaxPrefBreadth()) * flow.getHbar().getMax(), flow.getHbar().getVisibleAmount(), 0.0);
-        flow.setPosition(.28f);
-        pulse();
-        assertEquals(0, flow.getHbar().getMin(), 0.0);
-        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getWidth(), flow.getHbar().getMax(), 0.0);
-        assertEquals((flow.clipView.getWidth()/flow.getMaxPrefBreadth()) * flow.getHbar().getMax(), flow.getHbar().getVisibleAmount(), 0.0);
-
-        flow.setVertical(false);
-        flow.setPosition(0);
-        flow.resize(300, 50);
-        pulse();
-        assertEquals(0, flow.getVbar().getMin(), 0.0);
-        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getHeight(), flow.getVbar().getMax(), 0.0);
-        assertEquals((flow.clipView.getHeight()/flow.getMaxPrefBreadth()) * flow.getVbar().getMax(), flow.getVbar().getVisibleAmount(), 0.0);
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(0, flow.getVbar().getMin(), 0.0);
-        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getHeight(), flow.getVbar().getMax(), 0.0);
-        assertEquals((flow.clipView.getHeight()/flow.getMaxPrefBreadth()) * flow.getVbar().getMax(), flow.getVbar().getVisibleAmount(), 0.0);
-    }
-
-    /**
-     * Tests that the maxPrefBreadth is computed correctly for the first page of cells.
-     * In our test case, the first page of cells have a uniform pref.
-     */
-    @Test public void testGeneralLayout_maxPrefBreadth() {
-        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
-    }
-
-    /**
-     * Tests that even after the first computation of max pref, that it is
-     * updated when we encounter a new cell (while scrolling for example) that
-     * has a larger pref.
-     */
-    @Ignore
-    @Test public void testGeneralLayout_maxPrefBreadthUpdatedWhenEncounterLargerPref() {
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
-    }
-
-    /**
-     * Tests that if we encounter cells or pages of cells with smaller prefs
-     * than the max pref that we will keep the max pref the same.
-     */
-    @Ignore
-    @Test public void testGeneralLayout_maxPrefBreadthRemainsSameWhenEncounterSmallerPref() {
-        flow.setPosition(.28);
-        pulse();
-        flow.setPosition(.8);
-        pulse();
-        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
-    }
-
-    /**
-     * Tests that changes to the vertical property will clear the maxPrefBreadth
-     */
-    @Test public void testGeneralLayout_VerticalChangeClearsmaxPrefBreadth() {
-        flow.setVertical(false);
-        assertEquals(-1, flow.getMaxPrefBreadth(), 0.0);
-    }
-
-    /**
-     * Tests that changes to the cell count will not affect maxPrefBreadth.
-     */
-    @Ignore
-    @Test public void testGeneralLayout_maxPrefBreadthUnaffectedByCellCountChanges() {
-        flow.setCellCount(10);
-        pulse();
-        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
-        flow.setCellCount(100);
-        pulse();
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
-        flow.setCellCount(10);
-        pulse();
-        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
-    }
-
-    /**
-     * Tests that as we scroll, if the non-virtual scroll bar is visible, then
-     * as we update maxPrefBreadth it will not affect the non-virtual scroll bar's
-     * value <b>unless</b> the value is such that the scroll bar is scrolled
-     * all the way to the end, in which case it will remain scrolled to the
-     * end.
-     */
-    @Test public void testGeneralLayout_maxPrefBreadthScrollBarValueInteraction() {
-        flow.resize(50, flow.getHeight());
-        flow.getHbar().setValue(30);
-        pulse();
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(30, flow.getHbar().getValue(), 0.0);
-
-        // Reset the test and this time check what happens when we are scrolled
-        // to the very right
-        flow.setPosition(0);
-        flow.setVertical(false);
-        flow.setVertical(true);
-        pulse();
-        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
-        flow.getHbar().setValue(flow.getHbar().getMax()); // scroll to the end
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(flow.getHbar().getMax(), flow.getHbar().getValue(), 0.0);
-
-        flow.setVertical(false);
-        flow.setPosition(0);
-        flow.getHbar().setValue(0);
-        flow.resize(300, 50);
-        pulse();
-        flow.getVbar().setValue(30);
-        pulse();
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(30, flow.getVbar().getValue(), 0.0);
-
-        // Reset the test and this time check what happens when we are scrolled
-        // to the very right
-        flow.setPosition(0);
-        flow.setVertical(true);
-        flow.setVertical(false);
-        pulse();
-        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
-        flow.getVbar().setValue(flow.getVbar().getMax()); // scroll to the end
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(flow.getVbar().getMax(), flow.getVbar().getValue(), 0.0);
-    }
-
-    @Test public void testGeneralLayout_ScrollToEndOfVirtual_BarStillVisible() {
-        assertTrue("The vbar was expected to be visible", flow.getVbar().isVisible());
-        flow.setPosition(1);
-        pulse();
-        assertTrue("The vbar was expected to be visible", flow.getVbar().isVisible());
-
-        flow.setPosition(0);
-        flow.setVertical(false);
-        pulse();
-        assertTrue("The hbar was expected to be visible", flow.getHbar().isVisible());
-        flow.setPosition(1);
-        pulse();
-        assertTrue("The hbar was expected to be visible", flow.getHbar().isVisible());
-    }
-
-    // Need to test all the resize operations and make sure the position of
-    // nodes is as expected, that they don't get shifted etc.
-
-    // Test: Scroll to the bottom, expand size out, then make smaller. The
-    // thumb/scroll is not consistent right now.
-
-    // TODO figure out and deal with what happens when orientation changes
-    // to the hbar.value and vbar.value. Do they just switch? Probably not?
-    // Probably reset the non-virtual direction and swap the virtual one over.
-    // So if vbar was .5 and hbar was 30, when we set vertical = false, then
-    // we change the hbar to .5 and the vbar to 0. However this has to be done
-    // at the same time that the "virtual" property of the scroll bars is
-    // changed
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Cell Layout
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Test to make sure that we are virtual -- that all cells are not being
-     * created.
-     */
-    @Test public void testCellLayout_NotAllCellsAreCreated() {
-        // due to the initial size of the VirtualFlow and the number of cells
-        // and their heights, we should have more cells than we have space to
-        // fit them and so only enough cells should be created to meet our
-        // needs and not any more than that
-        assertTrue("All of the cells were created", flow.cells.size() < flow.getCellCount());
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    /**
-     * Tests the size and position of all the cells to make sure they were
-     * laid out properly.
-     */
-    @Test public void testCellLayout_CellSizes_AfterLayout() {
-        double offset = 0.0;
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(25, cell.getHeight(), 0.0);
-            assertEquals(offset, cell.getLayoutY(), 0.0);
-            offset += cell.getHeight();
-        }
-
-        offset = 0.0;
-        flow.setVertical(false);
-        pulse();
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(25, cell.getWidth(), 0.0);
-            assertEquals(offset, cell.getLayoutX(), 0.0);
-            offset += cell.getWidth();
-        }
-    }
-
-    /**
-     * Test the widths of the cells when the viewport is wider than the
-     * max pref width/height. They should be uniform, and should be the
-     * width of the viewport.
-     */
-    @Test public void testCellLayout_ViewportWiderThanmaxPrefBreadth() {
-        // Note that the pref width of everything is 100, but the actual
-        // available width is much larger (300 - hbar.width or
-        // 300 - vbar.height) and so the non-virtual dimension of the cell
-        // should be larger than the max pref
-        double expected = flow.clipView.getWidth();
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(expected, cell.getWidth(), 0.0);
-        }
-
-        flow.setVertical(false);
-        pulse();
-        expected = flow.clipView.getHeight();
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(expected, cell.getHeight(), 0.0);
-        }
-    }
-
-    /**
-     * Test the widths of the cells when the viewport is shorter than the
-     * max pref width/height. They should be uniform, and should be the max
-     * pref.
-     */
-    @Test public void testCellLayout_ViewportShorterThanmaxPrefBreadth() {
-        flow.resize(50, flow.getHeight());
-        pulse();
-        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(flow.getMaxPrefBreadth(), cell.getWidth(), 0.0);
-        }
-
-        flow.setVertical(false);
-        flow.resize(flow.getWidth(), 50);
-        pulse();
-        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(flow.getMaxPrefBreadth(), cell.getHeight(), 0.0);
-        }
-    }
-
-    /**
-     * Test that when we scroll and encounter a cell which has a larger pref
-     * than we have previously encountered (happens in this test when we visit
-     * the cell for item #29), then the max pref is updated and the cells are
-     * all resized to match.
-     */
-    @Ignore
-    @Test public void testCellLayout_ScrollingFindsCellWithLargemaxPrefBreadth() {
-        flow.resize(50, flow.getHeight());
-        flow.setPosition(.28); // happens to position such that #29 is visible
-        pulse();
-        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(flow.getMaxPrefBreadth(), cell.getWidth(), 0.0);
-        }
-
-        flow.setVertical(false);
-        flow.resize(flow.getWidth(), 50);
-        // NOTE Run this test without the pulse and it fails!
-        pulse();
-        flow.setPosition(.28);
-        pulse();
-        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
-        for (int i = 0; i < flow.cells.size(); i++) {
-            IndexedCell cell = flow.cells.get(i);
-            assertEquals(flow.getMaxPrefBreadth(), cell.getHeight(), 0.0);
-        }
-    }
-
-    /**
-     * Checks that the initial set of cells (the first page of cells) are
-     * indexed starting with cell #0 and working up from there.
-     */
-    @Test public void testCellLayout_CellIndexes_FirstPage() {
-        for (int i = 0; i < flow.cells.size(); i++) {
-            assertEquals(i, flow.cells.get(i).getIndex());
-        }
-    }
-
-    /**
-     * The bug here is that if layout() is called on the flow numerous times,
-     * but nothing substantially has changed, we should reuse the cells in the
-     * same order they were before. We had a bug where when you clicked on the
-     * ListView, the click wouldn't register. This was because by clicking we
-     * were giving focus to the ListView, which caused a layout(), and then the
-     * cells location was shuffled. It didn't look like it to the user, but that
-     * is what happened. As a result, when the mouse release took place, the
-     * event was delivered to a different cell than expected and misbehavior
-     * took place.
-     */
-    @Test public void testCellLayout_LayoutWithoutChangingThingsUsesCellsInSameOrderAsBefore() {
-        List<IndexedCell> cells = new LinkedList<IndexedCell>();
-        for (int i = 0; i < flow.cells.size(); i++) {
-            cells.add(flow.cells.get(i));
-        }
-        assertMatch(cells, flow.cells); // sanity check
-        flow.requestLayout();
-        pulse();
-        assertMatch(cells, flow.cells);
-        flow.setPosition(1);
-        pulse();
-        cells.clear();
-        for (int i = 0; i < flow.cells.size(); i++) {
-            cells.add(flow.cells.get(i));
-        }
-        flow.requestLayout();
-        pulse();
-        assertMatch(cells, flow.cells);
-    }
-
-
-    @Test
-    public void testCellLayout_BiasedCellAndLengthBar() {
-        flow.setCreateCell(param -> new CellStub(flow) {
-            @Override protected double computeMinWidth(double height) { return 0; }
-            @Override protected double computeMaxWidth(double height) { return Double.MAX_VALUE; }
-            @Override protected double computePrefWidth(double height) {
-                return 200;
-            }
-
-            @Override protected double computeMinHeight(double width) { return 0; }
-            @Override protected double computeMaxHeight(double width) { return Double.MAX_VALUE; }
-            @Override protected double computePrefHeight(double width) {
-                return getIndex() == 0 ? 100 - 5 *(Math.floorDiv((int)width - 200, 10)) : 100;
-            }
-        });
-        flow.setCellCount(3);
-        flow.recreateCells(); // This help to override layoutChildren() in flow.setCellCount()
-        flow.getVbar().setPrefWidth(20); // Since Skins are not initialized, we set the pref width explicitly
-        flow.requestLayout();
-        pulse();
-        assertEquals(300, flow.cells.get(0).getWidth(), 1e-100);
-        assertEquals(50, flow.cells.get(0).getHeight(), 1e-100);
-
-        flow.resize(200, 300);
-
-        flow.requestLayout();
-        pulse();
-        assertEquals(200, flow.cells.get(0).getWidth(), 1e-100);
-        assertEquals(100, flow.cells.get(0).getHeight(), 1e-100);
-
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Cell Life Cycle
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    @Test public void testCellLifeCycle_CellsAreCreatedOnLayout() {
-        // when the flow was first created in setUp we do a layout()
-        assertTrue("The cells didn't get created", flow.cells.size() > 0);
-    }
-
-//    /**
-//     * During layout the order and contents of cells will change. We need
-//     * to make sure that CSS for cells is applied at this time. To test this,
-//     * I just set the position and perform a new pulse. Since layout happens
-//     * after the CSS updates are applied, if the test fails, then there will
-//     * be cells left in a state where they need their CSS applied.
-//     */
-//    @Test public void testCellLifeCycle_CSSUpdatesHappenDuringLayout() {
-//        flow.setPosition(.35);
-//        pulse();
-//        for (int i = 0; i < flow.cells.size(); i++) {
-//            IndexedCell cell = flow.cells.get(i);
-//            assertEquals(CssFlags.CLEAN, cell.impl_getCSSFlags());
-//        }
-//    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Position
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Pixel Scrolling
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Cell Count Changes
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    // want to test that the view remains stable when the cell count changes
-
-    // LIST VIEW: test that using a bunch of nodes as items to a ListView works
-    // LIST VIEW: test that inserting an item moves the selected index to keep in sync
-    // test that dynamically changing all of the contents causes them to refresh
-
-    // test that when the number of cells change, that things are laid out
-//    @Test public void testCellCountChanges_FirstRowIsRemoved() {
-//
-//    }
-//
-//    @Test public void testCellCountChanges_MiddleRowIsRemoved() {
-//
-//    }
-//
-//    @Test public void testCellCountChanges_LastRowIsRemoved() {
-//
-//    }
-//
-////    @Test public void testCellCountChanges_SelectedRowRemoved() {
-////
-////    }
-////
-////    @Test public void testCellCountChanges_NonSelectedRowRemoved() {
-////
-////    }
-//
-//    @Test public void testCellCountChanges_FirstRowIsAdded() {
-//
-//    }
-//
-//    @Test public void testCellCountChanges_MiddleRowIsAdded() {
-//
-//    }
-//
-//    @Test public void testCellCountChanges_LastRowIsAdded() {
-//
-//    }
-//
-////    @Test public void testCellCountChanges_RowIsAddedBeforeSelectedRow() {
-////
-////    }
-////
-////    @Test public void testCellCountChanges_RowIsAddedAfterSelectedRow() {
-////
-////    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  VirtualFlow State Changes
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Tests that when the createCell method changes, it results in layout
-     */
-    @Test public void testCreateCellFunctionChangesResultInNeedsLayoutAndNoCellsAndNoAccumCell() {
-        assertFalse(flow.isNeedsLayout());
-        flow.getCellLength(49); // forces accum cell to be created
-        assertNotNull("Accum cell was null", flow.accumCell);
-        flow.setCreateCell(p -> new CellStub(flow));
-        assertTrue(flow.isNeedsLayout());
-        assertNull("accumCell didn't get cleared", flow.accumCell);
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    //  Tests on specific functions
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    @Test public void test_getCellLength() {
-        assertEquals(100, flow.getCellCount());
-        for (int i = 0; i < 50; i++) {
-            if (i != 29) assertEquals(25, flow.getCellLength(i), 0.0);
-        }
-        flow.setVertical(false);
-        flow.requestLayout();
-        pulse();
-        assertEquals(100, flow.getCellCount());
-        for (int i = 0; i < 50; i++) {
-            if (i != 29) assertEquals("Bad index: " + i, 25, flow.getCellLength(i), 0.0);
-        }
-    }
-
-    /*
-    ** if we scroll the flow by a number of LINES,
-    ** without having done anything to select a cell
-    ** the flow should scroll.
-    */ 
-    @Test public void testInitialScrollEventActuallyScrolls() {
-        /*
-        ** re-initialize this, as it must be the first
-        ** interaction with the flow
-        */
-        flow = new VirtualFlow();
-        flow.setVertical(true);
-        flow.setCreateCell(p -> new CellStub(flow) {
-            @Override protected double computeMinWidth(double height) { return computePrefWidth(height); }
-            @Override protected double computeMaxWidth(double height) { return computePrefWidth(height); }
-            @Override protected double computePrefWidth(double height) {
-                return flow.isVertical() ? (c.getIndex() == 29 ? 200 : 100) : (c.getIndex() == 29 ? 100 : 25);
-            }
-
-            @Override protected double computeMinHeight(double width) { return computePrefHeight(width); }
-            @Override protected double computeMaxHeight(double width) { return computePrefHeight(width); }
-            @Override protected double computePrefHeight(double width) {
-                return flow.isVertical() ? (c.getIndex() == 29 ? 100 : 25) : (c.getIndex() == 29 ? 200 : 100);
-            }
-        });
-        
-        flow.setCellCount(100);
-        flow.resize(300, 300);
-        pulse();
-       
-        double originalValue = flow.getPosition();
-
-        Event.fireEvent(flow, 
-              new ScrollEvent(ScrollEvent.SCROLL,
-                          0.0, -10.0, 0.0, -10.0,
-                          false, false, false, false, true, false,
-                          0, 0,
-                          0, 0,
-                          ScrollEvent.HorizontalTextScrollUnits.NONE, 0.0,
-                          ScrollEvent.VerticalTextScrollUnits.LINES, -1.0,
-                          0, null));
-
-        assertTrue(originalValue != flow.getPosition());
-    }
-
-    @Test
-    public void test_RT_36507() {
-        flow = new VirtualFlow();
-        flow.setVertical(true);
-        // Worst case scenario is that the cells have height = 0.
-        // The code should prevent creating more than 100 of these zero height cells
-        // (since viewportLength is 100).
-        // An "INFO: index exceeds maxCellCount" message should print out.
-        flow.setCreateCell(p -> new CellStub(flow) {
-            @Override
-            protected double computeMaxHeight(double width) { return 0; }
-            @Override
-            protected double computePrefHeight(double width) { return 0; }
-            @Override
-            protected double computeMinHeight(double width) { return 0; }
-
-        });
-        flow.setCellCount(10);
-        flow.setViewportLength(100);
-        flow.addLeadingCells(1, 0);
-        flow.sheetChildren.addListener((InvalidationListener) (o) -> {
-            int count = ((List) o).size();
-            assertTrue(Integer.toString(count), count <= 100);
-        });
-        flow.addTrailingCells(true);
-    }
-
-    private int rt36556_instanceCount;
-    @Test
-    public void test_rt36556() {
-        rt36556_instanceCount = 0;
-        flow = new VirtualFlow();
-        flow.setVertical(true);
-        flow.setCreateCell(p -> {
-            rt36556_instanceCount++;
-            return new CellStub(flow);
-        });
-        flow.setCellCount(100);
-        flow.resize(300, 300);
-        pulse();
-        final int cellCountAtStart = rt36556_instanceCount;
-        flow.adjustPixels(10000);
-        pulse();
-        assertEquals(cellCountAtStart, rt36556_instanceCount);
-        assertNull(flow.getVisibleCell(0));
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    @Test
-    public void test_rt36556_scrollto() {
-        rt36556_instanceCount = 0;
-        flow = new VirtualFlow();
-        flow.setVertical(true);
-        flow.setCreateCell(p -> {
-            rt36556_instanceCount++;
-            return new CellStub(flow);
-        });
-        flow.setCellCount(100);
-        flow.resize(300, 300);
-        pulse();
-        final int cellCountAtStart = rt36556_instanceCount;
-        flow.scrollTo(80);
-        pulse();
-        assertEquals(cellCountAtStart, rt36556_instanceCount);
-        assertNull(flow.getVisibleCell(0));
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-    
-    @Test
-    public void test_RT39035() {
-        flow.adjustPixels(250);
-        pulse();
-        flow.adjustPixels(500);
-        pulse();
-        assertTrue(flow.getPosition() < 1.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    @Test
-    public void test_RT37421() {
-        flow.setPosition(0.98);
-        pulse();
-        flow.adjustPixels(100);
-        pulse();
-        assertEquals(1.0, flow.getPosition(), 0.0);
-        assertMinimalNumberOfCellsAreUsed(flow);
-    }
-
-    @Test
-    public void test_RT39568() {
-        flow.getHbar().setPrefHeight(16);
-        flow.resize(50, flow.getHeight());
-        flow.setPosition(1);
-        pulse();
-        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
-        assertMinimalNumberOfCellsAreUsed(flow);
-        assertEquals(flow.getViewportLength()-25.0, flow.cells.getLast().getLayoutY(), 0.0);
-    }
-}
-
-class CellStub extends IndexedCell {
-    String s;
-    VirtualFlow flow;
-
-    public CellStub(VirtualFlow flow) { init(flow); }
-    public CellStub(VirtualFlow flow, String s) { init(flow); this.s = s; }
-    
-    private void init(VirtualFlow flow) {
-        this.flow = flow;
-        setSkin(new SkinStub<CellStub>(this));
-        updateItem(this, false);
-    }
-
-    @Override
-    public void updateIndex(int i) {
-        super.updateIndex(i);
-        
-        s = "Item " + getIndex();
-//        updateItem(getIndex(), getIndex() >= flow.getCellCount());
-    }
-}
--- /dev/null	2015-09-03 15:30:29.000000000 -0700
+++ new/modules/controls/src/test/java/javafx/scene/control/skin/VirtualFlowTest.java	2015-09-03 15:30:27.729534700 -0700
@@ -0,0 +1,1144 @@
+/*
+ * Copyright (c) 2010, 2015, 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import javafx.beans.InvalidationListener;
+import javafx.event.Event;
+import javafx.scene.control.IndexedCell;
+import javafx.scene.control.SkinStub;
+import javafx.scene.control.skin.VirtualFlow.ArrayLinkedList;
+import javafx.scene.input.ScrollEvent;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.List;
+
+/**
+ * Tests for the VirtualFlow class. VirtualFlow is the guts of the ListView,
+ * TreeView, and TableView implementations.
+ */
+public class VirtualFlowTest {
+    // The following 4 vars are used when testing the
+    private ArrayLinkedList<CellStub> list;
+    private CellStub a;
+    private CellStub b;
+    private CellStub c;
+
+    // The VirtualFlow we are going to test. By default, there are 100 cells
+    // and each cell is 100 wide and 25 tall, except for the 30th cell, which
+    // is 200 wide and 100 tall.
+    private VirtualFlow<IndexedCell> flow;
+//    private Scene scene;
+
+    @Before public void setUp() {
+        list = new ArrayLinkedList<CellStub>();
+        a = new CellStub(flow, "A");
+        b = new CellStub(flow, "B");
+        c = new CellStub(flow, "C");
+
+        flow = new VirtualFlow();
+//        flow.setManaged(false);
+        flow.setVertical(true);
+        flow.setCellFactory(p -> new CellStub(flow) {
+            @Override
+            protected double computeMinWidth(double height) {
+                return computePrefWidth(height);
+            }
+
+            @Override
+            protected double computeMaxWidth(double height) {
+                return computePrefWidth(height);
+            }
+
+            @Override
+            protected double computePrefWidth(double height) {
+                return flow.isVertical() ? (c.getIndex() == 29 ? 200 : 100) : (c.getIndex() == 29 ? 100 : 25);
+            }
+
+            @Override
+            protected double computeMinHeight(double width) {
+                return computePrefHeight(width);
+            }
+
+            @Override
+            protected double computeMaxHeight(double width) {
+                return computePrefHeight(width);
+            }
+
+            @Override
+            protected double computePrefHeight(double width) {
+                return flow.isVertical() ? (c.getIndex() == 29 ? 100 : 25) : (c.getIndex() == 29 ? 200 : 100);
+            }
+        });
+        flow.setCellCount(100);
+        flow.resize(300, 300);
+        pulse();
+    }
+
+    private void pulse() {
+//        flow.impl_processCSS(true);
+        flow.layout();
+    }
+
+    /**
+     * Asserts that the items in the control LinkedList and the ones in the
+     * list are exactly the same.
+     */
+    private void assertMatch(List<IndexedCell> control, ArrayLinkedList<IndexedCell> list) {
+        assertEquals("The control and list did not have the same sizes. " +
+                     "Expected " + control.size() + " but was " + list.size(),
+                     control.size(), list.size());
+        int index = 0;
+        Iterator<IndexedCell> itr = control.iterator();
+        while (itr.hasNext()) {
+            IndexedCell cell = itr.next();
+            IndexedCell cell2 = list.get(index);
+            assertSame("The control and list did not have the same item at " +
+                       "index " + index + ". Expected " + cell + " but was " + cell2,
+                       cell, cell2);
+            index++;
+        }
+    }
+
+    /**
+     * Asserts that only the minimal number of cells are used.
+     */
+    public <T extends IndexedCell> void assertMinimalNumberOfCellsAreUsed(VirtualFlow<T> flow) {
+        pulse();
+        IndexedCell firstCell = flow.cells.getFirst();
+        IndexedCell lastCell = flow.cells.getLast();
+        if (flow.isVertical()) {
+            // First make sure that enough cells were created
+            assertTrue("There is a gap between the top of the viewport and the first cell",
+                       firstCell.getLayoutY() <= 0);
+            assertTrue("There is a gap between the bottom of the last cell and the bottom of the viewport",
+                       lastCell.getLayoutY() + lastCell.getHeight() >= flow.getViewportLength());
+
+            // Now make sure that no extra cells were created.
+            if (flow.cells.size() > 3) {
+                IndexedCell secondLastCell = flow.cells.get(flow.cells.size() - 2);
+                IndexedCell secondCell = flow.cells.get(1);
+                assertFalse("There are more cells created before the start of " +
+                            "the flow than necessary",
+                            secondCell.getLayoutY() <= 0);
+                assertFalse("There are more cells created after the end of the " +
+                            "flow than necessary",
+                            secondLastCell.getLayoutY() + secondLastCell.getHeight() >= flow.getViewportLength());
+            }
+        } else {
+            // First make sure that enough cells were created
+            assertTrue("There is a gap between the left of the viewport and the first cell",
+                       firstCell.getLayoutX() <= 0);
+            assertTrue("There is a gap between the right of the last cell and the right of the viewport",
+                       lastCell.getLayoutX() + lastCell.getWidth() >= flow.getViewportLength());
+
+            // Now make sure that no extra cells were created.
+            if (flow.cells.size() > 3) {
+                IndexedCell secondLastCell = flow.cells.get(flow.cells.size() - 2);
+                IndexedCell secondCell = flow.cells.get(1);
+                assertFalse("There are more cells created before the start of " +
+                            "the flow than necessary",
+                            secondCell.getLayoutX() <= 0);
+                assertFalse("There are more cells created after the end of the " +
+                            "flow than necessary",
+                            secondLastCell.getLayoutX() + secondLastCell.getWidth() >= flow.getViewportLength());
+            }
+        }
+    }
+
+
+    /***************************************************************************
+     *                          Tests for VirtualFlow                          *
+     *                                                                         *
+     *  These tests are broken out into several broad categories:              *
+     *      - general layout (position of scroll bars, viewport, etc)          *
+     *      - cell layout                                                      *
+     *      - cell life cycle (creation, configuration, reuse, etc)            *
+     *      - position (stable view, adjusts when necessary, etc)              *
+     *      - pixel scrolling (cells are reused, position updated, etc)        *
+     *                                                                         *
+     *  - Test that the preferred width of a vertical flow takes into account  *
+     *    the preferred width of the cells that are visible                    *
+     *  - Test the same for horizontal when working with a horizontal flow     *
+     *  - Test that cells are laid out as expected in a vertical flow          *
+     *  - Test the same for a horizontal flow                                  *
+     *  - Test that the width of cells in a vertical flow adjusts based on the *
+     *    width of the flow's content area                                     *
+     *  - Test the same for the height of cells in a horizontal flow           *
+     *  - Test that changing the number of cells (up and down) also adjusts    *
+     *    the position such that it is "stable", unless that is not possible   *
+     *  - Test that after changing the cell factory, things are rebuilt        *
+     *  - Test that after changing the cell config function, things are        *
+     *    reconfigured.                                                        *
+     *  - Test that functions which add to the pile and so forth work as       *
+     *    expected.                                                            *
+     *  - Test the layout of the scroll bars in various combinations, along    *
+     *    with the corner region and so forth.                                 *
+     *                                                                         *
+     **************************************************************************/
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  General Layout
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * In this test there are no cells. The VirtualFlow should be laid out such
+     * that the scroll bars and corner are not visible, and the clip view fills
+     * the entire width/height of the VirtualFlow.
+     */
+    @Test public void testGeneralLayout_NoCells() {
+        flow.setCellCount(0);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * When we have a few cells, not enough to fill the viewport, then we need
+     * to make sure there is no virtual scroll bar. In this test case the cells
+     * are not wider than the viewport so no horizontal bar either.
+     */
+    @Test public void testGeneralLayout_FewCells() {
+        flow.setCellCount(3);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertEquals(12, flow.cells.size()); // we stil have 12 cells (300px / 25px), even if only three filled cells exist
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+//        assertEquals(3, flow.cells.size());
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Tests the case of a few cells (so not requiring a vertical scroll bar),
+     * but the cells are wider than the viewport so a horizontal scroll bar is
+     * required.
+     */
+    @Test public void testGeneralLayout_FewCellsButWide() {
+        flow.setCellCount(3);
+        flow.resize(50, flow.getHeight());
+        pulse();
+        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
+        assertEquals(flow.getHbar().getLayoutY(), flow.getHeight() - flow.getHbar().getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        flow.resize(300, 50);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Tests that having a situation where the hbar in a vertical flow is
+     * necessary (due to wide cells) will end up hiding the hbar if the flow
+     * becomes wide enough that the hbar is no longer necessary.
+     */
+    @Test public void testGeneralLayout_FewCellsButWide_ThenNarrow() {
+        flow.setCellCount(3);
+        flow.resize(50, flow.getHeight());
+        pulse();
+        flow.resize(300, flow.getHeight());
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        flow.resize(300, 50);
+        pulse();
+        flow.resize(flow.getWidth(), 300);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Tests that when there are many cells then the vbar in a vertical flow
+     * is used.
+     * <p>
+     * Note, this test uncovered a bug where the bottom of the last cell was
+     * exactly on the bottom edge of the flow and the vbar was not made visible.
+     * Be sure to test for this explicitly some time!
+     */
+    @Test public void testGeneralLayout_ManyCells() {
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        pulse();
+        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
+        assertEquals(flow.getHbar().getLayoutY(), flow.getHeight() - flow.getHbar().getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Test that after having only a few cells, if I then have many cells, that
+     * the vbar is shown appropriately.
+     */
+    @Test public void testGeneralLayout_FewCells_ThenMany() {
+        flow.setCellCount(3);
+        pulse();
+        flow.setCellCount(100);
+        pulse();
+        assertFalse("The hbar should have been invisible", flow.getHbar().isVisible());
+        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight(), 0.0);
+        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        flow.setCellCount(3);
+        pulse();
+        flow.setCellCount(100);
+        pulse();
+        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
+        assertFalse("The vbar should have been invisible", flow.getVbar().isVisible());
+        assertFalse("The corner should have been invisible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
+        assertEquals(flow.getHbar().getLayoutY(), flow.getHeight() - flow.getHbar().getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Test the case where there are many cells and they are wider than the
+     * viewport. We should have the hbar, vbar, and corner region in this case.
+     */
+    @Test public void testGeneralLayout_ManyCellsAndWide() {
+        flow.resize(50, flow.getHeight());
+        pulse();
+        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
+        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
+        assertTrue("The corner should have been visible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
+        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getVbar().getWidth(), flow.corner.getWidth(), 0.0);
+        assertEquals(flow.getHbar().getHeight(), flow.corner.getHeight(), 0.0);
+        assertEquals(flow.getHbar().getWidth(), flow.getWidth() - flow.corner.getWidth(), 0.0);
+        assertEquals(flow.getVbar().getHeight(), flow.getHeight() - flow.corner.getHeight(), 0.0);
+        assertEquals(flow.corner.getLayoutX(), flow.getWidth() - flow.corner.getWidth(), 0.0);
+        assertEquals(flow.corner.getLayoutY(), flow.getHeight() - flow.corner.getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+
+        flow.setVertical(false);
+        flow.resize(300, 50);
+        pulse();
+        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
+        assertTrue("The vbar should have been visible", flow.getVbar().isVisible());
+        assertTrue("The corner should have been visible", flow.corner.isVisible());
+        assertEquals(flow.getWidth(), flow.clipView.getWidth() + flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getHeight(), flow.clipView.getHeight() + flow.getHbar().getHeight(), 0.0);
+        assertEquals(flow.getVbar().getLayoutX(), flow.getWidth() - flow.getVbar().getWidth(), 0.0);
+        assertEquals(flow.getVbar().getWidth(), flow.corner.getWidth(), 0.0);
+        assertEquals(flow.getHbar().getHeight(), flow.corner.getHeight(), 0.0);
+        assertEquals(flow.getHbar().getWidth(), flow.getWidth() - flow.corner.getWidth(), 0.0);
+        assertEquals(flow.getVbar().getHeight(), flow.getHeight() - flow.corner.getHeight(), 0.0);
+        assertEquals(flow.corner.getLayoutX(), flow.getWidth() - flow.corner.getWidth(), 0.0);
+        assertEquals(flow.corner.getLayoutY(), flow.getHeight() - flow.corner.getHeight(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Tests that when the vertical flag changes, it results in layout
+     */
+    @Test public void testGeneralLayout_VerticalChangeResultsInNeedsLayout() {
+        assertFalse(flow.isNeedsLayout());
+        flow.setVertical(false);
+        assertTrue(flow.isNeedsLayout());
+    }
+
+    /**
+     * Tests that the range of the non-virtual scroll bar is valid
+     */
+    @Test public void testGeneralLayout_NonVirtualScrollBarRange() {
+        flow.resize(50, flow.getHeight());
+        pulse();
+        assertEquals(0, flow.getHbar().getMin(), 0.0);
+        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getWidth(), flow.getHbar().getMax(), 0.0);
+        assertEquals((flow.clipView.getWidth()/flow.getMaxPrefBreadth()) * flow.getHbar().getMax(), flow.getHbar().getVisibleAmount(), 0.0);
+        flow.setPosition(.28f);
+        pulse();
+        assertEquals(0, flow.getHbar().getMin(), 0.0);
+        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getWidth(), flow.getHbar().getMax(), 0.0);
+        assertEquals((flow.clipView.getWidth()/flow.getMaxPrefBreadth()) * flow.getHbar().getMax(), flow.getHbar().getVisibleAmount(), 0.0);
+
+        flow.setVertical(false);
+        flow.setPosition(0);
+        flow.resize(300, 50);
+        pulse();
+        assertEquals(0, flow.getVbar().getMin(), 0.0);
+        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getHeight(), flow.getVbar().getMax(), 0.0);
+        assertEquals((flow.clipView.getHeight()/flow.getMaxPrefBreadth()) * flow.getVbar().getMax(), flow.getVbar().getVisibleAmount(), 0.0);
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(0, flow.getVbar().getMin(), 0.0);
+        assertEquals(flow.getMaxPrefBreadth() - flow.clipView.getHeight(), flow.getVbar().getMax(), 0.0);
+        assertEquals((flow.clipView.getHeight()/flow.getMaxPrefBreadth()) * flow.getVbar().getMax(), flow.getVbar().getVisibleAmount(), 0.0);
+    }
+
+    /**
+     * Tests that the maxPrefBreadth is computed correctly for the first page of cells.
+     * In our test case, the first page of cells have a uniform pref.
+     */
+    @Test public void testGeneralLayout_maxPrefBreadth() {
+        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
+    }
+
+    /**
+     * Tests that even after the first computation of max pref, that it is
+     * updated when we encounter a new cell (while scrolling for example) that
+     * has a larger pref.
+     */
+    @Ignore
+    @Test public void testGeneralLayout_maxPrefBreadthUpdatedWhenEncounterLargerPref() {
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
+    }
+
+    /**
+     * Tests that if we encounter cells or pages of cells with smaller prefs
+     * than the max pref that we will keep the max pref the same.
+     */
+    @Ignore
+    @Test public void testGeneralLayout_maxPrefBreadthRemainsSameWhenEncounterSmallerPref() {
+        flow.setPosition(.28);
+        pulse();
+        flow.setPosition(.8);
+        pulse();
+        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
+    }
+
+    /**
+     * Tests that changes to the vertical property will clear the maxPrefBreadth
+     */
+    @Test public void testGeneralLayout_VerticalChangeClearsmaxPrefBreadth() {
+        flow.setVertical(false);
+        assertEquals(-1, flow.getMaxPrefBreadth(), 0.0);
+    }
+
+    /**
+     * Tests that changes to the cell count will not affect maxPrefBreadth.
+     */
+    @Ignore
+    @Test public void testGeneralLayout_maxPrefBreadthUnaffectedByCellCountChanges() {
+        flow.setCellCount(10);
+        pulse();
+        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
+        flow.setCellCount(100);
+        pulse();
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
+        flow.setCellCount(10);
+        pulse();
+        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
+    }
+
+    /**
+     * Tests that as we scroll, if the non-virtual scroll bar is visible, then
+     * as we update maxPrefBreadth it will not affect the non-virtual scroll bar's
+     * value <b>unless</b> the value is such that the scroll bar is scrolled
+     * all the way to the end, in which case it will remain scrolled to the
+     * end.
+     */
+    @Test public void testGeneralLayout_maxPrefBreadthScrollBarValueInteraction() {
+        flow.resize(50, flow.getHeight());
+        flow.getHbar().setValue(30);
+        pulse();
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(30, flow.getHbar().getValue(), 0.0);
+
+        // Reset the test and this time check what happens when we are scrolled
+        // to the very right
+        flow.setPosition(0);
+        flow.setVertical(false);
+        flow.setVertical(true);
+        pulse();
+        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
+        flow.getHbar().setValue(flow.getHbar().getMax()); // scroll to the end
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(flow.getHbar().getMax(), flow.getHbar().getValue(), 0.0);
+
+        flow.setVertical(false);
+        flow.setPosition(0);
+        flow.getHbar().setValue(0);
+        flow.resize(300, 50);
+        pulse();
+        flow.getVbar().setValue(30);
+        pulse();
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(30, flow.getVbar().getValue(), 0.0);
+
+        // Reset the test and this time check what happens when we are scrolled
+        // to the very right
+        flow.setPosition(0);
+        flow.setVertical(true);
+        flow.setVertical(false);
+        pulse();
+        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
+        flow.getVbar().setValue(flow.getVbar().getMax()); // scroll to the end
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(flow.getVbar().getMax(), flow.getVbar().getValue(), 0.0);
+    }
+
+    @Test public void testGeneralLayout_ScrollToEndOfVirtual_BarStillVisible() {
+        assertTrue("The vbar was expected to be visible", flow.getVbar().isVisible());
+        flow.setPosition(1);
+        pulse();
+        assertTrue("The vbar was expected to be visible", flow.getVbar().isVisible());
+
+        flow.setPosition(0);
+        flow.setVertical(false);
+        pulse();
+        assertTrue("The hbar was expected to be visible", flow.getHbar().isVisible());
+        flow.setPosition(1);
+        pulse();
+        assertTrue("The hbar was expected to be visible", flow.getHbar().isVisible());
+    }
+
+    // Need to test all the resize operations and make sure the position of
+    // nodes is as expected, that they don't get shifted etc.
+
+    // Test: Scroll to the bottom, expand size out, then make smaller. The
+    // thumb/scroll is not consistent right now.
+
+    // TODO figure out and deal with what happens when orientation changes
+    // to the hbar.value and vbar.value. Do they just switch? Probably not?
+    // Probably reset the non-virtual direction and swap the virtual one over.
+    // So if vbar was .5 and hbar was 30, when we set vertical = false, then
+    // we change the hbar to .5 and the vbar to 0. However this has to be done
+    // at the same time that the "virtual" property of the scroll bars is
+    // changed
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  Cell Layout
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Test to make sure that we are virtual -- that all cells are not being
+     * created.
+     */
+    @Test public void testCellLayout_NotAllCellsAreCreated() {
+        // due to the initial size of the VirtualFlow and the number of cells
+        // and their heights, we should have more cells than we have space to
+        // fit them and so only enough cells should be created to meet our
+        // needs and not any more than that
+        assertTrue("All of the cells were created", flow.cells.size() < flow.getCellCount());
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    /**
+     * Tests the size and position of all the cells to make sure they were
+     * laid out properly.
+     */
+    @Test public void testCellLayout_CellSizes_AfterLayout() {
+        double offset = 0.0;
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(25, cell.getHeight(), 0.0);
+            assertEquals(offset, cell.getLayoutY(), 0.0);
+            offset += cell.getHeight();
+        }
+
+        offset = 0.0;
+        flow.setVertical(false);
+        pulse();
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(25, cell.getWidth(), 0.0);
+            assertEquals(offset, cell.getLayoutX(), 0.0);
+            offset += cell.getWidth();
+        }
+    }
+
+    /**
+     * Test the widths of the cells when the viewport is wider than the
+     * max pref width/height. They should be uniform, and should be the
+     * width of the viewport.
+     */
+    @Test public void testCellLayout_ViewportWiderThanmaxPrefBreadth() {
+        // Note that the pref width of everything is 100, but the actual
+        // available width is much larger (300 - hbar.width or
+        // 300 - vbar.height) and so the non-virtual dimension of the cell
+        // should be larger than the max pref
+        double expected = flow.clipView.getWidth();
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(expected, cell.getWidth(), 0.0);
+        }
+
+        flow.setVertical(false);
+        pulse();
+        expected = flow.clipView.getHeight();
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(expected, cell.getHeight(), 0.0);
+        }
+    }
+
+    /**
+     * Test the widths of the cells when the viewport is shorter than the
+     * max pref width/height. They should be uniform, and should be the max
+     * pref.
+     */
+    @Test public void testCellLayout_ViewportShorterThanmaxPrefBreadth() {
+        flow.resize(50, flow.getHeight());
+        pulse();
+        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(flow.getMaxPrefBreadth(), cell.getWidth(), 0.0);
+        }
+
+        flow.setVertical(false);
+        flow.resize(flow.getWidth(), 50);
+        pulse();
+        assertEquals(100, flow.getMaxPrefBreadth(), 0.0);
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(flow.getMaxPrefBreadth(), cell.getHeight(), 0.0);
+        }
+    }
+
+    /**
+     * Test that when we scroll and encounter a cell which has a larger pref
+     * than we have previously encountered (happens in this test when we visit
+     * the cell for item #29), then the max pref is updated and the cells are
+     * all resized to match.
+     */
+    @Ignore
+    @Test public void testCellLayout_ScrollingFindsCellWithLargemaxPrefBreadth() {
+        flow.resize(50, flow.getHeight());
+        flow.setPosition(.28); // happens to position such that #29 is visible
+        pulse();
+        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(flow.getMaxPrefBreadth(), cell.getWidth(), 0.0);
+        }
+
+        flow.setVertical(false);
+        flow.resize(flow.getWidth(), 50);
+        // NOTE Run this test without the pulse and it fails!
+        pulse();
+        flow.setPosition(.28);
+        pulse();
+        assertEquals(200, flow.getMaxPrefBreadth(), 0.0);
+        for (int i = 0; i < flow.cells.size(); i++) {
+            IndexedCell cell = flow.cells.get(i);
+            assertEquals(flow.getMaxPrefBreadth(), cell.getHeight(), 0.0);
+        }
+    }
+
+    /**
+     * Checks that the initial set of cells (the first page of cells) are
+     * indexed starting with cell #0 and working up from there.
+     */
+    @Test public void testCellLayout_CellIndexes_FirstPage() {
+        for (int i = 0; i < flow.cells.size(); i++) {
+            assertEquals(i, flow.cells.get(i).getIndex());
+        }
+    }
+
+    /**
+     * The bug here is that if layout() is called on the flow numerous times,
+     * but nothing substantially has changed, we should reuse the cells in the
+     * same order they were before. We had a bug where when you clicked on the
+     * ListView, the click wouldn't register. This was because by clicking we
+     * were giving focus to the ListView, which caused a layout(), and then the
+     * cells location was shuffled. It didn't look like it to the user, but that
+     * is what happened. As a result, when the mouse release took place, the
+     * event was delivered to a different cell than expected and misbehavior
+     * took place.
+     */
+    @Test public void testCellLayout_LayoutWithoutChangingThingsUsesCellsInSameOrderAsBefore() {
+        List<IndexedCell> cells = new LinkedList<IndexedCell>();
+        for (int i = 0; i < flow.cells.size(); i++) {
+            cells.add(flow.cells.get(i));
+        }
+        assertMatch(cells, flow.cells); // sanity check
+        flow.requestLayout();
+        pulse();
+        assertMatch(cells, flow.cells);
+        flow.setPosition(1);
+        pulse();
+        cells.clear();
+        for (int i = 0; i < flow.cells.size(); i++) {
+            cells.add(flow.cells.get(i));
+        }
+        flow.requestLayout();
+        pulse();
+        assertMatch(cells, flow.cells);
+    }
+
+
+    @Test
+    public void testCellLayout_BiasedCellAndLengthBar() {
+        flow.setCellFactory(param -> new CellStub(flow) {
+            @Override
+            protected double computeMinWidth(double height) {
+                return 0;
+            }
+
+            @Override
+            protected double computeMaxWidth(double height) {
+                return Double.MAX_VALUE;
+            }
+
+            @Override
+            protected double computePrefWidth(double height) {
+                return 200;
+            }
+
+            @Override
+            protected double computeMinHeight(double width) {
+                return 0;
+            }
+
+            @Override
+            protected double computeMaxHeight(double width) {
+                return Double.MAX_VALUE;
+            }
+
+            @Override
+            protected double computePrefHeight(double width) {
+                return getIndex() == 0 ? 100 - 5 * (Math.floorDiv((int) width - 200, 10)) : 100;
+            }
+        });
+        flow.setCellCount(3);
+        flow.recreateCells(); // This help to override layoutChildren() in flow.setCellCount()
+        flow.getVbar().setPrefWidth(20); // Since Skins are not initialized, we set the pref width explicitly
+        flow.requestLayout();
+        pulse();
+        assertEquals(300, flow.cells.get(0).getWidth(), 1e-100);
+        assertEquals(50, flow.cells.get(0).getHeight(), 1e-100);
+
+        flow.resize(200, 300);
+
+        flow.requestLayout();
+        pulse();
+        assertEquals(200, flow.cells.get(0).getWidth(), 1e-100);
+        assertEquals(100, flow.cells.get(0).getHeight(), 1e-100);
+
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  Cell Life Cycle
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    @Test public void testCellLifeCycle_CellsAreCreatedOnLayout() {
+        // when the flow was first created in setUp we do a layout()
+        assertTrue("The cells didn't get created", flow.cells.size() > 0);
+    }
+
+//    /**
+//     * During layout the order and contents of cells will change. We need
+//     * to make sure that CSS for cells is applied at this time. To test this,
+//     * I just set the position and perform a new pulse. Since layout happens
+//     * after the CSS updates are applied, if the test fails, then there will
+//     * be cells left in a state where they need their CSS applied.
+//     */
+//    @Test public void testCellLifeCycle_CSSUpdatesHappenDuringLayout() {
+//        flow.setPosition(.35);
+//        pulse();
+//        for (int i = 0; i < flow.cells.size(); i++) {
+//            IndexedCell cell = flow.cells.get(i);
+//            assertEquals(CssFlags.CLEAN, cell.impl_getCSSFlags());
+//        }
+//    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  Position
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  Pixel Scrolling
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  Cell Count Changes
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    // want to test that the view remains stable when the cell count changes
+
+    // LIST VIEW: test that using a bunch of nodes as items to a ListView works
+    // LIST VIEW: test that inserting an item moves the selected index to keep in sync
+    // test that dynamically changing all of the contents causes them to refresh
+
+    // test that when the number of cells change, that things are laid out
+//    @Test public void testCellCountChanges_FirstRowIsRemoved() {
+//
+//    }
+//
+//    @Test public void testCellCountChanges_MiddleRowIsRemoved() {
+//
+//    }
+//
+//    @Test public void testCellCountChanges_LastRowIsRemoved() {
+//
+//    }
+//
+////    @Test public void testCellCountChanges_SelectedRowRemoved() {
+////
+////    }
+////
+////    @Test public void testCellCountChanges_NonSelectedRowRemoved() {
+////
+////    }
+//
+//    @Test public void testCellCountChanges_FirstRowIsAdded() {
+//
+//    }
+//
+//    @Test public void testCellCountChanges_MiddleRowIsAdded() {
+//
+//    }
+//
+//    @Test public void testCellCountChanges_LastRowIsAdded() {
+//
+//    }
+//
+////    @Test public void testCellCountChanges_RowIsAddedBeforeSelectedRow() {
+////
+////    }
+////
+////    @Test public void testCellCountChanges_RowIsAddedAfterSelectedRow() {
+////
+////    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  VirtualFlow State Changes
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Tests that when the createCell method changes, it results in layout
+     */
+    @Test public void testCreateCellFunctionChangesResultInNeedsLayoutAndNoCellsAndNoAccumCell() {
+        assertFalse(flow.isNeedsLayout());
+        flow.getCellLength(49); // forces accum cell to be created
+        assertNotNull("Accum cell was null", flow.accumCell);
+        flow.setCellFactory(p -> new CellStub(flow));
+        assertTrue(flow.isNeedsLayout());
+        assertNull("accumCell didn't get cleared", flow.accumCell);
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    //  Tests on specific functions
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    @Test public void test_getCellLength() {
+        assertEquals(100, flow.getCellCount());
+        for (int i = 0; i < 50; i++) {
+            if (i != 29) assertEquals(25, flow.getCellLength(i), 0.0);
+        }
+        flow.setVertical(false);
+        flow.requestLayout();
+        pulse();
+        assertEquals(100, flow.getCellCount());
+        for (int i = 0; i < 50; i++) {
+            if (i != 29) assertEquals("Bad index: " + i, 25, flow.getCellLength(i), 0.0);
+        }
+    }
+
+    /*
+    ** if we scroll the flow by a number of LINES,
+    ** without having done anything to select a cell
+    ** the flow should scroll.
+    */ 
+    @Test public void testInitialScrollEventActuallyScrolls() {
+        /*
+        ** re-initialize this, as it must be the first
+        ** interaction with the flow
+        */
+        flow = new VirtualFlow();
+        flow.setVertical(true);
+        flow.setCellFactory(p -> new CellStub(flow) {
+            @Override
+            protected double computeMinWidth(double height) {
+                return computePrefWidth(height);
+            }
+
+            @Override
+            protected double computeMaxWidth(double height) {
+                return computePrefWidth(height);
+            }
+
+            @Override
+            protected double computePrefWidth(double height) {
+                return flow.isVertical() ? (c.getIndex() == 29 ? 200 : 100) : (c.getIndex() == 29 ? 100 : 25);
+            }
+
+            @Override
+            protected double computeMinHeight(double width) {
+                return computePrefHeight(width);
+            }
+
+            @Override
+            protected double computeMaxHeight(double width) {
+                return computePrefHeight(width);
+            }
+
+            @Override
+            protected double computePrefHeight(double width) {
+                return flow.isVertical() ? (c.getIndex() == 29 ? 100 : 25) : (c.getIndex() == 29 ? 200 : 100);
+            }
+        });
+        
+        flow.setCellCount(100);
+        flow.resize(300, 300);
+        pulse();
+       
+        double originalValue = flow.getPosition();
+
+        Event.fireEvent(flow, 
+              new ScrollEvent(ScrollEvent.SCROLL,
+                          0.0, -10.0, 0.0, -10.0,
+                          false, false, false, false, true, false,
+                          0, 0,
+                          0, 0,
+                          ScrollEvent.HorizontalTextScrollUnits.NONE, 0.0,
+                          ScrollEvent.VerticalTextScrollUnits.LINES, -1.0,
+                          0, null));
+
+        assertTrue(originalValue != flow.getPosition());
+    }
+
+    @Test
+    public void test_RT_36507() {
+        flow = new VirtualFlow();
+        flow.setVertical(true);
+        // Worst case scenario is that the cells have height = 0.
+        // The code should prevent creating more than 100 of these zero height cells
+        // (since viewportLength is 100).
+        // An "INFO: index exceeds maxCellCount" message should print out.
+        flow.setCellFactory(p -> new CellStub(flow) {
+            @Override
+            protected double computeMaxHeight(double width) {
+                return 0;
+            }
+
+            @Override
+            protected double computePrefHeight(double width) {
+                return 0;
+            }
+
+            @Override
+            protected double computeMinHeight(double width) {
+                return 0;
+            }
+
+        });
+        flow.setCellCount(10);
+        flow.setViewportLength(100);
+        flow.addLeadingCells(1, 0);
+        flow.sheetChildren.addListener((InvalidationListener) (o) -> {
+            int count = ((List) o).size();
+            assertTrue(Integer.toString(count), count <= 100);
+        });
+        flow.addTrailingCells(true);
+    }
+
+    private int rt36556_instanceCount;
+    @Test
+    public void test_rt36556() {
+        rt36556_instanceCount = 0;
+        flow = new VirtualFlow();
+        flow.setVertical(true);
+        flow.setCellFactory(p -> {
+            rt36556_instanceCount++;
+            return new CellStub(flow);
+        });
+        flow.setCellCount(100);
+        flow.resize(300, 300);
+        pulse();
+        final int cellCountAtStart = rt36556_instanceCount;
+        flow.scrollPixels(10000);
+        pulse();
+        assertEquals(cellCountAtStart, rt36556_instanceCount);
+        assertNull(flow.getVisibleCell(0));
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    @Test
+    public void test_rt36556_scrollto() {
+        rt36556_instanceCount = 0;
+        flow = new VirtualFlow();
+        flow.setVertical(true);
+        flow.setCellFactory(p -> {
+            rt36556_instanceCount++;
+            return new CellStub(flow);
+        });
+        flow.setCellCount(100);
+        flow.resize(300, 300);
+        pulse();
+        final int cellCountAtStart = rt36556_instanceCount;
+        flow.scrollTo(80);
+        pulse();
+        assertEquals(cellCountAtStart, rt36556_instanceCount);
+        assertNull(flow.getVisibleCell(0));
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+    
+    @Test
+    public void test_RT39035() {
+        flow.scrollPixels(250);
+        pulse();
+        flow.scrollPixels(500);
+        pulse();
+        assertTrue(flow.getPosition() < 1.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    @Test
+    public void test_RT37421() {
+        flow.setPosition(0.98);
+        pulse();
+        flow.scrollPixels(100);
+        pulse();
+        assertEquals(1.0, flow.getPosition(), 0.0);
+        assertMinimalNumberOfCellsAreUsed(flow);
+    }
+
+    @Test
+    public void test_RT39568() {
+        flow.getHbar().setPrefHeight(16);
+        flow.resize(50, flow.getHeight());
+        flow.setPosition(1);
+        pulse();
+        assertTrue("The hbar should have been visible", flow.getHbar().isVisible());
+        assertMinimalNumberOfCellsAreUsed(flow);
+        assertEquals(flow.getViewportLength()-25.0, flow.cells.getLast().getLayoutY(), 0.0);
+    }
+}
+
+class CellStub extends IndexedCell {
+    String s;
+    VirtualFlow flow;
+
+    public CellStub(VirtualFlow flow) { init(flow); }
+    public CellStub(VirtualFlow flow, String s) { init(flow); this.s = s; }
+    
+    private void init(VirtualFlow flow) {
+        this.flow = flow;
+        setSkin(new SkinStub<CellStub>(this));
+        updateItem(this, false);
+    }
+
+    @Override
+    public void updateIndex(int i) {
+        super.updateIndex(i);
+        
+        s = "Item " + getIndex();
+//        updateItem(getIndex(), getIndex() >= flow.getCellCount());
+    }
+}
--- old/modules/controls/src/test/resources/com/sun/javafx/scene/control/skin/LabeledTextTest.css	2015-09-03 15:30:36.739050100 -0700
+++ /dev/null	2015-09-03 15:30:37.000000000 -0700
@@ -1,16 +0,0 @@
-.label {
-    -fx-text-fill: red;
-    -fx-text-alignment: center;
-    -fx-text-font: 20px Amble;
-    -fx-underline: false;
-}
-
-.label > .text { 
-    -fx-fill: green; 
-    -fx-text-alignment: right;
-    -fx-font: 10px Amble;
-    -fx-underline: true;
-}
-
-#test-rt-37787 { -fx-font-size: 1.5em; }
-
--- /dev/null	2015-09-03 15:30:38.000000000 -0700
+++ new/modules/controls/src/test/resources/com/sun/javafx/scene/control/LabeledTextTest.css	2015-09-03 15:30:36.108014000 -0700
@@ -0,0 +1,16 @@
+.label {
+    -fx-text-fill: red;
+    -fx-text-alignment: center;
+    -fx-text-font: 20px Amble;
+    -fx-underline: false;
+}
+
+.label > .text { 
+    -fx-fill: green; 
+    -fx-text-alignment: right;
+    -fx-font: 10px Amble;
+    -fx-underline: true;
+}
+
+#test-rt-37787 { -fx-font-size: 1.5em; }
+
--- old/modules/controls/src/test/resources/com/sun/javafx/scene/control/skin/VirtualFlowTest.css	2015-09-03 15:30:41.572326500 -0700
+++ /dev/null	2015-09-03 15:30:42.000000000 -0700
@@ -1,11 +0,0 @@
-/**
- * This rule is required so that we can force CSS to be dirty whenever the
- * index changes, so as to test some scenarios.
- */
-.indexed-cell:odd {
-    text-fill: BLUE;
-}
-
-.indexed-cell {
-    text-fill: BLACK;
-}
\ No newline at end of file
--- /dev/null	2015-09-03 15:30:42.000000000 -0700
+++ new/modules/controls/src/test/resources/javafx/scene/control/skin/VirtualFlowTest.css	2015-09-03 15:30:40.638273100 -0700
@@ -0,0 +1,11 @@
+/**
+ * This rule is required so that we can force CSS to be dirty whenever the
+ * index changes, so as to test some scenarios.
+ */
+.indexed-cell:odd {
+    text-fill: BLUE;
+}
+
+.indexed-cell {
+    text-fill: BLACK;
+}
\ No newline at end of file
--- old/modules/fxml/src/main/java/com/sun/javafx/fxml/LoadListener.java	2015-09-03 15:30:46.126587000 -0700
+++ /dev/null	2015-09-03 15:30:47.000000000 -0700
@@ -1,152 +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 com.sun.javafx.fxml;
-
-/**
- * Load listener interface.
- */
-public interface LoadListener {
-    /**
-     * Called when the loader has read an import processing instruction.
-     *
-     * @param target
-     */
-    public void readImportProcessingInstruction(String target);
-
-    /**
-     * Called when the loader has read a language processing instruction.
-     *
-     * @param language
-     */
-    public void readLanguageProcessingInstruction(String language);
-
-    /**
-     * Called when the loader has read a comment.
-     *
-     * @param comment
-     */
-    public void readComment(String comment);
-
-    /**
-     * Called when the loader has begun reading an instance declaration
-     * element.
-     *
-     * @param type
-     */
-    public void beginInstanceDeclarationElement(Class<?> type);
-
-    /**
-     * Called when the loader has begun reading an instance declaration
-     * element for an unknown type.
-     *
-     * @param name
-     */
-    public void beginUnknownTypeElement(String name);
-
-    /**
-     * Called when the loader has begun reading an include element.
-     */
-    public void beginIncludeElement();
-
-    /**
-     * Called when the loader has begun reading a reference element.
-     */
-    public void beginReferenceElement();
-
-    /**
-     * Called when the loader has begun reading a copy element.
-     */
-    public void beginCopyElement();
-
-    /**
-     * Called when the loader has begun reading a root element.
-     */
-    public void beginRootElement();
-
-    /**
-     * Called when the loader has begun reading a property element.
-     *
-     * @param name
-     * @param sourceType
-     */
-    public void beginPropertyElement(String name, Class<?> sourceType);
-
-    /**
-     * Called when the loader has begun reading a static property element
-     * defined by an unknown type.
-     *
-     * @param name
-     * @param sourceType
-     */
-    public void beginUnknownStaticPropertyElement(String name);
-
-    /**
-     * Called when the loader has begun reading a script element.
-     */
-    public void beginScriptElement();
-
-    /**
-     * Called when the loader has begun reading a define element.
-     */
-    public void beginDefineElement();
-
-    /**
-     * Called when the loader has read an internal attribute.
-     *
-     * @param name
-     * @param value
-     */
-    public void readInternalAttribute(String name, String value);
-
-    /**
-     * Called when the loader has read a property attribute.
-     *
-     * @param name
-     * @param sourceType
-     * @param value
-     */
-    public void readPropertyAttribute(String name, Class<?> sourceType, String value);
-
-    /**
-     * Called when the loader has read an unknown static property attribute.
-     */
-    public void readUnknownStaticPropertyAttribute(String name, String value);
-
-    /**
-     * Called when the loader has read an event handler attribute.
-     *
-     * @param name
-     * @param value
-     */
-    public void readEventHandlerAttribute(String name, String value);
-
-    /**
-     * Called when the loader has finished reading an element.
-     *
-     * @param value
-     */
-    public void endElement(Object value);
-}
--- /dev/null	2015-09-03 15:30:47.000000000 -0700
+++ new/modules/fxml/src/main/java/javafx/fxml/LoadListener.java	2015-09-03 15:30:45.408545900 -0700
@@ -0,0 +1,152 @@
+/*
+ * 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.fxml;
+
+/**
+ * Load listener interface.
+ */
+public interface LoadListener {
+    /**
+     * Called when the loader has read an import processing instruction.
+     *
+     * @param target
+     */
+    public void readImportProcessingInstruction(String target);
+
+    /**
+     * Called when the loader has read a language processing instruction.
+     *
+     * @param language
+     */
+    public void readLanguageProcessingInstruction(String language);
+
+    /**
+     * Called when the loader has read a comment.
+     *
+     * @param comment
+     */
+    public void readComment(String comment);
+
+    /**
+     * Called when the loader has begun reading an instance declaration
+     * element.
+     *
+     * @param type
+     */
+    public void beginInstanceDeclarationElement(Class<?> type);
+
+    /**
+     * Called when the loader has begun reading an instance declaration
+     * element for an unknown type.
+     *
+     * @param name
+     */
+    public void beginUnknownTypeElement(String name);
+
+    /**
+     * Called when the loader has begun reading an include element.
+     */
+    public void beginIncludeElement();
+
+    /**
+     * Called when the loader has begun reading a reference element.
+     */
+    public void beginReferenceElement();
+
+    /**
+     * Called when the loader has begun reading a copy element.
+     */
+    public void beginCopyElement();
+
+    /**
+     * Called when the loader has begun reading a root element.
+     */
+    public void beginRootElement();
+
+    /**
+     * Called when the loader has begun reading a property element.
+     *
+     * @param name
+     * @param sourceType
+     */
+    public void beginPropertyElement(String name, Class<?> sourceType);
+
+    /**
+     * Called when the loader has begun reading a static property element
+     * defined by an unknown type.
+     *
+     * @param name
+     * @param sourceType
+     */
+    public void beginUnknownStaticPropertyElement(String name);
+
+    /**
+     * Called when the loader has begun reading a script element.
+     */
+    public void beginScriptElement();
+
+    /**
+     * Called when the loader has begun reading a define element.
+     */
+    public void beginDefineElement();
+
+    /**
+     * Called when the loader has read an internal attribute.
+     *
+     * @param name
+     * @param value
+     */
+    public void readInternalAttribute(String name, String value);
+
+    /**
+     * Called when the loader has read a property attribute.
+     *
+     * @param name
+     * @param sourceType
+     * @param value
+     */
+    public void readPropertyAttribute(String name, Class<?> sourceType, String value);
+
+    /**
+     * Called when the loader has read an unknown static property attribute.
+     */
+    public void readUnknownStaticPropertyAttribute(String name, String value);
+
+    /**
+     * Called when the loader has read an event handler attribute.
+     *
+     * @param name
+     * @param value
+     */
+    public void readEventHandlerAttribute(String name, String value);
+
+    /**
+     * Called when the loader has finished reading an element.
+     *
+     * @param value
+     */
+    public void endElement(Object value);
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/FontFace.java	2015-09-03 15:30:54.263052400 -0700
+++ /dev/null	2015-09-03 15:30:55.000000000 -0700
@@ -1,178 +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.css;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A FontFace is a @font-face definition from CSS file
- */
-final public class FontFace {
-    public static enum FontFaceSrcType {URL,LOCAL, REFERENCE}
-
-    private final Map<String,String> descriptors;
-    private final List<FontFaceSrc> sources;
-
-    public FontFace(Map<String, String> descriptors, List<FontFaceSrc> sources) {
-        this.descriptors = descriptors;
-        this.sources = sources;
-    }
-
-    public Map<String, String> getDescriptors() {
-        return descriptors;
-    }
-
-    public List<FontFaceSrc> getSources() {
-        return sources;
-    }
-
-    @Override public String toString() {
-        StringBuilder sb = new StringBuilder("@font-face { ");
-        for(Map.Entry<String,String> desc: descriptors.entrySet()) {
-            sb.append(desc.getKey());
-            sb.append(" : ");
-            sb.append(desc.getValue());
-            sb.append("; ");
-        }
-        sb.append("src : ");
-        for(FontFaceSrc src: sources) {
-            sb.append(src.getType());
-            sb.append(" \"");
-            sb.append(src.getSrc());
-            sb.append("\", ");
-        }
-        sb.append("; ");
-        sb.append(" }");
-        return sb.toString();
-    }
-
-    final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
-    {
-        Set<Map.Entry<String,String>> entrySet = getDescriptors() != null ? getDescriptors().entrySet() : null;
-        int nEntries = entrySet != null ? entrySet.size() : 0;
-        os.writeShort(nEntries);
-        if (entrySet != null) {
-            for(Map.Entry<String,String> entry : entrySet) {
-                int index = stringStore.addString(entry.getKey());
-                os.writeInt(index);
-                index = stringStore.addString(entry.getValue());
-                os.writeInt(index);
-            }
-        }
-
-        List<FontFaceSrc> fontFaceSrcs = getSources();
-        nEntries = fontFaceSrcs != null ? fontFaceSrcs.size() : 0;
-        os.writeShort(nEntries);
-        for (int n=0; n<nEntries; n++) {
-            FontFaceSrc fontFaceSrc = fontFaceSrcs.get(n);
-            fontFaceSrc.writeBinary(os, stringStore);
-        }
-
-    }
-
-    final static FontFace readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
-    {
-        int nEntries = is.readShort();
-        Map<String,String> descriptors = new HashMap(nEntries);
-        for (int n=0; n<nEntries; n++) {
-            int index = is.readInt();
-            String key = strings[index];
-            index = is.readInt();
-            String value = strings[index];
-            descriptors.put(key, value);
-        }
-
-        nEntries = is.readShort();
-        List<FontFaceSrc> fontFaceSrcs = new ArrayList<>(nEntries);
-        for (int n=0; n<nEntries; n++) {
-            FontFaceSrc fontFaceSrc = FontFaceSrc.readBinary(bssVersion, is, strings);
-            fontFaceSrcs.add(fontFaceSrc);
-        }
-
-        return new FontFace(descriptors, fontFaceSrcs);
-
-    }
-
-    public static class FontFaceSrc {
-        private final FontFaceSrcType type;
-        private final String src;
-        private final String format;
-
-        public FontFaceSrc(FontFaceSrcType type, String src, String format) {
-            this.type = type;
-            this.src = src;
-            this.format = format;
-        }
-
-        public FontFaceSrc(FontFaceSrcType type, String src) {
-            this.type = type;
-            this.src = src;
-            this.format = null;
-        }
-
-        public FontFaceSrcType getType() {
-            return type;
-        }
-
-        public String getSrc() {
-            return src;
-        }
-
-        public String getFormat() {
-            return format;
-        }
-
-        final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
-        {
-            // ok if type, src or format are null since StringStore allows null
-            os.writeInt(stringStore.addString(type.name()));
-            os.writeInt(stringStore.addString(src));
-            os.writeInt(stringStore.addString(format));
-        }
-
-        final static FontFaceSrc readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
-        {
-            int index = is.readInt();
-            FontFaceSrcType type = (strings[index] != null) ? FontFaceSrcType.valueOf(strings[index]) : null;
-
-            index = is.readInt();
-            String src = strings[index];
-
-            index = is.readInt();
-            String format = strings[index];
-
-            return new FontFaceSrc(type, src, format);
-
-        }
-    }
-}
--- /dev/null	2015-09-03 15:30:55.000000000 -0700
+++ new/modules/graphics/src/main/java/com/sun/javafx/css/FontFaceImpl.java	2015-09-03 15:30:53.525010200 -0700
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2011, 2015, 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.FontFace;
+import javafx.css.StyleConverter.StringStore;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A FontFace is a @font-face definition from CSS file
+ */
+final public class FontFaceImpl extends FontFace {
+    public static enum FontFaceSrcType {URL,LOCAL, REFERENCE}
+
+    private final Map<String,String> descriptors;
+    private final List<FontFaceSrc> sources;
+
+    public FontFaceImpl(Map<String, String> descriptors, List<FontFaceSrc> sources) {
+        this.descriptors = descriptors;
+        this.sources = sources;
+    }
+
+    public Map<String, String> getDescriptors() {
+        return descriptors;
+    }
+
+    public List<FontFaceSrc> getSources() {
+        return sources;
+    }
+
+    @Override public String toString() {
+        StringBuilder sb = new StringBuilder("@font-face { ");
+        for(Map.Entry<String,String> desc: descriptors.entrySet()) {
+            sb.append(desc.getKey());
+            sb.append(" : ");
+            sb.append(desc.getValue());
+            sb.append("; ");
+        }
+        sb.append("src : ");
+        for(FontFaceSrc src: sources) {
+            sb.append(src.getType());
+            sb.append(" \"");
+            sb.append(src.getSrc());
+            sb.append("\", ");
+        }
+        sb.append("; ");
+        sb.append(" }");
+        return sb.toString();
+    }
+
+    public final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
+    {
+        Set<Map.Entry<String,String>> entrySet = getDescriptors() != null ? getDescriptors().entrySet() : null;
+        int nEntries = entrySet != null ? entrySet.size() : 0;
+        os.writeShort(nEntries);
+        if (entrySet != null) {
+            for(Map.Entry<String,String> entry : entrySet) {
+                int index = stringStore.addString(entry.getKey());
+                os.writeInt(index);
+                index = stringStore.addString(entry.getValue());
+                os.writeInt(index);
+            }
+        }
+
+        List<FontFaceSrc> fontFaceSrcs = getSources();
+        nEntries = fontFaceSrcs != null ? fontFaceSrcs.size() : 0;
+        os.writeShort(nEntries);
+        for (int n=0; n<nEntries; n++) {
+            FontFaceSrc fontFaceSrc = fontFaceSrcs.get(n);
+            fontFaceSrc.writeBinary(os, stringStore);
+        }
+
+    }
+
+    public final static FontFaceImpl readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
+    {
+        int nEntries = is.readShort();
+        Map<String,String> descriptors = new HashMap(nEntries);
+        for (int n=0; n<nEntries; n++) {
+            int index = is.readInt();
+            String key = strings[index];
+            index = is.readInt();
+            String value = strings[index];
+            descriptors.put(key, value);
+        }
+
+        nEntries = is.readShort();
+        List<FontFaceSrc> fontFaceSrcs = new ArrayList<>(nEntries);
+        for (int n=0; n<nEntries; n++) {
+            FontFaceSrc fontFaceSrc = FontFaceSrc.readBinary(bssVersion, is, strings);
+            fontFaceSrcs.add(fontFaceSrc);
+        }
+
+        return new FontFaceImpl(descriptors, fontFaceSrcs);
+    }
+
+    public static class FontFaceSrc {
+        private final FontFaceSrcType type;
+        private final String src;
+        private final String format;
+
+        public FontFaceSrc(FontFaceSrcType type, String src, String format) {
+            this.type = type;
+            this.src = src;
+            this.format = format;
+        }
+
+        public FontFaceSrc(FontFaceSrcType type, String src) {
+            this.type = type;
+            this.src = src;
+            this.format = null;
+        }
+
+        public FontFaceSrcType getType() {
+            return type;
+        }
+
+        public String getSrc() {
+            return src;
+        }
+
+        public String getFormat() {
+            return format;
+        }
+
+        final void writeBinary(final DataOutputStream os, final StringStore stringStore) throws IOException
+        {
+            // ok if type, src or format are null since StringStore allows null
+            os.writeInt(stringStore.addString(type.name()));
+            os.writeInt(stringStore.addString(src));
+            os.writeInt(stringStore.addString(format));
+        }
+
+        final static FontFaceSrc readBinary(int bssVersion, DataInputStream is, String[] strings) throws IOException
+        {
+            int index = is.readInt();
+            FontFaceSrcType type = (strings[index] != null) ? FontFaceSrcType.valueOf(strings[index]) : null;
+
+            index = is.readInt();
+            String src = strings[index];
+
+            index = is.readInt();
+            String format = strings[index];
+
+            return new FontFaceSrc(type, src, format);
+
+        }
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/CascadingStyle.java	2015-09-03 15:31:02.183505400 -0700
+++ /dev/null	2015-09-03 15:31:03.000000000 -0700
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2008, 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.css;
-
-import javafx.css.PseudoClass;
-import javafx.css.StyleOrigin;
-
-import java.util.Set;
-
-
-/** A marriage of pseudo-classes (potentially empty) to property and value */
-public class CascadingStyle implements Comparable<CascadingStyle> {
-
-    /** */
-    private final Style style;
-    public Style getStyle() {
-        return style;
-    }
-    
-    /** State variables, like &quot;hover&quot; or &quot;pressed&quot; */
-    private final Set<PseudoClass> pseudoClasses;
-
-    /* specificity of the selector that matched */
-    private final int specificity;
-    
-    /* order in which this style appeared in the stylesheet */
-    private final int ordinal;
-    
-    /*
-     * True if the property is -fx-skin. We want the skin property to
-     * sort less than all other properties.
-     */
-    private final boolean skinProp;
-
-    public CascadingStyle(final Style style, Set<PseudoClass> pseudoClasses,
-            final int specificity, final int ordinal) {
-        this.style = style;
-        this.pseudoClasses = pseudoClasses;
-        this.specificity = specificity;
-        this.ordinal = ordinal;
-        this.skinProp = "-fx-skin".equals(style.getDeclaration().getProperty());
-    }
-        
-    // Wrapper to make StyleHelper's life a little easier
-    public String getProperty() {
-        return style.getDeclaration().getProperty();
-    }
-    
-    // Wrapper to make StyleHelper's life a little easier
-    public Selector getSelector() {
-        return style.getSelector();
-    }
-    
-    // Wrapper to make StyleHelper's life a little easier
-    public Rule getRule() {
-        return style.getDeclaration().getRule();
-    }
-    
-    // Wrapper to make StyleHelper's life a little easier
-    public StyleOrigin getOrigin() {
-        return getRule().getOrigin();
-    }
-    
-    // Wrapper to make StyleHelper's life a little easier
-    public ParsedValueImpl getParsedValueImpl() {
-        return style.getDeclaration().getParsedValueImpl();
-    }
-    
-    @Override public String toString() { return getProperty(); }
-
-    /**
-     * When testing equality against another Style, we only care about
-     * the property and pseudo-classes. In other words, we only care about
-     * where the style is applied, not what is applied.
-     */
-    @Override public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        CascadingStyle other = (CascadingStyle)obj;
-
-        final String property = getProperty();
-        final String otherProperty = other.getProperty();
-        if (property == null ? otherProperty != null : !property.equals(otherProperty)) {
-            return false;
-        }
-        
-        // does [foo bar bang] contain all of [foo bar]?
-        if (pseudoClasses == null ? other.pseudoClasses != null : !pseudoClasses.containsAll(other.pseudoClasses)) {
-            return false;            
-        }
-        
-        return true;
-
-    }
-
-    /*
-     * Hash on property and pseudoclasses since
-     * obj1.hashCode() should equal obj2.hashCode() if obj1.equals(obj2)
-     */
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        final String property = getProperty();
-        hash = 47 * hash + (property != null ? property.hashCode() : 0);
-        hash = 47 * hash + (pseudoClasses != null ? pseudoClasses.hashCode() : 0);
-        return hash;
-    }
-
-    /**
-     * Implementation of Comparable such that more specific styles get
-     * sorted before less specific ones.
-     */
-    @Override
-    public int compareTo(CascadingStyle other) {
-
-        //
-        // Important styles take the cake
-        // Importance being equal, then specificity is considered
-        // Specificity being equal, then the order of declaration decides.
-        //
-        
-        final Declaration decl = style.getDeclaration();
-        final boolean important = decl != null ? decl.isImportant() : false;
-        final Rule rule = decl != null ? decl.getRule() : null;
-        final StyleOrigin source = rule != null ? rule.getOrigin() : null;
-        
-        final Declaration otherDecl = other.style.getDeclaration();
-        final boolean otherImportant = otherDecl != null ? otherDecl.isImportant() : false;
-        final Rule otherRule = otherDecl != null ? otherDecl.getRule() : null;
-        final StyleOrigin otherSource = otherRule != null ? otherRule.getOrigin() : null;
-
-        int c = 0;
-
-        if (this.skinProp && !other.skinProp) {
-            c = 1;
-        } else if (important != otherImportant) {
-            c = important ? -1 : 1;
-        } else if (source != otherSource) {
-            if (source == null) c = -1;
-            else if (otherSource == null) c = 1;
-            else c = otherSource.compareTo(source);
-        } else {
-            c = other.specificity - this.specificity;
-        };
-
-        if (c == 0) c = other.ordinal - this.ordinal;
-        return c;
-    }
-
-}
-
--- /dev/null	2015-09-03 15:31:03.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/CascadingStyle.java	2015-09-03 15:31:01.459464000 -0700
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+import java.util.Set;
+
+/** A marriage of pseudo-classes (potentially empty) to property and value
+ *
+ * @since 9
+ */
+public class CascadingStyle implements Comparable<CascadingStyle> {
+
+    /** */
+    private final Style style;
+    public Style getStyle() {
+        return style;
+    }
+    
+    /** State variables, like &quot;hover&quot; or &quot;pressed&quot; */
+    private final Set<PseudoClass> pseudoClasses;
+
+    /* specificity of the selector that matched */
+    private final int specificity;
+    
+    /* order in which this style appeared in the stylesheet */
+    private final int ordinal;
+    
+    /*
+     * True if the property is -fx-skin. We want the skin property to
+     * sort less than all other properties.
+     */
+    private final boolean skinProp;
+
+    public CascadingStyle(final Style style, Set<PseudoClass> pseudoClasses,
+            final int specificity, final int ordinal) {
+        this.style = style;
+        this.pseudoClasses = pseudoClasses;
+        this.specificity = specificity;
+        this.ordinal = ordinal;
+        this.skinProp = "-fx-skin".equals(style.getDeclaration().getProperty());
+    }
+        
+    public CascadingStyle(final Declaration decl, final Match match, final int ordinal) {
+        this(new Style(match.getSelector(), decl), 
+             match.getPseudoClasses(), 
+             match.getSpecificity(), 
+             ordinal);
+    }
+
+    // Wrapper to make StyleHelper's life a little easier
+    public String getProperty() {
+        return style.getDeclaration().getProperty();
+    }
+    
+    // Wrapper to make StyleHelper's life a little easier
+    public Selector getSelector() {
+        return style.getSelector();
+    }
+    
+    // Wrapper to make StyleHelper's life a little easier
+    public Rule getRule() {
+        return style.getDeclaration().getRule();
+    }
+    
+    // Wrapper to make StyleHelper's life a little easier
+    public StyleOrigin getOrigin() {
+        return getRule().getOrigin();
+    }
+    
+    // Wrapper to make StyleHelper's life a little easier
+    public ParsedValue getParsedValue() {
+        return style.getDeclaration().getParsedValue();
+    }
+    
+    @Override public String toString() { return getProperty(); }
+
+    /**
+     * When testing equality against another Style, we only care about
+     * the property and pseudo-classes. In other words, we only care about
+     * where the style is applied, not what is applied.
+     */
+    @Override public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        CascadingStyle other = (CascadingStyle)obj;
+
+        final String property = getProperty();
+        final String otherProperty = other.getProperty();
+        if (property == null ? otherProperty != null : !property.equals(otherProperty)) {
+            return false;
+        }
+        
+        // does [foo bar bang] contain all of [foo bar]?
+        if (pseudoClasses == null ? other.pseudoClasses != null : !pseudoClasses.containsAll(other.pseudoClasses)) {
+            return false;            
+        }
+        
+        return true;
+
+    }
+
+    /*
+     * Hash on property and pseudoclasses since
+     * obj1.hashCode() should equal obj2.hashCode() if obj1.equals(obj2)
+     */
+    @Override public int hashCode() {
+        int hash = 7;
+        final String property = getProperty();
+        hash = 47 * hash + (property != null ? property.hashCode() : 0);
+        hash = 47 * hash + (pseudoClasses != null ? pseudoClasses.hashCode() : 0);
+        return hash;
+    }
+
+    /**
+     * Implementation of Comparable such that more specific styles get
+     * sorted before less specific ones.
+     */
+    @Override public int compareTo(CascadingStyle other) {
+
+        //
+        // Important styles take the cake
+        // Importance being equal, then specificity is considered
+        // Specificity being equal, then the order of declaration decides.
+        //
+        
+        final Declaration decl = style.getDeclaration();
+        final boolean important = decl != null ? decl.isImportant() : false;
+        final Rule rule = decl != null ? decl.getRule() : null;
+        final StyleOrigin source = rule != null ? rule.getOrigin() : null;
+        
+        final Declaration otherDecl = other.style.getDeclaration();
+        final boolean otherImportant = otherDecl != null ? otherDecl.isImportant() : false;
+        final Rule otherRule = otherDecl != null ? otherDecl.getRule() : null;
+        final StyleOrigin otherSource = otherRule != null ? otherRule.getOrigin() : null;
+
+        int c = 0;
+
+        if (this.skinProp && !other.skinProp) {
+            c = 1;
+        } else if (important != otherImportant) {
+            c = important ? -1 : 1;
+        } else if (source != otherSource) {
+            if (source == null) c = -1;
+            else if (otherSource == null) c = 1;
+            else c = otherSource.compareTo(source);
+        } else {
+            c = other.specificity - this.specificity;
+        };
+
+        if (c == 0) c = other.ordinal - this.ordinal;
+        return c;
+    }
+
+}
+
--- old/modules/graphics/src/main/java/com/sun/javafx/css/CompoundSelector.java	2015-09-03 15:31:10.317970700 -0700
+++ /dev/null	2015-09-03 15:31:11.000000000 -0700
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 2008, 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.css;
-
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-/**
- * A compound selector which behaves according to the CSS standard. The selector is 
- * composed of one or more <code>Selectors</code>, along with an array of 
- * <code>CompoundSelectorRelationships</code> indicating the required relationship at each 
- * stage.  There must be exactly one less <code>Combinator</code> than 
- * there are selectors.
- * <p>
- * For example, the parameters <code>[selector1, selector2, selector3]</code>
- * and <code>[Combinator.CHILD, Combinator.DESCENDANT]</code> will match 
- * a component when all of the following conditions hold:
- * <ol>
- * <li>The component itself is matched by selector3
- * <li>The component has an ancestor which is matched by selector2
- * <li>The ancestor matched in step 2 is a direct CHILD of a component 
- * matched by selector1
- * </ol>
- * In other words, the compound selector specified above is (in CSS syntax) 
- * <code>selector1 &gt; selector2 selector3</code>.  The greater-than (&gt;) 
- * between selector1 and selector2 specifies a direct CHILD, whereas the 
- * whitespace between selector2 and selector3 corresponds to
- * <code>Combinator.DESCENDANT</code>.
- *
- */
-
-final public class CompoundSelector extends Selector {
-
-    private final List<SimpleSelector> selectors;
-    /**
-     * The selectors that make up this compound selector
-     * @return Immutable List&lt;SimpleSelector&gt;
-     */
-    public List<SimpleSelector> getSelectors() {
-        return selectors;
-    }
-
-    private final List<Combinator> relationships;
-    /**
-     * The relationships between the selectors
-     * @return Immutable List&lt;Combinator&gt;
-     */
-    public List<Combinator> getRelationships() {
-        return relationships;
-    }
-
-    public CompoundSelector(List<SimpleSelector> selectors, List<Combinator> relationships)
-    {
-        this.selectors = 
-            (selectors != null) 
-                ? Collections.unmodifiableList(selectors) 
-                : Collections.EMPTY_LIST;
-        this.relationships =
-            (relationships != null) 
-                ? Collections.unmodifiableList(relationships) 
-                : Collections.EMPTY_LIST;
-    }
-        
-    private CompoundSelector()
-    {
-        this(null, null);
-    }
-    
-    Match createMatch() {
-
-        final PseudoClassState allPseudoClasses = new PseudoClassState();
-        int idCount = 0;
-        int styleClassCount = 0;
-
-        for(int n=0, nMax=selectors.size(); n<nMax; n++) {
-            Selector sel = selectors.get(n);
-            Match match = sel.createMatch();
-            allPseudoClasses.addAll(match.pseudoClasses);
-            idCount += match.idCount;
-            styleClassCount += match.styleClassCount;
-        }
-
-        return new Match(this, allPseudoClasses, idCount, styleClassCount);
-    }
-
-    @Override
-    public boolean applies(final Styleable styleable) {
-        return applies(styleable, selectors.size()-1, null, 0);
-    }
-
-    @Override
-    boolean applies(final Styleable styleable, Set<PseudoClass>[] triggerStates, int depth) {
-        
-        assert (triggerStates == null || depth < triggerStates.length);
-        if (triggerStates != null && triggerStates.length <= depth) {
-            return false;
-        }
-        
-        // 
-        // We only care about pseudo-class if the selector applies. But in
-        // the case of a compound selector, we don't know whether it applies
-        // until all the selectors have been checked (in the worse case). So
-        // the setting of pseudo-class has to be deferred until we know
-        // that this compound selector applies. So we'll send a new 
-        // PseudoClassSet[] and if the compound selector applies, 
-        // just copy the state back. 
-        //
-        final Set<PseudoClass>[] tempStates = triggerStates != null 
-                ? new PseudoClassState[triggerStates.length] : null;
-        
-        final boolean applies = applies(styleable, selectors.size()-1, tempStates, depth);
-        
-        if (applies && tempStates != null) {
-            
-            for(int n=0; n<triggerStates.length; n++) {
-                                
-                final Set<PseudoClass> pseudoClassOut = triggerStates[n];
-                final Set<PseudoClass> pseudoClassIn = tempStates[n];
-                
-                if (pseudoClassOut != null) {
-                    pseudoClassOut.addAll(pseudoClassIn);
-                } else {
-                    triggerStates[n] = pseudoClassIn;
-                } 
-            
-            }
-        }
-        return applies;
-    }
-
-    private boolean applies(final Styleable styleable, final int index, Set<PseudoClass>[] triggerStates, int depth) {
-        // If the index is < 0 then we know we don't apply
-        if (index < 0) return false;
-
-        // Simply check the selector associated with this index and see if it
-        // applies to the Node
-        if (! selectors.get(index).applies(styleable, triggerStates, depth)) return false;
-
-        // If there are no more selectors to check (ie: index == 0) then we
-        // know we know we apply
-        if (index == 0) return true;
-
-        // We have not yet checked all the selectors in this CompoundSelector,
-        // so now we need to find the next parent and try again. If the
-        // relationship between this selector and its ancestor selector is
-        // "CHILD" then it is required that the parent scenegraph node match
-        // the ancestor selector. Otherwise, we just walk up the scenegraph
-        // until we find an ancestor node that matches the selector. If we
-        // manage to walk all the way to the top without having satisfied all
-        // of the selectors, then we know it doesn't apply.
-        final Combinator relationship = relationships.get(index-1);
-        if (relationship == Combinator.CHILD) {
-            final Styleable parent = styleable.getStyleableParent();
-            if (parent == null) return false;
-            // If this call succeeds, then all preceding selectors will have
-            // matched due to the recursive nature of the call
-            return applies(parent, index - 1, triggerStates, ++depth);
-        } else {
-             Styleable parent = styleable.getStyleableParent();
-            while (parent != null) {
-                boolean answer = applies(parent, index - 1, triggerStates, ++depth);
-                // If a call to stateMatches succeeded, then we know that
-                // all preceding selectors will have also matched.
-                if (answer) return true;
-                // Otherwise we need to get the next parent and try again
-                parent = parent.getStyleableParent();
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean stateMatches(final Styleable styleable, Set<PseudoClass> states) {
-        return stateMatches(styleable, states, selectors.size()-1);
-    }
-
-    private boolean stateMatches(Styleable styleable, Set<PseudoClass> states, int index) {
-        // If the index is < 0 then we know we don't match
-        if (index < 0) return false;
-
-        // Simply check the selector associated with this index and see if it
-        // matches the Node and states provided.
-        if (! selectors.get(index).stateMatches(styleable, states)) return false;
-
-        // If there are no more selectors to match (ie: index == 0) then we
-        // know we have successfully matched
-        if (index == 0) return true;
-
-        // We have not yet checked all the selectors in this CompoundSelector,
-        // so now we need to find the next parent and try again. If the
-        // relationship between this selector and its ancestor selector is
-        // "CHILD" then it is required that the parent scenegraph node match
-        // the ancestor selector. Otherwise, we just walk up the scenegraph
-        // until we find an ancestor node that matches the selector. If we
-        // manage to walk all the way to the top without having satisfied all
-        // of the selectors, then we know it doesn't match.
-        final Combinator relationship = relationships.get(index - 1);
-        if (relationship == Combinator.CHILD) {
-            final Styleable parent = styleable.getStyleableParent();
-            if (parent == null) return false;
-            if (selectors.get(index-1).applies(parent)) {
-                // If this call succeeds, then all preceding selectors will have
-                // matched due to the recursive nature of the call
-                Set<PseudoClass> parentStates = parent.getPseudoClassStates();
-                return stateMatches(parent, parentStates, index - 1);
-            }
-        } else {
-            Styleable parent = styleable.getStyleableParent();
-            while (parent != null) {
-                if (selectors.get(index-1).applies(parent)) { 
-                    Set<PseudoClass> parentStates = parent.getPseudoClassStates();
-                    return stateMatches(parent, parentStates, index - 1);
-                }
-                // Otherwise we need to get the next parent and try again
-                parent = parent.getStyleableParent();
-            }
-        }
-
-        return false;
-    }
-
-    private  int hash = -1;
-
-    /* Hash code is used in Style's hash code and Style's hash
-       code is used by StyleHelper */
-    @Override
-    public int hashCode() {
-        if (hash == -1) {
-            for (int i = 0, max=selectors.size(); i<max; i++) 
-                hash = 31 * (hash + selectors.get(i).hashCode());
-            for (int i = 0, max=relationships.size(); i<max; i++) 
-                hash = 31 * (hash + relationships.get(i).hashCode());
-        }
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final CompoundSelector other = (CompoundSelector) obj;
-        if (other.selectors.size() != selectors.size()) return false;
-        // Avoid ArrayList equals since it uses enhanced for loop
-        for (int i = 0, max=selectors.size(); i<max; i++) {
-            if (!other.selectors.get(i).equals(selectors.get(i))) return false;
-        }
-        // Avoid ArrayList equals since it uses enhanced for loop
-        if (other.relationships.size() != relationships.size()) return false;
-        for (int i = 0, max=relationships.size(); i<max; i++) {
-            if (!other.relationships.get(i).equals(relationships.get(i))) return false;
-        }
-        return true;
-    }
-
-    @Override public String toString() {
-        StringBuilder sbuf = new StringBuilder(); 
-        sbuf.append(selectors.get(0));
-        for(int n=1; n<selectors.size(); n++) {
-            sbuf.append(relationships.get(n-1));
-            sbuf.append(selectors.get(n));
-        }
-        return sbuf.toString();
-    }
-
-    public final void writeBinary(final DataOutputStream os, final StringStore stringStore)
-            throws IOException
-    {
-        super.writeBinary(os, stringStore);
-        os.writeShort(selectors.size());
-        for (int n=0; n< selectors.size(); n++) selectors.get(n).writeBinary(os,stringStore);
-        os.writeShort(relationships.size());
-        for (int n=0; n< relationships.size(); n++) os.writeByte(relationships.get(n).ordinal());
-    }
-
-    public static CompoundSelector readBinary(int bssVersion, final DataInputStream is, final String[] strings)
-            throws IOException
-    {
-
-        final int nSelectors = is.readShort();
-        final List<SimpleSelector> selectors = new ArrayList<SimpleSelector>();
-        for (int n=0; n<nSelectors; n++) {
-            selectors.add((SimpleSelector)Selector.readBinary(bssVersion, is,strings));
-        }
-
-        final int nRelationships = is.readShort();
-
-        final List<Combinator> relationships = new ArrayList<Combinator>();
-        for (int n=0; n<nRelationships; n++) {
-            final int ordinal = is.readByte();
-            if (ordinal == Combinator.CHILD.ordinal()) 
-                relationships.add(Combinator.CHILD);
-            else if (ordinal == Combinator.DESCENDANT.ordinal()) 
-                relationships.add(Combinator.DESCENDANT);
-            else {
-                assert false : "error deserializing CompoundSelector: Combinator = " + ordinal;
-                relationships.add(Combinator.DESCENDANT);
-            }
-        }
-        return new CompoundSelector(selectors, relationships);
-    }
-}
--- /dev/null	2015-09-03 15:31:11.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/CompoundSelector.java	2015-09-03 15:31:09.601929700 -0700
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+import com.sun.javafx.css.Combinator;
+import com.sun.javafx.css.PseudoClassState;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+
+/**
+ * A compound selector which behaves according to the CSS standard. The selector is 
+ * composed of one or more <code>Selectors</code>, along with an array of 
+ * <code>CompoundSelectorRelationships</code> indicating the required relationship at each 
+ * stage.  There must be exactly one less <code>Combinator</code> than 
+ * there are selectors.
+ * <p>
+ * For example, the parameters <code>[selector1, selector2, selector3]</code>
+ * and <code>[Combinator.CHILD, Combinator.DESCENDANT]</code> will match 
+ * a component when all of the following conditions hold:
+ * <ol>
+ * <li>The component itself is matched by selector3
+ * <li>The component has an ancestor which is matched by selector2
+ * <li>The ancestor matched in step 2 is a direct CHILD of a component 
+ * matched by selector1
+ * </ol>
+ * In other words, the compound selector specified above is (in CSS syntax) 
+ * <code>selector1 &gt; selector2 selector3</code>.  The greater-than (&gt;) 
+ * between selector1 and selector2 specifies a direct CHILD, whereas the 
+ * whitespace between selector2 and selector3 corresponds to
+ * <code>Combinator.DESCENDANT</code>.
+ *
+ * @since 9
+ */
+final public class CompoundSelector extends Selector {
+
+    private final List<SimpleSelector> selectors;
+    /**
+     * The selectors that make up this compound selector
+     * @return Immutable List&lt;SimpleSelector&gt;
+     */
+    public List<SimpleSelector> getSelectors() {
+        return selectors;
+    }
+
+    private final List<Combinator> relationships;
+    // /**
+    //  * The relationships between the selectors
+    //  * @return Immutable List&lt;Combinator&gt;
+    //  */
+    // public List<Combinator> getRelationships() {
+    //     return relationships;
+    // }
+
+    /**
+     * Creates a <code>CompoundSelector</code> from a list of selectors and a
+     * list of <code>Combinator</code> relationships.  There must be exactly one
+     * less <code>Combinator</code> than there are selectors.
+     */
+    CompoundSelector(List<SimpleSelector> selectors, List<Combinator> relationships) {
+        this.selectors = 
+            (selectors != null) 
+                ? Collections.unmodifiableList(selectors) 
+                : Collections.EMPTY_LIST;
+        this.relationships =
+            (relationships != null) 
+                ? Collections.unmodifiableList(relationships) 
+                : Collections.EMPTY_LIST;
+    }
+        
+    private CompoundSelector() {
+        this(null, null);
+    }
+    
+
+    @Override public Match createMatch() {
+        final PseudoClassState allPseudoClasses = new PseudoClassState();
+        int idCount = 0;
+        int styleClassCount = 0;
+
+        for(int n=0, nMax=selectors.size(); n<nMax; n++) {
+            Selector sel = selectors.get(n);
+            Match match = sel.createMatch();
+            allPseudoClasses.addAll(match.pseudoClasses);
+            idCount += match.idCount;
+            styleClassCount += match.styleClassCount;
+        }
+
+        return new Match(this, allPseudoClasses, idCount, styleClassCount);
+    }
+
+    @Override public boolean applies(final Styleable styleable) {
+        return applies(styleable, selectors.size()-1, null, 0);
+    }
+
+    @Override public boolean applies(final Styleable styleable, Set<PseudoClass>[] triggerStates, int depth) {
+        
+        assert (triggerStates == null || depth < triggerStates.length);
+        if (triggerStates != null && triggerStates.length <= depth) {
+            return false;
+        }
+        
+        // 
+        // We only care about pseudo-class if the selector applies. But in
+        // the case of a compound selector, we don't know whether it applies
+        // until all the selectors have been checked (in the worse case). So
+        // the setting of pseudo-class has to be deferred until we know
+        // that this compound selector applies. So we'll send a new 
+        // PseudoClassSet[] and if the compound selector applies, 
+        // just copy the state back. 
+        //
+        final Set<PseudoClass>[] tempStates = triggerStates != null 
+                ? new PseudoClassState[triggerStates.length] : null;
+        
+        final boolean applies = applies(styleable, selectors.size()-1, tempStates, depth);
+        
+        if (applies && tempStates != null) {
+            
+            for(int n=0; n<triggerStates.length; n++) {
+                                
+                final Set<PseudoClass> pseudoClassOut = triggerStates[n];
+                final Set<PseudoClass> pseudoClassIn = tempStates[n];
+                
+                if (pseudoClassOut != null) {
+                    pseudoClassOut.addAll(pseudoClassIn);
+                } else {
+                    triggerStates[n] = pseudoClassIn;
+                } 
+            
+            }
+        }
+        return applies;
+    }
+
+    private boolean applies(final Styleable styleable, final int index, Set<PseudoClass>[] triggerStates, int depth) {
+        // If the index is < 0 then we know we don't apply
+        if (index < 0) return false;
+
+        // Simply check the selector associated with this index and see if it
+        // applies to the Node
+        if (! selectors.get(index).applies(styleable, triggerStates, depth)) return false;
+
+        // If there are no more selectors to check (ie: index == 0) then we
+        // know we know we apply
+        if (index == 0) return true;
+
+        // We have not yet checked all the selectors in this CompoundSelector,
+        // so now we need to find the next parent and try again. If the
+        // relationship between this selector and its ancestor selector is
+        // "CHILD" then it is required that the parent scenegraph node match
+        // the ancestor selector. Otherwise, we just walk up the scenegraph
+        // until we find an ancestor node that matches the selector. If we
+        // manage to walk all the way to the top without having satisfied all
+        // of the selectors, then we know it doesn't apply.
+        final Combinator relationship = relationships.get(index-1);
+        if (relationship == Combinator.CHILD) {
+            final Styleable parent = styleable.getStyleableParent();
+            if (parent == null) return false;
+            // If this call succeeds, then all preceding selectors will have
+            // matched due to the recursive nature of the call
+            return applies(parent, index - 1, triggerStates, ++depth);
+        } else {
+             Styleable parent = styleable.getStyleableParent();
+            while (parent != null) {
+                boolean answer = applies(parent, index - 1, triggerStates, ++depth);
+                // If a call to stateMatches succeeded, then we know that
+                // all preceding selectors will have also matched.
+                if (answer) return true;
+                // Otherwise we need to get the next parent and try again
+                parent = parent.getStyleableParent();
+            }
+        }
+        return false;
+    }
+
+    @Override public boolean stateMatches(final Styleable styleable, Set<PseudoClass> states) {
+        return stateMatches(styleable, states, selectors.size()-1);
+    }
+
+    private boolean stateMatches(Styleable styleable, Set<PseudoClass> states, int index) {
+        // If the index is < 0 then we know we don't match
+        if (index < 0) return false;
+
+        // Simply check the selector associated with this index and see if it
+        // matches the Node and states provided.
+        if (! selectors.get(index).stateMatches(styleable, states)) return false;
+
+        // If there are no more selectors to match (ie: index == 0) then we
+        // know we have successfully matched
+        if (index == 0) return true;
+
+        // We have not yet checked all the selectors in this CompoundSelector,
+        // so now we need to find the next parent and try again. If the
+        // relationship between this selector and its ancestor selector is
+        // "CHILD" then it is required that the parent scenegraph node match
+        // the ancestor selector. Otherwise, we just walk up the scenegraph
+        // until we find an ancestor node that matches the selector. If we
+        // manage to walk all the way to the top without having satisfied all
+        // of the selectors, then we know it doesn't match.
+        final Combinator relationship = relationships.get(index - 1);
+        if (relationship == Combinator.CHILD) {
+            final Styleable parent = styleable.getStyleableParent();
+            if (parent == null) return false;
+            if (selectors.get(index-1).applies(parent)) {
+                // If this call succeeds, then all preceding selectors will have
+                // matched due to the recursive nature of the call
+                Set<PseudoClass> parentStates = parent.getPseudoClassStates();
+                return stateMatches(parent, parentStates, index - 1);
+            }
+        } else {
+            Styleable parent = styleable.getStyleableParent();
+            while (parent != null) {
+                if (selectors.get(index-1).applies(parent)) { 
+                    Set<PseudoClass> parentStates = parent.getPseudoClassStates();
+                    return stateMatches(parent, parentStates, index - 1);
+                }
+                // Otherwise we need to get the next parent and try again
+                parent = parent.getStyleableParent();
+            }
+        }
+
+        return false;
+    }
+
+    private  int hash = -1;
+
+    /* Hash code is used in Style's hash code and Style's hash
+       code is used by StyleHelper */
+    @Override public int hashCode() {
+        if (hash == -1) {
+            for (int i = 0, max=selectors.size(); i<max; i++) 
+                hash = 31 * (hash + selectors.get(i).hashCode());
+            for (int i = 0, max=relationships.size(); i<max; i++) 
+                hash = 31 * (hash + relationships.get(i).hashCode());
+        }
+        return hash;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final CompoundSelector other = (CompoundSelector) obj;
+        if (other.selectors.size() != selectors.size()) return false;
+        // Avoid ArrayList equals since it uses enhanced for loop
+        for (int i = 0, max=selectors.size(); i<max; i++) {
+            if (!other.selectors.get(i).equals(selectors.get(i))) return false;
+        }
+        // Avoid ArrayList equals since it uses enhanced for loop
+        if (other.relationships.size() != relationships.size()) return false;
+        for (int i = 0, max=relationships.size(); i<max; i++) {
+            if (!other.relationships.get(i).equals(relationships.get(i))) return false;
+        }
+        return true;
+    }
+
+    @Override public String toString() {
+        StringBuilder sbuf = new StringBuilder(); 
+        sbuf.append(selectors.get(0));
+        for(int n=1; n<selectors.size(); n++) {
+            sbuf.append(relationships.get(n-1));
+            sbuf.append(selectors.get(n));
+        }
+        return sbuf.toString();
+    }
+
+    @Override protected final void writeBinary(final DataOutputStream os, final StyleConverter.StringStore stringStore)
+            throws IOException
+    {
+        super.writeBinary(os, stringStore);
+        os.writeShort(selectors.size());
+        for (int n=0; n< selectors.size(); n++) selectors.get(n).writeBinary(os,stringStore);
+        os.writeShort(relationships.size());
+        for (int n=0; n< relationships.size(); n++) os.writeByte(relationships.get(n).ordinal());
+    }
+
+    static CompoundSelector readBinary(int bssVersion, final DataInputStream is, final String[] strings)
+            throws IOException
+    {
+
+        final int nSelectors = is.readShort();
+        final List<SimpleSelector> selectors = new ArrayList<SimpleSelector>();
+        for (int n=0; n<nSelectors; n++) {
+            selectors.add((SimpleSelector)Selector.readBinary(bssVersion, is,strings));
+        }
+
+        final int nRelationships = is.readShort();
+
+        final List<Combinator> relationships = new ArrayList<Combinator>();
+        for (int n=0; n<nRelationships; n++) {
+            final int ordinal = is.readByte();
+            if (ordinal == Combinator.CHILD.ordinal()) 
+                relationships.add(Combinator.CHILD);
+            else if (ordinal == Combinator.DESCENDANT.ordinal()) 
+                relationships.add(Combinator.DESCENDANT);
+            else {
+                assert false : "error deserializing CompoundSelector: Combinator = " + ordinal;
+                relationships.add(Combinator.DESCENDANT);
+            }
+        }
+        return new CompoundSelector(selectors, relationships);
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSLexer.java	2015-09-03 15:31:18.200421500 -0700
+++ /dev/null	2015-09-03 15:31:19.000000000 -0700
@@ -1,1009 +0,0 @@
-/*
- * Copyright (c) 2010, 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.css.parser;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.Map;
-
-
-final class CSSLexer {
-
-    /* Lazy instantiation */
-    private static class InstanceHolder {
-        final static CSSLexer INSTANCE = new CSSLexer();
-    }
-
-    public static CSSLexer getInstance() {
-        return InstanceHolder.INSTANCE;
-    }
-
-    final static int STRING = 10;
-    final static int IDENT = 11;
-    final static int FUNCTION = 12;
-    final static int NUMBER = 13;
-    final static int CM = 14;
-    final static int EMS = 15;
-    final static int EXS = 16;
-    final static int IN = 17;
-    final static int MM = 18;
-    final static int PC = 19;
-    final static int PT = 20;
-    final static int PX = 21;
-    final static int PERCENTAGE = 22;
-    final static int DEG = 23;
-    final static int GRAD = 24;
-    final static int RAD = 25;
-    final static int TURN = 26;
-    final static int GREATER = 27;
-    final static int LBRACE = 28;
-    final static int RBRACE = 29;
-    final static int SEMI = 30;
-    final static int COLON = 31;
-    final static int SOLIDUS = 32;
-    final static int STAR = 33;
-    final static int LPAREN = 34;
-    final static int RPAREN = 35;
-    final static int COMMA = 36;
-    final static int HASH = 37;
-    final static int DOT = 38;
-    final static int IMPORTANT_SYM = 39;
-    final static int WS = 40;
-    final static int NL = 41;
-    final static int FONT_FACE = 42;
-    final static int URL = 43;
-    final static int IMPORT = 44;
-    final static int SECONDS = 45;
-    final static int MS = 46;
-    final static int AT_KEYWORD = 47;
-
-    private final Recognizer A = (c) -> c == 'a' || c == 'A';
-    private final Recognizer B = (c) -> c == 'b' || c == 'B';
-    private final Recognizer C = (c) -> c == 'c' || c == 'C';
-    private final Recognizer D = (c) -> c == 'd' || c == 'D';
-    private final Recognizer E = (c) -> c == 'e' || c == 'E';
-    private final Recognizer F = (c) -> c == 'f' || c == 'F';
-    private final Recognizer G = (c) -> c == 'g' || c == 'G';
-    private final Recognizer H = (c) -> c == 'h' || c == 'H';
-    private final Recognizer I = (c) -> c == 'i' || c == 'I';
-    private final Recognizer J = (c) -> c == 'j' || c == 'J';
-    private final Recognizer K = (c) -> c == 'k' || c == 'K';
-    private final Recognizer L = (c) -> c == 'l' || c == 'L';
-    private final Recognizer M = (c) -> c == 'm' || c == 'M';
-    private final Recognizer N = (c) -> c == 'n' || c == 'N';
-    private final Recognizer O = (c) -> c == 'o' || c == 'O';
-    private final Recognizer P = (c) -> c == 'p' || c == 'P';
-    private final Recognizer Q = (c) -> c == 'q' || c == 'Q';
-    private final Recognizer R = (c) -> c == 'r' || c == 'R';
-    private final Recognizer S = (c) -> c == 's' || c == 'S';
-    private final Recognizer T = (c) -> c == 't' || c == 'T';
-    private final Recognizer U = (c) -> c == 'u' || c == 'U';
-    private final Recognizer V = (c) -> c == 'v' || c == 'V';
-    private final Recognizer W = (c) -> c == 'w' || c == 'W';
-    private final Recognizer X = (c) -> c == 'x' || c == 'X';
-    private final Recognizer Y = (c) -> c == 'y' || c == 'Y';
-    private final Recognizer Z = (c) -> c == 'z' || c == 'Z';
-    private final Recognizer ALPHA =  (c) -> ('a' <= c && c <= 'z') ||
-           ('A' <= c && c <= 'Z');
-
-    private final Recognizer NON_ASCII = (c) -> '\u0080' <= c && c <= '\uFFFF';
-
-    private final Recognizer DOT_CHAR =        (c) -> c == '.';
-    private final Recognizer GREATER_CHAR =    (c) -> c == '>';
-    private final Recognizer LBRACE_CHAR =     (c) -> c == '{';
-    private final Recognizer RBRACE_CHAR =     (c) -> c == '}';
-    private final Recognizer SEMI_CHAR  =      (c) -> c == ';';
-    private final Recognizer COLON_CHAR =      (c) -> c == ':';
-    private final Recognizer SOLIDUS_CHAR =    (c) -> c == '/';
-    private final Recognizer MINUS_CHAR =      (c) -> c == '-';
-    private final Recognizer PLUS_CHAR =       (c) -> c == '+';
-    private final Recognizer STAR_CHAR =       (c) -> c == '*';
-    private final Recognizer LPAREN_CHAR =     (c) -> c == '(';
-    private final Recognizer RPAREN_CHAR =     (c) -> c == ')';
-    private final Recognizer COMMA_CHAR =      (c) -> c == ',';
-    private final Recognizer UNDERSCORE_CHAR = (c) -> c == '_';
-    private final Recognizer HASH_CHAR =       (c) -> c == '#';
-
-    private final Recognizer WS_CHARS = (c) -> c == ' '  ||
-           c == '\t' ||
-           c == '\r' ||
-           c == '\n' ||
-           c == '\f';
-    private final Recognizer NL_CHARS = (c) -> (c == '\r' || c == '\n');
-
-    private final Recognizer DIGIT = (c) -> '0' <= c && c <= '9';
-
-    private final Recognizer HEX_DIGIT = (c) -> ('0' <= c && c <= '9') ||
-           ('a' <= c && c <= 'f') ||
-           ('A' <= c && c <= 'F');
-
-    // The initial accepts any character
-    final LexerState initState = new LexerState("initState", null) {
-        @Override public boolean accepts(int c) { return true; }
-    };
-
-    final LexerState hashState = new LexerState("hashState",
-        HASH_CHAR
-    );
-
-    final LexerState minusState = new LexerState("minusState",
-        MINUS_CHAR
-    );
-
-    final LexerState plusState = new LexerState("plusState",
-        PLUS_CHAR
-    );
-
-    // The dot char is either just a dot or may be the start of a number
-    final LexerState dotState = new LexerState(DOT, "dotState",
-        DOT_CHAR
-    );
-
-    // [_a-z]|{nonascii}|{escape}
-    final LexerState nmStartState = new LexerState(IDENT, "nmStartState",
-        UNDERSCORE_CHAR, ALPHA
-    );
-
-    // nmchar		[_a-z0-9-]|{nonascii}|{escape}
-    final LexerState nmCharState = new LexerState(IDENT, "nmCharState",
-        UNDERSCORE_CHAR, ALPHA, DIGIT, MINUS_CHAR
-    );
-
-    // same as nmchar, but need to differentiate between nmchar in ident and
-    // nmchar in
-    final LexerState hashNameCharState = new LexerState(HASH, "hashNameCharState",
-        UNDERSCORE_CHAR, ALPHA, DIGIT, MINUS_CHAR
-    );
-
-    // lparen after ident implies function
-    final LexerState lparenState = new LexerState(FUNCTION, "lparenState",
-        LPAREN_CHAR
-    ) {
-        @Override public int getType() {
-
-            if (text.indexOf("url(") == 0) {
-                try {
-                    return consumeUrl();
-                } catch (IOException ioe) {
-                    return Token.INVALID;
-                }
-            }
-            return super.getType();
-        }
-    };
-
-
-    // initial digits in a number
-    final LexerState leadingDigitsState = new LexerState(NUMBER,"leadingDigitsState",
-        DIGIT
-    );
-
-    // If the dot char follows leading digits, a plus or a minus, then it is
-    // a decimal mark
-    final LexerState decimalMarkState = new LexerState("decimalMarkState",
-        DOT_CHAR
-    );
-
-    // digits following decimal mark
-    final LexerState trailingDigitsState = new LexerState(NUMBER,"trailingDigitsState",
-        DIGIT
-    );
-    
-    // http://www.w3.org/TR/css3-values/
-    final LexerState unitsState = new UnitsState();
-
-    private Map<LexerState, LexerState[]> createStateMap() {
-
-        Map<LexerState, LexerState[]> map =
-                new HashMap<LexerState, LexerState[]>();
-
-        // initState -- [#] --> hashState
-        // initState -- [-] --> minusState
-        // initState -- [+] --> plusState
-        // initState -- [_a-z] --> nmStartState
-        // initState -- [0-9] --> leadingDigitsState
-        // initState -- [.] --> dotState
-        map.put(
-                initState,
-                new LexerState[] {
-                    hashState,
-                    minusState,
-                    nmStartState,
-                    plusState,
-                    minusState,
-                    leadingDigitsState,
-                    dotState
-                }
-        );
-
-        // minus could be the start of an ident or a number
-        // minusState -- [_a-z] --> nmStartState
-        // minusState -- [0-9] --> leadingDigitsState
-        // minusState -- [.] --> decimalMarkState
-        map.put(
-                minusState,
-                new LexerState[] {
-                    nmStartState,
-                    leadingDigitsState,
-                    decimalMarkState,
-                }
-        );
-
-        //
-        // # {name}
-        // hash {nmchar}+
-        // hashState -- [_a-z0-9-] --> nmCharState
-        // nmCharState -- [_a-z0-9-] --> nmCharState
-        //
-        map.put(
-                hashState,
-                new LexerState[] {
-                    hashNameCharState
-                }
-        );
-
-        map.put(
-                hashNameCharState,
-                new LexerState[] {
-                    hashNameCharState,
-                }
-        );
-
-
-        //
-        // {ident}
-        // ident '-'? {nmchar}+
-        // nmStartState -- [_a-z0-9-] --> nmCharState
-        // nmCharState -- [_a-z0-9-] --> nmCharState
-        // nmCharState -- [(] --> lparenState
-        //
-        map.put(
-                nmStartState,
-                new LexerState[] {
-                    nmCharState
-                }
-        );
-
-        map.put(
-                nmCharState,
-                new LexerState[] {
-                    nmCharState,
-                    lparenState
-                }
-        );
-
-        // from +/- state, next state must be a digit or a dot
-        map.put(
-                plusState,
-                new LexerState[] {
-                    leadingDigitsState,
-                    decimalMarkState
-                }
-        );
-
-        // from leadingDigitsState, next state must be
-        // another digit, a decimal mark, or units
-        map.put(
-                leadingDigitsState,
-                new LexerState[] {
-                    leadingDigitsState,
-                    decimalMarkState,
-                    unitsState
-                }
-        );
-
-        // from decimal mark, next state must be a digit.
-        // Need to map both dotState and decimalMarkState
-        // since dot might be the first character and would
-        // not be seen as a decimal point.
-        map.put(
-                dotState,
-                new LexerState[] {
-                    trailingDigitsState
-                }
-        );
-
-        map.put(
-                decimalMarkState,
-                new LexerState[] {
-                    trailingDigitsState
-                }
-        );
-
-        // from trailingDigitsState, next state must be another digit or units
-        map.put(
-                trailingDigitsState,
-                new LexerState[] {
-                    trailingDigitsState,
-                    unitsState,
-                }
-        );
-
-        // UnitsState stays in UnitsState
-        map.put(
-                unitsState,
-                new LexerState[] {
-                    unitsState
-                }
-        );
-
-        return map;
-    }
-
-    CSSLexer() {
-        this.stateMap = createStateMap();
-        this.text = new StringBuilder(64);
-        this.currentState = initState;
-    }
-
-    public void setReader(Reader reader) {
-        this.reader = reader;
-        lastc = -1;
-        pos = offset = 0;
-        line = 1;
-        this.currentState = initState;
-        this.token = null;
-        try {
-            this.ch = readChar();
-        } catch (IOException ioe) {
-            token = Token.EOF_TOKEN;
-        }
-    }
-
-    private Token scanImportant()  throws IOException{
-        // CSS 2.1 grammar for important_sym
-        // "!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T}
-        final Recognizer[] important_sym =
-                new Recognizer[] { I, M, P, O, R, T, A, N, T };
-        int current = 0;
-        
-        text.append((char)ch);
-        
-        // get past the '!'
-        ch = readChar();
-       
-        while(true) {
-            
-            switch (ch) {
-
-                case Token.EOF:
-                    token = Token.EOF_TOKEN;
-                    return token;
-
-                case '/':                    
-                    ch = readChar();
-                    if (ch == '*') skipComment();
-                    else if (ch == '/') skipEOL();
-                    else {
-                        text.append('/').append((char)ch);
-                        int temp = offset;
-                        offset = pos;
-                        return new Token(Token.INVALID, text.toString(), line, temp);
-                    }
-                    break;
-
-                case ' ':
-                case '\t':
-                case '\r':
-                case '\n':
-                case '\f':
-                    ch = readChar();
-                    break;
-
-                default:
-                    boolean accepted = true;
-                    while(accepted && current < important_sym.length) {
-                        accepted = important_sym[current++].recognize(ch);
-                        text.append((char)ch);
-                        ch = readChar();
-                    }
-                    if (accepted) {
-                        final int temp = offset;
-                        offset = pos-1; // will have read one char too many
-                        return new Token(IMPORTANT_SYM, "!important", line, temp);
-                    } else {
-                        while (ch != ';' &&
-                               ch != '}' &&
-                               ch != Token.EOF) {
-                            ch = readChar();
-                        }
-                        if (ch != Token.EOF) {
-                            final int temp = offset;
-                            offset = pos-1; // will have read one char too many
-                            return new Token(Token.SKIP, text.toString(), line, temp);
-                        } else {
-                            return Token.EOF_TOKEN;
-                        }
-                    }
-            }
-        }
-    }
-
-    // http://www.ietf.org/rfc/rfc3986
-    // http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#uri
-    // http://www.w3.org/TR/css3-syntax/#consume-a-url-token
-    private int consumeUrl() throws IOException {
-
-        text.delete(0, text.length());
-
-        // skip initial white space
-        while (WS_CHARS.recognize(ch)) {
-            ch = readChar();
-        }
-
-        if (ch == Token.EOF) {
-            return Token.EOF;
-        }
-
-        if (ch == '\'' || ch == '"') {
-
-            int endQuote = ch;
-
-            ch = readChar();
-
-            // consume the string
-            while (ch != endQuote) {
-
-                if (ch == Token.EOF) {
-                    break;
-                }
-
-                // un-escaped newline is an error
-                if (NL_CHARS.recognize(ch)) {
-                    break;
-                }
-
-                // handle escaped char
-                // Note: this block does not handle the algorithm for consuming hex-digits
-                if (ch == '\\') {
-
-                    ch = readChar();
-
-                    if (NL_CHARS.recognize(ch)) {
-
-                        // consume newline
-                        while(NL_CHARS.recognize(ch)) {
-                            ch = readChar();
-                        }
-
-                    } else if (ch != Token.EOF) {
-                        // if EOF, do nothing
-                        text.append((char)ch);
-                        ch = readChar();
-                    }
-
-                    continue;
-                }
-
-                text.append((char)ch);
-                ch = readChar();
-
-            }
-
-            if (ch == endQuote) {
-
-                ch = readChar();
-                while(WS_CHARS.recognize(ch)) {
-                    ch = readChar();
-                }
-
-                // After consuming white-space, the char has to be rparen or EOF. Error otherwise.
-                if (ch == ')') {
-                    // consume the rparen
-                    ch = readChar();
-                    return URL;
-                }
-
-                if(ch == Token.EOF) {
-                    return URL;
-                }
-            }
-
-        } else {
-
-            // TODO: a lot of repeat code from above
-            text.append((char)ch);
-            ch = readChar();
-
-            while (true) {
-
-                while (WS_CHARS.recognize(ch)) {
-                    ch = readChar();
-                }
-
-                if (ch == ')') {
-                    // consume the rparen
-                    ch = readChar();
-                    return URL;
-                }
-
-                if (ch == Token.EOF) {
-                    return URL;
-                }
-
-                // handle escaped char
-                // Note: this block does not handle the algorithm for consuming hex-digits
-                if (ch == '\\') {
-
-                    ch = readChar();
-
-                    if (NL_CHARS.recognize(ch)) {
-
-                        // consume newline
-                        while(NL_CHARS.recognize(ch)) {
-                            ch = readChar();
-                        }
-
-                    } else if (ch != Token.EOF) {
-                        // if EOF, do nothing
-                        text.append((char)ch);
-                        ch = readChar();
-                    }
-
-                    continue;
-                }
-
-                if (ch == '\'' || ch == '"' || ch == '(') {
-                    break;
-                }
-
-                text.append((char)ch);
-                ch = readChar();
-
-            }
-        }
-
-        // if we get to here, then the token is bad
-        // consume up to rparen or eof
-        while(true) {
-            int lastCh = ch;
-            if (ch == Token.EOF) {
-                return Token.EOF;
-            } else if (ch == ')' && lastCh != '\\') {
-                ch = readChar();
-                return Token.INVALID;
-            }
-
-            lastCh = ch;
-            ch = readChar();
-        }
-
-    }
-
-    private class UnitsState extends LexerState {
-
-        private final Recognizer[][] units = {
-        
-            // TODO: all units from http://www.w3.org/TR/css3-values/
-            // If units are added, getType and unitsMask must be updated!
-            { C, M },
-            { D, E, G },
-            { E, M },
-            { E, X },
-            { G, R, A, D },
-            { I, N },
-            { M, M },
-            { M, S },
-            { P, C },
-            { P, T },
-            { P, X },
-            { R, A, D },
-            { S },
-            { T, U, R, N },
-            { (c) -> c == '%'}
-        };
-        
-        // One bit per unit
-        private int unitsMask = 0x7FFF;
-
-        // Offset into inner array of units
-        private int index = -1;
-        
-        UnitsState() {
-            super(-1, "UnitsState", null);            
-        }
-        
-        @Override
-        public int getType() {
-            
-            int type = Token.INVALID;
-                
-            // Must keep this in sync with units array.
-            // Small switch will be faster than Math.log(oldMask)/Math.log(2) 
-            switch (unitsMask) {
-                case 0x1: type = CM; break;
-                case 0x2: type = DEG; break;
-                case 0x4: type = EMS; break;
-                case 0x8: type = EXS; break;
-                case 0x10: type = GRAD; break;
-                case 0x20: type = IN; break;
-                case 0x40: type = MM; break;
-                case 0x80: type = MS; break;
-                case 0x100: type = PC; break;
-                case 0x200: type = PT; break;
-                case 0x400: type = PX; break;
-                case 0x800: type = RAD; break;
-                case 0x1000: type = SECONDS; break;
-                case 0x2000: type = TURN; break;
-                case 0x4000: type = PERCENTAGE; break;
-                default: type = Token.INVALID;
-            }
-             
-            // reset
-            unitsMask = 0x7fff;
-            index = -1;
-            
-            return type;
-        }
-
-        @Override
-        public boolean accepts(int c) {
-            
-            // Ensure that something bogus like '10xyzzy' is 
-            // consumed as a token by only returning false
-            // if the char is not alpha or %
-            if (!ALPHA.recognize(c) && c != '%') {
-                return false;
-            }
-            
-            // If unitsMask is zero, then we've already figured out that 
-            // this is an invalid token, but we want to accept c so that 
-            // '10xyzzy' is consumed as a token, albeit an invalid one.
-            if (unitsMask == 0) return true;
-            
-            index += 1;
-
-            for (int n=0 ; n < units.length; n++) {
-                
-                final int u = 1 << n;
-                
-                // the unit at this index already failed. Move on.
-                if ((unitsMask & u) == 0) continue;
-
-                if ((index >= units[n].length) || !(units[n][index].recognize(c))) {
-                    // not a match, turn off this bit
-                    unitsMask &= ~u;
-                }
-                    
-            }
-
-
-            return true;
-        }
-
-    }
-        
-    private  void skipComment() throws IOException {
-        while(ch != -1) {
-            if (ch == '*') {
-                ch = readChar();
-                if (ch == '/') {
-                    offset = pos;
-                    ch=readChar();
-                    break;
-                }
-            } else {
-                ch = readChar();
-            }
-        }
-    }
-
-    private void skipEOL() throws IOException {
-
-        int lastc = ch;
-
-        while (ch != -1) {
-
-            ch = readChar();
-
-            // EOL is cr, lf, or crlf
-            if ((ch == '\n') || (lastc == '\r' && ch != '\n')) {
-                    break;
-            }
-        }
-
-    }
-
-    private int pos = 0;
-    private int offset = 0;
-    private int line = 1;
-    private int lastc = -1;
-
-    private int readChar() throws IOException {
-
-        int c = reader.read();
-
-        // only reset line and pos counters after having read a NL since
-        // a NL token is created after the readChar
-        if (lastc == '\n' || (lastc == '\r' && c != '\n')) {
-            // set pos to 1 since we've already read the first char of the new line
-            pos = 1; 
-            offset = 0;
-            line++;
-        } else {
-            pos++;
-        }
-        
-        lastc = c;
-        return c;
-    }
-
-    public Token nextToken() {
-
-        Token tok = null;
-        if (token != null) {
-            tok = token;
-            if (token.getType() != Token.EOF) token = null;
-        } else {
-            do {
-                tok = getToken();
-            } while (tok != null &&
-//                     tok.getType() != Token.EOF &&
-                     Token.SKIP_TOKEN.equals(tok));
-        }
-
-        // reset text buffer and currentState
-        text.delete(0,text.length());
-        currentState = initState;
-
-        return tok;
-    }
-
-    private Token getToken() {
-
-        try {
-            while (true) {
-                charNotConsumed = false;
-
-                final LexerState[] reachableStates =
-                        currentState != null ? stateMap.get(currentState) : null;
-
-                final int max = reachableStates != null ? reachableStates.length : 0;
-
-                LexerState newState = null;
-                for (int n=0; n<max && newState == null; n++) {
-                    final LexerState reachableState = reachableStates[n];
-                    if (reachableState.accepts(ch)) {
-                        newState = reachableState;
-                    }
-                }
-
-                if (newState != null) {
-
-                    // Some reachable state was reached. Keep going until
-                    // the char isn't accepted by any state
-                    currentState = newState;
-                    text.append((char)ch);
-                    ch = readChar();
-                    continue;
-
-                } else {
-
-                    // If none of the reachable states accepts the char,
-                    // then see if there is a token.
-
-                    final int type = currentState != null ? currentState.getType() : Token.INVALID;
-
-                    //
-                    // If the token is INVALID and
-                    // the currentState is something other than initState, then
-                    // there is an error, so return INVALID.
-                     //
-                    if (type != Token.INVALID ||
-                        !currentState.equals(initState)) {
-
-                        final String str = text.toString();
-                        Token tok = new Token(type, str, line, offset);
-                        // because the next char has already been read, 
-                        // the next token starts at pos-1
-                        offset = pos-1;
-
-                        // return here, but the next char has already been read.
-                        return tok;
-
-                    }
-                }
-
-                // The char wasn't accepted and there was no previous token.
-                switch (ch) {
-
-                    case -1:
-                        token = Token.EOF_TOKEN;
-                        return token;
-
-                    case '"':
-                    case '\'':
-
-                        text.append((char)ch);
-                        final int endq = ch;
-                        while((ch=readChar()) != -1) {
-                            text.append((char)ch);
-                            if (ch == endq) break;
-                        }
-
-                        if (ch != -1) {
-                            token = new Token(STRING, text.toString(), line, offset);
-                            offset = pos;
-                        } else {
-                            token = new Token(Token.INVALID, text.toString(), line, offset);
-                            offset = pos;
-                        }
-                        break;
-
-                    case '/':
-                        ch = readChar();
-                        if (ch == '*') {
-                            skipComment();
-                             if (ch != -1) {
-                                continue;
-                            } else {
-                                token = Token.EOF_TOKEN;
-                                return token;
-                            }
-                        } else if (ch == '/') {
-                            skipEOL();
-                            if (ch != -1) {
-                                continue;
-                            } else {
-                                token = Token.EOF_TOKEN;
-                                return token;
-                            }
-                        } else {
-                            // not a comment - a SOLIDUS
-                            token = new Token(SOLIDUS,"/", line, offset);
-                            offset = pos;
-                            charNotConsumed = true;
-                        }
-                        break;
-
-                    case '>':
-
-                        token = new Token(GREATER,">", line, offset);
-                        offset = pos;
-                        break;
-
-                    case '{':
-                        token = new Token(LBRACE,"{", line, offset);
-                        offset = pos;
-                        break;
-
-                    case '}':
-                        token = new Token(RBRACE,"}", line, offset);
-                        offset = pos;
-                        break;
-
-                    case ';':
-                        token = new Token(SEMI,";", line, offset);
-                        offset = pos;
-                        break;
-
-                    case ':':
-                        token = new Token(COLON,":", line, offset);
-                        offset = pos;
-                        break;
-
-                    case '*':
-                        token = new Token(STAR,"*", line, offset);
-                        offset = pos;
-                        break;
-
-                    case '(':
-                        token = new Token(LPAREN,"(", line, offset);
-                        offset = pos;
-                        break;
-
-                    case ')':
-                        token = new Token(RPAREN,")", line, offset);
-                        offset = pos;
-                        break;
-
-                    case ',':
-                        token = new Token(COMMA,",", line, offset);
-                        offset = pos;
-                        break;
-
-                    case '.':
-                        token = new Token(DOT,".", line, offset);
-                        offset = pos;
-                        break;
-
-                    case ' ':
-                    case '\t':
-                    case '\f':
-                        token = new Token(WS, Character.toString((char)ch), line, offset);
-                        offset = pos;
-                        break;
-
-
-                    case '\r':
-                        token = new Token(NL, "\\r", line, offset);
-                        // offset and pos are reset on next readChar
-                        
-                        ch = readChar();
-                        if (ch == '\n') {
-                            token = new Token(NL, "\\r\\n", line, offset);
-                            // offset and pos are reset on next readChar
-                        } else {
-                            // already read the next character, so return
-                            // return the NL token here (avoid the readChar
-                            // at the end of the loop below)
-                            final Token tok = token;
-                            token = (ch == -1) ? Token.EOF_TOKEN : null;
-                            return tok;
-                        }                        
-                        break;
-
-                    case '\n':
-                        token = new Token(NL, "\\n", line, offset);
-                        // offset and pos are reset on next readChar
-                        break;
-
-                    case '!':
-                        Token tok = scanImportant();
-                        return tok;
-
-                    case '@':
-                        token = new Token(AT_KEYWORD, "@", line, offset);
-                        offset = pos;
-                        break;
-
-                    default:
-//                      System.err.println("hit default case: ch = " + Character.toString((char)ch));
-                        token = new Token(Token.INVALID, Character.toString((char)ch), line, offset);
-                        offset = pos;
-                        break;
-                }
-
-                if (token == null) {
-//                    System.err.println("token is null! ch = " + Character.toString((char)ch));
-                    token = new Token(Token.INVALID, null, line, offset);
-                    offset = pos;
-                } else if (token.getType() == Token.EOF) {
-                    return token;
-                } 
-
-                if (ch != -1 && !charNotConsumed) ch = readChar();
-
-                final Token tok = token;
-                token = null;
-                return tok;
-            }
-        } catch (IOException ioe) {
-            token = Token.EOF_TOKEN;
-            return token;
-        }
-    }
-    
-    private int ch;
-    private boolean charNotConsumed = false;
-    private Reader reader;
-    private Token token;
-    private final Map<LexerState, LexerState[]> stateMap;
-    private LexerState currentState;
-    private final StringBuilder text;
-
-}
--- /dev/null	2015-09-03 15:31:19.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/CssLexer.java	2015-09-03 15:31:17.409376300 -0700
@@ -0,0 +1,1003 @@
+/*
+ * Copyright (c) 2010, 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.css;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.sun.javafx.css.parser.LexerState;
+import com.sun.javafx.css.parser.Recognizer;
+import com.sun.javafx.css.parser.Token;
+
+    
+final class CssLexer {
+    final static int STRING = 10;
+    final static int IDENT = 11;
+    final static int FUNCTION = 12;
+    final static int NUMBER = 13;
+    final static int CM = 14;
+    final static int EMS = 15;
+    final static int EXS = 16;
+    final static int IN = 17;
+    final static int MM = 18;
+    final static int PC = 19;
+    final static int PT = 20;
+    final static int PX = 21;
+    final static int PERCENTAGE = 22;
+    final static int DEG = 23;
+    final static int GRAD = 24;
+    final static int RAD = 25;
+    final static int TURN = 26;
+    final static int GREATER = 27;
+    final static int LBRACE = 28;
+    final static int RBRACE = 29;
+    final static int SEMI = 30;
+    final static int COLON = 31;
+    final static int SOLIDUS = 32;
+    final static int STAR = 33;
+    final static int LPAREN = 34;
+    final static int RPAREN = 35;
+    final static int COMMA = 36;
+    final static int HASH = 37;
+    final static int DOT = 38;
+    final static int IMPORTANT_SYM = 39;
+    final static int WS = 40;
+    final static int NL = 41;
+    final static int FONT_FACE = 42;
+    final static int URL = 43;
+    final static int IMPORT = 44;
+    final static int SECONDS = 45;
+    final static int MS = 46;
+    final static int AT_KEYWORD = 47;
+
+    private final Recognizer A = (c) -> c == 'a' || c == 'A';
+    private final Recognizer B = (c) -> c == 'b' || c == 'B';
+    private final Recognizer C = (c) -> c == 'c' || c == 'C';
+    private final Recognizer D = (c) -> c == 'd' || c == 'D';
+    private final Recognizer E = (c) -> c == 'e' || c == 'E';
+    private final Recognizer F = (c) -> c == 'f' || c == 'F';
+    private final Recognizer G = (c) -> c == 'g' || c == 'G';
+    private final Recognizer H = (c) -> c == 'h' || c == 'H';
+    private final Recognizer I = (c) -> c == 'i' || c == 'I';
+    private final Recognizer J = (c) -> c == 'j' || c == 'J';
+    private final Recognizer K = (c) -> c == 'k' || c == 'K';
+    private final Recognizer L = (c) -> c == 'l' || c == 'L';
+    private final Recognizer M = (c) -> c == 'm' || c == 'M';
+    private final Recognizer N = (c) -> c == 'n' || c == 'N';
+    private final Recognizer O = (c) -> c == 'o' || c == 'O';
+    private final Recognizer P = (c) -> c == 'p' || c == 'P';
+    private final Recognizer Q = (c) -> c == 'q' || c == 'Q';
+    private final Recognizer R = (c) -> c == 'r' || c == 'R';
+    private final Recognizer S = (c) -> c == 's' || c == 'S';
+    private final Recognizer T = (c) -> c == 't' || c == 'T';
+    private final Recognizer U = (c) -> c == 'u' || c == 'U';
+    private final Recognizer V = (c) -> c == 'v' || c == 'V';
+    private final Recognizer W = (c) -> c == 'w' || c == 'W';
+    private final Recognizer X = (c) -> c == 'x' || c == 'X';
+    private final Recognizer Y = (c) -> c == 'y' || c == 'Y';
+    private final Recognizer Z = (c) -> c == 'z' || c == 'Z';
+    private final Recognizer ALPHA =  (c) -> ('a' <= c && c <= 'z') ||
+           ('A' <= c && c <= 'Z');
+
+    private final Recognizer NON_ASCII = (c) -> '\u0080' <= c && c <= '\uFFFF';
+
+    private final Recognizer DOT_CHAR =        (c) -> c == '.';
+    private final Recognizer GREATER_CHAR =    (c) -> c == '>';
+    private final Recognizer LBRACE_CHAR =     (c) -> c == '{';
+    private final Recognizer RBRACE_CHAR =     (c) -> c == '}';
+    private final Recognizer SEMI_CHAR  =      (c) -> c == ';';
+    private final Recognizer COLON_CHAR =      (c) -> c == ':';
+    private final Recognizer SOLIDUS_CHAR =    (c) -> c == '/';
+    private final Recognizer MINUS_CHAR =      (c) -> c == '-';
+    private final Recognizer PLUS_CHAR =       (c) -> c == '+';
+    private final Recognizer STAR_CHAR =       (c) -> c == '*';
+    private final Recognizer LPAREN_CHAR =     (c) -> c == '(';
+    private final Recognizer RPAREN_CHAR =     (c) -> c == ')';
+    private final Recognizer COMMA_CHAR =      (c) -> c == ',';
+    private final Recognizer UNDERSCORE_CHAR = (c) -> c == '_';
+    private final Recognizer HASH_CHAR =       (c) -> c == '#';
+
+    private final Recognizer WS_CHARS = (c) -> c == ' '  ||
+           c == '\t' ||
+           c == '\r' ||
+           c == '\n' ||
+           c == '\f';
+    private final Recognizer NL_CHARS = (c) -> (c == '\r' || c == '\n');
+
+    private final Recognizer DIGIT = (c) -> '0' <= c && c <= '9';
+
+    private final Recognizer HEX_DIGIT = (c) -> ('0' <= c && c <= '9') ||
+           ('a' <= c && c <= 'f') ||
+           ('A' <= c && c <= 'F');
+
+    // The initial accepts any character
+    final LexerState initState = new LexerState("initState", null) {
+        @Override public boolean accepts(int c) { return true; }
+    };
+
+    final LexerState hashState = new LexerState("hashState",
+        HASH_CHAR
+    );
+
+    final LexerState minusState = new LexerState("minusState",
+        MINUS_CHAR
+    );
+
+    final LexerState plusState = new LexerState("plusState",
+        PLUS_CHAR
+    );
+
+    // The dot char is either just a dot or may be the start of a number
+    final LexerState dotState = new LexerState(DOT, "dotState",
+        DOT_CHAR
+    );
+
+    // [_a-z]|{nonascii}|{escape}
+    final LexerState nmStartState = new LexerState(IDENT, "nmStartState",
+        UNDERSCORE_CHAR, ALPHA
+    );
+
+    // nmchar		[_a-z0-9-]|{nonascii}|{escape}
+    final LexerState nmCharState = new LexerState(IDENT, "nmCharState",
+        UNDERSCORE_CHAR, ALPHA, DIGIT, MINUS_CHAR
+    );
+
+    // same as nmchar, but need to differentiate between nmchar in ident and
+    // nmchar in
+    final LexerState hashNameCharState = new LexerState(HASH, "hashNameCharState",
+        UNDERSCORE_CHAR, ALPHA, DIGIT, MINUS_CHAR
+    );
+
+    // lparen after ident implies function
+    final LexerState lparenState = new LexerState(FUNCTION, "lparenState",
+        LPAREN_CHAR
+    ) {
+        @Override public int getType() {
+
+            if (text.indexOf("url(") == 0) {
+                try {
+                    return consumeUrl();
+                } catch (IOException ioe) {
+                    return Token.INVALID;
+                }
+            }
+            return super.getType();
+        }
+    };
+
+
+    // initial digits in a number
+    final LexerState leadingDigitsState = new LexerState(NUMBER,"leadingDigitsState",
+        DIGIT
+    );
+
+    // If the dot char follows leading digits, a plus or a minus, then it is
+    // a decimal mark
+    final LexerState decimalMarkState = new LexerState("decimalMarkState",
+        DOT_CHAR
+    );
+
+    // digits following decimal mark
+    final LexerState trailingDigitsState = new LexerState(NUMBER,"trailingDigitsState",
+        DIGIT
+    );
+    
+    // http://www.w3.org/TR/css3-values/
+    final LexerState unitsState = new UnitsState();
+
+    private Map<LexerState, LexerState[]> createStateMap() {
+
+        Map<LexerState, LexerState[]> map =
+                new HashMap<LexerState, LexerState[]>();
+
+        // initState -- [#] --> hashState
+        // initState -- [-] --> minusState
+        // initState -- [+] --> plusState
+        // initState -- [_a-z] --> nmStartState
+        // initState -- [0-9] --> leadingDigitsState
+        // initState -- [.] --> dotState
+        map.put(
+                initState,
+                new LexerState[] {
+                    hashState,
+                    minusState,
+                    nmStartState,
+                    plusState,
+                    minusState,
+                    leadingDigitsState,
+                    dotState
+                }
+        );
+
+        // minus could be the start of an ident or a number
+        // minusState -- [_a-z] --> nmStartState
+        // minusState -- [0-9] --> leadingDigitsState
+        // minusState -- [.] --> decimalMarkState
+        map.put(
+                minusState,
+                new LexerState[] {
+                    nmStartState,
+                    leadingDigitsState,
+                    decimalMarkState,
+                }
+        );
+
+        //
+        // # {name}
+        // hash {nmchar}+
+        // hashState -- [_a-z0-9-] --> nmCharState
+        // nmCharState -- [_a-z0-9-] --> nmCharState
+        //
+        map.put(
+                hashState,
+                new LexerState[] {
+                    hashNameCharState
+                }
+        );
+
+        map.put(
+                hashNameCharState,
+                new LexerState[] {
+                    hashNameCharState,
+                }
+        );
+
+
+        //
+        // {ident}
+        // ident '-'? {nmchar}+
+        // nmStartState -- [_a-z0-9-] --> nmCharState
+        // nmCharState -- [_a-z0-9-] --> nmCharState
+        // nmCharState -- [(] --> lparenState
+        //
+        map.put(
+                nmStartState,
+                new LexerState[] {
+                    nmCharState
+                }
+        );
+
+        map.put(
+                nmCharState,
+                new LexerState[] {
+                    nmCharState,
+                    lparenState
+                }
+        );
+
+        // from +/- state, next state must be a digit or a dot
+        map.put(
+                plusState,
+                new LexerState[] {
+                    leadingDigitsState,
+                    decimalMarkState
+                }
+        );
+
+        // from leadingDigitsState, next state must be
+        // another digit, a decimal mark, or units
+        map.put(
+                leadingDigitsState,
+                new LexerState[] {
+                    leadingDigitsState,
+                    decimalMarkState,
+                    unitsState
+                }
+        );
+
+        // from decimal mark, next state must be a digit.
+        // Need to map both dotState and decimalMarkState
+        // since dot might be the first character and would
+        // not be seen as a decimal point.
+        map.put(
+                dotState,
+                new LexerState[] {
+                    trailingDigitsState
+                }
+        );
+
+        map.put(
+                decimalMarkState,
+                new LexerState[] {
+                    trailingDigitsState
+                }
+        );
+
+        // from trailingDigitsState, next state must be another digit or units
+        map.put(
+                trailingDigitsState,
+                new LexerState[] {
+                    trailingDigitsState,
+                    unitsState,
+                }
+        );
+
+        // UnitsState stays in UnitsState
+        map.put(
+                unitsState,
+                new LexerState[] {
+                    unitsState
+                }
+        );
+
+        return map;
+    }
+
+    CssLexer() {
+        this.stateMap = createStateMap();
+        this.text = new StringBuilder(64);
+        this.currentState = initState;
+    }
+
+    void setReader(Reader reader) {
+        this.reader = reader;
+        lastc = -1;
+        pos = offset = 0;
+        line = 1;
+        this.currentState = initState;
+        this.token = null;
+        try {
+            this.ch = readChar();
+        } catch (IOException ioe) {
+            token = Token.EOF_TOKEN;
+        }
+    }
+
+    private Token scanImportant()  throws IOException{
+        // CSS 2.1 grammar for important_sym
+        // "!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T}
+        final Recognizer[] important_sym =
+                new Recognizer[] { I, M, P, O, R, T, A, N, T };
+        int current = 0;
+        
+        text.append((char)ch);
+        
+        // get past the '!'
+        ch = readChar();
+       
+        while(true) {
+            
+            switch (ch) {
+
+                case Token.EOF:
+                    token = Token.EOF_TOKEN;
+                    return token;
+
+                case '/':                    
+                    ch = readChar();
+                    if (ch == '*') skipComment();
+                    else if (ch == '/') skipEOL();
+                    else {
+                        text.append('/').append((char)ch);
+                        int temp = offset;
+                        offset = pos;
+                        return new Token(Token.INVALID, text.toString(), line, temp);
+                    }
+                    break;
+
+                case ' ':
+                case '\t':
+                case '\r':
+                case '\n':
+                case '\f':
+                    ch = readChar();
+                    break;
+
+                default:
+                    boolean accepted = true;
+                    while(accepted && current < important_sym.length) {
+                        accepted = important_sym[current++].recognize(ch);
+                        text.append((char)ch);
+                        ch = readChar();
+                    }
+                    if (accepted) {
+                        final int temp = offset;
+                        offset = pos-1; // will have read one char too many
+                        return new Token(IMPORTANT_SYM, "!important", line, temp);
+                    } else {
+                        while (ch != ';' &&
+                               ch != '}' &&
+                               ch != Token.EOF) {
+                            ch = readChar();
+                        }
+                        if (ch != Token.EOF) {
+                            final int temp = offset;
+                            offset = pos-1; // will have read one char too many
+                            return new Token(Token.SKIP, text.toString(), line, temp);
+                        } else {
+                            return Token.EOF_TOKEN;
+                        }
+                    }
+            }
+        }
+    }
+
+    // http://www.ietf.org/rfc/rfc3986
+    // http://www.w3.org/TR/2011/REC-CSS2-20110607/syndata.html#uri
+    // http://www.w3.org/TR/css3-syntax/#consume-a-url-token
+    private int consumeUrl() throws IOException {
+
+        text.delete(0, text.length());
+
+        // skip initial white space
+        while (WS_CHARS.recognize(ch)) {
+            ch = readChar();
+        }
+
+        if (ch == Token.EOF) {
+            return Token.EOF;
+        }
+
+        if (ch == '\'' || ch == '"') {
+
+            int endQuote = ch;
+
+            ch = readChar();
+
+            // consume the string
+            while (ch != endQuote) {
+
+                if (ch == Token.EOF) {
+                    break;
+                }
+
+                // un-escaped newline is an error
+                if (NL_CHARS.recognize(ch)) {
+                    break;
+                }
+
+                // handle escaped char
+                // Note: this block does not handle the algorithm for consuming hex-digits
+                if (ch == '\\') {
+
+                    ch = readChar();
+
+                    if (NL_CHARS.recognize(ch)) {
+
+                        // consume newline
+                        while(NL_CHARS.recognize(ch)) {
+                            ch = readChar();
+                        }
+
+                    } else if (ch != Token.EOF) {
+                        // if EOF, do nothing
+                        text.append((char)ch);
+                        ch = readChar();
+                    }
+
+                    continue;
+                }
+
+                text.append((char)ch);
+                ch = readChar();
+
+            }
+
+            if (ch == endQuote) {
+
+                ch = readChar();
+                while(WS_CHARS.recognize(ch)) {
+                    ch = readChar();
+                }
+
+                // After consuming white-space, the char has to be rparen or EOF. Error otherwise.
+                if (ch == ')') {
+                    // consume the rparen
+                    ch = readChar();
+                    return URL;
+                }
+
+                if(ch == Token.EOF) {
+                    return URL;
+                }
+            }
+
+        } else {
+
+            // TODO: a lot of repeat code from above
+            text.append((char)ch);
+            ch = readChar();
+
+            while (true) {
+
+                while (WS_CHARS.recognize(ch)) {
+                    ch = readChar();
+                }
+
+                if (ch == ')') {
+                    // consume the rparen
+                    ch = readChar();
+                    return URL;
+                }
+
+                if (ch == Token.EOF) {
+                    return URL;
+                }
+
+                // handle escaped char
+                // Note: this block does not handle the algorithm for consuming hex-digits
+                if (ch == '\\') {
+
+                    ch = readChar();
+
+                    if (NL_CHARS.recognize(ch)) {
+
+                        // consume newline
+                        while(NL_CHARS.recognize(ch)) {
+                            ch = readChar();
+                        }
+
+                    } else if (ch != Token.EOF) {
+                        // if EOF, do nothing
+                        text.append((char)ch);
+                        ch = readChar();
+                    }
+
+                    continue;
+                }
+
+                if (ch == '\'' || ch == '"' || ch == '(') {
+                    break;
+                }
+
+                text.append((char)ch);
+                ch = readChar();
+
+            }
+        }
+
+        // if we get to here, then the token is bad
+        // consume up to rparen or eof
+        while(true) {
+            int lastCh = ch;
+            if (ch == Token.EOF) {
+                return Token.EOF;
+            } else if (ch == ')' && lastCh != '\\') {
+                ch = readChar();
+                return Token.INVALID;
+            }
+
+            lastCh = ch;
+            ch = readChar();
+        }
+
+    }
+
+    private class UnitsState extends LexerState {
+
+        private final Recognizer[][] units = {
+        
+            // TODO: all units from http://www.w3.org/TR/css3-values/
+            // If units are added, getType and unitsMask must be updated!
+            { C, M },
+            { D, E, G },
+            { E, M },
+            { E, X },
+            { G, R, A, D },
+            { I, N },
+            { M, M },
+            { M, S },
+            { P, C },
+            { P, T },
+            { P, X },
+            { R, A, D },
+            { S },
+            { T, U, R, N },
+            { (c) -> c == '%'}
+        };
+        
+        // One bit per unit
+        private int unitsMask = 0x7FFF;
+
+        // Offset into inner array of units
+        private int index = -1;
+        
+        UnitsState() {
+            super(-1, "UnitsState", null);            
+        }
+        
+        @Override
+        public int getType() {
+            
+            int type = Token.INVALID;
+                
+            // Must keep this in sync with units array.
+            // Small switch will be faster than Math.log(oldMask)/Math.log(2) 
+            switch (unitsMask) {
+                case 0x1: type = CM; break;
+                case 0x2: type = DEG; break;
+                case 0x4: type = EMS; break;
+                case 0x8: type = EXS; break;
+                case 0x10: type = GRAD; break;
+                case 0x20: type = IN; break;
+                case 0x40: type = MM; break;
+                case 0x80: type = MS; break;
+                case 0x100: type = PC; break;
+                case 0x200: type = PT; break;
+                case 0x400: type = PX; break;
+                case 0x800: type = RAD; break;
+                case 0x1000: type = SECONDS; break;
+                case 0x2000: type = TURN; break;
+                case 0x4000: type = PERCENTAGE; break;
+                default: type = Token.INVALID;
+            }
+             
+            // reset
+            unitsMask = 0x7fff;
+            index = -1;
+            
+            return type;
+        }
+
+        @Override
+        public boolean accepts(int c) {
+            
+            // Ensure that something bogus like '10xyzzy' is 
+            // consumed as a token by only returning false
+            // if the char is not alpha or %
+            if (!ALPHA.recognize(c) && c != '%') {
+                return false;
+            }
+            
+            // If unitsMask is zero, then we've already figured out that 
+            // this is an invalid token, but we want to accept c so that 
+            // '10xyzzy' is consumed as a token, albeit an invalid one.
+            if (unitsMask == 0) return true;
+            
+            index += 1;
+
+            for (int n=0 ; n < units.length; n++) {
+                
+                final int u = 1 << n;
+                
+                // the unit at this index already failed. Move on.
+                if ((unitsMask & u) == 0) continue;
+
+                if ((index >= units[n].length) || !(units[n][index].recognize(c))) {
+                    // not a match, turn off this bit
+                    unitsMask &= ~u;
+                }
+                    
+            }
+
+
+            return true;
+        }
+
+    }
+        
+    private  void skipComment() throws IOException {
+        while(ch != -1) {
+            if (ch == '*') {
+                ch = readChar();
+                if (ch == '/') {
+                    offset = pos;
+                    ch=readChar();
+                    break;
+                }
+            } else {
+                ch = readChar();
+            }
+        }
+    }
+
+    private void skipEOL() throws IOException {
+
+        int lastc = ch;
+
+        while (ch != -1) {
+
+            ch = readChar();
+
+            // EOL is cr, lf, or crlf
+            if ((ch == '\n') || (lastc == '\r' && ch != '\n')) {
+                    break;
+            }
+        }
+
+    }
+
+    private int pos = 0;
+    private int offset = 0;
+    private int line = 1;
+    private int lastc = -1;
+
+    private int readChar() throws IOException {
+
+        int c = reader.read();
+
+        // only reset line and pos counters after having read a NL since
+        // a NL token is created after the readChar
+        if (lastc == '\n' || (lastc == '\r' && c != '\n')) {
+            // set pos to 1 since we've already read the first char of the new line
+            pos = 1; 
+            offset = 0;
+            line++;
+        } else {
+            pos++;
+        }
+        
+        lastc = c;
+        return c;
+    }
+
+    Token nextToken() {
+
+        Token tok = null;
+        if (token != null) {
+            tok = token;
+            if (token.getType() != Token.EOF) token = null;
+        } else {
+            do {
+                tok = getToken();
+            } while (tok != null &&
+//                     tok.getType() != Token.EOF &&
+                     Token.SKIP_TOKEN.equals(tok));
+        }
+
+        // reset text buffer and currentState
+        text.delete(0,text.length());
+        currentState = initState;
+
+        return tok;
+    }
+
+    private Token getToken() {
+
+        try {
+            while (true) {
+                charNotConsumed = false;
+
+                final LexerState[] reachableStates =
+                        currentState != null ? stateMap.get(currentState) : null;
+
+                final int max = reachableStates != null ? reachableStates.length : 0;
+
+                LexerState newState = null;
+                for (int n=0; n<max && newState == null; n++) {
+                    final LexerState reachableState = reachableStates[n];
+                    if (reachableState.accepts(ch)) {
+                        newState = reachableState;
+                    }
+                }
+
+                if (newState != null) {
+
+                    // Some reachable state was reached. Keep going until
+                    // the char isn't accepted by any state
+                    currentState = newState;
+                    text.append((char)ch);
+                    ch = readChar();
+                    continue;
+
+                } else {
+
+                    // If none of the reachable states accepts the char,
+                    // then see if there is a token.
+
+                    final int type = currentState != null ? currentState.getType() : Token.INVALID;
+
+                    //
+                    // If the token is INVALID and
+                    // the currentState is something other than initState, then
+                    // there is an error, so return INVALID.
+                     //
+                    if (type != Token.INVALID ||
+                        !currentState.equals(initState)) {
+
+                        final String str = text.toString();
+                        Token tok = new Token(type, str, line, offset);
+                        // because the next char has already been read, 
+                        // the next token starts at pos-1
+                        offset = pos-1;
+
+                        // return here, but the next char has already been read.
+                        return tok;
+
+                    }
+                }
+
+                // The char wasn't accepted and there was no previous token.
+                switch (ch) {
+
+                    case -1:
+                        token = Token.EOF_TOKEN;
+                        return token;
+
+                    case '"':
+                    case '\'':
+
+                        text.append((char)ch);
+                        final int endq = ch;
+                        while((ch=readChar()) != -1) {
+                            text.append((char)ch);
+                            if (ch == endq) break;
+                        }
+
+                        if (ch != -1) {
+                            token = new Token(STRING, text.toString(), line, offset);
+                            offset = pos;
+                        } else {
+                            token = new Token(Token.INVALID, text.toString(), line, offset);
+                            offset = pos;
+                        }
+                        break;
+
+                    case '/':
+                        ch = readChar();
+                        if (ch == '*') {
+                            skipComment();
+                             if (ch != -1) {
+                                continue;
+                            } else {
+                                token = Token.EOF_TOKEN;
+                                return token;
+                            }
+                        } else if (ch == '/') {
+                            skipEOL();
+                            if (ch != -1) {
+                                continue;
+                            } else {
+                                token = Token.EOF_TOKEN;
+                                return token;
+                            }
+                        } else {
+                            // not a comment - a SOLIDUS
+                            token = new Token(SOLIDUS,"/", line, offset);
+                            offset = pos;
+                            charNotConsumed = true;
+                        }
+                        break;
+
+                    case '>':
+
+                        token = new Token(GREATER,">", line, offset);
+                        offset = pos;
+                        break;
+
+                    case '{':
+                        token = new Token(LBRACE,"{", line, offset);
+                        offset = pos;
+                        break;
+
+                    case '}':
+                        token = new Token(RBRACE,"}", line, offset);
+                        offset = pos;
+                        break;
+
+                    case ';':
+                        token = new Token(SEMI,";", line, offset);
+                        offset = pos;
+                        break;
+
+                    case ':':
+                        token = new Token(COLON,":", line, offset);
+                        offset = pos;
+                        break;
+
+                    case '*':
+                        token = new Token(STAR,"*", line, offset);
+                        offset = pos;
+                        break;
+
+                    case '(':
+                        token = new Token(LPAREN,"(", line, offset);
+                        offset = pos;
+                        break;
+
+                    case ')':
+                        token = new Token(RPAREN,")", line, offset);
+                        offset = pos;
+                        break;
+
+                    case ',':
+                        token = new Token(COMMA,",", line, offset);
+                        offset = pos;
+                        break;
+
+                    case '.':
+                        token = new Token(DOT,".", line, offset);
+                        offset = pos;
+                        break;
+
+                    case ' ':
+                    case '\t':
+                    case '\f':
+                        token = new Token(WS, Character.toString((char)ch), line, offset);
+                        offset = pos;
+                        break;
+
+
+                    case '\r':
+                        token = new Token(NL, "\\r", line, offset);
+                        // offset and pos are reset on next readChar
+                        
+                        ch = readChar();
+                        if (ch == '\n') {
+                            token = new Token(NL, "\\r\\n", line, offset);
+                            // offset and pos are reset on next readChar
+                        } else {
+                            // already read the next character, so return
+                            // return the NL token here (avoid the readChar
+                            // at the end of the loop below)
+                            final Token tok = token;
+                            token = (ch == -1) ? Token.EOF_TOKEN : null;
+                            return tok;
+                        }                        
+                        break;
+
+                    case '\n':
+                        token = new Token(NL, "\\n", line, offset);
+                        // offset and pos are reset on next readChar
+                        break;
+
+                    case '!':
+                        Token tok = scanImportant();
+                        return tok;
+
+                    case '@':
+                        token = new Token(AT_KEYWORD, "@", line, offset);
+                        offset = pos;
+                        break;
+
+                    default:
+//                      System.err.println("hit default case: ch = " + Character.toString((char)ch));
+                        token = new Token(Token.INVALID, Character.toString((char)ch), line, offset);
+                        offset = pos;
+                        break;
+                }
+
+                if (token == null) {
+//                    System.err.println("token is null! ch = " + Character.toString((char)ch));
+                    token = new Token(Token.INVALID, null, line, offset);
+                    offset = pos;
+                } else if (token.getType() == Token.EOF) {
+                    return token;
+                } 
+
+                if (ch != -1 && !charNotConsumed) ch = readChar();
+
+                final Token tok = token;
+                token = null;
+                return tok;
+            }
+        } catch (IOException ioe) {
+            token = Token.EOF_TOKEN;
+            return token;
+        }
+    }
+    
+    private int ch;
+    private boolean charNotConsumed = false;
+    private Reader reader;
+    private Token token;
+    private final Map<LexerState, LexerState[]> stateMap;
+    private LexerState currentState;
+    private final StringBuilder text;
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/CSSParser.java	2015-09-03 15:31:26.434892500 -0700
+++ /dev/null	2015-09-03 15:31:27.000000000 -0700
@@ -1,4720 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.parser;
-
-import com.sun.javafx.util.Utils;
-import com.sun.javafx.css.Combinator;
-import com.sun.javafx.css.CompoundSelector;
-import com.sun.javafx.css.CssError;
-import com.sun.javafx.css.Declaration;
-import com.sun.javafx.css.FontFace;
-import com.sun.javafx.css.ParsedValueImpl;
-import com.sun.javafx.css.Rule;
-import com.sun.javafx.css.Selector;
-import com.sun.javafx.css.SimpleSelector;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleManager;
-import com.sun.javafx.css.Stylesheet;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.converters.DurationConverter;
-import com.sun.javafx.css.converters.EffectConverter;
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.FontConverter;
-import com.sun.javafx.css.converters.InsetsConverter;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.converters.SizeConverter.SequenceConverter;
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.css.converters.URLConverter;
-import com.sun.javafx.scene.layout.region.BackgroundPositionConverter;
-import com.sun.javafx.scene.layout.region.BackgroundSizeConverter;
-import com.sun.javafx.scene.layout.region.BorderImageSliceConverter;
-import com.sun.javafx.scene.layout.region.BorderImageSlices;
-import com.sun.javafx.scene.layout.region.BorderImageWidthConverter;
-import com.sun.javafx.scene.layout.region.BorderImageWidthsSequenceConverter;
-import com.sun.javafx.scene.layout.region.BorderStrokeStyleSequenceConverter;
-import com.sun.javafx.scene.layout.region.BorderStyleConverter;
-import com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter;
-import com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter;
-import com.sun.javafx.scene.layout.region.LayeredBorderPaintConverter;
-import com.sun.javafx.scene.layout.region.LayeredBorderStyleConverter;
-import com.sun.javafx.scene.layout.region.Margins;
-import com.sun.javafx.scene.layout.region.RepeatStruct;
-import com.sun.javafx.scene.layout.region.RepeatStructConverter;
-import com.sun.javafx.scene.layout.region.SliceSequenceConverter;
-import com.sun.javafx.scene.layout.region.StrokeBorderPaintConverter;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.css.Styleable;
-import javafx.geometry.Insets;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.Effect;
-import javafx.scene.layout.BackgroundPosition;
-import javafx.scene.layout.BackgroundRepeat;
-import javafx.scene.layout.BackgroundSize;
-import javafx.scene.layout.BorderStrokeStyle;
-import javafx.scene.layout.BorderWidths;
-import javafx.scene.layout.CornerRadii;
-import com.sun.javafx.scene.layout.region.CornerRadiiConverter;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.CycleMethod;
-import javafx.scene.paint.Paint;
-import javafx.scene.paint.Stop;
-import javafx.scene.shape.StrokeLineCap;
-import javafx.scene.shape.StrokeLineJoin;
-import javafx.scene.shape.StrokeType;
-import javafx.scene.text.Font;
-import javafx.scene.text.FontPosture;
-import javafx.scene.text.FontWeight;
-import javafx.util.Duration;
-import sun.util.logging.PlatformLogger;
-import sun.util.logging.PlatformLogger.Level;
-
-import java.io.BufferedReader;
-import java.io.CharArrayReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Stack;
-
-final public class CSSParser {
-
-    /**
-     * @deprecated As of 8u40, use new CSSParser() instead.
-     */
-    @Deprecated
-    public static CSSParser getInstance() {
-        return new CSSParser();
-    }
-
-    public CSSParser() {
-        properties = new HashMap<String,String>();
-    }
-
-    // stylesheet as a string from parse method. This will be null if the
-    // stylesheet is being parsed from a file; otherwise, the parser is parsing
-    // a string and this is that string.
-    private String     stylesheetAsText;
-
-    // the url of the stylesheet file, or the docbase of an applet. This will
-    // be null if the source is not a file or from an applet.
-    private String        sourceOfStylesheet;
-
-    // the Styleable from the node with an in-line style. This will be null
-    // unless the source of the styles is a Node's styleProperty. In this case,
-    // the stylesheetString will also be set.
-    private Styleable sourceOfInlineStyle;
-
-    // source is a file
-    private void setInputSource(String url, String str) {
-        stylesheetAsText = str;
-        sourceOfStylesheet = url;
-        sourceOfInlineStyle = null;
-    }
-
-    // source as string only
-    private void setInputSource(String str) {
-        stylesheetAsText = str;
-        sourceOfStylesheet = null;
-        sourceOfInlineStyle = null;
-    }
-
-    // source is in-line style
-    private void setInputSource(Styleable styleable) {
-        stylesheetAsText = styleable != null ? styleable.getStyle() : null;
-        sourceOfStylesheet = null;
-        sourceOfInlineStyle = styleable;
-    }
-
-    private static final PlatformLogger LOGGER = com.sun.javafx.util.Logging.getCSSLogger();
-
-    private static final class ParseException extends Exception {
-        ParseException(String message) {
-            this(message,null,null);
-        }
-        ParseException(String message, Token tok, CSSParser parser) {
-            super(message);
-            this.tok = tok;
-            if (parser.sourceOfStylesheet != null) {
-                source = parser.sourceOfStylesheet;
-            } else if (parser.sourceOfInlineStyle != null) {
-                source = parser.sourceOfInlineStyle.toString();
-            } else if (parser.stylesheetAsText != null) {
-                source = parser.stylesheetAsText;
-            } else {
-                source = "?";
-            }
-        }
-        @Override public String toString() {
-            StringBuilder builder = new StringBuilder(super.getMessage());
-            builder.append(source);
-            if (tok != null) builder.append(": ").append(tok.toString());
-            return builder.toString();
-        }
-        private final Token tok;
-        private final String source;
-    }
-
-    /**
-     * Creates a stylesheet from a CSS document string.
-     *
-     *@param stylesheetText the CSS document to parse
-     *@return the Stylesheet
-     */
-    public Stylesheet parse(final String stylesheetText) {
-        final Stylesheet stylesheet = new Stylesheet();
-        if (stylesheetText != null && !stylesheetText.trim().isEmpty()) {
-            setInputSource(stylesheetText);
-            try (Reader reader = new CharArrayReader(stylesheetText.toCharArray())) {
-                parse(stylesheet, reader);
-            } catch (IOException ioe) {
-                // this method doesn't explicitly throw IOException
-            }
-        }
-        return stylesheet;
-    }
-
-    /**
-     * Creates a stylesheet from a CSS document string using docbase as
-     * the base URL for resolving references within stylesheet.
-     *
-     *@param stylesheetText the CSS document to parse
-     *@return the Stylesheet
-     */
-    public Stylesheet parse(final String docbase, final String stylesheetText) throws IOException {
-        final Stylesheet stylesheet = new Stylesheet(docbase);
-        if (stylesheetText != null && !stylesheetText.trim().isEmpty()) {
-            setInputSource(docbase, stylesheetText);
-            try (Reader reader = new CharArrayReader(stylesheetText.toCharArray())) {
-                parse(stylesheet, reader);
-            }
-        }
-        return stylesheet;
-    }
-
-    /**
-     * Updates the given stylesheet by reading a CSS document from a URL,
-     * assuming UTF-8 encoding.
-     *
-     *@param  url URL of the stylesheet to parse
-     *@return the stylesheet
-     *@throws IOException
-     */
-    public Stylesheet parse(final URL url) throws IOException {
-
-        final String path = url != null ? url.toExternalForm() : null;
-        final Stylesheet stylesheet = new Stylesheet(path);
-        if (url != null) {
-            setInputSource(path, null);
-            try (Reader reader = new BufferedReader(new InputStreamReader(url.openStream()))) {
-                parse(stylesheet, reader);
-            }
-        }
-        return stylesheet;
-    }
-
-    /* All of the other function calls should wind up here */
-    private void parse(final Stylesheet stylesheet, final Reader reader) {
-
-//        CSSLexer lex = CSSLexer.getInstance();
-        CSSLexer lex = new CSSLexer();
-        lex.setReader(reader);
-
-        try {
-            this.parse(stylesheet, lex);
-        } catch (Exception ex) {
-            // Sometimes bad syntax causes an exception. The code should be
-            // fixed to handle the bad syntax, but the fallback is
-            // to handle the exception here. Uncaught, the exception can cause
-            // problems like RT-20311
-            reportException(ex);
-        }
-
-    }
-
-    /** Parse an in-line style from a Node */
-    public Stylesheet parseInlineStyle(final Styleable node) {
-
-        Stylesheet stylesheet = new Stylesheet();
-
-        final String stylesheetText = (node != null) ? node.getStyle() : null;
-        if (stylesheetText != null && !stylesheetText.trim().isEmpty()) {
-            setInputSource(node);
-            final List<Rule> rules = new ArrayList<Rule>();
-            try (Reader reader = new CharArrayReader(stylesheetText.toCharArray())) {
-                final CSSLexer lexer = CSSLexer.getInstance();
-                lexer.setReader(reader);
-                currentToken = nextToken(lexer);
-                final List<Declaration> declarations = declarations(lexer);
-                if (declarations != null && !declarations.isEmpty()) {
-                    final Selector selector = Selector.getUniversalSelector();
-                    final Rule rule = new Rule(
-                        Collections.singletonList(selector),
-                        declarations
-                    );
-                    rules.add(rule);
-                }
-            } catch (IOException ioe) {
-            } catch (Exception ex) {
-                // Sometimes bad syntax causes an exception. The code should be
-                // fixed to handle the bad syntax, but the fallback is
-                // to handle the exception here. Uncaught, the exception can cause
-                // problems like RT-20311
-                reportException(ex);
-            }
-            stylesheet.getRules().addAll(rules);
-        }
-
-        // don't retain reference to the styleable
-        setInputSource((Styleable) null);
-
-        return stylesheet;
-    }
-
-    /** convenience method for unit tests */
-    public ParsedValueImpl parseExpr(String property, String expr) {
-        if (property == null || expr == null) return null;
-
-        ParsedValueImpl value = null;
-        setInputSource(null, property + ": " + expr);
-        char buf[] = new char[expr.length() + 1];
-        System.arraycopy(expr.toCharArray(), 0, buf, 0, expr.length());
-        buf[buf.length-1] = ';';
-
-        try (Reader reader = new CharArrayReader(buf)) {
-            CSSLexer lex = CSSLexer.getInstance();
-            lex.setReader(reader);
-
-            currentToken = nextToken(lex);
-            CSSParser.Term term = this.expr(lex);
-            value = valueFor(property, term, lex);
-        } catch (IOException ioe) {
-        } catch (ParseException e) {
-            if (LOGGER.isLoggable(Level.WARNING)) {
-                LOGGER.warning("\"" +property + ": " + expr  + "\" " + e.toString());
-            }
-        } catch (Exception ex) {
-            // Sometimes bad syntax causes an exception. The code should be
-            // fixed to handle the bad syntax, but the fallback is
-            // to handle the exception here. Uncaught, the exception can cause
-            // problems like RT-20311
-            reportException(ex);
-        }
-        return value;
-    }
-    /*
-     * Map of property names found while parsing. If a value matches a
-     * property name, then the value is a lookup.
-     */
-    private final Map<String,String> properties;
-
-    /*
-     * While parsing a declaration, tokens from parsing value (that is,
-     * the expr rule) are held in this tree structure which is then passed
-     * to methods which convert the tree into a ParsedValueImpl.
-     *
-     * Each term in expr is a Term. For simple terms, like HASH, the
-     * Term is just the Token. If the term is a function, then the
-     * Term is a linked-list of Term, the first being the function
-     * name and each nextArg being the arguments.
-     *
-     * If there is more than one term in the expr (insets, for example),
-     * then the terms are linked on nextInSequence. If there is more than one
-     * layer (sequence of terms), then each layer becomes the nextLayer
-     * to the last root in the previous sequence.
-     *
-     * The easiest way to think of it is that a comma starts a nextLayer (except
-     * when a function arg).
-     *
-     * The expr part of the declaration "-fx-padding 1 2, 3 4;" would look
-     * like this:
-     * [1 | nextLayer | nextInSeries]-->[2 | nextLayer | nextInSeries]-->null
-     *            |                            |
-     *          null                           |
-     *       .---------------------------------'
-     *       '-->[3 | nextLayer | nextInSeries]-->[4 | nextLayer | nextInSeries]-->null
-     *                    |                              |
-     *                   null                           null
-     *
-     * The first argument in a function needs to be distinct from the
-     * remaining args so that the args of a function in the middle of
-     * a function will not be omitted. Consider 'f0(a, f1(b, c), d)'
-     * If we relied only on nextArg, then the next arg of f0 would be a but
-     * the nextArg of f1 would be d. With firstArg, the firstArg of f0 is a,
-     * the nextArg of a is f1, the firstArg of f1 is b and the nextArg of f1 is d.
-     *
-     * TODO: now that the parser is the parser and not an adjunct to an ANTLR
-     * parser, this Term stuff shouldn't be needed.
-     */
-    static class Term {
-    	final Token token;
-    	Term nextInSeries;
-    	Term nextLayer;
-        Term firstArg;
-        Term nextArg;
-    	Term(Token token) {
-            this.token = token;
-            this.nextLayer = null;
-            this.nextInSeries = null;
-            this.firstArg = null;
-            this.nextArg = null;
-    	}
-    	Term() {
-            this(null);
-    	}
-
-    	@Override public String toString() {
-            StringBuilder buf = new StringBuilder();
-            if (token != null) buf.append(String.valueOf(token.getText()));
-            if (nextInSeries != null) {
-                buf.append("<nextInSeries>");
-                buf.append(nextInSeries.toString());
-                buf.append("</nextInSeries>\n");
-            }
-            if (nextLayer != null) {
-                buf.append("<nextLayer>");
-                buf.append(nextLayer.toString());
-                buf.append("</nextLayer>\n");
-            }
-            if (firstArg != null) {
-                buf.append("<args>");
-                buf.append(firstArg.toString());
-                if (nextArg != null) {
-                    buf.append(nextArg.toString());
-                }
-                buf.append("</args>");
-            }
-
-            return buf.toString();
-    	}
-
-    }
-
-    private CssError createError(String msg) {
-
-        CssError error = null;
-        if (sourceOfStylesheet != null) {
-            error = new CssError.StylesheetParsingError(sourceOfStylesheet, msg);
-        } else if (sourceOfInlineStyle != null) {
-            error = new CssError.InlineStyleParsingError(sourceOfInlineStyle, msg);
-        } else {
-            error = new CssError.StringParsingError(stylesheetAsText, msg);
-        }
-        return error;
-    }
-
-    private void reportError(CssError error) {
-        List<CssError> errors = null;
-        if ((errors = StyleManager.getErrors()) != null) {
-            errors.add(error);
-        }
-    }
-
-    private void error(final Term root, final String msg) throws ParseException {
-
-        final Token token = root != null ? root.token : null;
-        final ParseException pe = new ParseException(msg,token,this);
-        reportError(createError(pe.toString()));
-        throw pe;
-    }
-
-    private void reportException(Exception exception) {
-
-        if (LOGGER.isLoggable(Level.WARNING)) {
-            final StackTraceElement[] stea = exception.getStackTrace();
-            if (stea.length > 0) {
-                final StringBuilder buf =
-                    new StringBuilder("Please report ");
-                buf.append(exception.getClass().getName())
-                   .append(" at:");
-                int end = 0;
-                while(end < stea.length) {
-                    // only report parser part of the stack trace.
-                    if (!getClass().getName().equals(stea[end].getClassName())) {
-                        break;
-                    }
-                    buf.append("\n\t")
-                    .append(stea[end++].toString());
-                }
-                LOGGER.warning(buf.toString());
-            }
-        }
-    }
-
-    private String formatDeprecatedMessage(final Term root, final String syntax) {
-        final StringBuilder buf =
-            new StringBuilder("Using deprecated syntax for ");
-        buf.append(syntax);
-        if (sourceOfStylesheet != null){
-            buf.append(" at ")
-               .append(sourceOfStylesheet)
-               .append("[")
-               .append(root.token.getLine())
-               .append(',')
-               .append(root.token.getOffset())
-               .append("]");
-        }
-        buf.append(". Refer to the CSS Reference Guide.");
-        return buf.toString();
-    }
-
-    // Assumes string is not a lookup!
-    private ParsedValueImpl<Color,Color> colorValueOfString(String str) {
-
-        if(str.startsWith("#") || str.startsWith("0x")) {
-
-            double a = 1.0f;
-            String c = str;
-            final int prefixLength = (str.startsWith("#")) ? 1 : 2;
-
-            final int len = c.length();
-            // rgba or rrggbbaa - trim off the alpha
-            if ( (len-prefixLength) == 4) {
-                a = Integer.parseInt(c.substring(len-1), 16) / 15.0f;
-                c = c.substring(0,len-1);
-            } else if ((len-prefixLength) == 8) {
-                a = Integer.parseInt(c.substring(len-2), 16) / 255.0f;
-                c = c.substring(0,len-2);
-            }
-            // else color was rgb or rrggbb (no alpha)
-            return new ParsedValueImpl<Color,Color>(Color.web(c,a), null);
-        }
-
-        try {
-            return new ParsedValueImpl<Color,Color>(Color.web(str), null);
-        } catch (final IllegalArgumentException e) {
-        } catch (final NullPointerException e) {
-        }
-
-        // not a color
-        return null;
-    }
-
-    private String stripQuotes(String string) {
-        return com.sun.javafx.util.Utils.stripQuotes(string);
-    }
-
-    private double clamp(double min, double val, double max) {
-        if (val < min) return min;
-        if (max < val) return max;
-        return val;
-    }
-
-    // Return true if the token is a size type or an identifier
-    // (which would indicate a lookup).
-    private boolean isSize(Token token) {
-        final int ttype = token.getType();
-        switch (ttype) {
-        case CSSLexer.NUMBER:
-        case CSSLexer.PERCENTAGE:
-        case CSSLexer.EMS:
-        case CSSLexer.EXS:
-        case CSSLexer.PX:
-        case CSSLexer.CM:
-        case CSSLexer.MM:
-        case CSSLexer.IN:
-        case CSSLexer.PT:
-        case CSSLexer.PC:
-        case CSSLexer.DEG:
-        case CSSLexer.GRAD:
-        case CSSLexer.RAD:
-        case CSSLexer.TURN:
-            return true;
-        default:
-            return token.getType() == CSSLexer.IDENT;
-        }
-    }
-
-    private Size size(final Token token) throws ParseException {
-        SizeUnits units = SizeUnits.PX;
-        // Amount to trim off the suffix, if any. Most are 2 chars.
-        int trim = 2;
-        final String sval = token.getText().trim();
-        final int len = sval.length();
-        final int ttype = token.getType();
-        switch (ttype) {
-        case CSSLexer.NUMBER:
-            units = SizeUnits.PX;
-            trim = 0;
-            break;
-        case CSSLexer.PERCENTAGE:
-            units = SizeUnits.PERCENT;
-            trim = 1;
-            break;
-        case CSSLexer.EMS:
-            units = SizeUnits.EM;
-            break;
-        case CSSLexer.EXS:
-            units = SizeUnits.EX;
-            break;
-        case CSSLexer.PX:
-            units = SizeUnits.PX;
-            break;
-        case CSSLexer.CM:
-            units = SizeUnits.CM;
-            break;
-        case CSSLexer.MM:
-            units = SizeUnits.MM;
-            break;
-        case CSSLexer.IN:
-            units = SizeUnits.IN;
-            break;
-        case CSSLexer.PT:
-            units = SizeUnits.PT;
-            break;
-        case CSSLexer.PC:
-            units = SizeUnits.PC;
-            break;
-        case CSSLexer.DEG:
-            units = SizeUnits.DEG;
-            trim = 3;
-            break;
-        case CSSLexer.GRAD:
-            units = SizeUnits.GRAD;
-            trim = 4;
-            break;
-        case CSSLexer.RAD:
-            units = SizeUnits.RAD;
-            trim = 3;
-            break;
-        case CSSLexer.TURN:
-            units = SizeUnits.TURN;
-            trim = 4;
-            break;
-        case CSSLexer.SECONDS:
-            units = SizeUnits.S;
-            trim = 1;
-            break;
-        case CSSLexer.MS:
-            units = SizeUnits.MS;
-            break;
-        default:
-            if (LOGGER.isLoggable(Level.FINEST)) {
-                LOGGER.finest("Expected \'<number>\'");
-            }
-            ParseException re = new ParseException("Expected \'<number>\'",token, this);
-            reportError(createError(re.toString()));
-            throw re;
-        }
-        // TODO: Handle NumberFormatException
-        return new Size(
-            Double.parseDouble(sval.substring(0,len-trim)),
-            units
-        );
-    }
-
-    // Count the number of terms in a series
-    private int numberOfTerms(final Term root) {
-        if (root == null) return 0;
-
-        int nTerms = 0;
-        Term term = root;
-        do {
-            nTerms += 1;
-            term = term.nextInSeries;
-        } while (term != null);
-        return nTerms;
-    }
-
-    // Count the number of series of terms
-    private int numberOfLayers(final Term root) {
-        if (root == null) return 0;
-
-        int nLayers = 0;
-        Term term = root;
-        do {
-            nLayers += 1;
-            while (term.nextInSeries != null) {
-                term = term.nextInSeries;
-            }
-            term = term.nextLayer;
-        } while (term != null);
-        return nLayers;
-    }
-
-    // Count the number of args of terms. root is the function.
-    private int numberOfArgs(final Term root) {
-        if (root == null) return 0;
-
-        int nArgs = 0;
-        Term term = root.firstArg;
-        while (term != null) {
-            nArgs += 1;
-            term = term.nextArg;
-        }
-        return nArgs;
-    }
-
-    // Get the next layer following this term, which may be null
-    private Term nextLayer(final Term root) {
-        if (root == null) return null;
-
-        Term term = root;
-        while (term.nextInSeries != null) {
-            term = term.nextInSeries;
-        }
-        return term.nextLayer;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    // Parsing routines
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    ParsedValueImpl valueFor(String property, Term root, CSSLexer lexer) throws ParseException {
-        final String prop = property.toLowerCase(Locale.ROOT);
-        properties.put(prop, prop);
-        if (root == null || root.token == null) {
-            error(root, "Expected value for property \'" + prop + "\'");
-        }
-
-        if (root.token.getType() == CSSLexer.IDENT) {
-            final String txt = root.token.getText();
-            if ("inherit".equalsIgnoreCase(txt)) {
-                return new ParsedValueImpl<String,String>("inherit", null);
-            } else if ("null".equalsIgnoreCase(txt)
-                    || "none".equalsIgnoreCase(txt)) {
-                return new ParsedValueImpl<String,String>("null", null);
-            }
-        }
-        if ("-fx-fill".equals(prop)) {
-             ParsedValueImpl pv = parse(root);
-            if (pv.getConverter() == StyleConverter.getUrlConverter()) {
-                // ImagePatternConverter expects array of ParsedValue where element 0 is the URL
-                // Pending RT-33574
-                pv = new ParsedValueImpl(new ParsedValue[] {pv},PaintConverter.ImagePatternConverter.getInstance());
-            }
-            return pv;
-        }
-        else if ("-fx-background-color".equals(prop)) {
-            return parsePaintLayers(root);
-        } else if ("-fx-background-image".equals(prop)) {
-            return parseURILayers(root);
-        } else if ("-fx-background-insets".equals(prop)) {
-             return parseInsetsLayers(root);
-        } else if ("-fx-opaque-insets".equals(prop)) {
-            return parseInsetsLayer(root);
-        } else if ("-fx-background-position".equals(prop)) {
-             return parseBackgroundPositionLayers(root);
-        } else if ("-fx-background-radius".equals(prop)) {
-            return parseCornerRadius(root);
-        } else if ("-fx-background-repeat".equals(prop)) {
-             return parseBackgroundRepeatStyleLayers(root);
-        } else if ("-fx-background-size".equals(prop)) {
-             return parseBackgroundSizeLayers(root);
-        } else if ("-fx-border-color".equals(prop)) {
-             return parseBorderPaintLayers(root);
-        } else if ("-fx-border-insets".equals(prop)) {
-             return parseInsetsLayers(root);
-        } else if ("-fx-border-radius".equals(prop)) {
-             return parseCornerRadius(root);
-        } else if ("-fx-border-style".equals(prop)) {
-             return parseBorderStyleLayers(root);
-        } else if ("-fx-border-width".equals(prop)) {
-             return parseMarginsLayers(root);
-        } else if ("-fx-border-image-insets".equals(prop)) {
-             return parseInsetsLayers(root);
-        } else if ("-fx-border-image-repeat".equals(prop)) {
-             return parseBorderImageRepeatStyleLayers(root);
-        } else if ("-fx-border-image-slice".equals(prop)) {
-             return parseBorderImageSliceLayers(root);
-        } else if ("-fx-border-image-source".equals(prop)) {
-             return parseURILayers(root);
-        } else if ("-fx-border-image-width".equals(prop)) {
-             return parseBorderImageWidthLayers(root);
-        } else if ("-fx-padding".equals(prop)) {
-            ParsedValueImpl<?,Size>[] sides = parseSize1to4(root);
-            return new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
-        } else if ("-fx-label-padding".equals(prop)) {
-            ParsedValueImpl<?,Size>[] sides = parseSize1to4(root);
-            return new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
-        } else if (prop.endsWith("font-family")) {
-            return parseFontFamily(root);
-        } else if (prop.endsWith("font-size")) {
-            ParsedValueImpl fsize = parseFontSize(root);
-            if (fsize == null) error(root, "Expected \'<font-size>\'");
-            return fsize;
-        } else if (prop.endsWith("font-style")) {
-            ParsedValueImpl fstyle = parseFontStyle(root);
-            if (fstyle == null) error(root, "Expected \'<font-style>\'");
-            return fstyle;
-        } else if (prop.endsWith("font-weight")) {
-            ParsedValueImpl fweight = parseFontWeight(root);
-            if (fweight == null) error(root, "Expected \'<font-style>\'");
-            return fweight;
-        } else if (prop.endsWith("font")) {
-            return parseFont(root);
-        } else if ("-fx-stroke-dash-array".equals(prop)) {
-            // TODO: Figure out a way that these properties don't need to be
-            // special cased.
-            Term term = root;
-            int nArgs = numberOfTerms(term);
-            ParsedValueImpl<?,Size>[] segments = new ParsedValueImpl[nArgs];
-            int segment = 0;
-            while(term != null) {
-                segments[segment++] = parseSize(term);
-                term = term.nextInSeries;
-            }
-
-            return new ParsedValueImpl<ParsedValue[],Number[]>(segments,SequenceConverter.getInstance());
-
-        } else if ("-fx-stroke-line-join".equals(prop)) {
-            // TODO: Figure out a way that these properties don't need to be
-            // special cased.
-            ParsedValueImpl[] values = parseStrokeLineJoin(root);
-            if (values == null) error(root, "Expected \'miter', \'bevel\' or \'round\'");
-            return values[0];
-        } else if ("-fx-stroke-line-cap".equals(prop)) {
-            // TODO: Figure out a way that these properties don't need to be
-            // special cased.
-            ParsedValueImpl value = parseStrokeLineCap(root);
-            if (value == null) error(root, "Expected \'square', \'butt\' or \'round\'");
-            return value;
-        } else if ("-fx-stroke-type".equals(prop)) {
-            // TODO: Figure out a way that these properties don't need to be
-            // special cased.
-            ParsedValueImpl value = parseStrokeType(root);
-            if (value == null) error(root, "Expected \'centered', \'inside\' or \'outside\'");
-            return value;
-        } else if ("-fx-font-smoothing-type".equals(prop)) {
-            // TODO: Figure out a way that these properties don't need to be
-            // special cased.
-            String str = null;
-            int ttype = -1;
-            final Token token = root.token;
-
-            if (root.token == null
-                    || ((ttype = root.token.getType()) != CSSLexer.STRING
-                         && ttype != CSSLexer.IDENT)
-                    || (str = root.token.getText()) == null
-                    || str.isEmpty()) {
-                error(root,  "Expected STRING or IDENT");
-            }
-            return new ParsedValueImpl<String, String>(stripQuotes(str), null, false);
-        }
-        return parse(root);
-    }
-
-    private ParsedValueImpl parse(Term root) throws ParseException {
-
-        if (root.token == null) error(root, "Parse error");
-        final Token token = root.token;
-        ParsedValueImpl value = null; // value to return;
-
-        final int ttype = token.getType();
-        switch (ttype) {
-        case CSSLexer.NUMBER:
-        case CSSLexer.PERCENTAGE:
-        case CSSLexer.EMS:
-        case CSSLexer.EXS:
-        case CSSLexer.PX:
-        case CSSLexer.CM:
-        case CSSLexer.MM:
-        case CSSLexer.IN:
-        case CSSLexer.PT:
-        case CSSLexer.PC:
-        case CSSLexer.DEG:
-        case CSSLexer.GRAD:
-        case CSSLexer.RAD:
-        case CSSLexer.TURN:
-            if (root.nextInSeries == null) {
-                ParsedValueImpl sizeValue = new ParsedValueImpl<Size,Number>(size(token), null);
-                value = new ParsedValueImpl<ParsedValue<?,Size>, Number>(sizeValue, SizeConverter.getInstance());
-            } else {
-                ParsedValueImpl<Size,Size>[] sizeValue = parseSizeSeries(root);
-                value = new ParsedValueImpl<ParsedValue[],Number[]>(sizeValue, SizeConverter.SequenceConverter.getInstance());
-            }
-            break;
-        case CSSLexer.SECONDS:
-        case CSSLexer.MS: {
-            ParsedValue<Size, Size> sizeValue = new ParsedValueImpl<Size, Size>(size(token), null);
-            value = new ParsedValueImpl<ParsedValue<?, Size>, Duration>(sizeValue, DurationConverter.getInstance());
-            break;
-        }
-        case CSSLexer.STRING:
-        case CSSLexer.IDENT:
-            boolean isIdent = ttype == CSSLexer.IDENT;
-            final String str = stripQuotes(token.getText());
-            final String text = str.toLowerCase(Locale.ROOT);
-            if ("ladder".equals(text)) {
-                value = ladder(root);
-            } else if ("linear".equals(text) && (root.nextInSeries) != null) {
-                // if nextInSeries is null, then assume this is _not_ an old-style linear gradient
-                value = linearGradient(root);
-            } else if ("radial".equals(text) && (root.nextInSeries) != null) {
-                // if nextInSeries is null, then assume this is _not_ an old-style radial gradient
-                value = radialGradient(root);
-            } else if ("infinity".equals(text)) {
-                Size size = new Size(Double.MAX_VALUE, SizeUnits.PX);
-                ParsedValueImpl sizeValue = new ParsedValueImpl<Size,Number>(size, null);
-                value = new ParsedValueImpl<ParsedValue<?,Size>,Number>(sizeValue, SizeConverter.getInstance());
-            } else if ("indefinite".equals(text)) {
-                Size size = new Size(Double.POSITIVE_INFINITY, SizeUnits.PX);
-                ParsedValueImpl<Size,Size> sizeValue = new ParsedValueImpl<>(size, null);
-                value = new ParsedValueImpl<ParsedValue<?,Size>,Duration>(sizeValue, DurationConverter.getInstance());
-            } else if ("true".equals(text)) {
-                // TODO: handling of boolean is really bogus
-                value = new ParsedValueImpl<String,Boolean>("true",BooleanConverter.getInstance());
-            } else if ("false".equals(text)) {
-                // TODO: handling of boolean is really bogus
-                value = new ParsedValueImpl<String,Boolean>("false",BooleanConverter.getInstance());
-            } else {
-                // if the property value is another property, then it needs to be looked up.
-                boolean needsLookup = isIdent && properties.containsKey(text);
-                if (needsLookup || ((value = colorValueOfString(str)) == null )) {
-                    // If the value is a lookup, make sure to use the lower-case text so it matches the property
-                    // in the Declaration. If the value is not a lookup, then use str since the value might
-                    // be a string which could have some case sensitive meaning
-                    //
-                    // TODO: isIdent is needed here because of RT-38345. This effectively undoes RT-38201
-                    value = new ParsedValueImpl<String,String>(needsLookup ? text : str, null, isIdent || needsLookup);
-                }
-            }
-            break;
-        case CSSLexer.HASH:
-            final String clr = token.getText();
-            try {
-                value = new ParsedValueImpl<Color,Color>(Color.web(clr), null);
-            } catch (final IllegalArgumentException e) {
-                error(root, e.getMessage());
-            }
-            break;
-        case CSSLexer.FUNCTION:
-            return  parseFunction(root);
-        case CSSLexer.URL:
-            return parseURI(root);
-        default:
-            final String msg = "Unknown token type: \'" + ttype + "\'";
-            error(root, msg);
-        }
-        return value;
-
-    }
-
-    /* Parse size.
-     * @throw RecongnitionExcpetion if the token is not a size type or a lookup.
-     */
-    private ParsedValueImpl<?,Size> parseSize(final Term root) throws ParseException {
-
-        if (root.token == null || !isSize(root.token)) error(root, "Expected \'<size>\'");
-
-        ParsedValueImpl<?,Size> value = null;
-
-        if (root.token.getType() != CSSLexer.IDENT) {
-
-            Size size = size(root.token);
-            value = new ParsedValueImpl<Size,Size>(size, null);
-
-        } else {
-
-            String key = root.token.getText();
-            value = new ParsedValueImpl<String,Size>(key, null, true);
-
-        }
-
-        return value;
-    }
-
-    private ParsedValueImpl<?,Color> parseColor(final Term root) throws ParseException {
-
-        ParsedValueImpl<?,Color> color = null;
-        if (root.token != null &&
-            (root.token.getType() == CSSLexer.IDENT ||
-             root.token.getType() == CSSLexer.HASH ||
-             root.token.getType() == CSSLexer.FUNCTION)) {
-
-            color = parse(root);
-
-        } else {
-            error(root,  "Expected \'<color>\'");
-        }
-        return color;
-    }
-
-    // rgb(NUMBER, NUMBER, NUMBER)
-    // rgba(NUMBER, NUMBER, NUMBER, NUMBER)
-    // rgb(PERCENTAGE, PERCENTAGE, PERCENTAGE)
-    // rgba(PERCENTAGE, PERCENTAGE, PERCENTAGE, NUMBER)
-    private ParsedValueImpl rgb(Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"rgb".regionMatches(true, 0, fn, 0, 3)) {
-            final String msg = "Expected \'rgb\' or \'rgba\'";
-            error(root, msg);
-        }
-
-        Term arg = root;
-        Token rtok, gtok, btok, atok;
-
-        if ((arg = arg.firstArg) == null) error(root, "Expected \'<number>\' or \'<percentage>\'");
-        if ((rtok = arg.token) == null ||
-            (rtok.getType() != CSSLexer.NUMBER &&
-             rtok.getType() != CSSLexer.PERCENTAGE)) error(arg, "Expected \'<number>\' or \'<percentage>\'");
-
-        root = arg;
-
-        if ((arg = arg.nextArg) == null) error(root, "Expected \'<number>\' or \'<percentage>\'");
-        if ((gtok = arg.token) == null ||
-            (gtok.getType() != CSSLexer.NUMBER &&
-             gtok.getType() != CSSLexer.PERCENTAGE)) error(arg, "Expected \'<number>\' or \'<percentage>\'");
-
-        root = arg;
-
-        if ((arg = arg.nextArg) == null) error(root, "Expected \'<number>\' or \'<percentage>\'");
-        if ((btok = arg.token) == null ||
-            (btok.getType() != CSSLexer.NUMBER &&
-             btok.getType() != CSSLexer.PERCENTAGE)) error(arg, "Expected \'<number>\' or \'<percentage>\'");
-
-        root = arg;
-
-        if ((arg = arg.nextArg) != null) {
-            if ((atok = arg.token) == null ||
-                 atok.getType() != CSSLexer.NUMBER) error(arg, "Expected \'<number>\'");
-        } else {
-            atok = null;
-        }
-
-        int argType = rtok.getType();
-        if (argType != gtok.getType() || argType != btok.getType() ||
-            (argType != CSSLexer.NUMBER && argType != CSSLexer.PERCENTAGE)) {
-            error(root, "Argument type mistmatch");
-        }
-
-        final String rtext = rtok.getText();
-        final String gtext = gtok.getText();
-        final String btext = btok.getText();
-
-        double rval = 0;
-        double gval = 0;
-        double bval = 0;
-        if (argType == CSSLexer.NUMBER) {
-            rval = clamp(0.0f, Double.parseDouble(rtext) / 255.0f, 1.0f);
-            gval = clamp(0.0f, Double.parseDouble(gtext) / 255.0f, 1.0f);
-            bval = clamp(0.0f, Double.parseDouble(btext) / 255.0f, 1.0f);
-        } else {
-            rval = clamp(0.0f, Double.parseDouble(rtext.substring(0,rtext.length()-1)) / 100.0f, 1.0f);
-            gval = clamp(0.0f, Double.parseDouble(gtext.substring(0,gtext.length()-1)) / 100.0f, 1.0f);
-            bval = clamp(0.0f, Double.parseDouble(btext.substring(0,btext.length()-1)) / 100.0f, 1.0f);
-        }
-
-        final String atext = (atok != null) ? atok.getText() : null;
-        final double aval =  (atext != null) ? clamp(0.0f, Double.parseDouble(atext), 1.0f) : 1.0;
-
-        return new ParsedValueImpl<Color,Color>(Color.color(rval,gval,bval,aval), null);
-
-    }
-
-    // hsb(NUMBER, PERCENTAGE, PERCENTAGE)
-    // hsba(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER)
-    private ParsedValueImpl hsb(Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"hsb".regionMatches(true, 0, fn, 0, 3)) {
-            final String msg = "Expected \'hsb\' or \'hsba\'";
-            error(root, msg);
-        }
-
-        Term arg = root;
-        Token htok, stok, btok, atok;
-
-        if ((arg = arg.firstArg) == null) error(root, "Expected \'<number>\'");
-        if ((htok = arg.token) == null || htok.getType() != CSSLexer.NUMBER) error(arg, "Expected \'<number>\'");
-
-        root = arg;
-
-        if ((arg = arg.nextArg) == null) error(root, "Expected \'<percent>\'");
-        if ((stok = arg.token) == null || stok.getType() != CSSLexer.PERCENTAGE) error(arg, "Expected \'<percent>\'");
-
-        root = arg;
-
-        if ((arg = arg.nextArg) == null) error(root, "Expected \'<percent>\'");
-        if ((btok = arg.token) == null || btok.getType() != CSSLexer.PERCENTAGE) error(arg, "Expected \'<percent>\'");
-
-        root = arg;
-
-        if ((arg = arg.nextArg) != null) {
-            if ((atok = arg.token) == null || atok.getType() != CSSLexer.NUMBER) error(arg, "Expected \'<number>\'");
-        } else {
-            atok = null;
-        }
-
-        final Size hval = size(htok);
-        final Size sval = size(stok);
-        final Size bval = size(btok);
-
-        final double hue = hval.pixels(); // no clamp - hue can be negative
-        final double saturation = clamp(0.0f, sval.pixels(), 1.0f);
-        final double brightness = clamp(0.0f, bval.pixels(), 1.0f);
-
-        final Size aval = (atok != null) ? size(atok) : null;
-        final double opacity =  (aval != null) ? clamp(0.0f, aval.pixels(), 1.0f) : 1.0;
-
-        return new ParsedValueImpl<Color,Color>(Color.hsb(hue, saturation, brightness, opacity), null);
-    }
-
-    // derive(color, pct)
-    private ParsedValueImpl<ParsedValue[],Color> derive(final Term root)
-            throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"derive".regionMatches(true, 0, fn, 0, 6)) {
-            final String msg = "Expected \'derive\'";
-            error(root, msg);
-        }
-
-        Term arg = root;
-        if ((arg = arg.firstArg) == null) error(root, "Expected \'<color>\'");
-
-        final ParsedValueImpl<?,Color> color = parseColor(arg);
-
-        final Term prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<percent\'");
-
-        final ParsedValueImpl<?,Size> brightness = parseSize(arg);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[] { color, brightness };
-        return new ParsedValueImpl<ParsedValue[],Color>(values, DeriveColorConverter.getInstance());
-    }
-
-    // 'ladder' color 'stops' stop+
-    private ParsedValueImpl<ParsedValue[],Color> ladder(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"ladder".regionMatches(true, 0, fn, 0, 6)) {
-            final String msg = "Expected \'ladder\'";
-            error(root, msg);
-        }
-
-        if (LOGGER.isLoggable(Level.WARNING)) {
-            LOGGER.warning(formatDeprecatedMessage(root, "ladder"));
-        }
-
-        Term term = root;
-
-        if ((term = term.nextInSeries) == null) error(root, "Expected \'<color>\'");
-        final ParsedValueImpl<?,Color> color = parse(term);
-
-        Term prev = term;
-
-        if ((term = term.nextInSeries) == null) error(prev,  "Expected \'stops\'");
-        if (term.token == null ||
-            term.token.getType() != CSSLexer.IDENT ||
-            !"stops".equalsIgnoreCase(term.token.getText())) error(term,  "Expected \'stops\'");
-
-        prev = term;
-
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <color>)\'");
-
-        int nStops = 0;
-        Term temp = term;
-        do {
-            nStops += 1;
-            // if next token type is IDENT, then we have CycleMethod
-        } while (((temp = temp.nextInSeries) != null) &&
-                 ((temp.token != null) && (temp.token.getType() == CSSLexer.LPAREN)));
-
-        ParsedValueImpl[] values = new ParsedValueImpl[nStops+1];
-        values[0] = color;
-        int stopIndex = 1;
-        do {
-            ParsedValueImpl<ParsedValue[],Stop> stop = stop(term);
-            if (stop != null) values[stopIndex++] = stop;
-            prev = term;
-        } while(((term = term.nextInSeries) != null) &&
-                 (term.token.getType() == CSSLexer.LPAREN));
-
-        // if term is not null and the last term was not an lparen,
-        // then term starts a new series of Paint. Point
-        // root.nextInSeries to term so the next loop skips over the
-        // already parsed ladder bits.
-        if (term != null) {
-            root.nextInSeries = term;
-        }
-
-        // if term is null, then we are at the end of a series.
-        // root points to 'ladder', now we want the next term after root
-        // to be the term after the last stop, which may be another layer
-        else {
-            root.nextInSeries = null;
-            root.nextLayer = prev.nextLayer;
-        }
-
-        return new ParsedValueImpl<ParsedValue[], Color>(values, LadderConverter.getInstance());
-    }
-
-    // <ladder> = ladder(<color>, <color-stop>[, <color-stop>]+ )
-    private ParsedValueImpl<ParsedValue[],Color> parseLadder(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"ladder".regionMatches(true, 0, fn, 0, 6)) {
-            final String msg = "Expected \'ladder\'";
-            error(root, msg);
-        }
-
-        Term term = root;
-
-        if ((term = term.firstArg) == null) error(root, "Expected \'<color>\'");
-        final ParsedValueImpl<?,Color> color = parse(term);
-
-        Term prev = term;
-
-        if ((term = term.nextArg) == null)
-            error(prev,  "Expected \'<color-stop>[, <color-stop>]+\'");
-
-        ParsedValueImpl<ParsedValue[],Stop>[] stops = parseColorStops(term);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[stops.length+1];
-        values[0] = color;
-        System.arraycopy(stops, 0, values, 1, stops.length);
-        return new ParsedValueImpl<ParsedValue[], Color>(values, LadderConverter.getInstance());
-    }
-
-    // parse (<number>, <color>)+
-    // root.token should be a size
-    // root.token.next should be a color
-    private ParsedValueImpl<ParsedValue[], Stop> stop(final Term root)
-            throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"(".equals(fn)) {
-            final String msg = "Expected \'(\'";
-            error(root, msg);
-        }
-
-        Term arg = null;
-
-        if ((arg = root.firstArg) == null) error(root,  "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> size = parseSize(arg);
-
-        Term prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev,  "Expected \'<color>\'");
-
-        ParsedValueImpl<?,Color> color = parseColor(arg);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[] { size, color };
-        return new ParsedValueImpl<ParsedValue[],Stop>(values, StopConverter.getInstance());
-
-    }
-
-    // http://dev.w3.org/csswg/css3-images/#color-stop-syntax
-    // <color-stop> = <color> [ <percentage> | <length> ]?
-    private ParsedValueImpl<ParsedValue[], Stop>[] parseColorStops(final Term root)
-            throws ParseException {
-
-        int nArgs = 1;
-        Term temp = root;
-        while(temp != null) {
-            if (temp.nextArg != null) {
-                nArgs += 1;
-                temp = temp.nextArg;
-            } else if (temp.nextInSeries != null) {
-                temp = temp.nextInSeries;
-            } else {
-                break;
-            }
-        }
-
-        if (nArgs < 2) {
-            error(root, "Expected \'<color-stop>\'");
-        }
-
-        ParsedValueImpl<?,Color>[] colors = new ParsedValueImpl[nArgs];
-        Size[] positions = new Size[nArgs];
-        java.util.Arrays.fill(positions, null);
-
-        Term stop = root;
-        Term prev = root;
-        SizeUnits units = null;
-        for (int n = 0; n<nArgs; n++) {
-
-            colors[n] = parseColor(stop);
-
-            prev = stop;
-            Term term = stop.nextInSeries;
-            if (term != null) {
-                if (isSize(term.token)) {
-                    positions[n] = size(term.token);
-                    if (units != null) {
-                        if (units != positions[n].getUnits()) {
-                            error(term, "Parser unable to handle mixed \'<percent>\' and \'<length>\'");
-                        }
-                    }
-                } else {
-                    error(prev, "Expected \'<percent>\' or \'<length>\'");
-                }
-                prev = term;
-                stop = term.nextArg;
-            } else {
-                prev = stop;
-                stop = stop.nextArg;
-            }
-
-        }
-
-        //
-        // normalize positions according to
-        // http://dev.w3.org/csswg/css3-images/#color-stop-syntax
-        //
-        // If the first color-stop does not have a position, set its
-        // position to 0%. If the last color-stop does not have a position,
-        // set its position to 100%.
-        if (positions[0] == null) positions[0] = new Size(0, SizeUnits.PERCENT);
-        if (positions[nArgs-1] == null) positions[nArgs-1] = new Size(100, SizeUnits.PERCENT);
-
-        // If a color-stop has a position that is less than the specified
-        // position of any color-stop before it in the list, set its
-        // position to be equal to the largest specified position of any
-        // color-stop before it.
-        Size max = null;
-        for (int n = 1 ; n<nArgs; n++) {
-            Size pos0 = positions[n-1];
-            if (pos0 == null) continue;
-            if (max == null || max.getValue() < pos0.getValue()) {
-                // TODO: this doesn't work with mixed length and percent
-                max = pos0;
-            }
-            Size pos1 = positions[n];
-            if (pos1 == null) continue;
-
-            if (pos1.getValue() < max.getValue()) positions[n] = max;
-        }
-
-        // If any color-stop still does not have a position, then,
-        // for each run of adjacent color-stops without positions, set
-        // their positions so that they are evenly spaced between the
-        // preceding and following color-stops with positions.
-        Size preceding = null;
-        int withoutIndex = -1;
-        for (int n = 0 ; n<nArgs; n++) {
-            Size pos = positions[n];
-            if (pos == null) {
-                if (withoutIndex == -1) withoutIndex = n;
-            } else {
-                if (withoutIndex > -1) {
-
-                    int nWithout = n - withoutIndex;
-                    double precedingValue = preceding.getValue();
-                    double delta =
-                        (pos.getValue() - precedingValue) / (nWithout + 1);
-
-                    while(withoutIndex < n) {
-                        precedingValue += delta;
-                        positions[withoutIndex++] =
-                            new Size(precedingValue, pos.getUnits());
-                    }
-                    withoutIndex = -1;
-                    preceding = pos;
-                } else {
-                    preceding = pos;
-                }
-            }
-        }
-
-        ParsedValueImpl<ParsedValue[],Stop>[] stops = new ParsedValueImpl[nArgs];
-        for (int n=0; n<nArgs; n++) {
-            stops[n] = new ParsedValueImpl<ParsedValue[],Stop>(
-                new ParsedValueImpl[] {
-                    new ParsedValueImpl<Size,Size>(positions[n], null),
-                    colors[n]
-                },
-                StopConverter.getInstance()
-            );
-        }
-
-        return stops;
-
-    }
-
-    // parse (<number>, <number>)
-    private ParsedValueImpl[] point(final Term root) throws ParseException {
-
-        if (root.token == null ||
-            root.token.getType() != CSSLexer.LPAREN) error(root, "Expected \'(<number>, <number>)\'");
-
-        final String fn = root.token.getText();
-        if (fn == null || !"(".equalsIgnoreCase(fn)) {
-            final String msg = "Expected \'(\'";
-            error(root, msg);
-        }
-
-        Term arg = null;
-
-        // no <number>
-        if ((arg = root.firstArg) == null)  error(root, "Expected \'<number>\'");
-
-        final ParsedValueImpl<?,Size> ptX = parseSize(arg);
-
-        final Term prev = arg;
-
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        final ParsedValueImpl<?,Size> ptY = parseSize(arg);
-
-        return new ParsedValueImpl[] { ptX, ptY };
-    }
-
-    private ParsedValueImpl parseFunction(final Term root) throws ParseException {
-
-        // Text from parser is function name plus the lparen, e.g., 'derive('
-        final String fcn = (root.token != null) ? root.token.getText() : null;
-        if (fcn == null) {
-            error(root, "Expected function name");
-        } else if ("rgb".regionMatches(true, 0, fcn, 0, 3)) {
-            return rgb(root);
-        } else if ("hsb".regionMatches(true, 0, fcn, 0, 3)) {
-            return hsb(root);
-        } else if ("derive".regionMatches(true, 0, fcn, 0, 6)) {
-            return derive(root);
-        } else if ("innershadow".regionMatches(true, 0, fcn, 0, 11)) {
-            return innershadow(root);
-        } else if ("dropshadow".regionMatches(true, 0, fcn, 0, 10)) {
-            return dropshadow(root);
-        } else if ("linear-gradient".regionMatches(true, 0, fcn, 0, 15)) {
-            return parseLinearGradient(root);
-        } else if ("radial-gradient".regionMatches(true, 0, fcn, 0, 15)) {
-            return parseRadialGradient(root);
-        } else if ("image-pattern".regionMatches(true, 0, fcn, 0, 13)) {
-            return parseImagePattern(root);
-        } else if ("repeating-image-pattern".regionMatches(true, 0, fcn, 0, 23)) {
-            return parseRepeatingImagePattern(root);
-        } else if ("ladder".regionMatches(true, 0, fcn, 0, 6)) {
-            return parseLadder(root);
-        } else if ("region".regionMatches(true, 0, fcn, 0, 6)) {
-            return parseRegion(root);
-        } else {
-            error(root, "Unexpected function \'" + fcn + "\'");
-        }
-        return null;
-    }
-
-    private ParsedValueImpl<String,BlurType> blurType(final Term root) throws ParseException {
-
-        if (root == null) return null;
-        if (root.token == null ||
-            root.token.getType() != CSSLexer.IDENT ||
-            root.token.getText() == null ||
-            root.token.getText().isEmpty()) {
-            final String msg = "Expected \'gaussian\', \'one-pass-box\', \'two-pass-box\', or \'three-pass-box\'";
-            error(root, msg);
-        }
-        final String blurStr = root.token.getText().toLowerCase(Locale.ROOT);
-        BlurType blurType = BlurType.THREE_PASS_BOX;
-        if ("gaussian".equals(blurStr)) {
-            blurType = BlurType.GAUSSIAN;
-        } else if ("one-pass-box".equals(blurStr)) {
-            blurType = BlurType.ONE_PASS_BOX;
-        } else if ("two-pass-box".equals(blurStr)) {
-            blurType = BlurType.TWO_PASS_BOX;
-        } else if ("three-pass-box".equals(blurStr)) {
-            blurType = BlurType.THREE_PASS_BOX;
-        } else {
-            final String msg = "Expected \'gaussian\', \'one-pass-box\', \'two-pass-box\', or \'three-pass-box\'";
-            error(root, msg);
-        }
-        return new ParsedValueImpl<String,BlurType>(blurType.name(), new EnumConverter<BlurType>(BlurType.class));
-    }
-
-    // innershadow <blur-type> <color> <radius> <choke> <offset-x> <offset-y>
-    private ParsedValueImpl innershadow(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"innershadow".regionMatches(true, 0, fn, 0, 11)) {
-            final String msg = "Expected \'innershadow\'";
-            error(root, msg);
-        }
-
-        Term arg;
-
-        if ((arg = root.firstArg) == null) error(root, "Expected \'<blur-type>\'");
-        ParsedValueImpl<String,BlurType> blurVal = blurType(arg);
-
-        Term prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<color>\'");
-
-        ParsedValueImpl<?,Color> colorVal = parseColor(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> radiusVal = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> chokeVal = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> offsetXVal = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> offsetYVal = parseSize(arg);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[] {
-            blurVal,
-            colorVal,
-            radiusVal,
-            chokeVal,
-            offsetXVal,
-            offsetYVal
-        };
-        return new ParsedValueImpl<ParsedValue[],Effect>(values, EffectConverter.InnerShadowConverter.getInstance());
-    }
-
-    // dropshadow <blur-type> <color> <radius> <spread> <offset-x> <offset-y>
-    private ParsedValueImpl dropshadow(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"dropshadow".regionMatches(true, 0, fn, 0, 10)) {
-            final String msg = "Expected \'dropshadow\'";
-            error(root, msg);
-        }
-
-        Term arg;
-
-        if ((arg = root.firstArg) == null) error(root, "Expected \'<blur-type>\'");
-        ParsedValueImpl<String,BlurType> blurVal = blurType(arg);
-
-        Term prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<color>\'");
-
-        ParsedValueImpl<?,Color> colorVal = parseColor(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> radiusVal = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> spreadVal = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> offsetXVal = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
-
-        ParsedValueImpl<?,Size> offsetYVal = parseSize(arg);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[] {
-            blurVal,
-            colorVal,
-            radiusVal,
-            spreadVal,
-            offsetXVal,
-            offsetYVal
-        };
-        return new ParsedValueImpl<ParsedValue[],Effect>(values, EffectConverter.DropShadowConverter.getInstance());
-    }
-
-    // returns null if the Term is null or is not a cycle method.
-    private ParsedValueImpl<String, CycleMethod> cycleMethod(final Term root) {
-        CycleMethod cycleMethod = null;
-        if (root != null && root.token.getType() == CSSLexer.IDENT) {
-
-            final String text = root.token.getText().toLowerCase(Locale.ROOT);
-            if ("repeat".equals(text)) {
-                cycleMethod = CycleMethod.REPEAT;
-            } else if ("reflect".equals(text)) {
-                cycleMethod = CycleMethod.REFLECT;
-            } else if ("no-cycle".equals(text)) {
-                cycleMethod = CycleMethod.NO_CYCLE;
-            }
-        }
-        if (cycleMethod != null)
-            return new ParsedValueImpl<String,CycleMethod>(cycleMethod.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
-        else
-            return null;
-    }
-
-    // linear <point> TO <point> STOPS <stop>+ cycleMethod?
-    private ParsedValueImpl<ParsedValue[],Paint> linearGradient(final Term root) throws ParseException {
-
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"linear".equalsIgnoreCase(fn)) {
-            final String msg = "Expected \'linear\'";
-            error(root, msg);
-        }
-
-        if (LOGGER.isLoggable(Level.WARNING)) {
-            LOGGER.warning(formatDeprecatedMessage(root, "linear gradient"));
-        }
-
-        Term term = root;
-
-        if ((term = term.nextInSeries) == null) error(root, "Expected \'(<number>, <number>)\'");
-
-        final ParsedValueImpl<?,Size>[] startPt = point(term);
-
-        Term prev = term;
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'to\'");
-        if (term.token == null ||
-            term.token.getType() != CSSLexer.IDENT ||
-            !"to".equalsIgnoreCase(term.token.getText())) error(root, "Expected \'to\'");
-
-        prev = term;
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <number>)\'");
-
-        final ParsedValueImpl<?,Size>[] endPt = point(term);
-
-        prev = term;
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'stops\'");
-        if (term.token == null ||
-            term.token.getType() != CSSLexer.IDENT ||
-            !"stops".equalsIgnoreCase(term.token.getText())) error(term, "Expected \'stops\'");
-
-        prev = term;
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <number>)\'");
-
-        int nStops = 0;
-        Term temp = term;
-        do {
-            nStops += 1;
-            // if next token type is IDENT, then we have CycleMethod
-        } while (((temp = temp.nextInSeries) != null) &&
-                 ((temp.token != null) && (temp.token.getType() == CSSLexer.LPAREN)));
-
-        ParsedValueImpl[] stops = new ParsedValueImpl[nStops];
-        int stopIndex = 0;
-        do {
-            ParsedValueImpl<ParsedValue[],Stop> stop = stop(term);
-            if (stop != null) stops[stopIndex++] = stop;
-            prev = term;
-        } while(((term = term.nextInSeries) != null) &&
-                (term.token.getType() == CSSLexer.LPAREN));
-
-        // term is either null or is a cycle method, or the start of another Paint.
-        ParsedValueImpl<String,CycleMethod> cycleMethod = cycleMethod(term);
-
-        if (cycleMethod == null) {
-
-            cycleMethod = new ParsedValueImpl<String,CycleMethod>(CycleMethod.NO_CYCLE.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
-
-            // if term is not null and the last term was not a cycle method,
-            // then term starts a new series or layer of Paint
-            if (term != null) {
-                root.nextInSeries = term;
-            }
-
-            // if term is null, then we are at the end of a series.
-            // root points to 'linear', now we want the next term after root
-            // to be the term after the last stop, which may be another layer
-            else {
-                root.nextInSeries = null;
-                root.nextLayer = prev.nextLayer;
-            }
-
-
-        } else {
-            // last term was a CycleMethod, so term is not null.
-            // root points at 'linear', now we want the next term after root
-            // to be the term after cyclemethod, which may be another series
-            // of paint or another layer.
-            //
-            root.nextInSeries = term.nextInSeries;
-            root.nextLayer = term.nextLayer;
-        }
-
-        ParsedValueImpl[] values = new ParsedValueImpl[5 + stops.length];
-        int index = 0;
-        values[index++] = (startPt != null) ? startPt[0] : null;
-        values[index++] = (startPt != null) ? startPt[1] : null;
-        values[index++] = (endPt != null) ? endPt[0] : null;
-        values[index++] = (endPt != null) ? endPt[1] : null;
-        values[index++] = cycleMethod;
-        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
-        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.LinearGradientConverter.getInstance());
-    }
-
-    // Based off http://dev.w3.org/csswg/css3-images/#linear-gradients
-    //
-    // <linear-gradient> = linear-gradient(
-    //        [ [from <point> to <point>] | [ to <side-or-corner> ] ] ,]? [ [ repeat | reflect ] ,]?
-    //        <color-stop>[, <color-stop>]+
-    // )
-    //
-    //
-    // <point> = <percentage> <percentage> | <length> <length>
-    // <side-or-corner> = [left | right] || [top | bottom]
-    //
-    // If neither repeat nor reflect are given, then the CycleMethod defaults "NO_CYCLE".
-    // If neither [from <point> to <point>] nor [ to <side-or-corner> ] are given,
-    // then the gradient direction defaults to 'to bottom'.
-    // Stops are per http://dev.w3.org/csswg/css3-images/#color-stop-syntax.
-    private ParsedValueImpl parseLinearGradient(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"linear-gradient".regionMatches(true, 0, fn, 0, 15)) {
-            final String msg = "Expected \'linear-gradient\'";
-            error(root, msg);
-        }
-
-        Term arg;
-
-        if ((arg = root.firstArg) == null ||
-             arg.token == null ||
-             arg.token.getText().isEmpty()) {
-            error(root,
-                "Expected \'from <point> to <point>\' or \'to <side-or-corner>\' " +
-                "or \'<cycle-method>\' or \'<color-stop>\'");
-        }
-
-        Term prev = arg;
-//        ParsedValueImpl<Size,Size> angleVal = null;
-        ParsedValueImpl<?,Size>[] startPt = null;
-        ParsedValueImpl<?,Size>[] endPt = null;
-
-        if ("from".equalsIgnoreCase(arg.token.getText())) {
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
-
-            ParsedValueImpl<?,Size> ptX = parseSize(arg);
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
-
-            ParsedValueImpl<?,Size> ptY = parseSize(arg);
-
-            startPt = new ParsedValueImpl[] { ptX, ptY };
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'to\'");
-            if (arg.token == null ||
-                arg.token.getType() != CSSLexer.IDENT ||
-                !"to".equalsIgnoreCase(arg.token.getText())) error(prev, "Expected \'to\'");
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
-
-            ptX = parseSize(arg);
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
-
-            ptY = parseSize(arg);
-
-            endPt = new ParsedValueImpl[] { ptX, ptY };
-
-            prev = arg;
-            arg = arg.nextArg;
-
-        } else if("to".equalsIgnoreCase(arg.token.getText())) {
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null ||
-                arg.token == null ||
-                arg.token.getType() != CSSLexer.IDENT ||
-                arg.token.getText().isEmpty()) {
-                error (prev, "Expected \'<side-or-corner>\'");
-            }
-
-
-            int startX = 0;
-            int startY = 0;
-            int endX = 0;
-            int endY = 0;
-
-            String sideOrCorner1 = arg.token.getText().toLowerCase(Locale.ROOT);
-            // The keywords denote the direction.
-            if ("top".equals(sideOrCorner1)) {
-                // going toward the top, then start at the bottom
-                startY = 100;
-                endY = 0;
-
-            } else if ("bottom".equals(sideOrCorner1)) {
-                // going toward the bottom, then start at the top
-                startY = 0;
-                endY = 100;
-
-            } else if ("right".equals(sideOrCorner1)) {
-                // going toward the right, then start at the left
-                startX = 0;
-                endX = 100;
-
-            } else if ("left".equals(sideOrCorner1)) {
-                // going toward the left, then start at the right
-                startX = 100;
-                endX = 0;
-
-            } else {
-                error(arg, "Invalid \'<side-or-corner>\'");
-            }
-
-            prev = arg;
-            if (arg.nextInSeries != null) {
-                arg = arg.nextInSeries;
-                if (arg.token != null &&
-                    arg.token.getType() == CSSLexer.IDENT &&
-                    !arg.token.getText().isEmpty()) {
-
-                    String sideOrCorner2 = arg.token.getText().toLowerCase(Locale.ROOT);
-
-                    // if right or left has already been given,
-                    // then either startX or endX will not be zero.
-                    if ("right".equals(sideOrCorner2) &&
-                        startX == 0 && endX == 0) {
-                        // start left, end right
-                        startX = 0;
-                        endX = 100;
-                    } else if ("left".equals(sideOrCorner2) &&
-                        startX == 0 && endX == 0) {
-                        // start right, end left
-                        startX = 100;
-                        endX = 0;
-
-                    // if top or bottom has already been given,
-                    // then either startY or endY will not be zero.
-                    } else if("top".equals(sideOrCorner2) &&
-                        startY == 0 && endY == 0) {
-                        // start bottom, end top
-                        startY = 100;
-                        endY = 0;
-                    } else if ("bottom".equals(sideOrCorner2) &&
-                        startY == 0 && endY == 0) {
-                        // start top, end bottom
-                        startY = 0;
-                        endY = 100;
-
-                    } else {
-                        error(arg, "Invalid \'<side-or-corner>\'");
-                    }
-
-                } else {
-                    error (prev, "Expected \'<side-or-corner>\'");
-                }
-            }
-
-
-            startPt = new ParsedValueImpl[] {
-                new ParsedValueImpl<Size,Size>(new Size(startX, SizeUnits.PERCENT), null),
-                new ParsedValueImpl<Size,Size>(new Size(startY, SizeUnits.PERCENT), null)
-            };
-
-            endPt = new ParsedValueImpl[] {
-                new ParsedValueImpl<Size,Size>(new Size(endX, SizeUnits.PERCENT), null),
-                new ParsedValueImpl<Size,Size>(new Size(endY, SizeUnits.PERCENT), null)
-            };
-
-            prev = arg;
-            arg = arg.nextArg;
-        }
-
-        if (startPt == null && endPt == null) {
-            // spec says defaults to bottom
-            startPt = new ParsedValueImpl[] {
-                new ParsedValueImpl<Size,Size>(new Size(0, SizeUnits.PERCENT), null),
-                new ParsedValueImpl<Size,Size>(new Size(0, SizeUnits.PERCENT), null)
-            };
-
-            endPt = new ParsedValueImpl[] {
-                new ParsedValueImpl<Size,Size>(new Size(0, SizeUnits.PERCENT), null),
-                new ParsedValueImpl<Size,Size>(new Size(100, SizeUnits.PERCENT), null)
-            };
-        }
-
-        if (arg == null ||
-            arg.token == null ||
-            arg.token.getText().isEmpty()) {
-            error(prev, "Expected \'<cycle-method>\' or \'<color-stop>\'");
-        }
-
-        CycleMethod cycleMethod = CycleMethod.NO_CYCLE;
-        if ("reflect".equalsIgnoreCase(arg.token.getText())) {
-            cycleMethod = CycleMethod.REFLECT;
-            prev = arg;
-            arg = arg.nextArg;
-        } else if ("repeat".equalsIgnoreCase(arg.token.getText())) {
-            cycleMethod = CycleMethod.REFLECT;
-            prev = arg;
-            arg = arg.nextArg;
-        }
-
-        if (arg == null  ||
-            arg.token == null ||
-            arg.token.getText().isEmpty()) {
-            error(prev, "Expected \'<color-stop>\'");
-        }
-
-        ParsedValueImpl<ParsedValue[],Stop>[] stops = parseColorStops(arg);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[5 + stops.length];
-        int index = 0;
-        values[index++] = (startPt != null) ? startPt[0] : null;
-        values[index++] = (startPt != null) ? startPt[1] : null;
-        values[index++] = (endPt != null) ? endPt[0] : null;
-        values[index++] = (endPt != null) ? endPt[1] : null;
-        values[index++] = new ParsedValueImpl<String,CycleMethod>(cycleMethod.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
-        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
-        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.LinearGradientConverter.getInstance());
-
-    }
-
-    // radial [focus-angle <number | percent>]? [focus-distance <size>]?
-    // [center (<size>,<size>)]? <size>
-    // stops [ ( <number> , <color> ) ]+ [ repeat | reflect ]?
-    private ParsedValueImpl<ParsedValue[], Paint> radialGradient(final Term root) throws ParseException {
-
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (fn == null || !"radial".equalsIgnoreCase(fn)) {
-            final String msg = "Expected \'radial\'";
-            error(root, msg);
-        }
-
-        if (LOGGER.isLoggable(Level.WARNING)) {
-            LOGGER.warning(formatDeprecatedMessage(root, "radial gradient"));
-        }
-
-        Term term = root;
-        Term prev = root;
-
-        if ((term = term.nextInSeries) == null) error(root, "Expected \'focus-angle <number>\', \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
-        if (term.token == null) error(term, "Expected \'focus-angle <number>\', \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
-
-
-        ParsedValueImpl<?,Size> focusAngle = null;
-        if (term.token.getType() == CSSLexer.IDENT) {
-            final String keyword = term.token.getText().toLowerCase(Locale.ROOT);
-            if ("focus-angle".equals(keyword)) {
-
-                prev = term;
-                if ((term = term.nextInSeries) == null) error(prev, "Expected \'<number>\'");
-                if (term.token == null) error(prev, "Expected \'<number>\'");
-
-                focusAngle = parseSize(term);
-
-                prev = term;
-                if ((term = term.nextInSeries) == null) error(prev, "Expected \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
-                if (term.token == null) error(term,  "Expected \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
-            }
-        }
-
-        ParsedValueImpl<?,Size> focusDistance = null;
-        if (term.token.getType() == CSSLexer.IDENT) {
-            final String keyword = term.token.getText().toLowerCase(Locale.ROOT);
-            if ("focus-distance".equals(keyword)) {
-
-                prev = term;
-                if ((term = term.nextInSeries) == null) error(prev, "Expected \'<number>\'");
-                if (term.token == null) error(prev, "Expected \'<number>\'");
-
-                focusDistance = parseSize(term);
-
-                prev = term;
-                if ((term = term.nextInSeries) == null) error(prev, "Expected  \'center (<number>,<number>)\' or \'<size>\'");
-                if (term.token == null) error(term,  "Expected  \'center (<number>,<number>)\' or \'<size>\'");
-            }
-        }
-
-        ParsedValueImpl<?,Size>[] centerPoint = null;
-        if (term.token.getType() == CSSLexer.IDENT) {
-            final String keyword = term.token.getText().toLowerCase(Locale.ROOT);
-            if ("center".equals(keyword)) {
-
-                prev = term;
-                if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>,<number>)\'");
-                if (term.token == null ||
-                    term.token.getType() != CSSLexer.LPAREN) error(term, "Expected \'(<number>,<number>)\'");
-
-                centerPoint = point(term);
-
-                prev = term;
-                if ((term = term.nextInSeries) == null) error(prev, "Expected \'<size>\'");
-                if (term.token == null) error(term,  "Expected \'<size>\'");
-            }
-        }
-
-        ParsedValueImpl<?,Size> radius = parseSize(term);
-
-        prev = term;
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'stops\' keyword");
-        if (term.token == null ||
-            term.token.getType() != CSSLexer.IDENT) error(term, "Expected \'stops\' keyword");
-
-        if (!"stops".equalsIgnoreCase(term.token.getText())) error(term, "Expected \'stops\'");
-
-        prev = term;
-        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <number>)\'");
-
-        int nStops = 0;
-        Term temp = term;
-        do {
-            nStops += 1;
-            // if next token type is IDENT, then we have CycleMethod
-        } while (((temp = temp.nextInSeries) != null) &&
-                 ((temp.token != null) && (temp.token.getType() == CSSLexer.LPAREN)));
-
-        ParsedValueImpl[] stops = new ParsedValueImpl[nStops];
-        int stopIndex = 0;
-        do {
-            ParsedValueImpl<ParsedValue[],Stop> stop = stop(term);
-            if (stop != null) stops[stopIndex++] = stop;
-            prev = term;
-        } while(((term = term.nextInSeries) != null) &&
-                (term.token.getType() == CSSLexer.LPAREN));
-
-        // term is either null or is a cycle method, or the start of another Paint.
-        ParsedValueImpl<String,CycleMethod> cycleMethod = cycleMethod(term);
-
-        if (cycleMethod == null) {
-
-            cycleMethod = new ParsedValueImpl<String,CycleMethod>(CycleMethod.NO_CYCLE.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
-
-            // if term is not null and the last term was not a cycle method,
-            // then term starts a new series or layer of Paint
-            if (term != null) {
-                root.nextInSeries = term;
-            }
-
-            // if term is null, then we are at the end of a series.
-            // root points to 'linear', now we want the next term after root
-            // to be the term after the last stop, which may be another layer
-            else {
-                root.nextInSeries = null;
-                root.nextLayer = prev.nextLayer;
-            }
-
-
-        } else {
-            // last term was a CycleMethod, so term is not null.
-            // root points at 'linear', now we want the next term after root
-            // to be the term after cyclemethod, which may be another series
-            // of paint or another layer.
-            //
-            root.nextInSeries = term.nextInSeries;
-            root.nextLayer = term.nextLayer;
-        }
-
-        ParsedValueImpl[] values = new ParsedValueImpl[6 + stops.length];
-        int index = 0;
-        values[index++] = focusAngle;
-        values[index++] = focusDistance;
-        values[index++] = (centerPoint != null) ? centerPoint[0] : null;
-        values[index++] = (centerPoint != null) ? centerPoint[1] : null;
-        values[index++] = radius;
-        values[index++] = cycleMethod;
-        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
-        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.RadialGradientConverter.getInstance());
-    }
-
-    // Based off http://dev.w3.org/csswg/css3-images/#radial-gradients
-    //
-    // <radial-gradient> = radial-gradient(
-    //        [ focus-angle <angle>, ]?
-    //        [ focus-distance <percentage>, ]?
-    //        [ center <point>, ]?
-    //        radius <length>,
-    //        [ [ repeat | reflect ] ,]?
-    //        <color-stop>[, <color-stop>]+ )
-    //
-    // Stops are per http://dev.w3.org/csswg/css3-images/#color-stop-syntax.
-    private ParsedValueImpl parseRadialGradient(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"radial-gradient".regionMatches(true, 0, fn, 0, 15)) {
-            final String msg = "Expected \'radial-gradient\'";
-            error(root, msg);
-        }
-
-        Term arg;
-
-        if ((arg = root.firstArg) == null ||
-             arg.token == null ||
-             arg.token.getText().isEmpty()) {
-            error(root,
-                "Expected \'focus-angle <angle>\' " +
-                "or \'focus-distance <percentage>\' " +
-                "or \'center <point>\' " +
-                "or \'radius [<length> | <percentage>]\'");
-        }
-
-        Term prev = arg;
-        ParsedValueImpl<?,Size>focusAngle = null;
-        ParsedValueImpl<?,Size>focusDistance = null;
-        ParsedValueImpl<?,Size>[] centerPoint = null;
-        ParsedValueImpl<?,Size>radius = null;
-
-        if ("focus-angle".equalsIgnoreCase(arg.token.getText())) {
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null ||
-                    !isSize(arg.token)) error(prev, "Expected \'<angle>\'");
-
-            Size angle = size(arg.token);
-            switch(angle.getUnits()) {
-                case DEG:
-                case RAD:
-                case GRAD:
-                case TURN:
-                case PX:
-                    break;
-                default:
-                    error(arg, "Expected [deg | rad | grad | turn ]");
-            }
-            focusAngle = new ParsedValueImpl<Size,Size>(angle, null);
-
-            prev = arg;
-            if ((arg = arg.nextArg) == null)
-                error(prev, "Expected \'focus-distance <percentage>\' " +
-                            "or \'center <point>\' " +
-                            "or \'radius [<length> | <percentage>]\'");
-
-        }
-
-        if ("focus-distance".equalsIgnoreCase(arg.token.getText())) {
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null ||
-                    !isSize(arg.token)) error(prev, "Expected \'<percentage>\'");
-
-            Size distance = size(arg.token);
-
-            // "The focus point is always specified relative to the center
-            // point by an angle and a distance relative to the radius."
-            switch(distance.getUnits()) {
-                case PERCENT:
-                    break;
-                default:
-                    error(arg, "Expected \'%\'");
-            }
-            focusDistance = new ParsedValueImpl<Size,Size>(distance, null);
-
-            prev = arg;
-            if ((arg = arg.nextArg) == null)
-                error(prev, "Expected \'center <center>\' " +
-                            "or \'radius <length>\'");
-
-        }
-
-        if ("center".equalsIgnoreCase(arg.token.getText())) {
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
-
-            ParsedValueImpl<?,Size> ptX = parseSize(arg);
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
-
-            ParsedValueImpl<?,Size> ptY = parseSize(arg);
-
-            centerPoint = new ParsedValueImpl[] { ptX, ptY };
-
-            prev = arg;
-            if ((arg = arg.nextArg) == null)
-                error(prev, "Expected \'radius [<length> | <percentage>]\'");
-        }
-
-        if ("radius".equalsIgnoreCase(arg.token.getText())) {
-
-            prev = arg;
-            if ((arg = arg.nextInSeries) == null ||
-                !isSize(arg.token)) error(prev, "Expected \'[<length> | <percentage>]\'");
-
-            radius = parseSize(arg);
-
-            prev = arg;
-            if ((arg = arg.nextArg) == null)
-                error(prev, "Expected \'radius [<length> | <percentage>]\'");
-        }
-
-        CycleMethod cycleMethod = CycleMethod.NO_CYCLE;
-        if ("reflect".equalsIgnoreCase(arg.token.getText())) {
-            cycleMethod = CycleMethod.REFLECT;
-            prev = arg;
-            arg = arg.nextArg;
-        } else if ("repeat".equalsIgnoreCase(arg.token.getText())) {
-            cycleMethod = CycleMethod.REFLECT;
-            prev = arg;
-            arg = arg.nextArg;
-        }
-
-        if (arg == null  ||
-            arg.token == null ||
-            arg.token.getText().isEmpty()) {
-            error(prev, "Expected \'<color-stop>\'");
-        }
-
-        ParsedValueImpl<ParsedValue[],Stop>[] stops = parseColorStops(arg);
-
-        ParsedValueImpl[] values = new ParsedValueImpl[6 + stops.length];
-        int index = 0;
-        values[index++] = focusAngle;
-        values[index++] = focusDistance;
-        values[index++] = (centerPoint != null) ? centerPoint[0] : null;
-        values[index++] = (centerPoint != null) ? centerPoint[1] : null;
-        values[index++] = radius;
-        values[index++] = new ParsedValueImpl<String,CycleMethod>(cycleMethod.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
-        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
-        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.RadialGradientConverter.getInstance());
-
-    }
-
-    // Based off ImagePattern constructor
-    //
-    // image-pattern(<uri-string>[,<size>,<size>,<size>,<size>[,<boolean>]?]?)
-    //
-    private ParsedValueImpl<ParsedValue[], Paint> parseImagePattern(final Term root) throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"image-pattern".regionMatches(true, 0, fn, 0, 13)) {
-            final String msg = "Expected \'image-pattern\'";
-            error(root, msg);
-        }
-
-        Term arg;
-        if ((arg = root.firstArg) == null ||
-             arg.token == null ||
-             arg.token.getText().isEmpty()) {
-            error(root,
-                "Expected \'<uri-string>\'");
-        }
-
-        Term prev = arg;
-
-        final String uri = arg.token.getText();
-        ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
-            new ParsedValueImpl<String,String>(uri, StringConverter.getInstance()),
-            null // placeholder for Stylesheet URL
-        };
-        ParsedValueImpl parsedURI = new ParsedValueImpl<ParsedValue[],String>(uriValues, URLConverter.getInstance());
-
-        // If nextArg is null, then there are no remaining arguments, so we are done.
-        if (arg.nextArg == null) {
-            ParsedValueImpl[] values = new ParsedValueImpl[1];
-            values[0] = parsedURI;
-            return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.ImagePatternConverter.getInstance());
-        }
-
-        // There must now be 4 sizes in a row.
-        Token token;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
-        ParsedValueImpl<?, Size> x = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
-        ParsedValueImpl<?, Size> y = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
-        ParsedValueImpl<?, Size> w = parseSize(arg);
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
-        ParsedValueImpl<?, Size> h = parseSize(arg);
-
-        // If there are no more args, then we are done.
-        if (arg.nextArg == null) {
-            ParsedValueImpl[] values = new ParsedValueImpl[5];
-            values[0] = parsedURI;
-            values[1] = x;
-            values[2] = y;
-            values[3] = w;
-            values[4] = h;
-            return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.ImagePatternConverter.getInstance());
-        }
-
-        prev = arg;
-        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<boolean>\'");
-        if ((token = arg.token) == null || token.getText() == null) error(arg, "Expected \'<boolean>\'");
-
-        ParsedValueImpl[] values = new ParsedValueImpl[6];
-        values[0] = parsedURI;
-        values[1] = x;
-        values[2] = y;
-        values[3] = w;
-        values[4] = h;
-        values[5] = new ParsedValueImpl<Boolean, Boolean>(Boolean.parseBoolean(token.getText()), null);
-        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.ImagePatternConverter.getInstance());
-    }
-
-    // For tiling ImagePatterns easily.
-    //
-    // repeating-image-pattern(<uri-string>)
-    //
-    private ParsedValueImpl<ParsedValue[], Paint> parseRepeatingImagePattern(final Term root) throws ParseException {
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"repeating-image-pattern".regionMatches(true, 0, fn, 0, 23)) {
-            final String msg = "Expected \'repeating-image-pattern\'";
-            error(root, msg);
-        }
-
-        Term arg;
-        if ((arg = root.firstArg) == null ||
-             arg.token == null ||
-             arg.token.getText().isEmpty()) {
-            error(root,
-                "Expected \'<uri-string>\'");
-        }
-
-        final String uri = arg.token.getText();
-        ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
-            new ParsedValueImpl<String,String>(uri, StringConverter.getInstance()),
-            null // placeholder for Stylesheet URL
-        };
-        ParsedValueImpl parsedURI = new ParsedValueImpl<ParsedValue[],String>(uriValues, URLConverter.getInstance());
-        ParsedValueImpl[] values = new ParsedValueImpl[1];
-        values[0] = parsedURI;
-        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.RepeatingImagePatternConverter.getInstance());
-    }
-
-    // parse a series of paint values separated by commas.
-    // i.e., <paint> [, <paint>]*
-    private ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]> parsePaintLayers(Term root)
-            throws ParseException {
-
-        // how many paints in the series?
-        int nPaints = numberOfLayers(root);
-
-        ParsedValueImpl<?,Paint>[] paints = new ParsedValueImpl[nPaints];
-
-        Term temp = root;
-        int paint = 0;
-
-        do {
-            if (temp.token == null ||
-                temp.token.getText() == null ||
-                temp.token.getText().isEmpty()) error(temp, "Expected \'<paint>\'");
-
-            paints[paint++] = (ParsedValueImpl<?,Paint>)parse(temp);
-
-            temp = nextLayer(temp);
-        } while (temp != null);
-
-        return new ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]>(paints, PaintConverter.SequenceConverter.getInstance());
-
-    }
-
-    // An size or a series of four size values
-    // <size> | <size> <size> <size> <size>
-    private ParsedValueImpl<?,Size>[] parseSize1to4(final Term root)
-            throws ParseException {
-
-        Term temp = root;
-        ParsedValueImpl<?,Size>[] sides = new ParsedValueImpl[4];
-        int side = 0;
-
-        while (side < 4 && temp != null) {
-            sides[side++] = parseSize(temp);
-            temp = temp.nextInSeries;
-        }
-
-        if (side < 2) sides[1] = sides[0]; // right = top
-        if (side < 3) sides[2] = sides[0]; // bottom = top
-        if (side < 4) sides[3] = sides[1]; // left = right
-
-        return sides;
-    }
-
-    // A series of inset or sets of four inset values
-    // <size> | <size> <size> <size> <size> [ , [ <size> | <size> <size> <size> <size>] ]*
-    private ParsedValueImpl<ParsedValue<ParsedValue[],Insets>[], Insets[]> parseInsetsLayers(Term root)
-            throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-
-        Term temp = root;
-        int layer = 0;
-        ParsedValueImpl<ParsedValue[],Insets>[] layers = new ParsedValueImpl[nLayers];
-
-        while(temp != null) {
-            ParsedValueImpl<?,Size>[] sides = parseSize1to4(temp);
-            layers[layer++] = new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
-            while(temp.nextInSeries != null) {
-                temp = temp.nextInSeries;
-            }
-            temp = nextLayer(temp);
-        }
-
-        return new ParsedValueImpl<ParsedValue<ParsedValue[],Insets>[], Insets[]>(layers, InsetsConverter.SequenceConverter.getInstance());
-    }
-
-    // A single inset (1, 2, 3, or 4 digits)
-    // <size> | <size> <size> <size> <size>
-    private ParsedValueImpl<ParsedValue[],Insets> parseInsetsLayer(Term root)
-            throws ParseException {
-
-        Term temp = root;
-        ParsedValueImpl<ParsedValue[],Insets> layer = null;
-
-        while(temp != null) {
-            ParsedValueImpl<?,Size>[] sides = parseSize1to4(temp);
-            layer = new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
-            while(temp.nextInSeries != null) {
-                temp = temp.nextInSeries;
-            }
-            temp = nextLayer(temp);
-        }
-        return layer;
-    }
-
-    // <size> | <size> <size> <size> <size>
-    private ParsedValueImpl<ParsedValue<ParsedValue[],Margins>[], Margins[]> parseMarginsLayers(Term root)
-            throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-
-        Term temp = root;
-        int layer = 0;
-        ParsedValueImpl<ParsedValue[],Margins>[] layers = new ParsedValueImpl[nLayers];
-
-        while(temp != null) {
-            ParsedValueImpl<?,Size>[] sides = parseSize1to4(temp);
-            layers[layer++] = new ParsedValueImpl<ParsedValue[],Margins>(sides, Margins.Converter.getInstance());
-            while(temp.nextInSeries != null) {
-                temp = temp.nextInSeries;
-            }
-            temp = nextLayer(temp);
-        }
-
-        return new ParsedValueImpl<ParsedValue<ParsedValue[],Margins>[], Margins[]>(layers, Margins.SequenceConverter.getInstance());
-    }
-
-    // <size> | <size> <size> <size> <size>
-    private ParsedValueImpl<Size, Size>[] parseSizeSeries(Term root)
-            throws ParseException {
-
-        if (root.token == null) error(root, "Parse error");
-
-        List<ParsedValueImpl<Size,Size>> sizes = new ArrayList<>();
-
-        Term term = root;
-        while(term != null) {
-            Token token = term.token;
-            final int ttype = token.getType();
-            switch (ttype) {
-                case CSSLexer.NUMBER:
-                case CSSLexer.PERCENTAGE:
-                case CSSLexer.EMS:
-                case CSSLexer.EXS:
-                case CSSLexer.PX:
-                case CSSLexer.CM:
-                case CSSLexer.MM:
-                case CSSLexer.IN:
-                case CSSLexer.PT:
-                case CSSLexer.PC:
-                case CSSLexer.DEG:
-                case CSSLexer.GRAD:
-                case CSSLexer.RAD:
-                case CSSLexer.TURN:
-                    ParsedValueImpl sizeValue = new ParsedValueImpl<Size, Size>(size(token), null);
-                    sizes.add(sizeValue);
-                    break;
-                default:
-                    error (root, "expected series of <size>");
-            }
-            term = term.nextInSeries;
-        }
-        return sizes.toArray(new ParsedValueImpl[sizes.size()]);
-
-    }
-
-    // http://www.w3.org/TR/css3-background/#the-border-radius
-    // <size>{1,4} [ '/' <size>{1,4}]? [',' <size>{1,4} [ '/' <size>{1,4}]?]?
-    private ParsedValueImpl<ParsedValue<ParsedValue<?,Size>[][],CornerRadii>[], CornerRadii[]> parseCornerRadius(Term root)
-            throws ParseException {
-
-
-        int nLayers = numberOfLayers(root);
-
-        Term term = root;
-        int layer = 0;
-        ParsedValueImpl<ParsedValue<?,Size>[][],CornerRadii>[] layers = new ParsedValueImpl[nLayers];
-
-        while(term != null) {
-
-            int nHorizontalTerms = 0;
-            Term temp = term;
-            while (temp != null) {
-                if (temp.token.getType() == CSSLexer.SOLIDUS) {
-                    temp = temp.nextInSeries;
-                    break;
-                }
-                nHorizontalTerms += 1;
-                temp = temp.nextInSeries;
-            };
-
-            int nVerticalTerms = 0;
-            while (temp != null) {
-                if (temp.token.getType() == CSSLexer.SOLIDUS) {
-                    error(temp, "unexpected SOLIDUS");
-                    break;
-                }
-                nVerticalTerms += 1;
-                temp = temp.nextInSeries;
-            }
-
-            if ((nHorizontalTerms == 0 || nHorizontalTerms > 4) || nVerticalTerms > 4) {
-                error(root, "expected [<length>|<percentage>]{1,4} [/ [<length>|<percentage>]{1,4}]?");
-            }
-
-            // used as index into margins[]. horizontal = 0, vertical = 1
-            int orientation = 0;
-
-            // at most, there should be four radii in the horizontal orientation and four in the vertical.
-            ParsedValueImpl<?,Size>[][] radii = new ParsedValueImpl[2][4];
-
-            ParsedValueImpl<?,Size> zero = new ParsedValueImpl<Size,Size>(new Size(0,SizeUnits.PX), null);
-            for (int r=0; r<4; r++) { radii[0][r] = zero; radii[1][r] = zero; }
-
-            int hr = 0;
-            int vr = 0;
-
-            Term lastTerm = term;
-            while ((hr <= 4) && (vr <= 4) && (term != null)) {
-
-                if (term.token.getType() == CSSLexer.SOLIDUS) {
-                    orientation += 1;
-                } else  {
-                    ParsedValueImpl<?,Size> parsedValue = parseSize(term);
-                    if (orientation == 0) {
-                        radii[orientation][hr++] = parsedValue;
-                    } else {
-                        radii[orientation][vr++] = parsedValue;
-                    }
-                }
-                lastTerm = term;
-                term = term.nextInSeries;
-            }
-
-            //
-            // http://www.w3.org/TR/css3-background/#the-border-radius
-            // The four values for each radii are given in the order top-left, top-right, bottom-right, bottom-left.
-            // If bottom-left is omitted it is the same as top-right.
-            // If bottom-right is omitted it is the same as top-left.
-            // If top-right is omitted it is the same as top-left.
-            //
-            // If there is no vertical component, then set both equally.
-            // If either is zero, then both are zero.
-            //
-
-            // if hr == 0, then there were no horizontal radii (which would be an error caught above)
-            if (hr != 0) {
-                if (hr < 2) radii[0][1] = radii[0][0]; // top-right = top-left
-                if (hr < 3) radii[0][2] = radii[0][0]; // bottom-right = top-left
-                if (hr < 4) radii[0][3] = radii[0][1]; // bottom-left = top-right
-            } else {
-                assert(false);
-            }
-
-            // if vr == 0, then there were no vertical radii
-            if (vr != 0) {
-                if (vr < 2) radii[1][1] = radii[1][0]; // top-right = top-left
-                if (vr < 3) radii[1][2] = radii[1][0]; // bottom-right = top-left
-                if (vr < 4) radii[1][3] = radii[1][1]; // bottom-left = top-right
-            } else {
-                // if no vertical, the vertical value is same as horizontal
-                radii[1][0] = radii[0][0];
-                radii[1][1] = radii[0][1];
-                radii[1][2] = radii[0][2];
-                radii[1][3] = radii[0][3];
-            }
-
-            // if either is zero, both are zero
-            if (zero.equals(radii[0][0]) || zero.equals(radii[1][0])) { radii[1][0] = radii[0][0] = zero; }
-            if (zero.equals(radii[0][1]) || zero.equals(radii[1][1])) { radii[1][1] = radii[0][1] = zero; }
-            if (zero.equals(radii[0][2]) || zero.equals(radii[1][2])) { radii[1][2] = radii[0][2] = zero; }
-            if (zero.equals(radii[0][3]) || zero.equals(radii[1][3])) { radii[1][3] = radii[0][3] = zero; }
-
-            layers[layer++] = new ParsedValueImpl<ParsedValue<?,Size>[][],CornerRadii>(radii, null);
-
-            term = nextLayer(lastTerm);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue<?,Size>[][],CornerRadii>[], CornerRadii[]>(layers, CornerRadiiConverter.getInstance());
-    }
-
-    /* Constant for background position */
-    private final static ParsedValueImpl<Size,Size> ZERO_PERCENT =
-            new ParsedValueImpl<Size,Size>(new Size(0f, SizeUnits.PERCENT), null);
-    /* Constant for background position */
-    private final static ParsedValueImpl<Size,Size> FIFTY_PERCENT =
-            new ParsedValueImpl<Size,Size>(new Size(50f, SizeUnits.PERCENT), null);
-    /* Constant for background position */
-    private final static ParsedValueImpl<Size,Size> ONE_HUNDRED_PERCENT =
-            new ParsedValueImpl<Size,Size>(new Size(100f, SizeUnits.PERCENT), null);
-
-    private static boolean isPositionKeyWord(String value) {
-        return "center".equalsIgnoreCase(value) || "top".equalsIgnoreCase(value) || "bottom".equalsIgnoreCase(value) || "left".equalsIgnoreCase(value) || "right".equalsIgnoreCase(value);
-    }
-
-    /*
-     * http://www.w3.org/TR/css3-background/#the-background-position
-     *
-     * <bg-position> = [
-     *   [ top | bottom ]
-     * |
-     *   [ <percentage> | <length> | left | center | right ]
-     *   [ <percentage> | <length> | top  | center | bottom ]?
-     * |
-     *   [ center | [ left | right  ] [ <percentage> | <length> ]? ] &&
-     *   [ center | [ top  | bottom ] [ <percentage> | <length> ]? ]
-     * ]
-     *
-     * From the W3 spec:
-     *
-     * returned ParsedValueImpl is [size, size, size, size] with the semantics
-     * [top offset, right offset, bottom offset left offset]
-     */
-    private ParsedValueImpl<ParsedValue[], BackgroundPosition> parseBackgroundPosition(Term term)
-        throws ParseException {
-
-        if (term.token == null ||
-            term.token.getText() == null ||
-            term.token.getText().isEmpty()) error(term, "Expected \'<bg-position>\'");
-
-        Term  termOne = term;
-        Token valueOne = term.token;
-
-        Term  termTwo = termOne.nextInSeries;
-        Token valueTwo = (termTwo != null) ? termTwo.token : null;
-
-        Term termThree = (termTwo != null) ? termTwo.nextInSeries : null;
-        Token valueThree = (termThree != null) ? termThree.token : null;
-
-        Term termFour = (termThree != null) ? termThree.nextInSeries : null;
-        Token valueFour = (termFour != null) ? termFour.token : null;
-
-        // are the horizontal and vertical exchanged
-        if( valueOne != null && valueTwo != null && valueThree == null && valueFour == null ) {
-            // 2 values filled
-            String v1 = valueOne.getText();
-            String v2 = valueTwo.getText();
-            if( ("top".equals(v1) || "bottom".equals(v1))
-                    && ("left".equals(v2) || "right".equals(v2) || "center".equals(v2)) ) {
-                {
-                    Token tmp = valueTwo;
-                    valueTwo = valueOne;
-                    valueOne = tmp;
-                }
-
-                {
-                    Term tmp = termTwo;
-                    termTwo = termOne;
-                    termOne = tmp;
-                }
-            }
-        } else if( valueOne != null && valueTwo != null && valueThree != null ) {
-            Term[] termArray = null;
-            Token[] tokeArray = null;
-            // 4 values filled
-            if( valueFour != null ) {
-                if( ("top".equals(valueOne.getText()) || "bottom".equals(valueOne.getText()))
-                        && ("left".equals(valueThree.getText()) || "right".equals(valueThree.getText())) ) {
-                    // e.g. top 50 left 20
-                    termArray = new Term[] { termThree, termFour, termOne, termTwo };
-                    tokeArray = new Token[] { valueThree, valueFour, valueOne, valueTwo };
-                }
-            } else {
-                if( ("top".equals(valueOne.getText()) || "bottom".equals(valueOne.getText())) ) {
-                    if( ("left".equals(valueTwo.getText()) || "right".equals(valueTwo.getText())) ) {
-                        // e.g. top left 50
-                        termArray = new Term[] { termTwo, termThree, termOne, null };
-                        tokeArray = new Token[] { valueTwo, valueThree, valueOne, null };
-                    } else {
-                        // e.g. top 50 left
-                        termArray = new Term[] { termThree, termOne, termTwo, null };
-                        tokeArray = new Token[] { valueThree, valueOne, valueTwo, null };
-                    }
-                }
-            }
-
-            if( termArray != null ) {
-                termOne = termArray[0];
-                termTwo = termArray[1];
-                termThree = termArray[2];
-                termFour = termArray[3];
-
-                valueOne = tokeArray[0];
-                valueTwo = tokeArray[1];
-                valueThree = tokeArray[2];
-                valueFour = tokeArray[3];
-            }
-        }
-
-
-        ParsedValueImpl<?,Size> top, right, bottom, left;
-        top = right = bottom = left = ZERO_PERCENT;
-        {
-            if(valueOne == null && valueTwo == null && valueThree == null && valueFour == null) {
-                error(term, "No value found for background-position");
-            } else if( valueOne != null && valueTwo == null && valueThree == null && valueFour == null ) {
-                // Only one value
-                String v1 = valueOne.getText();
-
-                if( "center".equals(v1) ) {
-                    left = FIFTY_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    top = FIFTY_PERCENT;
-                    bottom = ZERO_PERCENT;
-
-                } else if("left".equals(v1)) {
-                    left = ZERO_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    top = FIFTY_PERCENT;
-                    bottom = ZERO_PERCENT;
-
-                } else if( "right".equals(v1) ) {
-                    left = ONE_HUNDRED_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    top = FIFTY_PERCENT;
-                    bottom = ZERO_PERCENT;
-
-                } else if( "top".equals(v1) ) {
-                    left = FIFTY_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    top = ZERO_PERCENT;
-                    bottom = ZERO_PERCENT;
-
-                } else if( "bottom".equals(v1) ) {
-                    left = FIFTY_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    top = ONE_HUNDRED_PERCENT;
-                    bottom = ZERO_PERCENT;
-                } else {
-                    left = parseSize(termOne);
-                    right = ZERO_PERCENT;
-                    top = FIFTY_PERCENT;
-                    bottom = ZERO_PERCENT;
-                }
-            } else if( valueOne != null && valueTwo != null && valueThree == null && valueFour == null ) {
-                // 2 values
-                String v1 = valueOne.getText().toLowerCase(Locale.ROOT);
-                String v2 = valueTwo.getText().toLowerCase(Locale.ROOT);
-
-                if( ! isPositionKeyWord(v1) ) {
-                    left = parseSize(termOne);
-                    right = ZERO_PERCENT;
-
-                    if( "top".equals(v2) ) {
-                        top = ZERO_PERCENT;
-                        bottom = ZERO_PERCENT;
-                    } else if( "bottom".equals(v2) ) {
-                        top = ONE_HUNDRED_PERCENT;
-                        bottom = ZERO_PERCENT;
-                    } else if( "center".equals(v2) ) {
-                        top = FIFTY_PERCENT;
-                        bottom = ZERO_PERCENT;
-                    } else if( !isPositionKeyWord(v2) ) {
-                        top = parseSize(termTwo);
-                        bottom = ZERO_PERCENT;
-                    } else {
-                        error(termTwo,"Expected 'top', 'bottom', 'center' or <size>");
-                    }
-                } else if( v1.equals("left") || v1.equals("right") ) {
-                    left = v1.equals("right") ? ONE_HUNDRED_PERCENT : ZERO_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    if( ! isPositionKeyWord(v2) ) {
-                        top = parseSize(termTwo);
-                        bottom = ZERO_PERCENT;
-                    } else if( v2.equals("top") || v2.equals("bottom") || v2.equals("center") ) {
-                        if( v2.equals("top") ) {
-                            top = ZERO_PERCENT;
-                            bottom = ZERO_PERCENT;
-                        } else if(v2.equals("center")) {
-                            top = FIFTY_PERCENT;
-                            bottom = ZERO_PERCENT;
-                        } else {
-                            top = ONE_HUNDRED_PERCENT;
-                            bottom = ZERO_PERCENT;
-                        }
-                    } else {
-                        error(termTwo,"Expected 'top', 'bottom', 'center' or <size>");
-                    }
-                } else if( v1.equals("center") ) {
-                    left = FIFTY_PERCENT;
-                    right = ZERO_PERCENT;
-
-                    if( v2.equals("top") ) {
-                        top = ZERO_PERCENT;
-                        bottom = ZERO_PERCENT;
-                    } else if( v2.equals("bottom") ) {
-                        top = ONE_HUNDRED_PERCENT;
-                        bottom = ZERO_PERCENT;
-                    } else if( v2.equals("center") ) {
-                        top = FIFTY_PERCENT;
-                        bottom = ZERO_PERCENT;
-                    } else if( ! isPositionKeyWord(v2) ) {
-                        top = parseSize(termTwo);
-                        bottom = ZERO_PERCENT;
-                    } else {
-                        error(termTwo,"Expected 'top', 'bottom', 'center' or <size>");
-                    }
-                }
-            } else if( valueOne != null && valueTwo != null && valueThree != null && valueFour == null ) {
-                String v1 = valueOne.getText().toLowerCase(Locale.ROOT);
-                String v2 = valueTwo.getText().toLowerCase(Locale.ROOT);
-                String v3 = valueThree.getText().toLowerCase(Locale.ROOT);
-
-                if( ! isPositionKeyWord(v1) || "center".equals(v1) ) {
-                    // 1 is horizontal
-                    // means 2 & 3 are vertical
-                    if( "center".equals(v1) ) {
-                        left = FIFTY_PERCENT;
-                    } else {
-                        left = parseSize(termOne);
-                    }
-                    right = ZERO_PERCENT;
-
-                    if( !isPositionKeyWord(v3) ) {
-                        if( "top".equals(v2) ) {
-                            top = parseSize(termThree);
-                            bottom = ZERO_PERCENT;
-                        } else if( "bottom".equals(v2) ) {
-                            top = ZERO_PERCENT;
-                            bottom = parseSize(termThree);
-                        } else {
-                            error(termTwo,"Expected 'top' or 'bottom'");
-                        }
-                    } else {
-                        error(termThree,"Expected <size>");
-                    }
-                } else if( "left".equals(v1) || "right".equals(v1)  ) {
-                    if( ! isPositionKeyWord(v2) ) {
-                        // 1 & 2 are horizontal
-                        // 3 is vertical
-                        if( "left".equals(v1) ) {
-                            left = parseSize(termTwo);
-                            right = ZERO_PERCENT;
-                        } else {
-                            left = ZERO_PERCENT;
-                            right = parseSize(termTwo);
-                        }
-
-                        if( "top".equals(v3) ) {
-                            top = ZERO_PERCENT;
-                            bottom = ZERO_PERCENT;
-                        } else if( "bottom".equals(v3) ) {
-                            top = ONE_HUNDRED_PERCENT;
-                            bottom = ZERO_PERCENT;
-                        } else if( "center".equals(v3) ) {
-                            top = FIFTY_PERCENT;
-                            bottom = ZERO_PERCENT;
-                        } else {
-                            error(termThree,"Expected 'top', 'bottom' or 'center'");
-                        }
-                    } else {
-                        // 1 is horizontal
-                        // 2 & 3 are vertical
-                        if( "left".equals(v1) ) {
-                            left = ZERO_PERCENT;
-                            right = ZERO_PERCENT;
-                        } else {
-                            left = ONE_HUNDRED_PERCENT;
-                            right = ZERO_PERCENT;
-                        }
-
-                        if( ! isPositionKeyWord(v3) ) {
-                            if( "top".equals(v2) ) {
-                                top = parseSize(termThree);
-                                bottom = ZERO_PERCENT;
-                            } else if( "bottom".equals(v2) ) {
-                                top = ZERO_PERCENT;
-                                bottom = parseSize(termThree);
-                            } else {
-                                error(termTwo,"Expected 'top' or 'bottom'");
-                            }
-                        } else {
-                            error(termThree,"Expected <size>");
-                        }
-                    }
-                }
-            } else {
-                String v1 = valueOne.getText().toLowerCase(Locale.ROOT);
-                String v2 = valueTwo.getText().toLowerCase(Locale.ROOT);
-                String v3 = valueThree.getText().toLowerCase(Locale.ROOT);
-                String v4 = valueFour.getText().toLowerCase(Locale.ROOT);
-
-                if( (v1.equals("left") || v1.equals("right")) && (v3.equals("top") || v3.equals("bottom") ) && ! isPositionKeyWord(v2) && ! isPositionKeyWord(v4) ) {
-                    if( v1.equals("left") ) {
-                        left = parseSize(termTwo);
-                        right = ZERO_PERCENT;
-                    } else {
-                        left = ZERO_PERCENT;
-                        right = parseSize(termTwo);
-                    }
-
-                    if( v3.equals("top") ) {
-                        top = parseSize(termFour);
-                        bottom = ZERO_PERCENT;
-                    } else {
-                        top = ZERO_PERCENT;
-                        bottom = parseSize(termFour);
-                    }
-
-                } else {
-                    error(term,"Expected 'left' or 'right' followed by <size> followed by 'top' or 'bottom' followed by <size>");
-                }
-            }
-        }
-
-        ParsedValueImpl<?,Size>[] values = new ParsedValueImpl[] {top, right, bottom, left};
-        return new ParsedValueImpl<ParsedValue[], BackgroundPosition>(values, BackgroundPositionConverter.getInstance());
-    }
-
-    private ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundPosition>[], BackgroundPosition[]>
-            parseBackgroundPositionLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<ParsedValue[], BackgroundPosition>[] layers = new ParsedValueImpl[nLayers];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseBackgroundPosition(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundPosition>[], BackgroundPosition[]>(layers, LayeredBackgroundPositionConverter.getInstance());
-    }
-
-    /*
-    http://www.w3.org/TR/css3-background/#the-background-repeat
-    <repeat-style> = repeat-x | repeat-y | [repeat | space | round | no-repeat]{1,2}
-    */
-    private ParsedValueImpl<String, BackgroundRepeat>[] parseRepeatStyle(final Term root)
-            throws ParseException {
-
-        BackgroundRepeat xAxis, yAxis;
-        xAxis = yAxis = BackgroundRepeat.NO_REPEAT;
-
-        Term term = root;
-
-        if (term.token == null ||
-            term.token.getType() != CSSLexer.IDENT ||
-            term.token.getText() == null ||
-            term.token.getText().isEmpty()) error(term, "Expected \'<repeat-style>\'");
-
-        String text = term.token.getText().toLowerCase(Locale.ROOT);
-        if ("repeat-x".equals(text)) {
-            xAxis = BackgroundRepeat.REPEAT;
-            yAxis = BackgroundRepeat.NO_REPEAT;
-        } else if ("repeat-y".equals(text)) {
-            xAxis = BackgroundRepeat.NO_REPEAT;
-            yAxis = BackgroundRepeat.REPEAT;
-        } else if ("repeat".equals(text)) {
-            xAxis = BackgroundRepeat.REPEAT;
-            yAxis = BackgroundRepeat.REPEAT;
-        } else if ("space".equals(text)) {
-            xAxis = BackgroundRepeat.SPACE;
-            yAxis = BackgroundRepeat.SPACE;
-        } else if ("round".equals(text)) {
-            xAxis = BackgroundRepeat.ROUND;
-            yAxis = BackgroundRepeat.ROUND;
-        } else if ("no-repeat".equals(text)) {
-            xAxis = BackgroundRepeat.NO_REPEAT;
-            yAxis = BackgroundRepeat.NO_REPEAT;
-        } else if ("stretch".equals(text)) {
-            xAxis = BackgroundRepeat.NO_REPEAT;
-            yAxis = BackgroundRepeat.NO_REPEAT;
-        } else {
-            error(term, "Expected  \'<repeat-style>\' " + text);
-        }
-
-        if ((term = term.nextInSeries) != null &&
-             term.token != null &&
-             term.token.getType() == CSSLexer.IDENT &&
-             term.token.getText() != null &&
-             !term.token.getText().isEmpty()) {
-
-            text = term.token.getText().toLowerCase(Locale.ROOT);
-            if ("repeat-x".equals(text)) {
-                error(term, "Unexpected \'repeat-x\'");
-            } else if ("repeat-y".equals(text)) {
-                error(term, "Unexpected \'repeat-y\'");
-            } else if ("repeat".equals(text)) {
-                yAxis = BackgroundRepeat.REPEAT;
-            } else if ("space".equals(text)) {
-                yAxis = BackgroundRepeat.SPACE;
-            } else if ("round".equals(text)) {
-                yAxis = BackgroundRepeat.ROUND;
-            } else if ("no-repeat".equals(text)) {
-                yAxis = BackgroundRepeat.NO_REPEAT;
-            } else if ("stretch".equals(text)) {
-                yAxis = BackgroundRepeat.NO_REPEAT;
-            } else {
-                error(term, "Expected  \'<repeat-style>\'");
-            }
-        }
-
-        return new ParsedValueImpl[] {
-            new ParsedValueImpl<String,BackgroundRepeat>(xAxis.name(), new EnumConverter<BackgroundRepeat>(BackgroundRepeat.class)),
-            new ParsedValueImpl<String,BackgroundRepeat>(yAxis.name(), new EnumConverter<BackgroundRepeat>(BackgroundRepeat.class))
-        };
-    }
-
-    private ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][],RepeatStruct[]>
-            parseBorderImageRepeatStyleLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<String, BackgroundRepeat>[][] layers = new ParsedValueImpl[nLayers][];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseRepeatStyle(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][],RepeatStruct[]>(layers, RepeatStructConverter.getInstance());
-    }
-
-
-    private ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][], RepeatStruct[]>
-            parseBackgroundRepeatStyleLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<String, BackgroundRepeat>[][] layers = new ParsedValueImpl[nLayers][];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseRepeatStyle(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][], RepeatStruct[]>(layers, RepeatStructConverter.getInstance());
-    }
-
-    /*
-    http://www.w3.org/TR/css3-background/#the-background-size
-    <bg-size> = [ <length> | <percentage> | auto ]{1,2} | cover | contain
-    */
-    private ParsedValueImpl<ParsedValue[], BackgroundSize> parseBackgroundSize(final Term root)
-        throws ParseException {
-
-        ParsedValueImpl<?,Size> height = null, width = null;
-        boolean cover = false, contain = false;
-
-        Term term = root;
-        if (term.token == null) error(term, "Expected \'<bg-size>\'");
-
-        if (term.token.getType() == CSSLexer.IDENT) {
-            final String text =
-                (term.token.getText() != null) ? term.token.getText().toLowerCase(Locale.ROOT) : null;
-
-            if ("auto".equals(text)) {
-                // We don't do anything because width / height are already initialized
-            } else if ("cover".equals(text)) {
-                cover = true;
-            } else if ("contain".equals(text)) {
-                contain = true;
-            } else if ("stretch".equals(text)) {
-                width = ONE_HUNDRED_PERCENT;
-                height = ONE_HUNDRED_PERCENT;
-            } else {
-                error(term, "Expected \'auto\', \'cover\', \'contain\', or  \'stretch\'");
-            }
-        } else if (isSize(term.token)) {
-            width = parseSize(term);
-            height = null;
-        } else {
-            error(term, "Expected \'<bg-size>\'");
-        }
-
-        if ((term = term.nextInSeries) != null) {
-            if (cover || contain) error(term, "Unexpected \'<bg-size>\'");
-
-            if (term.token.getType() == CSSLexer.IDENT) {
-                final String text =
-                    (term.token.getText() != null) ? term.token.getText().toLowerCase(Locale.ROOT) : null;
-
-                if ("auto".equals(text)) {
-                    height = null;
-                } else if ("cover".equals(text)) {
-                    error(term, "Unexpected \'cover\'");
-                } else if ("contain".equals(text)) {
-                    error(term, "Unexpected \'contain\'");
-                } else if ("stretch".equals(text)) {
-                    height = ONE_HUNDRED_PERCENT;
-                } else {
-                    error(term, "Expected \'auto\' or \'stretch\'");
-                }
-            } else if (isSize(term.token)) {
-                height = parseSize(term);
-            } else {
-                error(term, "Expected \'<bg-size>\'");
-            }
-
-        }
-
-        ParsedValueImpl[] values = new ParsedValueImpl[] {
-            width,
-            height,
-            // TODO: handling of booleans is really bogus
-            new ParsedValueImpl<String,Boolean>((cover ? "true" : "false"), BooleanConverter.getInstance()),
-            new ParsedValueImpl<String,Boolean>((contain ? "true" : "false"), BooleanConverter.getInstance())
-        };
-        return new ParsedValueImpl<ParsedValue[], BackgroundSize>(values, BackgroundSizeConverter.getInstance());
-    }
-
-    private ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundSize>[],  BackgroundSize[]>
-            parseBackgroundSizeLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<ParsedValue[], BackgroundSize>[] layers = new ParsedValueImpl[nLayers];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseBackgroundSize(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundSize>[], BackgroundSize[]>(layers, LayeredBackgroundSizeConverter.getInstance());
-    }
-
-    private ParsedValueImpl<ParsedValue<?,Paint>[], Paint[]> parseBorderPaint(final Term root)
-        throws ParseException {
-
-        Term term = root;
-        ParsedValueImpl<?,Paint>[] paints = new ParsedValueImpl[4];
-        int paint = 0;
-
-        while(term != null) {
-            if (term.token == null || paints.length <= paint) error(term, "Expected \'<paint>\'");
-            paints[paint++] = parse(term);
-            term = term.nextInSeries;
-        }
-
-        if (paint < 2) paints[1] = paints[0]; // right = top
-        if (paint < 3) paints[2] = paints[0]; // bottom = top
-        if (paint < 4) paints[3] = paints[1]; // left = right
-
-        return new ParsedValueImpl<ParsedValue<?,Paint>[], Paint[]>(paints, StrokeBorderPaintConverter.getInstance());
-    }
-
-    private ParsedValueImpl<ParsedValue<ParsedValue<?,Paint>[],Paint[]>[], Paint[][]> parseBorderPaintLayers(final Term root)
-        throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]>[] layers = new ParsedValueImpl[nLayers];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseBorderPaint(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue<?,Paint>[],Paint[]>[], Paint[][]>(layers, LayeredBorderPaintConverter.getInstance());
-    }
-
-    // borderStyle (borderStyle (borderStyle borderStyle?)?)?
-    private ParsedValueImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]> parseBorderStyleSeries(final Term root)
-            throws ParseException {
-
-        Term term = root;
-        ParsedValueImpl<ParsedValue[],BorderStrokeStyle>[] borders = new ParsedValueImpl[4];
-        int border = 0;
-        while (term != null) {
-            borders[border++] = parseBorderStyle(term);
-            term = term.nextInSeries;
-        }
-
-        if (border < 2) borders[1] = borders[0]; // right = top
-        if (border < 3) borders[2] = borders[0]; // bottom = top
-        if (border < 4) borders[3] = borders[1]; // left = right
-
-        return new ParsedValueImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>(borders, BorderStrokeStyleSequenceConverter.getInstance());
-    }
-
-
-    private ParsedValueImpl<ParsedValue<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>[], BorderStrokeStyle[][]>
-            parseBorderStyleLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>[] layers = new ParsedValueImpl[nLayers];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseBorderStyleSeries(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>[], BorderStrokeStyle[][]>(layers, LayeredBorderStyleConverter.getInstance());
-    }
-
-    // Only meant to be used from parseBorderStyle, but might be useful elsewhere
-    private String getKeyword(final Term term) {
-        if (term != null &&
-             term.token != null &&
-             term.token.getType() == CSSLexer.IDENT &&
-             term.token.getText() != null &&
-             !term.token.getText().isEmpty()) {
-
-            return term.token.getText().toLowerCase(Locale.ROOT);
-        }
-        return null;
-    }
-
-    //<border-style> [ , <border-style> ]*
-    // where <border-style> =
-    //      <dash-style> [centered | inside | outside]? [line-join [miter <number> | bevel | round]]? [line-cap [square | butt | round]]?
-    // where <dash-style> =
-    //      [ none | solid | dotted | dashed ]
-    private ParsedValueImpl<ParsedValue[],BorderStrokeStyle> parseBorderStyle(final Term root)
-            throws ParseException {
-
-
-        ParsedValue<ParsedValue[],Number[]> dashStyle = null;
-        ParsedValue<ParsedValue<?,Size>,Number> dashPhase = null;
-        ParsedValue<String,StrokeType> strokeType = null;
-        ParsedValue<String,StrokeLineJoin> strokeLineJoin = null;
-        ParsedValue<ParsedValue<?,Size>,Number> strokeMiterLimit = null;
-        ParsedValue<String,StrokeLineCap> strokeLineCap = null;
-
-        Term term = root;
-
-        dashStyle = dashStyle(term);
-
-        Term prev = term;
-        term = term.nextInSeries;
-        String keyword = getKeyword(term);
-
-        // dash-style might be followed by 'phase <size>'
-        if ("phase".equals(keyword)) {
-
-            prev = term;
-            if ((term = term.nextInSeries) == null ||
-                 term.token == null ||
-                 !isSize(term.token)) error(term, "Expected \'<size>\'");
-
-            ParsedValueImpl<?,Size> sizeVal = parseSize(term);
-            dashPhase = new ParsedValueImpl<ParsedValue<?,Size>,Number>(sizeVal,SizeConverter.getInstance());
-
-            prev = term;
-            term = term.nextInSeries;
-        }
-
-        // stroke type might be next
-        strokeType = parseStrokeType(term);
-        if (strokeType != null) {
-            prev = term;
-            term = term.nextInSeries;
-        }
-
-        keyword = getKeyword(term);
-
-        if ("line-join".equals(keyword)) {
-
-            prev = term;
-            term = term.nextInSeries;
-
-            ParsedValueImpl[] lineJoinValues = parseStrokeLineJoin(term);
-            if (lineJoinValues != null) {
-                strokeLineJoin = lineJoinValues[0];
-                strokeMiterLimit = lineJoinValues[1];
-            } else {
-                error(term, "Expected \'miter <size>?\', \'bevel\' or \'round\'");
-            }
-            prev = term;
-            term = term.nextInSeries;
-            keyword = getKeyword(term);
-        }
-
-        if ("line-cap".equals(keyword)) {
-
-            prev = term;
-            term = term.nextInSeries;
-
-            strokeLineCap = parseStrokeLineCap(term);
-            if (strokeLineCap == null) {
-                error(term, "Expected \'square\', \'butt\' or \'round\'");
-            }
-
-            prev = term;
-            term = term.nextInSeries;
-        }
-
-        if (term != null) {
-            // if term is not null, then we have gotten to the end of
-            // one border style and term is start of another border style
-            root.nextInSeries = term;
-        } else {
-            // If term is null, then we have gotten to the end of
-            // a border style with no more to follow in this series.
-            // But there may be another layer.
-            root.nextInSeries = null;
-            root.nextLayer = prev.nextLayer;
-        }
-
-        final ParsedValue[] values = new ParsedValue[]{
-            dashStyle,
-            dashPhase,
-            strokeType,
-            strokeLineJoin,
-            strokeMiterLimit,
-            strokeLineCap
-        };
-
-        return new ParsedValueImpl(values, BorderStyleConverter.getInstance());
-    }
-
-    //
-    // segments(<size> [, <size>]+) | <border-style>
-    //
-    private ParsedValue<ParsedValue[],Number[]> dashStyle(final Term root) throws ParseException {
-
-        if (root.token == null) error(root, "Expected \'<dash-style>\'");
-
-        final int ttype = root.token.getType();
-
-        ParsedValue<ParsedValue[],Number[]>  segments = null;
-        if (ttype == CSSLexer.IDENT) {
-            segments = borderStyle(root);
-        } else if (ttype == CSSLexer.FUNCTION) {
-            segments = segments(root);
-        } else {
-            error(root, "Expected \'<dash-style>\'");
-        }
-
-        return segments;
-    }
-
-    /*
-    <border-style> = none | hidden | dotted | dashed | solid | double | groove | ridge | inset | outset
-    */
-    private ParsedValue<ParsedValue[],Number[]>  borderStyle(Term root)
-            throws ParseException {
-
-        if (root.token == null ||
-            root.token.getType() != CSSLexer.IDENT ||
-            root.token.getText() == null ||
-            root.token.getText().isEmpty()) error(root, "Expected \'<border-style>\'");
-
-        final String text = root.token.getText().toLowerCase(Locale.ROOT);
-
-        if ("none".equals(text)) {
-            return BorderStyleConverter.NONE;
-        } else if ("hidden".equals(text)) {
-            // The "hidden" mode doesn't make sense for FX, because it is the
-            // same as "none" except for border-collapsed CSS tables
-            return BorderStyleConverter.NONE;
-        } else if ("dotted".equals(text)) {
-            return BorderStyleConverter.DOTTED;
-        } else if ("dashed".equals(text)) {
-            return BorderStyleConverter.DASHED;
-        } else if ("solid".equals(text)) {
-            return BorderStyleConverter.SOLID;
-        } else if ("double".equals(text)) {
-            error(root, "Unsupported <border-style> \'double\'");
-        } else if ("groove".equals(text)) {
-            error(root, "Unsupported <border-style> \'groove\'");
-        } else if ("ridge".equals(text)) {
-            error(root, "Unsupported <border-style> \'ridge\'");
-        } else if ("inset".equals(text)) {
-            error(root, "Unsupported <border-style> \'inset\'");
-        } else if ("outset".equals(text)) {
-            error(root, "Unsupported <border-style> \'outset\'");
-        } else {
-            error(root, "Unsupported <border-style> \'" + text + "\'");
-        }
-        // error throws so we should never get here.
-        // but the compiler wants a return, so here it is.
-        return BorderStyleConverter.SOLID;
-    }
-
-    private ParsedValueImpl<ParsedValue[],Number[]> segments(Term root)
-            throws ParseException {
-
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"segments".regionMatches(true, 0, fn, 0, 8)) {
-            error(root,"Expected \'segments\'");
-        }
-
-        Term arg = root.firstArg;
-        if (arg == null) error(null, "Expected \'<size>\'");
-
-        int nArgs = numberOfArgs(root);
-        ParsedValueImpl<?,Size>[] segments = new ParsedValueImpl[nArgs];
-        int segment = 0;
-        while(arg != null) {
-            segments[segment++] = parseSize(arg);
-            arg = arg.nextArg;
-        }
-
-        return new ParsedValueImpl<ParsedValue[],Number[]>(segments,SizeConverter.SequenceConverter.getInstance());
-
-    }
-
-    private ParsedValueImpl<String,StrokeType> parseStrokeType(final Term root)
-        throws ParseException {
-
-        final String keyword = getKeyword(root);
-
-
-        if ("centered".equals(keyword) ||
-            "inside".equals(keyword) ||
-            "outside".equals(keyword)) {
-
-            return new ParsedValueImpl<String,StrokeType>(keyword, new EnumConverter(StrokeType.class));
-
-        }
-        return null;
-    }
-
-    // Root term is the term just after the line-join keyword
-    // Returns an array of two Values or null.
-    // ParsedValueImpl[0] is ParsedValueImpl<StrokeLineJoin,StrokeLineJoin>
-    // ParsedValueImpl[1] is ParsedValueImpl<Value<?,Size>,Number> if miter limit is given, null otherwise.
-    // If the token is not a StrokeLineJoin, then null is returned.
-    private ParsedValueImpl[] parseStrokeLineJoin(final Term root)
-        throws ParseException {
-
-        final String keyword = getKeyword(root);
-
-        if ("miter".equals(keyword) ||
-            "bevel".equals(keyword) ||
-            "round".equals(keyword)) {
-
-            ParsedValueImpl<String,StrokeLineJoin> strokeLineJoin =
-                    new ParsedValueImpl<String,StrokeLineJoin>(keyword, new EnumConverter(StrokeLineJoin.class));
-
-            ParsedValueImpl<ParsedValue<?,Size>,Number> strokeMiterLimit = null;
-            if ("miter".equals(keyword)) {
-
-                Term next = root.nextInSeries;
-                if (next != null &&
-                    next.token != null &&
-                    isSize(next.token)) {
-
-                    root.nextInSeries = next.nextInSeries;
-                    ParsedValueImpl<?,Size> sizeVal = parseSize(next);
-                    strokeMiterLimit = new ParsedValueImpl<ParsedValue<?,Size>,Number>(sizeVal,SizeConverter.getInstance());
-                }
-
-            }
-
-            return new ParsedValueImpl[] { strokeLineJoin, strokeMiterLimit };
-        }
-        return null;
-    }
-
-    // Root term is the term just after the line-cap keyword
-    // If the token is not a StrokeLineCap, then null is returned.
-    private ParsedValueImpl<String,StrokeLineCap> parseStrokeLineCap(final Term root)
-        throws ParseException {
-
-        final String keyword = getKeyword(root);
-
-        if ("square".equals(keyword) ||
-            "butt".equals(keyword) ||
-            "round".equals(keyword)) {
-
-            return new ParsedValueImpl<String,StrokeLineCap>(keyword, new EnumConverter(StrokeLineCap.class));
-        }
-        return null;
-    }
-
-    /*
-     * http://www.w3.org/TR/css3-background/#the-border-image-slice
-     * [<number> | <percentage>]{1,4} && fill?
-     */
-    private ParsedValueImpl<ParsedValue[],BorderImageSlices> parseBorderImageSlice(final Term root)
-        throws ParseException {
-
-        Term term = root;
-        if (term.token == null || !isSize(term.token))
-                error(term, "Expected \'<size>\'");
-
-        ParsedValueImpl<?,Size>[] insets = new ParsedValueImpl[4];
-        Boolean fill = Boolean.FALSE;
-
-        int inset = 0;
-        while (inset < 4 && term != null) {
-            insets[inset++] = parseSize(term);
-
-            if ((term = term.nextInSeries) != null &&
-                 term.token != null &&
-                 term.token.getType() == CSSLexer.IDENT) {
-
-                if("fill".equalsIgnoreCase(term.token.getText())) {
-                    fill = Boolean.TRUE;
-                    break;
-                }
-            }
-        }
-
-        if (inset < 2) insets[1] = insets[0]; // right = top
-        if (inset < 3) insets[2] = insets[0]; // bottom = top
-        if (inset < 4) insets[3] = insets[1]; // left = right
-
-        ParsedValueImpl[] values = new ParsedValueImpl[] {
-                new ParsedValueImpl<ParsedValue[],Insets>(insets, InsetsConverter.getInstance()),
-                new ParsedValueImpl<Boolean,Boolean>(fill, null)
-        };
-        return new ParsedValueImpl<ParsedValue[], BorderImageSlices>(values, BorderImageSliceConverter.getInstance());
-    }
-
-    private ParsedValueImpl<ParsedValue<ParsedValue[],BorderImageSlices>[],BorderImageSlices[]>
-            parseBorderImageSliceLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<ParsedValue[], BorderImageSlices>[] layers = new ParsedValueImpl[nLayers];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseBorderImageSlice(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue[],BorderImageSlices>[],BorderImageSlices[]> (layers, SliceSequenceConverter.getInstance());
-    }
-
-    /*
-     * http://www.w3.org/TR/css3-background/#border-image-width
-     * [ <length> | <percentage> | <number> | auto ]{1,4}
-     */
-    private ParsedValueImpl<ParsedValue[], BorderWidths> parseBorderImageWidth(final Term root)
-            throws ParseException {
-
-        Term term = root;
-        if (term.token == null || !isSize(term.token))
-            error(term, "Expected \'<size>\'");
-
-        ParsedValueImpl<?,Size>[] insets = new ParsedValueImpl[4];
-
-        int inset = 0;
-        while (inset < 4 && term != null) {
-            insets[inset++] = parseSize(term);
-
-            if ((term = term.nextInSeries) != null &&
-                    term.token != null &&
-                    term.token.getType() == CSSLexer.IDENT) {
-            }
-        }
-
-        if (inset < 2) insets[1] = insets[0]; // right = top
-        if (inset < 3) insets[2] = insets[0]; // bottom = top
-        if (inset < 4) insets[3] = insets[1]; // left = right
-
-        return new ParsedValueImpl<ParsedValue[], BorderWidths>(insets, BorderImageWidthConverter.getInstance());
-    }
-
-    private ParsedValueImpl<ParsedValue<ParsedValue[],BorderWidths>[],BorderWidths[]>
-        parseBorderImageWidthLayers(final Term root) throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-        ParsedValueImpl<ParsedValue[], BorderWidths>[] layers = new ParsedValueImpl[nLayers];
-        int layer = 0;
-        Term term = root;
-        while (term != null) {
-            layers[layer++] = parseBorderImageWidth(term);
-            term = nextLayer(term);
-        }
-        return new ParsedValueImpl<ParsedValue<ParsedValue[],BorderWidths>[],BorderWidths[]> (layers, BorderImageWidthsSequenceConverter.getInstance());
-    }
-
-    // parse a Region value
-    // i.e., region(".styleClassForRegion") or region("#idForRegion")
-    public static final String SPECIAL_REGION_URL_PREFIX = "SPECIAL-REGION-URL:";
-    private ParsedValueImpl<String,String> parseRegion(Term root)
-            throws ParseException {
-        // first term in the chain is the function name...
-        final String fn = (root.token != null) ? root.token.getText() : null;
-        if (!"region".regionMatches(true, 0, fn, 0, 6)) {
-            error(root,"Expected \'region\'");
-        }
-
-        Term arg = root.firstArg;
-        if (arg == null) error(root, "Expected \'region(\"<styleclass-or-id-string>\")\'");
-
-        if (arg.token == null ||
-                arg.token.getType() != CSSLexer.STRING ||
-                arg.token.getText() == null ||
-                arg.token.getText().isEmpty())  error(root, "Expected \'region(\"<styleclass-or-id-string>\")\'");
-
-        final String styleClassOrId = SPECIAL_REGION_URL_PREFIX+ Utils.stripQuotes(arg.token.getText());
-        return new ParsedValueImpl<String,String>(styleClassOrId, StringConverter.getInstance());
-    }
-
-    // url("<uri>") is tokenized by the lexer, so the root arg should be a URL token.
-    private ParsedValueImpl<ParsedValue[],String> parseURI(Term root)
-            throws ParseException {
-
-        if (root == null) error(root, "Expected \'url(\"<uri-string>\")\'");
-
-        if (root.token == null ||
-            root.token.getType() != CSSLexer.URL ||
-            root.token.getText() == null ||
-            root.token.getText().isEmpty()) error(root, "Expected \'url(\"<uri-string>\")\'");
-
-        final String uri = root.token.getText();
-        ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
-            new ParsedValueImpl<String,String>(uri, StringConverter.getInstance()),
-            null // placeholder for Stylesheet URL
-        };
-        return new ParsedValueImpl<ParsedValue[],String>(uriValues, URLConverter.getInstance());
-    }
-
-    // parse a series of URI values separated by commas.
-    // i.e., <uri> [, <uri>]*
-    private ParsedValueImpl<ParsedValue<ParsedValue[],String>[],String[]> parseURILayers(Term root)
-            throws ParseException {
-
-        int nLayers = numberOfLayers(root);
-
-        Term temp = root;
-        int layer = 0;
-        ParsedValueImpl<ParsedValue[],String>[] layers = new ParsedValueImpl[nLayers];
-
-        while(temp != null) {
-            layers[layer++] = parseURI(temp);
-            temp = nextLayer(temp);
-        }
-
-        return new ParsedValueImpl<ParsedValue<ParsedValue[],String>[],String[]>(layers, URLConverter.SequenceConverter.getInstance());
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    //
-    // http://www.w3.org/TR/css3-fonts
-    //
-    ////////////////////////////////////////////////////////////////////////////
-
-    /* http://www.w3.org/TR/css3-fonts/#font-size-the-font-size-property */
-    private ParsedValueImpl<ParsedValue<?,Size>,Number> parseFontSize(final Term root) throws ParseException {
-
-        if (root == null) return null;
-        final Token token = root.token;
-        if (token == null || !isSize(token)) error(root, "Expected \'<font-size>\'");
-
-        Size size = null;
-        if (token.getType() == CSSLexer.IDENT) {
-            final String ident = token.getText().toLowerCase(Locale.ROOT);
-            double value = -1;
-            if ("inherit".equals(ident)) {
-                value = 100;
-            } else if ("xx-small".equals(ident)) {
-                value = 60;
-            } else if ("x-small".equals(ident)) {
-                value = 75;
-            } else if ("small".equals(ident)) {
-                value = 80;
-            } else if ("medium".equals(ident)) {
-                value = 100;
-            } else if ("large".equals(ident)) {
-                value = 120;
-            } else if ("x-large".equals(ident)) {
-                value = 150;
-            } else if ("xx-large".equals(ident)) {
-                value = 200;
-            } else if ("smaller".equals(ident)) {
-                value = 80;
-            } else if ("larger".equals(ident)) {
-                value = 120;
-            }
-
-            if (value > -1) {
-                size = new Size(value, SizeUnits.PERCENT);
-            }
-        }
-
-        // if size is null, then size is not one of the keywords above.
-        if (size == null) {
-            size = size(token);
-        }
-
-        ParsedValueImpl<?,Size> svalue = new ParsedValueImpl<Size,Size>(size, null);
-        return new ParsedValueImpl<ParsedValue<?,Size>,Number>(svalue, FontConverter.FontSizeConverter.getInstance());
-    }
-
-    /* http://www.w3.org/TR/css3-fonts/#font-style-the-font-style-property */
-    private ParsedValueImpl<String,FontPosture> parseFontStyle(Term root) throws ParseException {
-
-        if (root == null) return null;
-        final Token token = root.token;
-        if (token == null ||
-            token.getType() != CSSLexer.IDENT ||
-            token.getText() == null ||
-            token.getText().isEmpty()) error(root, "Expected \'<font-style>\'");
-
-        final String ident = token.getText().toLowerCase(Locale.ROOT);
-        String posture = FontPosture.REGULAR.name();
-
-        if ("normal".equals(ident)) {
-            posture = FontPosture.REGULAR.name();
-        } else if ("italic".equals(ident)) {
-            posture = FontPosture.ITALIC.name();
-        } else if ("oblique".equals(ident)) {
-            posture = FontPosture.ITALIC.name();
-        } else if ("inherit".equals(ident)) {
-            posture = "inherit";
-        } else {
-            return null;
-        }
-
-        return new ParsedValueImpl<String,FontPosture>(posture, FontConverter.FontStyleConverter.getInstance());
-    }
-
-    /* http://www.w3.org/TR/css3-fonts/#font-weight-the-font-weight-property */
-    private ParsedValueImpl<String, FontWeight> parseFontWeight(Term root) throws ParseException {
-
-        if (root == null) return null;
-        final Token token = root.token;
-        if (token == null ||
-            token.getText() == null ||
-            token.getText().isEmpty()) error(root, "Expected \'<font-weight>\'");
-
-        final String ident = token.getText().toLowerCase(Locale.ROOT);
-        String weight = FontWeight.NORMAL.name();
-
-        if ("inherit".equals(ident)) {
-            weight = FontWeight.NORMAL.name();
-        } else if ("normal".equals(ident)) {
-            weight = FontWeight.NORMAL.name();
-        } else if ("bold".equals(ident)) {
-            weight = FontWeight.BOLD.name();
-        } else if ("bolder".equals(ident)) {
-            weight = FontWeight.BOLD.name();
-        } else if ("lighter".equals(ident)) {
-            weight = FontWeight.LIGHT.name();
-        } else if ("100".equals(ident)) {
-            weight = FontWeight.findByWeight(100).name();
-        } else if ("200".equals(ident)) {
-            weight = FontWeight.findByWeight(200).name();
-        } else if ("300".equals(ident)) {
-            weight = FontWeight.findByWeight(300).name();
-        } else if ("400".equals(ident)) {
-            weight = FontWeight.findByWeight(400).name();
-        } else if ("500".equals(ident)) {
-            weight = FontWeight.findByWeight(500).name();
-        } else if ("600".equals(ident)) {
-            weight = FontWeight.findByWeight(600).name();
-        } else if ("700".equals(ident)) {
-            weight = FontWeight.findByWeight(700).name();
-        } else if ("800".equals(ident)) {
-            weight = FontWeight.findByWeight(800).name();
-        } else if ("900".equals(ident)) {
-            weight = FontWeight.findByWeight(900).name();
-        } else {
-            error(root, "Expected \'<font-weight>\'");
-        }
-        return new ParsedValueImpl<String,FontWeight>(weight, FontConverter.FontWeightConverter.getInstance());
-    }
-
-    private ParsedValueImpl<String,String>  parseFontFamily(Term root) throws ParseException {
-
-        if (root == null) return null;
-        final Token token = root.token;
-        String text = null;
-        if (token == null ||
-            (token.getType() != CSSLexer.IDENT &&
-             token.getType() != CSSLexer.STRING) ||
-            (text = token.getText()) == null ||
-            text.isEmpty()) error(root, "Expected \'<font-family>\'");
-
-        final String fam = stripQuotes(text.toLowerCase(Locale.ROOT));
-        if ("inherit".equals(fam)) {
-            return new ParsedValueImpl<String,String>("inherit", StringConverter.getInstance());
-        } else if ("serif".equals(fam) ||
-            "sans-serif".equals(fam) ||
-            "cursive".equals(fam) ||
-            "fantasy".equals(fam) ||
-            "monospace".equals(fam)) {
-            return new ParsedValueImpl<String,String>(fam, StringConverter.getInstance());
-        } else {
-            return new ParsedValueImpl<String,String>(token.getText(), StringConverter.getInstance());
-        }
-    }
-
-    // (fontStyle || fontVariant || fontWeight)* fontSize (SOLIDUS size)? fontFamily
-    private ParsedValueImpl<ParsedValue[],Font> parseFont(Term root) throws ParseException {
-
-        // Because style, variant, weight, size and family can inherit
-        // AND style, variant and weight are optional, parsing this backwards
-        // is easier.
-        Term next = root.nextInSeries;
-        root.nextInSeries = null;
-        while (next != null) {
-            Term temp = next.nextInSeries;
-            next.nextInSeries = root;
-            root = next;
-            next = temp;
-        }
-
-        // Now, root should point to fontFamily
-        Token token = root.token;
-        int ttype = token.getType();
-        if (ttype != CSSLexer.IDENT &&
-            ttype != CSSLexer.STRING) error(root, "Expected \'<font-family>\'");
-        ParsedValueImpl<String,String> ffamily = parseFontFamily(root);
-
-        Term term = root;
-        if ((term = term.nextInSeries) == null) error(root, "Expected \'<size>\'");
-        if (term.token == null || !isSize(term.token)) error(term, "Expected \'<size>\'");
-
-        // Now, term could be the font size or it could be the line-height.
-        // If the next term is a forward slash, then it's line-height.
-        Term temp;
-        if (((temp = term.nextInSeries) != null) &&
-            (temp.token != null && temp.token.getType() == CSSLexer.SOLIDUS)) {
-
-            root = temp;
-
-            if ((term = temp.nextInSeries) == null) error(root, "Expected \'<size>\'");
-            if (term.token == null || !isSize(term.token)) error(term, "Expected \'<size>\'");
-
-            token = term.token;
-        }
-
-        ParsedValueImpl<ParsedValue<?,Size>,Number> fsize = parseFontSize(term);
-        if (fsize == null) error(root, "Expected \'<size>\'");
-
-        ParsedValueImpl<String,FontPosture> fstyle = null;
-        ParsedValueImpl<String,FontWeight> fweight = null;
-        String fvariant = null;
-
-        while ((term = term.nextInSeries) != null) {
-
-            if (term.token == null ||
-                term.token.getType() != CSSLexer.IDENT ||
-                term.token.getText() == null ||
-                term.token.getText().isEmpty())
-                error(term, "Expected \'<font-weight>\', \'<font-style>\' or \'<font-variant>\'");
-
-            if (fstyle == null && ((fstyle = parseFontStyle(term)) != null)) {
-                ;
-            } else if (fvariant == null && "small-caps".equalsIgnoreCase(term.token.getText())) {
-                fvariant = term.token.getText();
-            } else if (fweight == null && ((fweight = parseFontWeight(term)) != null)) {
-                ;
-            }
-        }
-
-        ParsedValueImpl[] values = new ParsedValueImpl[]{ ffamily, fsize, fweight, fstyle };
-        return new ParsedValueImpl<ParsedValue[],Font>(values, FontConverter.getInstance());
-    }
-
-    //
-    // Parser state machine
-    //
-    Token currentToken = null;
-
-    // return the next token that is not whitespace.
-    private Token nextToken(CSSLexer lexer) {
-
-        Token token = null;
-
-        do {
-            token = lexer.nextToken();
-        } while ((token != null) &&
-                (token.getType() == CSSLexer.WS) ||
-                (token.getType() == CSSLexer.NL));
-
-        if (LOGGER.isLoggable(Level.FINEST)) {
-            LOGGER.finest(token.toString());
-        }
-
-        return token;
-
-    }
-
-    // keep track of what is in process of being parsed to avoid import loops
-    private static Stack<String> imports;
-
-    private void parse(Stylesheet stylesheet, CSSLexer lexer) {
-
-        // need to read the first token
-        currentToken = nextToken(lexer);
-
-        while((currentToken != null) &&
-                (currentToken.getType() == CSSLexer.AT_KEYWORD)) {
-
-            currentToken = nextToken(lexer);
-
-            if (currentToken == null || currentToken.getType() != CSSLexer.IDENT) {
-
-                // just using ParseException for a nice error message, not for throwing the exception.
-                ParseException parseException = new ParseException("Expected IDENT", currentToken, this);
-                final String msg = parseException.toString();
-                CssError error = createError(msg);
-                if (LOGGER.isLoggable(Level.WARNING)) {
-                    LOGGER.warning(error.toString());
-                }
-                reportError(error);
-
-                // get past EOL or SEMI
-                do {
-                    currentToken = lexer.nextToken();
-                } while ((currentToken != null) &&
-                        (currentToken.getType() == CSSLexer.SEMI) ||
-                        (currentToken.getType() == CSSLexer.WS) ||
-                        (currentToken.getType() == CSSLexer.NL));
-                continue;
-            }
-
-            String keyword = currentToken.getText().toLowerCase(Locale.ROOT);
-            if ("font-face".equals(keyword)) {
-                FontFace fontFace = fontFace(lexer);
-                if (fontFace != null) stylesheet.getFontFaces().add(fontFace);
-                currentToken = nextToken(lexer);
-                continue;
-
-            } else if ("import".equals(keyword)) {
-
-                if (CSSParser.imports == null) {
-                    CSSParser.imports = new Stack<>();
-                }
-
-                if (!imports.contains(sourceOfStylesheet)) {
-
-                    imports.push(sourceOfStylesheet);
-
-                    Stylesheet importedStylesheet = handleImport(lexer);
-
-                    if (importedStylesheet != null) {
-                        stylesheet.importStylesheet(importedStylesheet);
-                    }
-
-                    imports.pop();
-
-                    if (CSSParser.imports.isEmpty()) {
-                        CSSParser.imports = null;
-                    }
-
-                } else {
-// Import imports import!
-                    final int line = currentToken.getLine();
-                    final int pos = currentToken.getOffset();
-                    final String msg =
-                            MessageFormat.format("Recursive @import at {2} [{0,number,#},{1,number,#}]",
-                                    line, pos, imports.peek());
-                    CssError error = createError(msg);
-                    if (LOGGER.isLoggable(Level.WARNING)) {
-                        LOGGER.warning(error.toString());
-                    }
-                    reportError(error);
-                }
-
-                // get past EOL or SEMI
-                do {
-                    currentToken = lexer.nextToken();
-                } while ((currentToken != null) &&
-                        (currentToken.getType() == CSSLexer.SEMI) ||
-                        (currentToken.getType() == CSSLexer.WS) ||
-                        (currentToken.getType() == CSSLexer.NL));
-
-                continue;
-
-            }
-        }
-
-        while ((currentToken != null) &&
-               (currentToken.getType() != Token.EOF)) {
-
-            List<Selector> selectors = selectors(lexer);
-            if (selectors == null) return;
-
-            if ((currentToken == null) ||
-                (currentToken.getType() != CSSLexer.LBRACE)) {
-                    final int line = currentToken != null ? currentToken.getLine() : -1;
-                    final int pos = currentToken != null ? currentToken.getOffset() : -1;
-                    final String msg =
-                        MessageFormat.format("Expected LBRACE at [{0,number,#},{1,number,#}]",
-                                line, pos);
-                    CssError error = createError(msg);
-                    if (LOGGER.isLoggable(Level.WARNING)) {
-                        LOGGER.warning(error.toString());
-                    }
-                    reportError(error);
-                currentToken = null;
-                return;
-            }
-
-            // get past the LBRACE
-            currentToken = nextToken(lexer);
-
-            List<Declaration> declarations = declarations(lexer);
-            if (declarations == null) return;
-
-            if ((currentToken != null) &&
-                (currentToken.getType() != CSSLexer.RBRACE)) {
-                    final int line = currentToken.getLine();
-                    final int pos = currentToken.getOffset();
-                    final String msg =
-                        MessageFormat.format("Expected RBRACE at [{0,number,#},{1,number,#}]",
-                        line,pos);
-                    CssError error = createError(msg);
-                    if (LOGGER.isLoggable(Level.WARNING)) {
-                        LOGGER.warning(error.toString());
-                    }
-                    reportError(error);
-                currentToken = null;
-                return;
-            }
-
-            stylesheet.getRules().add(new Rule(selectors, declarations));
-
-            currentToken = nextToken(lexer);
-
-        }
-        currentToken = null;
-    }
-
-    private FontFace fontFace(CSSLexer lexer) {
-        final Map<String,String> descriptors = new HashMap<String,String>();
-        final List<FontFace.FontFaceSrc> sources = new ArrayList<FontFace.FontFaceSrc>();
-        while(true) {
-            currentToken = nextToken(lexer);
-            if (currentToken.getType() == CSSLexer.IDENT) {
-                String key = currentToken.getText();
-                // ignore the colon that follows
-                currentToken = nextToken(lexer);
-                // get the next token after colon
-                currentToken = nextToken(lexer);
-                // ignore all but "src"
-                if ("src".equalsIgnoreCase(key)) {
-                    while(true) {
-                        if((currentToken != null) &&
-                                (currentToken.getType() != CSSLexer.SEMI) &&
-                                (currentToken.getType() != CSSLexer.RBRACE) &&
-                                (currentToken.getType() != Token.EOF)) {
-
-                            if (currentToken.getType() == CSSLexer.IDENT) {
-                                // simple reference to other font-family
-                                sources.add(new FontFace.FontFaceSrc(FontFace.FontFaceSrcType.REFERENCE,currentToken.getText()));
-
-                            } else if (currentToken.getType() == CSSLexer.URL) {
-
-                                // let URLConverter do the conversion
-                                ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>(currentToken.getText(), StringConverter.getInstance()),
-                                        new ParsedValueImpl<String,String>(sourceOfStylesheet, null)
-                                };
-                                ParsedValue<ParsedValue[], String> parsedValue =
-                                        new ParsedValueImpl<ParsedValue[], String>(uriValues, URLConverter.getInstance());
-                                String urlStr = parsedValue.convert(null);
-
-                                URL url = null;
-                                try {
-                                    URI fontUri = new URI(urlStr);
-                                    url = fontUri.toURL();
-                                } catch (URISyntaxException |  MalformedURLException malf) {
-
-                                    final int line = currentToken.getLine();
-                                    final int pos = currentToken.getOffset();
-                                    final String msg = MessageFormat.format("Could not resolve @font-face url [{2}] at [{0,number,#},{1,number,#}]",line,pos,urlStr);
-                                    CssError error = createError(msg);
-                                    if (LOGGER.isLoggable(Level.WARNING)) {
-                                        LOGGER.warning(error.toString());
-                                    }
-                                    reportError(error);
-
-                                    // skip the rest.
-                                    while(currentToken != null) {
-                                        int ttype = currentToken.getType();
-                                        if (ttype == CSSLexer.RBRACE ||
-                                                ttype == Token.EOF) {
-                                            return null;
-                                        }
-                                        currentToken = nextToken(lexer);
-                                    }
-                                }
-
-                                String format = null;
-                                while(true) {
-                                    currentToken = nextToken(lexer);
-                                    final int ttype = (currentToken != null) ? currentToken.getType() : Token.EOF;
-                                    if (ttype == CSSLexer.FUNCTION) {
-                                        if ("format(".equalsIgnoreCase(currentToken.getText())) {
-                                            continue;
-                                        } else {
-                                            break;
-                                        }
-                                    } else if (ttype == CSSLexer.IDENT ||
-                                            ttype == CSSLexer.STRING) {
-
-                                        format = Utils.stripQuotes(currentToken.getText());
-                                    } else if (ttype == CSSLexer.RPAREN) {
-                                        continue;
-                                    } else {
-                                        break;
-                                    }
-                                }
-                                sources.add(new FontFace.FontFaceSrc(FontFace.FontFaceSrcType.URL,url.toExternalForm(), format));
-
-                            } else if (currentToken.getType() == CSSLexer.FUNCTION) {
-                                if ("local(".equalsIgnoreCase(currentToken.getText())) {
-                                    // consume the function token
-                                    currentToken = nextToken(lexer);
-                                    // parse function contents
-                                    final StringBuilder localSb = new StringBuilder();
-                                    while(true) {
-                                        if((currentToken != null) && (currentToken.getType() != CSSLexer.RPAREN) &&
-                                                (currentToken.getType() != Token.EOF)) {
-                                            localSb.append(currentToken.getText());
-                                        } else {
-                                            break;
-                                        }
-                                        currentToken = nextToken(lexer);
-                                    }
-                                    int start = 0, end = localSb.length();
-                                    if (localSb.charAt(start) == '\'' || localSb.charAt(start) == '\"') start ++;
-                                    if (localSb.charAt(end-1) == '\'' || localSb.charAt(end-1) == '\"') end --;
-                                    final String local = localSb.substring(start,end);
-                                    sources.add(new FontFace.FontFaceSrc(FontFace.FontFaceSrcType.LOCAL,local));
-                                } else {
-                                    // error unknown fontface src type
-                                    final int line = currentToken.getLine();
-                                    final int pos = currentToken.getOffset();
-                                    final String msg = MessageFormat.format("Unknown @font-face src type ["+currentToken.getText()+")] at [{0,number,#},{1,number,#}]",line,pos);
-                                    CssError error = createError(msg);
-                                    if (LOGGER.isLoggable(Level.WARNING)) {
-                                        LOGGER.warning(error.toString());
-                                    }
-                                    reportError(error);
-
-                                }
-                            } else  if (currentToken.getType() == CSSLexer.COMMA) {
-                                // ignore
-                            } else {
-                                // error unexpected token
-                                final int line = currentToken.getLine();
-                                final int pos = currentToken.getOffset();
-                                final String msg = MessageFormat.format("Unexpected TOKEN ["+currentToken.getText()+"] at [{0,number,#},{1,number,#}]",line,pos);
-                                CssError error = createError(msg);
-                                if (LOGGER.isLoggable(Level.WARNING)) {
-                                    LOGGER.warning(error.toString());
-                                }
-                                reportError(error);
-                            }
-                        } else {
-                            break;
-                        }
-                        currentToken = nextToken(lexer);
-                    }
-                } else {
-                    StringBuilder descriptorVal = new StringBuilder();
-                    while(true) {
-                        if((currentToken != null) && (currentToken.getType() != CSSLexer.SEMI) &&
-                            (currentToken.getType() != Token.EOF)) {
-                            descriptorVal.append(currentToken.getText());
-                        } else {
-                            break;
-                        }
-                        currentToken = nextToken(lexer);
-                    }
-                    descriptors.put(key,descriptorVal.toString());
-                }
-//                continue;
-            }
-
-            if ((currentToken == null) ||
-                (currentToken.getType() == CSSLexer.RBRACE) ||
-                (currentToken.getType() == Token.EOF)) {
-                break;
-            }
-
-        }
-        return new FontFace(descriptors, sources);
-    }
-
-    private Stylesheet handleImport(CSSLexer lexer) {
-        currentToken = nextToken(lexer);
-
-        if (currentToken == null || currentToken.getType() == Token.EOF) {
-            return null;
-        }
-
-        int ttype = currentToken.getType();
-
-        String fname = null;
-        if (ttype == CSSLexer.STRING || ttype == CSSLexer.URL) {
-            fname = currentToken.getText();
-        }
-
-        Stylesheet importedStylesheet = null;
-        final String _sourceOfStylesheet = sourceOfStylesheet;
-
-        if (fname != null) {
-            // let URLConverter do the conversion
-            ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
-                    new ParsedValueImpl<String,String>(fname, StringConverter.getInstance()),
-                    new ParsedValueImpl<String,String>(sourceOfStylesheet, null)
-            };
-            ParsedValue<ParsedValue[], String> parsedValue =
-                    new ParsedValueImpl<ParsedValue[], String>(uriValues, URLConverter.getInstance());
-
-            String urlString = parsedValue.convert(null);
-            importedStylesheet = StyleManager.loadStylesheet(urlString);
-
-            // When we load an imported stylesheet, the sourceOfStylesheet field
-            // gets set to the new stylesheet. Once it is done loading we must reset
-            // this field back to the previous value, otherwise we will potentially
-            // run into problems (for example, see RT-40346).
-            sourceOfStylesheet = _sourceOfStylesheet;
-        }
-        if (importedStylesheet == null) {
-            final String msg =
-                    MessageFormat.format("Could not import {0}", fname);
-            CssError error = createError(msg);
-            if (LOGGER.isLoggable(Level.WARNING)) {
-                LOGGER.warning(error.toString());
-            }
-            reportError(error);
-        }
-        return importedStylesheet;
-    }
-
-    private List<Selector> selectors(CSSLexer lexer) {
-
-        List<Selector> selectors = new ArrayList<Selector>();
-
-        while(true) {
-            Selector selector = selector(lexer);
-            if (selector == null) {
-                // some error happened, skip the rule...
-                while ((currentToken != null) &&
-                       (currentToken.getType() != CSSLexer.RBRACE) &&
-                       (currentToken.getType() != Token.EOF)) {
-                    currentToken = nextToken(lexer);
-                }
-
-                // current token is either RBRACE or EOF. Calling
-                // currentToken will get the next token or EOF.
-                currentToken = nextToken(lexer);
-
-                // skipped the last rule?
-                if (currentToken == null || currentToken.getType() == Token.EOF) {
-                    currentToken = null;
-                    return null;
-                }
-
-                continue;
-            }
-            selectors.add(selector);
-
-            if ((currentToken != null) &&
-                (currentToken.getType() == CSSLexer.COMMA)) {
-                // get past the comma
-                currentToken = nextToken(lexer);
-                continue;
-            }
-
-            // currentToken was either null or not a comma
-            // so we are done with selectors.
-            break;
-        }
-
-        return selectors;
-    }
-
-    private Selector selector(CSSLexer lexer) {
-
-        List<Combinator> combinators = null;
-        List<SimpleSelector> sels = null;
-
-        SimpleSelector ancestor = simpleSelector(lexer);
-        if (ancestor == null) return null;
-
-        while (true) {
-            Combinator comb = combinator(lexer);
-            if (comb != null) {
-                if (combinators == null) {
-                    combinators = new ArrayList<Combinator>();
-                }
-                combinators.add(comb);
-                SimpleSelector descendant = simpleSelector(lexer);
-                if (descendant == null) return null;
-                if (sels == null) {
-                    sels = new ArrayList<SimpleSelector>();
-                    sels.add(ancestor);
-                }
-                sels.add(descendant);
-            } else {
-                break;
-            }
-        }
-
-        // RT-15473
-        // We might return from selector with a NL token instead of an
-        // LBRACE, so skip past the NL here.
-        if (currentToken != null && currentToken.getType() == CSSLexer.NL) {
-            currentToken = nextToken(lexer);
-        }
-
-
-        if (sels == null) {
-            return ancestor;
-        } else {
-            return new CompoundSelector(sels,combinators);
-        }
-
-    }
-
-    private SimpleSelector simpleSelector(CSSLexer lexer) {
-
-        String esel = "*"; // element selector. default to universal
-        String isel = ""; // id selector
-        List<String> csels = null; // class selector
-        List<String> pclasses = null; // pseudoclasses
-
-        while (true) {
-
-            final int ttype =
-                (currentToken != null) ? currentToken.getType() : Token.INVALID;
-
-            switch(ttype) {
-                // element selector
-                case CSSLexer.STAR:
-                case CSSLexer.IDENT:
-                    esel = currentToken.getText();
-                    break;
-
-                // class selector
-                case CSSLexer.DOT:
-                    currentToken = nextToken(lexer);
-                    if (currentToken != null &&
-                        currentToken.getType() == CSSLexer.IDENT) {
-                        if (csels == null) {
-                            csels = new ArrayList<String>();
-                        }
-                        csels.add(currentToken.getText());
-                    } else {
-                        currentToken = Token.INVALID_TOKEN;
-                        return null;
-                    }
-                    break;
-
-                // id selector
-                case CSSLexer.HASH:
-                    isel = currentToken.getText().substring(1);
-                    break;
-
-                case CSSLexer.COLON:
-                    currentToken = nextToken(lexer);
-                    if (currentToken != null && pclasses == null) {
-                        pclasses = new ArrayList<String>();
-                    }
-
-                    if (currentToken.getType() == CSSLexer.IDENT) {
-                        pclasses.add(currentToken.getText());
-                    } else if (currentToken.getType() == CSSLexer.FUNCTION){
-                        String pclass = functionalPseudo(lexer);
-                        pclasses.add(pclass);
-                    } else {
-                        currentToken = Token.INVALID_TOKEN;
-                    }
-
-                    if (currentToken.getType() == Token.INVALID) {
-                        return null;
-                    }
-                    break;
-
-                case CSSLexer.NL:
-                case CSSLexer.WS:
-                case CSSLexer.COMMA:
-                case CSSLexer.GREATER:
-                case CSSLexer.LBRACE:
-                case Token.EOF:
-                    return new SimpleSelector(esel, csels, pclasses, isel);
-
-                default:
-                    return null;
-
-
-            }
-
-            // get the next token, but don't skip whitespace
-            // since it may be a combinator
-            currentToken = lexer.nextToken();
-            if (LOGGER.isLoggable(Level.FINEST)) {
-                LOGGER.finest(currentToken.toString());
-            }
-        }
-    }
-
-    // From http://www.w3.org/TR/selectors/#grammar
-    //  functional_pseudo
-    //      : FUNCTION S* expression ')'
-    //      ;
-    //  expression
-    //      /* In CSS3, the expressions are identifiers, strings, */
-    //      /* or of the form "an+b" */
-    //      : [ [ PLUS | '-' | DIMENSION | NUMBER | STRING | IDENT ] S* ]+
-    //      ;
-    private String functionalPseudo(CSSLexer lexer) {
-
-        // TODO: This is not how we should handle functional pseudo-classes in the long-run!
-
-        StringBuilder pclass = new StringBuilder(currentToken.getText());
-
-        while(true) {
-
-            currentToken = nextToken(lexer);
-
-            switch(currentToken.getType()) {
-
-                // TODO: lexer doesn't really scan right and isn't CSS3,
-                // so PLUS, '-', NUMBER, etc are all useless at this point.
-                case CSSLexer.STRING:
-                case CSSLexer.IDENT:
-                    pclass.append(currentToken.getText());
-                    break;
-
-                case CSSLexer.RPAREN:
-                    pclass.append(')');
-                    return pclass.toString();
-
-                default:
-                    currentToken = Token.INVALID_TOKEN;
-                    return null;
-            }
-        }
-
-    }
-
-    private Combinator combinator(CSSLexer lexer) {
-
-        Combinator combinator = null;
-
-        while (true) {
-
-            final int ttype =
-                (currentToken != null) ? currentToken.getType() : Token.INVALID;
-
-            switch(ttype) {
-
-                case CSSLexer.WS:
-                    // need to check if combinator is null since child token
-                    // might be surrounded by whitespace.
-                    if (combinator == null && " ".equals(currentToken.getText())) {
-                        combinator = Combinator.DESCENDANT;
-                    }
-                    break;
-
-                case CSSLexer.GREATER:
-                    // no need to check if combinator is null here
-                    combinator = Combinator.CHILD;
-                    break;
-
-                case CSSLexer.STAR:
-                case CSSLexer.IDENT:
-                case CSSLexer.DOT:
-                case CSSLexer.HASH:
-                case CSSLexer.COLON:
-                    return combinator;
-
-                default:
-                    // only selector is expected
-                    return null;
-
-            }
-
-            // get the next token, but don't skip whitespace
-            currentToken = lexer.nextToken();
-            if (LOGGER.isLoggable(Level.FINEST)) {
-                LOGGER.finest(currentToken.toString());
-            }
-        }
-    }
-
-    private List<Declaration> declarations(CSSLexer lexer) {
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-
-        while (true) {
-
-            Declaration decl = declaration(lexer);
-            if (decl != null) {
-                declarations.add(decl);
-            } else {
-                // some error happened, skip the decl...
-                while ((currentToken != null) &&
-                       (currentToken.getType() != CSSLexer.SEMI) &&
-                       (currentToken.getType() != CSSLexer.RBRACE) &&
-                       (currentToken.getType() != Token.EOF)) {
-                    currentToken = nextToken(lexer);
-                }
-
-                // current token is either SEMI, RBRACE or EOF.
-                if (currentToken != null &&
-                    currentToken.getType() != CSSLexer.SEMI)
-                    return declarations;
-            }
-
-            // declaration; declaration; ???
-            // RT-17830 - allow declaration;;
-            while ((currentToken != null) &&
-                    (currentToken.getType() == CSSLexer.SEMI)) {
-                currentToken = nextToken(lexer);
-            }
-
-            // if it is delcaration; declaration, then the
-            // next token should be an IDENT.
-            if ((currentToken != null) &&
-                (currentToken.getType() == CSSLexer.IDENT)) {
-                continue;
-            }
-
-            break;
-        }
-
-        return declarations;
-    }
-
-    private Declaration declaration(CSSLexer lexer) {
-
-        final int ttype =
-            (currentToken != null) ? currentToken.getType() : Token.INVALID;
-
-        if ((currentToken == null) ||
-            (currentToken.getType() != CSSLexer.IDENT)) {
-//
-//            RT-16547: this warning was misleading because an empty rule
-//            not invalid. Some people put in empty rules just as placeholders.
-//
-//            if (LOGGER.isLoggable(PlatformLogger.WARNING)) {
-//                final int line = currentToken != null ? currentToken.getLine() : -1;
-//                final int pos = currentToken != null ? currentToken.getOffset() : -1;
-//                final String url =
-//                    (stylesheet != null && stylesheet.getUrl() != null) ?
-//                        stylesheet.getUrl().toExternalForm() : "?";
-//                LOGGER.warning("Expected IDENT at {0}[{1,number,#},{2,number,#}]",
-//                    url,line,pos);
-//            }
-            return null;
-        }
-
-        String property = currentToken.getText();
-
-        currentToken = nextToken(lexer);
-
-        if ((currentToken == null) ||
-            (currentToken.getType() != CSSLexer.COLON)) {
-                final int line = currentToken.getLine();
-                final int pos = currentToken.getOffset();
-                final String msg =
-                        MessageFormat.format("Expected COLON at [{0,number,#},{1,number,#}]",
-                    line,pos);
-                CssError error = createError(msg);
-                if (LOGGER.isLoggable(Level.WARNING)) {
-                    LOGGER.warning(error.toString());
-                }
-                reportError(error);
-            return null;
-        }
-
-        currentToken = nextToken(lexer);
-
-        Term root = expr(lexer);
-        ParsedValueImpl value = null;
-        try {
-            value = (root != null) ? valueFor(property, root, lexer) : null;
-        } catch (ParseException re) {
-                Token badToken = re.tok;
-                final int line = badToken != null ? badToken.getLine() : -1;
-                final int pos = badToken != null ? badToken.getOffset() : -1;
-                final String msg =
-                        MessageFormat.format("{2} while parsing ''{3}'' at [{0,number,#},{1,number,#}]",
-                    line,pos,re.getMessage(),property);
-                CssError error = createError(msg);
-                if (LOGGER.isLoggable(Level.WARNING)) {
-                    LOGGER.warning(error.toString());
-                }
-                reportError(error);
-            return null;
-        }
-
-        boolean important = currentToken.getType() == CSSLexer.IMPORTANT_SYM;
-        if (important) currentToken = nextToken(lexer);
-
-        Declaration decl = (value != null)
-                ? new Declaration(property.toLowerCase(Locale.ROOT), value, important) : null;
-        return decl;
-    }
-
-    private Term expr(CSSLexer lexer) {
-
-        final Term expr = term(lexer);
-        Term current = expr;
-
-        while(true) {
-
-            // if current is null, then term returned null
-            final int ttype =
-                (current != null && currentToken != null)
-                    ? currentToken.getType() : Token.INVALID;
-
-            if (ttype == Token.INVALID) {
-                skipExpr(lexer);
-                return null;
-            } else if (ttype == CSSLexer.SEMI ||
-                ttype == CSSLexer.IMPORTANT_SYM ||
-                ttype == CSSLexer.RBRACE ||
-                ttype == Token.EOF) {
-                return expr;
-            } else if (ttype == CSSLexer.COMMA) {
-            // comma breaks up sequences of terms.
-                // next series of terms chains off the last term in
-                // the current series.
-                currentToken = nextToken(lexer);
-                current = current.nextLayer = term(lexer);
-            } else {
-                current = current.nextInSeries = term(lexer);
-            }
-
-        }
-    }
-
-    private void skipExpr(CSSLexer lexer) {
-
-        while(true) {
-
-            currentToken = nextToken(lexer);
-
-            final int ttype =
-                (currentToken != null) ? currentToken.getType() : Token.INVALID;
-
-            if (ttype == CSSLexer.SEMI ||
-                ttype == CSSLexer.RBRACE ||
-                ttype == Token.EOF) {
-                return;
-            }
-        }
-    }
-
-    private Term term(CSSLexer lexer) {
-
-        final int ttype =
-            (currentToken != null) ? currentToken.getType() : Token.INVALID;
-
-        switch (ttype) {
-
-            case CSSLexer.NUMBER:
-            case CSSLexer.CM:
-            case CSSLexer.EMS:
-            case CSSLexer.EXS:
-            case CSSLexer.IN:
-            case CSSLexer.MM:
-            case CSSLexer.PC:
-            case CSSLexer.PT:
-            case CSSLexer.PX:
-            case CSSLexer.DEG:
-            case CSSLexer.GRAD:
-            case CSSLexer.RAD:
-            case CSSLexer.TURN:
-            case CSSLexer.PERCENTAGE:
-            case CSSLexer.SECONDS:
-            case CSSLexer.MS:
-                break;
-
-            case CSSLexer.STRING:
-                break;
-            case CSSLexer.IDENT:
-                break;
-
-            case CSSLexer.HASH:
-                break;
-
-            case CSSLexer.FUNCTION:
-            case CSSLexer.LPAREN:
-
-                Term function = new Term(currentToken);
-                currentToken = nextToken(lexer);
-
-                Term arg = term(lexer);
-                function.firstArg = arg;
-
-                while(true) {
-
-                    final int operator =
-                        currentToken != null ? currentToken.getType() : Token.INVALID;
-
-                    if (operator == CSSLexer.RPAREN) {
-                        currentToken = nextToken(lexer);
-                        return function;
-                    } else if (operator == CSSLexer.COMMA) {
-                        // comma breaks up sequences of terms.
-                        // next series of terms chains off the last term in
-                        // the current series.
-                        currentToken = nextToken(lexer);
-                        arg = arg.nextArg = term(lexer);
-
-                    } else {
-                        arg = arg.nextInSeries = term(lexer);
-                    }
-
-                }
-
-            case CSSLexer.URL:
-                break;
-
-            case CSSLexer.SOLIDUS:
-                break;
-
-            default:
-                final int line = currentToken != null ? currentToken.getLine() : -1;
-                final int pos = currentToken != null ? currentToken.getOffset() : -1;
-                final String text = currentToken != null ? currentToken.getText() : "";
-                final String msg =
-                    MessageFormat.format("Unexpected token {0}{1}{0} at [{2,number,#},{3,number,#}]",
-                    "\'",text,line,pos);
-                CssError error = createError(msg);
-                if (LOGGER.isLoggable(Level.WARNING)) {
-                    LOGGER.warning(error.toString());
-                }
-                reportError(error);
-                return null;
-//                currentToken = nextToken(lexer);
-//
-//                return new Term(Token.INVALID_TOKEN);
-        }
-
-        Term term = new Term(currentToken);
-        currentToken = nextToken(lexer);
-        return term;
-    }
-}
--- /dev/null	2015-09-03 15:31:27.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/CssParser.java	2015-09-03 15:31:25.627846300 -0700
@@ -0,0 +1,4828 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css;
+
+import com.sun.javafx.css.Combinator;
+import com.sun.javafx.css.FontFaceImpl;
+import com.sun.javafx.css.ParsedValueImpl;
+import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.util.Utils;
+import javafx.css.converter.BooleanConverter;
+import javafx.css.converter.DurationConverter;
+import javafx.css.converter.EffectConverter;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.FontConverter;
+import javafx.css.converter.InsetsConverter;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.SizeConverter;
+import javafx.css.converter.SizeConverter.SequenceConverter;
+import javafx.css.converter.StringConverter;
+import javafx.css.converter.URLConverter;
+import javafx.css.converter.DeriveColorConverter;
+import javafx.css.converter.LadderConverter;
+import javafx.css.converter.StopConverter;
+import com.sun.javafx.css.parser.Token;
+import com.sun.javafx.scene.layout.region.BackgroundPositionConverter;
+import com.sun.javafx.scene.layout.region.BackgroundSizeConverter;
+import com.sun.javafx.scene.layout.region.BorderImageSliceConverter;
+import com.sun.javafx.scene.layout.region.BorderImageSlices;
+import com.sun.javafx.scene.layout.region.BorderImageWidthConverter;
+import com.sun.javafx.scene.layout.region.BorderImageWidthsSequenceConverter;
+import com.sun.javafx.scene.layout.region.BorderStrokeStyleSequenceConverter;
+import com.sun.javafx.scene.layout.region.BorderStyleConverter;
+import com.sun.javafx.scene.layout.region.CornerRadiiConverter;
+import com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter;
+import com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter;
+import com.sun.javafx.scene.layout.region.LayeredBorderPaintConverter;
+import com.sun.javafx.scene.layout.region.LayeredBorderStyleConverter;
+import com.sun.javafx.scene.layout.region.Margins;
+import com.sun.javafx.scene.layout.region.RepeatStruct;
+import com.sun.javafx.scene.layout.region.RepeatStructConverter;
+import com.sun.javafx.scene.layout.region.SliceSequenceConverter;
+import com.sun.javafx.scene.layout.region.StrokeBorderPaintConverter;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.Effect;
+import javafx.scene.layout.BackgroundPosition;
+import javafx.scene.layout.BackgroundRepeat;
+import javafx.scene.layout.BackgroundSize;
+import javafx.scene.layout.BorderStrokeStyle;
+import javafx.scene.layout.BorderWidths;
+import javafx.scene.layout.CornerRadii;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.Stop;
+import javafx.scene.shape.StrokeLineCap;
+import javafx.scene.shape.StrokeLineJoin;
+import javafx.scene.shape.StrokeType;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontPosture;
+import javafx.scene.text.FontWeight;
+import javafx.util.Duration;
+import sun.util.logging.PlatformLogger;
+import sun.util.logging.PlatformLogger.Level;
+
+import java.io.BufferedReader;
+import java.io.CharArrayReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Stack;
+
+/**
+ * @since 9
+ */
+final public class CssParser {
+
+    public CssParser() {
+        properties = new HashMap<String,String>();
+    }
+
+    // stylesheet as a string from parse method. This will be null if the
+    // stylesheet is being parsed from a file; otherwise, the parser is parsing
+    // a string and this is that string.
+    private String     stylesheetAsText;
+
+    // the url of the stylesheet file, or the docbase of an applet. This will
+    // be null if the source is not a file or from an applet.
+    private String        sourceOfStylesheet;
+
+    // the Styleable from the node with an in-line style. This will be null
+    // unless the source of the styles is a Node's styleProperty. In this case,
+    // the stylesheetString will also be set.
+    private Styleable sourceOfInlineStyle;
+
+    // source is a file
+    private void setInputSource(String url, String str) {
+        stylesheetAsText = str;
+        sourceOfStylesheet = url;
+        sourceOfInlineStyle = null;
+    }
+
+    // source as string only
+    private void setInputSource(String str) {
+        stylesheetAsText = str;
+        sourceOfStylesheet = null;
+        sourceOfInlineStyle = null;
+    }
+
+    // source is in-line style
+    private void setInputSource(Styleable styleable) {
+        stylesheetAsText = styleable != null ? styleable.getStyle() : null;
+        sourceOfStylesheet = null;
+        sourceOfInlineStyle = styleable;
+    }
+
+    private static final PlatformLogger LOGGER = com.sun.javafx.util.Logging.getCSSLogger();
+
+    private static final class ParseException extends Exception {
+        ParseException(String message) {
+            this(message,null,null);
+        }
+        ParseException(String message, Token tok, CssParser parser) {
+            super(message);
+            this.tok = tok;
+            if (parser.sourceOfStylesheet != null) {
+                source = parser.sourceOfStylesheet;
+            } else if (parser.sourceOfInlineStyle != null) {
+                source = parser.sourceOfInlineStyle.toString();
+            } else if (parser.stylesheetAsText != null) {
+                source = parser.stylesheetAsText;
+            } else {
+                source = "?";
+            }
+        }
+        @Override public String toString() {
+            StringBuilder builder = new StringBuilder(super.getMessage());
+            builder.append(source);
+            if (tok != null) builder.append(": ").append(tok.toString());
+            return builder.toString();
+        }
+        private final Token tok;
+        private final String source;
+    }
+
+    /**
+     * Creates a stylesheet from a CSS document string.
+     *
+     *@param stylesheetText the CSS document to parse
+     *@return the Stylesheet
+     */
+    public Stylesheet parse(final String stylesheetText) {
+        final Stylesheet stylesheet = new Stylesheet();
+        if (stylesheetText != null && !stylesheetText.trim().isEmpty()) {
+            setInputSource(stylesheetText);
+            try (Reader reader = new CharArrayReader(stylesheetText.toCharArray())) {
+                parse(stylesheet, reader);
+            } catch (IOException ioe) {
+                // this method doesn't explicitly throw IOException
+            }
+        }
+        return stylesheet;
+    }
+
+    /**
+     * Creates a stylesheet from a CSS document string using docbase as
+     * the base URL for resolving references within stylesheet.
+     *
+     *@param stylesheetText the CSS document to parse
+     *@return the Stylesheet
+     */
+    public Stylesheet parse(final String docbase, final String stylesheetText) throws IOException {
+        final Stylesheet stylesheet = new Stylesheet(docbase);
+        if (stylesheetText != null && !stylesheetText.trim().isEmpty()) {
+            setInputSource(docbase, stylesheetText);
+            try (Reader reader = new CharArrayReader(stylesheetText.toCharArray())) {
+                parse(stylesheet, reader);
+            }
+        }
+        return stylesheet;
+    }
+
+    /**
+     * Updates the given stylesheet by reading a CSS document from a URL,
+     * assuming UTF-8 encoding.
+     *
+     *@param  url URL of the stylesheet to parse
+     *@return the stylesheet
+     *@throws IOException
+     */
+    public Stylesheet parse(final URL url) throws IOException {
+
+        final String path = url != null ? url.toExternalForm() : null;
+        final Stylesheet stylesheet = new Stylesheet(path);
+        if (url != null) {
+            setInputSource(path, null);
+            try (Reader reader = new BufferedReader(new InputStreamReader(url.openStream()))) {
+                parse(stylesheet, reader);
+            }
+        }
+        return stylesheet;
+    }
+
+    /* All of the other function calls should wind up here */
+    private void parse(final Stylesheet stylesheet, final Reader reader) {
+        CssLexer lex = new CssLexer();
+        lex.setReader(reader);
+
+        try {
+            this.parse(stylesheet, lex);
+        } catch (Exception ex) {
+            // Sometimes bad syntax causes an exception. The code should be
+            // fixed to handle the bad syntax, but the fallback is
+            // to handle the exception here. Uncaught, the exception can cause
+            // problems like RT-20311
+            reportException(ex);
+        }
+
+    }
+
+    /** Parse an in-line style from a Node */
+    public Stylesheet parseInlineStyle(final Styleable node) {
+
+        Stylesheet stylesheet = new Stylesheet();
+
+        final String stylesheetText = (node != null) ? node.getStyle() : null;
+        if (stylesheetText != null && !stylesheetText.trim().isEmpty()) {
+            setInputSource(node);
+            final List<Rule> rules = new ArrayList<Rule>();
+            try (Reader reader = new CharArrayReader(stylesheetText.toCharArray())) {
+                final CssLexer lexer = new CssLexer();
+                lexer.setReader(reader);
+                currentToken = nextToken(lexer);
+                final List<Declaration> declarations = declarations(lexer);
+                if (declarations != null && !declarations.isEmpty()) {
+                    final Selector selector = Selector.getUniversalSelector();
+                    final Rule rule = new Rule(
+                        Collections.singletonList(selector),
+                        declarations
+                    );
+                    rules.add(rule);
+                }
+            } catch (IOException ioe) {
+            } catch (Exception ex) {
+                // Sometimes bad syntax causes an exception. The code should be
+                // fixed to handle the bad syntax, but the fallback is
+                // to handle the exception here. Uncaught, the exception can cause
+                // problems like RT-20311
+                reportException(ex);
+            }
+            stylesheet.getRules().addAll(rules);
+        }
+
+        // don't retain reference to the styleable
+        setInputSource((Styleable) null);
+
+        return stylesheet;
+    }
+
+    /** convenience method for unit tests */
+    public ParsedValue parseExpr(String property, String expr) {
+        if (property == null || expr == null) return null;
+
+        ParsedValueImpl value = null;
+        setInputSource(null, property + ": " + expr);
+        char buf[] = new char[expr.length() + 1];
+        System.arraycopy(expr.toCharArray(), 0, buf, 0, expr.length());
+        buf[buf.length-1] = ';';
+
+        try (Reader reader = new CharArrayReader(buf)) {
+            CssLexer lex = new CssLexer();
+            lex.setReader(reader);
+
+            currentToken = nextToken(lex);
+            CssParser.Term term = this.expr(lex);
+            value = valueFor(property, term, lex);
+        } catch (IOException ioe) {
+        } catch (ParseException e) {
+            if (LOGGER.isLoggable(Level.WARNING)) {
+                LOGGER.warning("\"" +property + ": " + expr  + "\" " + e.toString());
+            }
+        } catch (Exception ex) {
+            // Sometimes bad syntax causes an exception. The code should be
+            // fixed to handle the bad syntax, but the fallback is
+            // to handle the exception here. Uncaught, the exception can cause
+            // problems like RT-20311
+            reportException(ex);
+        }
+        return value;
+    }
+    /*
+     * Map of property names found while parsing. If a value matches a
+     * property name, then the value is a lookup.
+     */
+    private final Map<String,String> properties;
+
+    /*
+     * While parsing a declaration, tokens from parsing value (that is,
+     * the expr rule) are held in this tree structure which is then passed
+     * to methods which convert the tree into a ParsedValueImpl.
+     *
+     * Each term in expr is a Term. For simple terms, like HASH, the
+     * Term is just the Token. If the term is a function, then the
+     * Term is a linked-list of Term, the first being the function
+     * name and each nextArg being the arguments.
+     *
+     * If there is more than one term in the expr (insets, for example),
+     * then the terms are linked on nextInSequence. If there is more than one
+     * layer (sequence of terms), then each layer becomes the nextLayer
+     * to the last root in the previous sequence.
+     *
+     * The easiest way to think of it is that a comma starts a nextLayer (except
+     * when a function arg).
+     *
+     * The expr part of the declaration "-fx-padding 1 2, 3 4;" would look
+     * like this:
+     * [1 | nextLayer | nextInSeries]-->[2 | nextLayer | nextInSeries]-->null
+     *            |                            |
+     *          null                           |
+     *       .---------------------------------'
+     *       '-->[3 | nextLayer | nextInSeries]-->[4 | nextLayer | nextInSeries]-->null
+     *                    |                              |
+     *                   null                           null
+     *
+     * The first argument in a function needs to be distinct from the
+     * remaining args so that the args of a function in the middle of
+     * a function will not be omitted. Consider 'f0(a, f1(b, c), d)'
+     * If we relied only on nextArg, then the next arg of f0 would be a but
+     * the nextArg of f1 would be d. With firstArg, the firstArg of f0 is a,
+     * the nextArg of a is f1, the firstArg of f1 is b and the nextArg of f1 is d.
+     *
+     * TODO: now that the parser is the parser and not an adjunct to an ANTLR
+     * parser, this Term stuff shouldn't be needed.
+     */
+    static class Term {
+    	final Token token;
+    	Term nextInSeries;
+    	Term nextLayer;
+        Term firstArg;
+        Term nextArg;
+    	Term(Token token) {
+            this.token = token;
+            this.nextLayer = null;
+            this.nextInSeries = null;
+            this.firstArg = null;
+            this.nextArg = null;
+    	}
+    	Term() {
+            this(null);
+    	}
+
+    	@Override public String toString() {
+            StringBuilder buf = new StringBuilder();
+            if (token != null) buf.append(String.valueOf(token.getText()));
+            if (nextInSeries != null) {
+                buf.append("<nextInSeries>");
+                buf.append(nextInSeries.toString());
+                buf.append("</nextInSeries>\n");
+            }
+            if (nextLayer != null) {
+                buf.append("<nextLayer>");
+                buf.append(nextLayer.toString());
+                buf.append("</nextLayer>\n");
+            }
+            if (firstArg != null) {
+                buf.append("<args>");
+                buf.append(firstArg.toString());
+                if (nextArg != null) {
+                    buf.append(nextArg.toString());
+                }
+                buf.append("</args>");
+            }
+
+            return buf.toString();
+    	}
+
+    }
+
+    private ParseError createError(String msg) {
+
+        ParseError error = null;
+        if (sourceOfStylesheet != null) {
+            error = new ParseError.StylesheetParsingError(sourceOfStylesheet, msg);
+        } else if (sourceOfInlineStyle != null) {
+            error = new ParseError.InlineStyleParsingError(sourceOfInlineStyle, msg);
+        } else {
+            error = new ParseError.StringParsingError(stylesheetAsText, msg);
+        }
+        return error;
+    }
+
+    private void reportError(ParseError error) {
+        List<ParseError> errors = null;
+        if ((errors = StyleManager.getErrors()) != null) {
+            errors.add(error);
+        }
+    }
+
+    private void error(final Term root, final String msg) throws ParseException {
+
+        final Token token = root != null ? root.token : null;
+        final ParseException pe = new ParseException(msg,token,this);
+        reportError(createError(pe.toString()));
+        throw pe;
+    }
+
+    private void reportException(Exception exception) {
+
+        if (LOGGER.isLoggable(Level.WARNING)) {
+            final StackTraceElement[] stea = exception.getStackTrace();
+            if (stea.length > 0) {
+                final StringBuilder buf =
+                    new StringBuilder("Please report ");
+                buf.append(exception.getClass().getName())
+                   .append(" at:");
+                int end = 0;
+                while(end < stea.length) {
+                    // only report parser part of the stack trace.
+                    if (!getClass().getName().equals(stea[end].getClassName())) {
+                        break;
+                    }
+                    buf.append("\n\t")
+                    .append(stea[end++].toString());
+                }
+                LOGGER.warning(buf.toString());
+            }
+        }
+    }
+
+    private String formatDeprecatedMessage(final Term root, final String syntax) {
+        final StringBuilder buf =
+            new StringBuilder("Using deprecated syntax for ");
+        buf.append(syntax);
+        if (sourceOfStylesheet != null){
+            buf.append(" at ")
+               .append(sourceOfStylesheet)
+               .append("[")
+               .append(root.token.getLine())
+               .append(',')
+               .append(root.token.getOffset())
+               .append("]");
+        }
+        buf.append(". Refer to the CSS Reference Guide.");
+        return buf.toString();
+    }
+
+    // Assumes string is not a lookup!
+    private ParsedValueImpl<Color,Color> colorValueOfString(String str) {
+
+        if(str.startsWith("#") || str.startsWith("0x")) {
+
+            double a = 1.0f;
+            String c = str;
+            final int prefixLength = (str.startsWith("#")) ? 1 : 2;
+
+            final int len = c.length();
+            // rgba or rrggbbaa - trim off the alpha
+            if ( (len-prefixLength) == 4) {
+                a = Integer.parseInt(c.substring(len-1), 16) / 15.0f;
+                c = c.substring(0,len-1);
+            } else if ((len-prefixLength) == 8) {
+                a = Integer.parseInt(c.substring(len-2), 16) / 255.0f;
+                c = c.substring(0,len-2);
+            }
+            // else color was rgb or rrggbb (no alpha)
+            return new ParsedValueImpl<Color,Color>(Color.web(c,a), null);
+        }
+
+        try {
+            return new ParsedValueImpl<Color,Color>(Color.web(str), null);
+        } catch (final IllegalArgumentException e) {
+        } catch (final NullPointerException e) {
+        }
+
+        // not a color
+        return null;
+    }
+
+    private String stripQuotes(String string) {
+        return com.sun.javafx.util.Utils.stripQuotes(string);
+    }
+
+    private double clamp(double min, double val, double max) {
+        if (val < min) return min;
+        if (max < val) return max;
+        return val;
+    }
+
+    // Return true if the token is a size type or an identifier
+    // (which would indicate a lookup).
+    private boolean isSize(Token token) {
+        final int ttype = token.getType();
+        switch (ttype) {
+        case CssLexer.NUMBER:
+        case CssLexer.PERCENTAGE:
+        case CssLexer.EMS:
+        case CssLexer.EXS:
+        case CssLexer.PX:
+        case CssLexer.CM:
+        case CssLexer.MM:
+        case CssLexer.IN:
+        case CssLexer.PT:
+        case CssLexer.PC:
+        case CssLexer.DEG:
+        case CssLexer.GRAD:
+        case CssLexer.RAD:
+        case CssLexer.TURN:
+            return true;
+        default:
+            return token.getType() == CssLexer.IDENT;
+        }
+    }
+
+    private Size size(final Token token) throws ParseException {
+        SizeUnits units = SizeUnits.PX;
+        // Amount to trim off the suffix, if any. Most are 2 chars.
+        int trim = 2;
+        final String sval = token.getText().trim();
+        final int len = sval.length();
+        final int ttype = token.getType();
+        switch (ttype) {
+        case CssLexer.NUMBER:
+            units = SizeUnits.PX;
+            trim = 0;
+            break;
+        case CssLexer.PERCENTAGE:
+            units = SizeUnits.PERCENT;
+            trim = 1;
+            break;
+        case CssLexer.EMS:
+            units = SizeUnits.EM;
+            break;
+        case CssLexer.EXS:
+            units = SizeUnits.EX;
+            break;
+        case CssLexer.PX:
+            units = SizeUnits.PX;
+            break;
+        case CssLexer.CM:
+            units = SizeUnits.CM;
+            break;
+        case CssLexer.MM:
+            units = SizeUnits.MM;
+            break;
+        case CssLexer.IN:
+            units = SizeUnits.IN;
+            break;
+        case CssLexer.PT:
+            units = SizeUnits.PT;
+            break;
+        case CssLexer.PC:
+            units = SizeUnits.PC;
+            break;
+        case CssLexer.DEG:
+            units = SizeUnits.DEG;
+            trim = 3;
+            break;
+        case CssLexer.GRAD:
+            units = SizeUnits.GRAD;
+            trim = 4;
+            break;
+        case CssLexer.RAD:
+            units = SizeUnits.RAD;
+            trim = 3;
+            break;
+        case CssLexer.TURN:
+            units = SizeUnits.TURN;
+            trim = 4;
+            break;
+        case CssLexer.SECONDS:
+            units = SizeUnits.S;
+            trim = 1;
+            break;
+        case CssLexer.MS:
+            units = SizeUnits.MS;
+            break;
+        default:
+            if (LOGGER.isLoggable(Level.FINEST)) {
+                LOGGER.finest("Expected \'<number>\'");
+            }
+            ParseException re = new ParseException("Expected \'<number>\'",token, this);
+            reportError(createError(re.toString()));
+            throw re;
+        }
+        // TODO: Handle NumberFormatException
+        return new Size(
+            Double.parseDouble(sval.substring(0,len-trim)),
+            units
+        );
+    }
+
+    // Count the number of terms in a series
+    private int numberOfTerms(final Term root) {
+        if (root == null) return 0;
+
+        int nTerms = 0;
+        Term term = root;
+        do {
+            nTerms += 1;
+            term = term.nextInSeries;
+        } while (term != null);
+        return nTerms;
+    }
+
+    // Count the number of series of terms
+    private int numberOfLayers(final Term root) {
+        if (root == null) return 0;
+
+        int nLayers = 0;
+        Term term = root;
+        do {
+            nLayers += 1;
+            while (term.nextInSeries != null) {
+                term = term.nextInSeries;
+            }
+            term = term.nextLayer;
+        } while (term != null);
+        return nLayers;
+    }
+
+    // Count the number of args of terms. root is the function.
+    private int numberOfArgs(final Term root) {
+        if (root == null) return 0;
+
+        int nArgs = 0;
+        Term term = root.firstArg;
+        while (term != null) {
+            nArgs += 1;
+            term = term.nextArg;
+        }
+        return nArgs;
+    }
+
+    // Get the next layer following this term, which may be null
+    private Term nextLayer(final Term root) {
+        if (root == null) return null;
+
+        Term term = root;
+        while (term.nextInSeries != null) {
+            term = term.nextInSeries;
+        }
+        return term.nextLayer;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    // Parsing routines
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    ParsedValueImpl valueFor(String property, Term root, CssLexer lexer) throws ParseException {
+        final String prop = property.toLowerCase(Locale.ROOT);
+        properties.put(prop, prop);
+        if (root == null || root.token == null) {
+            error(root, "Expected value for property \'" + prop + "\'");
+        }
+
+        if (root.token.getType() == CssLexer.IDENT) {
+            final String txt = root.token.getText();
+            if ("inherit".equalsIgnoreCase(txt)) {
+                return new ParsedValueImpl<String,String>("inherit", null);
+            } else if ("null".equalsIgnoreCase(txt)
+                    || "none".equalsIgnoreCase(txt)) {
+                return new ParsedValueImpl<String,String>("null", null);
+            }
+        }
+        if ("-fx-fill".equals(prop)) {
+             ParsedValueImpl pv = parse(root);
+            if (pv.getConverter() == StyleConverter.getUrlConverter()) {
+                // ImagePatternConverter expects array of ParsedValue where element 0 is the URL
+                // Pending RT-33574
+                pv = new ParsedValueImpl(new ParsedValue[] {pv},PaintConverter.ImagePatternConverter.getInstance());
+            }
+            return pv;
+        }
+        else if ("-fx-background-color".equals(prop)) {
+            return parsePaintLayers(root);
+        } else if ("-fx-background-image".equals(prop)) {
+            return parseURILayers(root);
+        } else if ("-fx-background-insets".equals(prop)) {
+             return parseInsetsLayers(root);
+        } else if ("-fx-opaque-insets".equals(prop)) {
+            return parseInsetsLayer(root);
+        } else if ("-fx-background-position".equals(prop)) {
+             return parseBackgroundPositionLayers(root);
+        } else if ("-fx-background-radius".equals(prop)) {
+            return parseCornerRadius(root);
+        } else if ("-fx-background-repeat".equals(prop)) {
+             return parseBackgroundRepeatStyleLayers(root);
+        } else if ("-fx-background-size".equals(prop)) {
+             return parseBackgroundSizeLayers(root);
+        } else if ("-fx-border-color".equals(prop)) {
+             return parseBorderPaintLayers(root);
+        } else if ("-fx-border-insets".equals(prop)) {
+             return parseInsetsLayers(root);
+        } else if ("-fx-border-radius".equals(prop)) {
+             return parseCornerRadius(root);
+        } else if ("-fx-border-style".equals(prop)) {
+             return parseBorderStyleLayers(root);
+        } else if ("-fx-border-width".equals(prop)) {
+             return parseMarginsLayers(root);
+        } else if ("-fx-border-image-insets".equals(prop)) {
+             return parseInsetsLayers(root);
+        } else if ("-fx-border-image-repeat".equals(prop)) {
+             return parseBorderImageRepeatStyleLayers(root);
+        } else if ("-fx-border-image-slice".equals(prop)) {
+             return parseBorderImageSliceLayers(root);
+        } else if ("-fx-border-image-source".equals(prop)) {
+             return parseURILayers(root);
+        } else if ("-fx-border-image-width".equals(prop)) {
+             return parseBorderImageWidthLayers(root);
+        } else if ("-fx-padding".equals(prop)) {
+            ParsedValueImpl<?,Size>[] sides = parseSize1to4(root);
+            return new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
+        } else if ("-fx-label-padding".equals(prop)) {
+            ParsedValueImpl<?,Size>[] sides = parseSize1to4(root);
+            return new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
+        } else if (prop.endsWith("font-family")) {
+            return parseFontFamily(root);
+        } else if (prop.endsWith("font-size")) {
+            ParsedValueImpl fsize = parseFontSize(root);
+            if (fsize == null) error(root, "Expected \'<font-size>\'");
+            return fsize;
+        } else if (prop.endsWith("font-style")) {
+            ParsedValueImpl fstyle = parseFontStyle(root);
+            if (fstyle == null) error(root, "Expected \'<font-style>\'");
+            return fstyle;
+        } else if (prop.endsWith("font-weight")) {
+            ParsedValueImpl fweight = parseFontWeight(root);
+            if (fweight == null) error(root, "Expected \'<font-style>\'");
+            return fweight;
+        } else if (prop.endsWith("font")) {
+            return parseFont(root);
+        } else if ("-fx-stroke-dash-array".equals(prop)) {
+            // TODO: Figure out a way that these properties don't need to be
+            // special cased.
+            Term term = root;
+            int nArgs = numberOfTerms(term);
+            ParsedValueImpl<?,Size>[] segments = new ParsedValueImpl[nArgs];
+            int segment = 0;
+            while(term != null) {
+                segments[segment++] = parseSize(term);
+                term = term.nextInSeries;
+            }
+
+            return new ParsedValueImpl<ParsedValue[],Number[]>(segments,SequenceConverter.getInstance());
+
+        } else if ("-fx-stroke-line-join".equals(prop)) {
+            // TODO: Figure out a way that these properties don't need to be
+            // special cased.
+            ParsedValueImpl[] values = parseStrokeLineJoin(root);
+            if (values == null) error(root, "Expected \'miter', \'bevel\' or \'round\'");
+            return values[0];
+        } else if ("-fx-stroke-line-cap".equals(prop)) {
+            // TODO: Figure out a way that these properties don't need to be
+            // special cased.
+            ParsedValueImpl value = parseStrokeLineCap(root);
+            if (value == null) error(root, "Expected \'square', \'butt\' or \'round\'");
+            return value;
+        } else if ("-fx-stroke-type".equals(prop)) {
+            // TODO: Figure out a way that these properties don't need to be
+            // special cased.
+            ParsedValueImpl value = parseStrokeType(root);
+            if (value == null) error(root, "Expected \'centered', \'inside\' or \'outside\'");
+            return value;
+        } else if ("-fx-font-smoothing-type".equals(prop)) {
+            // TODO: Figure out a way that these properties don't need to be
+            // special cased.
+            String str = null;
+            int ttype = -1;
+            final Token token = root.token;
+
+            if (root.token == null
+                    || ((ttype = root.token.getType()) != CssLexer.STRING
+                         && ttype != CssLexer.IDENT)
+                    || (str = root.token.getText()) == null
+                    || str.isEmpty()) {
+                error(root,  "Expected STRING or IDENT");
+            }
+            return new ParsedValueImpl<String, String>(stripQuotes(str), null, false);
+        }
+        return parse(root);
+    }
+
+    private ParsedValueImpl parse(Term root) throws ParseException {
+
+        if (root.token == null) error(root, "Parse error");
+        final Token token = root.token;
+        ParsedValueImpl value = null; // value to return;
+
+        final int ttype = token.getType();
+        switch (ttype) {
+        case CssLexer.NUMBER:
+        case CssLexer.PERCENTAGE:
+        case CssLexer.EMS:
+        case CssLexer.EXS:
+        case CssLexer.PX:
+        case CssLexer.CM:
+        case CssLexer.MM:
+        case CssLexer.IN:
+        case CssLexer.PT:
+        case CssLexer.PC:
+        case CssLexer.DEG:
+        case CssLexer.GRAD:
+        case CssLexer.RAD:
+        case CssLexer.TURN:
+            if (root.nextInSeries == null) {
+                ParsedValueImpl sizeValue = new ParsedValueImpl<Size,Number>(size(token), null);
+                value = new ParsedValueImpl<ParsedValue<?,Size>, Number>(sizeValue, SizeConverter.getInstance());
+            } else {
+                ParsedValueImpl<Size,Size>[] sizeValue = parseSizeSeries(root);
+                value = new ParsedValueImpl<ParsedValue[],Number[]>(sizeValue, SizeConverter.SequenceConverter.getInstance());
+            }
+            break;
+        case CssLexer.SECONDS:
+        case CssLexer.MS: {
+            ParsedValue<Size, Size> sizeValue = new ParsedValueImpl<Size, Size>(size(token), null);
+            value = new ParsedValueImpl<ParsedValue<?, Size>, Duration>(sizeValue, DurationConverter.getInstance());
+            break;
+        }
+        case CssLexer.STRING:
+        case CssLexer.IDENT:
+            boolean isIdent = ttype == CssLexer.IDENT;
+            final String str = stripQuotes(token.getText());
+            final String text = str.toLowerCase(Locale.ROOT);
+            if ("ladder".equals(text)) {
+                value = ladder(root);
+            } else if ("linear".equals(text) && (root.nextInSeries) != null) {
+                // if nextInSeries is null, then assume this is _not_ an old-style linear gradient
+                value = linearGradient(root);
+            } else if ("radial".equals(text) && (root.nextInSeries) != null) {
+                // if nextInSeries is null, then assume this is _not_ an old-style radial gradient
+                value = radialGradient(root);
+            } else if ("infinity".equals(text)) {
+                Size size = new Size(Double.MAX_VALUE, SizeUnits.PX);
+                ParsedValueImpl sizeValue = new ParsedValueImpl<Size,Number>(size, null);
+                value = new ParsedValueImpl<ParsedValue<?,Size>,Number>(sizeValue, SizeConverter.getInstance());
+            } else if ("indefinite".equals(text)) {
+                Size size = new Size(Double.POSITIVE_INFINITY, SizeUnits.PX);
+                ParsedValueImpl<Size,Size> sizeValue = new ParsedValueImpl<>(size, null);
+                value = new ParsedValueImpl<ParsedValue<?,Size>,Duration>(sizeValue, DurationConverter.getInstance());
+            } else if ("true".equals(text)) {
+                // TODO: handling of boolean is really bogus
+                value = new ParsedValueImpl<String,Boolean>("true",BooleanConverter.getInstance());
+            } else if ("false".equals(text)) {
+                // TODO: handling of boolean is really bogus
+                value = new ParsedValueImpl<String,Boolean>("false",BooleanConverter.getInstance());
+            } else {
+                // if the property value is another property, then it needs to be looked up.
+                boolean needsLookup = isIdent && properties.containsKey(text);
+                if (needsLookup || ((value = colorValueOfString(str)) == null )) {
+                    // If the value is a lookup, make sure to use the lower-case text so it matches the property
+                    // in the Declaration. If the value is not a lookup, then use str since the value might
+                    // be a string which could have some case sensitive meaning
+                    //
+                    // TODO: isIdent is needed here because of RT-38345. This effectively undoes RT-38201
+                    value = new ParsedValueImpl<String,String>(needsLookup ? text : str, null, isIdent || needsLookup);
+                }
+            }
+            break;
+        case CssLexer.HASH:
+            final String clr = token.getText();
+            try {
+                value = new ParsedValueImpl<Color,Color>(Color.web(clr), null);
+            } catch (final IllegalArgumentException e) {
+                error(root, e.getMessage());
+            }
+            break;
+        case CssLexer.FUNCTION:
+            return  parseFunction(root);
+        case CssLexer.URL:
+            return parseURI(root);
+        default:
+            final String msg = "Unknown token type: \'" + ttype + "\'";
+            error(root, msg);
+        }
+        return value;
+
+    }
+
+    /* Parse size.
+     * @throw RecongnitionExcpetion if the token is not a size type or a lookup.
+     */
+    private ParsedValueImpl<?,Size> parseSize(final Term root) throws ParseException {
+
+        if (root.token == null || !isSize(root.token)) error(root, "Expected \'<size>\'");
+
+        ParsedValueImpl<?,Size> value = null;
+
+        if (root.token.getType() != CssLexer.IDENT) {
+
+            Size size = size(root.token);
+            value = new ParsedValueImpl<Size,Size>(size, null);
+
+        } else {
+
+            String key = root.token.getText();
+            value = new ParsedValueImpl<String,Size>(key, null, true);
+
+        }
+
+        return value;
+    }
+
+    private ParsedValueImpl<?,Color> parseColor(final Term root) throws ParseException {
+
+        ParsedValueImpl<?,Color> color = null;
+        if (root.token != null &&
+            (root.token.getType() == CssLexer.IDENT ||
+             root.token.getType() == CssLexer.HASH ||
+             root.token.getType() == CssLexer.FUNCTION)) {
+
+            color = parse(root);
+
+        } else {
+            error(root,  "Expected \'<color>\'");
+        }
+        return color;
+    }
+
+    // rgb(NUMBER, NUMBER, NUMBER)
+    // rgba(NUMBER, NUMBER, NUMBER, NUMBER)
+    // rgb(PERCENTAGE, PERCENTAGE, PERCENTAGE)
+    // rgba(PERCENTAGE, PERCENTAGE, PERCENTAGE, NUMBER)
+    private ParsedValueImpl rgb(Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"rgb".regionMatches(true, 0, fn, 0, 3)) {
+            final String msg = "Expected \'rgb\' or \'rgba\'";
+            error(root, msg);
+        }
+
+        Term arg = root;
+        Token rtok, gtok, btok, atok;
+
+        if ((arg = arg.firstArg) == null) error(root, "Expected \'<number>\' or \'<percentage>\'");
+        if ((rtok = arg.token) == null ||
+            (rtok.getType() != CssLexer.NUMBER &&
+             rtok.getType() != CssLexer.PERCENTAGE)) error(arg, "Expected \'<number>\' or \'<percentage>\'");
+
+        root = arg;
+
+        if ((arg = arg.nextArg) == null) error(root, "Expected \'<number>\' or \'<percentage>\'");
+        if ((gtok = arg.token) == null ||
+            (gtok.getType() != CssLexer.NUMBER &&
+             gtok.getType() != CssLexer.PERCENTAGE)) error(arg, "Expected \'<number>\' or \'<percentage>\'");
+
+        root = arg;
+
+        if ((arg = arg.nextArg) == null) error(root, "Expected \'<number>\' or \'<percentage>\'");
+        if ((btok = arg.token) == null ||
+            (btok.getType() != CssLexer.NUMBER &&
+             btok.getType() != CssLexer.PERCENTAGE)) error(arg, "Expected \'<number>\' or \'<percentage>\'");
+
+        root = arg;
+
+        if ((arg = arg.nextArg) != null) {
+            if ((atok = arg.token) == null ||
+                 atok.getType() != CssLexer.NUMBER) error(arg, "Expected \'<number>\'");
+        } else {
+            atok = null;
+        }
+
+        int argType = rtok.getType();
+        if (argType != gtok.getType() || argType != btok.getType() ||
+            (argType != CssLexer.NUMBER && argType != CssLexer.PERCENTAGE)) {
+            error(root, "Argument type mistmatch");
+        }
+
+        final String rtext = rtok.getText();
+        final String gtext = gtok.getText();
+        final String btext = btok.getText();
+
+        double rval = 0;
+        double gval = 0;
+        double bval = 0;
+        if (argType == CssLexer.NUMBER) {
+            rval = clamp(0.0f, Double.parseDouble(rtext) / 255.0f, 1.0f);
+            gval = clamp(0.0f, Double.parseDouble(gtext) / 255.0f, 1.0f);
+            bval = clamp(0.0f, Double.parseDouble(btext) / 255.0f, 1.0f);
+        } else {
+            rval = clamp(0.0f, Double.parseDouble(rtext.substring(0,rtext.length()-1)) / 100.0f, 1.0f);
+            gval = clamp(0.0f, Double.parseDouble(gtext.substring(0,gtext.length()-1)) / 100.0f, 1.0f);
+            bval = clamp(0.0f, Double.parseDouble(btext.substring(0,btext.length()-1)) / 100.0f, 1.0f);
+        }
+
+        final String atext = (atok != null) ? atok.getText() : null;
+        final double aval =  (atext != null) ? clamp(0.0f, Double.parseDouble(atext), 1.0f) : 1.0;
+
+        return new ParsedValueImpl<Color,Color>(Color.color(rval,gval,bval,aval), null);
+
+    }
+
+    // hsb(NUMBER, PERCENTAGE, PERCENTAGE)
+    // hsba(NUMBER, PERCENTAGE, PERCENTAGE, NUMBER)
+    private ParsedValueImpl hsb(Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"hsb".regionMatches(true, 0, fn, 0, 3)) {
+            final String msg = "Expected \'hsb\' or \'hsba\'";
+            error(root, msg);
+        }
+
+        Term arg = root;
+        Token htok, stok, btok, atok;
+
+        if ((arg = arg.firstArg) == null) error(root, "Expected \'<number>\'");
+        if ((htok = arg.token) == null || htok.getType() != CssLexer.NUMBER) error(arg, "Expected \'<number>\'");
+
+        root = arg;
+
+        if ((arg = arg.nextArg) == null) error(root, "Expected \'<percent>\'");
+        if ((stok = arg.token) == null || stok.getType() != CssLexer.PERCENTAGE) error(arg, "Expected \'<percent>\'");
+
+        root = arg;
+
+        if ((arg = arg.nextArg) == null) error(root, "Expected \'<percent>\'");
+        if ((btok = arg.token) == null || btok.getType() != CssLexer.PERCENTAGE) error(arg, "Expected \'<percent>\'");
+
+        root = arg;
+
+        if ((arg = arg.nextArg) != null) {
+            if ((atok = arg.token) == null || atok.getType() != CssLexer.NUMBER) error(arg, "Expected \'<number>\'");
+        } else {
+            atok = null;
+        }
+
+        final Size hval = size(htok);
+        final Size sval = size(stok);
+        final Size bval = size(btok);
+
+        final double hue = hval.pixels(); // no clamp - hue can be negative
+        final double saturation = clamp(0.0f, sval.pixels(), 1.0f);
+        final double brightness = clamp(0.0f, bval.pixels(), 1.0f);
+
+        final Size aval = (atok != null) ? size(atok) : null;
+        final double opacity =  (aval != null) ? clamp(0.0f, aval.pixels(), 1.0f) : 1.0;
+
+        return new ParsedValueImpl<Color,Color>(Color.hsb(hue, saturation, brightness, opacity), null);
+    }
+
+    // derive(color, pct)
+    private ParsedValueImpl<ParsedValue[],Color> derive(final Term root)
+            throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"derive".regionMatches(true, 0, fn, 0, 6)) {
+            final String msg = "Expected \'derive\'";
+            error(root, msg);
+        }
+
+        Term arg = root;
+        if ((arg = arg.firstArg) == null) error(root, "Expected \'<color>\'");
+
+        final ParsedValueImpl<?,Color> color = parseColor(arg);
+
+        final Term prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<percent\'");
+
+        final ParsedValueImpl<?,Size> brightness = parseSize(arg);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[] { color, brightness };
+        return new ParsedValueImpl<ParsedValue[],Color>(values, DeriveColorConverter.getInstance());
+    }
+
+    // 'ladder' color 'stops' stop+
+    private ParsedValueImpl<ParsedValue[],Color> ladder(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"ladder".regionMatches(true, 0, fn, 0, 6)) {
+            final String msg = "Expected \'ladder\'";
+            error(root, msg);
+        }
+
+        if (LOGGER.isLoggable(Level.WARNING)) {
+            LOGGER.warning(formatDeprecatedMessage(root, "ladder"));
+        }
+
+        Term term = root;
+
+        if ((term = term.nextInSeries) == null) error(root, "Expected \'<color>\'");
+        final ParsedValueImpl<?,Color> color = parse(term);
+
+        Term prev = term;
+
+        if ((term = term.nextInSeries) == null) error(prev,  "Expected \'stops\'");
+        if (term.token == null ||
+            term.token.getType() != CssLexer.IDENT ||
+            !"stops".equalsIgnoreCase(term.token.getText())) error(term,  "Expected \'stops\'");
+
+        prev = term;
+
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <color>)\'");
+
+        int nStops = 0;
+        Term temp = term;
+        do {
+            nStops += 1;
+            // if next token type is IDENT, then we have CycleMethod
+        } while (((temp = temp.nextInSeries) != null) &&
+                 ((temp.token != null) && (temp.token.getType() == CssLexer.LPAREN)));
+
+        ParsedValueImpl[] values = new ParsedValueImpl[nStops+1];
+        values[0] = color;
+        int stopIndex = 1;
+        do {
+            ParsedValueImpl<ParsedValue[],Stop> stop = stop(term);
+            if (stop != null) values[stopIndex++] = stop;
+            prev = term;
+        } while(((term = term.nextInSeries) != null) &&
+                 (term.token.getType() == CssLexer.LPAREN));
+
+        // if term is not null and the last term was not an lparen,
+        // then term starts a new series of Paint. Point
+        // root.nextInSeries to term so the next loop skips over the
+        // already parsed ladder bits.
+        if (term != null) {
+            root.nextInSeries = term;
+        }
+
+        // if term is null, then we are at the end of a series.
+        // root points to 'ladder', now we want the next term after root
+        // to be the term after the last stop, which may be another layer
+        else {
+            root.nextInSeries = null;
+            root.nextLayer = prev.nextLayer;
+        }
+
+        return new ParsedValueImpl<ParsedValue[], Color>(values, LadderConverter.getInstance());
+    }
+
+    // <ladder> = ladder(<color>, <color-stop>[, <color-stop>]+ )
+    private ParsedValueImpl<ParsedValue[],Color> parseLadder(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"ladder".regionMatches(true, 0, fn, 0, 6)) {
+            final String msg = "Expected \'ladder\'";
+            error(root, msg);
+        }
+
+        Term term = root;
+
+        if ((term = term.firstArg) == null) error(root, "Expected \'<color>\'");
+        final ParsedValueImpl<?,Color> color = parse(term);
+
+        Term prev = term;
+
+        if ((term = term.nextArg) == null)
+            error(prev,  "Expected \'<color-stop>[, <color-stop>]+\'");
+
+        ParsedValueImpl<ParsedValue[],Stop>[] stops = parseColorStops(term);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[stops.length+1];
+        values[0] = color;
+        System.arraycopy(stops, 0, values, 1, stops.length);
+        return new ParsedValueImpl<ParsedValue[], Color>(values, LadderConverter.getInstance());
+    }
+
+    // parse (<number>, <color>)+
+    // root.token should be a size
+    // root.token.next should be a color
+    private ParsedValueImpl<ParsedValue[], Stop> stop(final Term root)
+            throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"(".equals(fn)) {
+            final String msg = "Expected \'(\'";
+            error(root, msg);
+        }
+
+        Term arg = null;
+
+        if ((arg = root.firstArg) == null) error(root,  "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> size = parseSize(arg);
+
+        Term prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev,  "Expected \'<color>\'");
+
+        ParsedValueImpl<?,Color> color = parseColor(arg);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[] { size, color };
+        return new ParsedValueImpl<ParsedValue[],Stop>(values, StopConverter.getInstance());
+
+    }
+
+    // http://dev.w3.org/csswg/css3-images/#color-stop-syntax
+    // <color-stop> = <color> [ <percentage> | <length> ]?
+    private ParsedValueImpl<ParsedValue[], Stop>[] parseColorStops(final Term root)
+            throws ParseException {
+
+        int nArgs = 1;
+        Term temp = root;
+        while(temp != null) {
+            if (temp.nextArg != null) {
+                nArgs += 1;
+                temp = temp.nextArg;
+            } else if (temp.nextInSeries != null) {
+                temp = temp.nextInSeries;
+            } else {
+                break;
+            }
+        }
+
+        if (nArgs < 2) {
+            error(root, "Expected \'<color-stop>\'");
+        }
+
+        ParsedValueImpl<?,Color>[] colors = new ParsedValueImpl[nArgs];
+        Size[] positions = new Size[nArgs];
+        java.util.Arrays.fill(positions, null);
+
+        Term stop = root;
+        Term prev = root;
+        SizeUnits units = null;
+        for (int n = 0; n<nArgs; n++) {
+
+            colors[n] = parseColor(stop);
+
+            prev = stop;
+            Term term = stop.nextInSeries;
+            if (term != null) {
+                if (isSize(term.token)) {
+                    positions[n] = size(term.token);
+                    if (units != null) {
+                        if (units != positions[n].getUnits()) {
+                            error(term, "Parser unable to handle mixed \'<percent>\' and \'<length>\'");
+                        }
+                    }
+                } else {
+                    error(prev, "Expected \'<percent>\' or \'<length>\'");
+                }
+                prev = term;
+                stop = term.nextArg;
+            } else {
+                prev = stop;
+                stop = stop.nextArg;
+            }
+
+        }
+
+        //
+        // normalize positions according to
+        // http://dev.w3.org/csswg/css3-images/#color-stop-syntax
+        //
+        // If the first color-stop does not have a position, set its
+        // position to 0%. If the last color-stop does not have a position,
+        // set its position to 100%.
+        if (positions[0] == null) positions[0] = new Size(0, SizeUnits.PERCENT);
+        if (positions[nArgs-1] == null) positions[nArgs-1] = new Size(100, SizeUnits.PERCENT);
+
+        // If a color-stop has a position that is less than the specified
+        // position of any color-stop before it in the list, set its
+        // position to be equal to the largest specified position of any
+        // color-stop before it.
+        Size max = null;
+        for (int n = 1 ; n<nArgs; n++) {
+            Size pos0 = positions[n-1];
+            if (pos0 == null) continue;
+            if (max == null || max.getValue() < pos0.getValue()) {
+                // TODO: this doesn't work with mixed length and percent
+                max = pos0;
+            }
+            Size pos1 = positions[n];
+            if (pos1 == null) continue;
+
+            if (pos1.getValue() < max.getValue()) positions[n] = max;
+        }
+
+        // If any color-stop still does not have a position, then,
+        // for each run of adjacent color-stops without positions, set
+        // their positions so that they are evenly spaced between the
+        // preceding and following color-stops with positions.
+        Size preceding = null;
+        int withoutIndex = -1;
+        for (int n = 0 ; n<nArgs; n++) {
+            Size pos = positions[n];
+            if (pos == null) {
+                if (withoutIndex == -1) withoutIndex = n;
+            } else {
+                if (withoutIndex > -1) {
+
+                    int nWithout = n - withoutIndex;
+                    double precedingValue = preceding.getValue();
+                    double delta =
+                        (pos.getValue() - precedingValue) / (nWithout + 1);
+
+                    while(withoutIndex < n) {
+                        precedingValue += delta;
+                        positions[withoutIndex++] =
+                            new Size(precedingValue, pos.getUnits());
+                    }
+                    withoutIndex = -1;
+                    preceding = pos;
+                } else {
+                    preceding = pos;
+                }
+            }
+        }
+
+        ParsedValueImpl<ParsedValue[],Stop>[] stops = new ParsedValueImpl[nArgs];
+        for (int n=0; n<nArgs; n++) {
+            stops[n] = new ParsedValueImpl<ParsedValue[],Stop>(
+                new ParsedValueImpl[] {
+                    new ParsedValueImpl<Size,Size>(positions[n], null),
+                    colors[n]
+                },
+                StopConverter.getInstance()
+            );
+        }
+
+        return stops;
+
+    }
+
+    // parse (<number>, <number>)
+    private ParsedValueImpl[] point(final Term root) throws ParseException {
+
+        if (root.token == null ||
+            root.token.getType() != CssLexer.LPAREN) error(root, "Expected \'(<number>, <number>)\'");
+
+        final String fn = root.token.getText();
+        if (fn == null || !"(".equalsIgnoreCase(fn)) {
+            final String msg = "Expected \'(\'";
+            error(root, msg);
+        }
+
+        Term arg = null;
+
+        // no <number>
+        if ((arg = root.firstArg) == null)  error(root, "Expected \'<number>\'");
+
+        final ParsedValueImpl<?,Size> ptX = parseSize(arg);
+
+        final Term prev = arg;
+
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        final ParsedValueImpl<?,Size> ptY = parseSize(arg);
+
+        return new ParsedValueImpl[] { ptX, ptY };
+    }
+
+    private ParsedValueImpl parseFunction(final Term root) throws ParseException {
+
+        // Text from parser is function name plus the lparen, e.g., 'derive('
+        final String fcn = (root.token != null) ? root.token.getText() : null;
+        if (fcn == null) {
+            error(root, "Expected function name");
+        } else if ("rgb".regionMatches(true, 0, fcn, 0, 3)) {
+            return rgb(root);
+        } else if ("hsb".regionMatches(true, 0, fcn, 0, 3)) {
+            return hsb(root);
+        } else if ("derive".regionMatches(true, 0, fcn, 0, 6)) {
+            return derive(root);
+        } else if ("innershadow".regionMatches(true, 0, fcn, 0, 11)) {
+            return innershadow(root);
+        } else if ("dropshadow".regionMatches(true, 0, fcn, 0, 10)) {
+            return dropshadow(root);
+        } else if ("linear-gradient".regionMatches(true, 0, fcn, 0, 15)) {
+            return parseLinearGradient(root);
+        } else if ("radial-gradient".regionMatches(true, 0, fcn, 0, 15)) {
+            return parseRadialGradient(root);
+        } else if ("image-pattern".regionMatches(true, 0, fcn, 0, 13)) {
+            return parseImagePattern(root);
+        } else if ("repeating-image-pattern".regionMatches(true, 0, fcn, 0, 23)) {
+            return parseRepeatingImagePattern(root);
+        } else if ("ladder".regionMatches(true, 0, fcn, 0, 6)) {
+            return parseLadder(root);
+        } else if ("region".regionMatches(true, 0, fcn, 0, 6)) {
+            return parseRegion(root);
+        } else {
+            error(root, "Unexpected function \'" + fcn + "\'");
+        }
+        return null;
+    }
+
+    private ParsedValueImpl<String,BlurType> blurType(final Term root) throws ParseException {
+
+        if (root == null) return null;
+        if (root.token == null ||
+            root.token.getType() != CssLexer.IDENT ||
+            root.token.getText() == null ||
+            root.token.getText().isEmpty()) {
+            final String msg = "Expected \'gaussian\', \'one-pass-box\', \'two-pass-box\', or \'three-pass-box\'";
+            error(root, msg);
+        }
+        final String blurStr = root.token.getText().toLowerCase(Locale.ROOT);
+        BlurType blurType = BlurType.THREE_PASS_BOX;
+        if ("gaussian".equals(blurStr)) {
+            blurType = BlurType.GAUSSIAN;
+        } else if ("one-pass-box".equals(blurStr)) {
+            blurType = BlurType.ONE_PASS_BOX;
+        } else if ("two-pass-box".equals(blurStr)) {
+            blurType = BlurType.TWO_PASS_BOX;
+        } else if ("three-pass-box".equals(blurStr)) {
+            blurType = BlurType.THREE_PASS_BOX;
+        } else {
+            final String msg = "Expected \'gaussian\', \'one-pass-box\', \'two-pass-box\', or \'three-pass-box\'";
+            error(root, msg);
+        }
+        return new ParsedValueImpl<String,BlurType>(blurType.name(), new EnumConverter<BlurType>(BlurType.class));
+    }
+
+    // innershadow <blur-type> <color> <radius> <choke> <offset-x> <offset-y>
+    private ParsedValueImpl innershadow(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"innershadow".regionMatches(true, 0, fn, 0, 11)) {
+            final String msg = "Expected \'innershadow\'";
+            error(root, msg);
+        }
+
+        Term arg;
+
+        if ((arg = root.firstArg) == null) error(root, "Expected \'<blur-type>\'");
+        ParsedValueImpl<String,BlurType> blurVal = blurType(arg);
+
+        Term prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<color>\'");
+
+        ParsedValueImpl<?,Color> colorVal = parseColor(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> radiusVal = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> chokeVal = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> offsetXVal = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> offsetYVal = parseSize(arg);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[] {
+            blurVal,
+            colorVal,
+            radiusVal,
+            chokeVal,
+            offsetXVal,
+            offsetYVal
+        };
+        return new ParsedValueImpl<ParsedValue[],Effect>(values, EffectConverter.InnerShadowConverter.getInstance());
+    }
+
+    // dropshadow <blur-type> <color> <radius> <spread> <offset-x> <offset-y>
+    private ParsedValueImpl dropshadow(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"dropshadow".regionMatches(true, 0, fn, 0, 10)) {
+            final String msg = "Expected \'dropshadow\'";
+            error(root, msg);
+        }
+
+        Term arg;
+
+        if ((arg = root.firstArg) == null) error(root, "Expected \'<blur-type>\'");
+        ParsedValueImpl<String,BlurType> blurVal = blurType(arg);
+
+        Term prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<color>\'");
+
+        ParsedValueImpl<?,Color> colorVal = parseColor(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> radiusVal = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> spreadVal = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> offsetXVal = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<number>\'");
+
+        ParsedValueImpl<?,Size> offsetYVal = parseSize(arg);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[] {
+            blurVal,
+            colorVal,
+            radiusVal,
+            spreadVal,
+            offsetXVal,
+            offsetYVal
+        };
+        return new ParsedValueImpl<ParsedValue[],Effect>(values, EffectConverter.DropShadowConverter.getInstance());
+    }
+
+    // returns null if the Term is null or is not a cycle method.
+    private ParsedValueImpl<String, CycleMethod> cycleMethod(final Term root) {
+        CycleMethod cycleMethod = null;
+        if (root != null && root.token.getType() == CssLexer.IDENT) {
+
+            final String text = root.token.getText().toLowerCase(Locale.ROOT);
+            if ("repeat".equals(text)) {
+                cycleMethod = CycleMethod.REPEAT;
+            } else if ("reflect".equals(text)) {
+                cycleMethod = CycleMethod.REFLECT;
+            } else if ("no-cycle".equals(text)) {
+                cycleMethod = CycleMethod.NO_CYCLE;
+            }
+        }
+        if (cycleMethod != null)
+            return new ParsedValueImpl<String,CycleMethod>(cycleMethod.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
+        else
+            return null;
+    }
+
+    // linear <point> TO <point> STOPS <stop>+ cycleMethod?
+    private ParsedValueImpl<ParsedValue[],Paint> linearGradient(final Term root) throws ParseException {
+
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"linear".equalsIgnoreCase(fn)) {
+            final String msg = "Expected \'linear\'";
+            error(root, msg);
+        }
+
+        if (LOGGER.isLoggable(Level.WARNING)) {
+            LOGGER.warning(formatDeprecatedMessage(root, "linear gradient"));
+        }
+
+        Term term = root;
+
+        if ((term = term.nextInSeries) == null) error(root, "Expected \'(<number>, <number>)\'");
+
+        final ParsedValueImpl<?,Size>[] startPt = point(term);
+
+        Term prev = term;
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'to\'");
+        if (term.token == null ||
+            term.token.getType() != CssLexer.IDENT ||
+            !"to".equalsIgnoreCase(term.token.getText())) error(root, "Expected \'to\'");
+
+        prev = term;
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <number>)\'");
+
+        final ParsedValueImpl<?,Size>[] endPt = point(term);
+
+        prev = term;
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'stops\'");
+        if (term.token == null ||
+            term.token.getType() != CssLexer.IDENT ||
+            !"stops".equalsIgnoreCase(term.token.getText())) error(term, "Expected \'stops\'");
+
+        prev = term;
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <number>)\'");
+
+        int nStops = 0;
+        Term temp = term;
+        do {
+            nStops += 1;
+            // if next token type is IDENT, then we have CycleMethod
+        } while (((temp = temp.nextInSeries) != null) &&
+                 ((temp.token != null) && (temp.token.getType() == CssLexer.LPAREN)));
+
+        ParsedValueImpl[] stops = new ParsedValueImpl[nStops];
+        int stopIndex = 0;
+        do {
+            ParsedValueImpl<ParsedValue[],Stop> stop = stop(term);
+            if (stop != null) stops[stopIndex++] = stop;
+            prev = term;
+        } while(((term = term.nextInSeries) != null) &&
+                (term.token.getType() == CssLexer.LPAREN));
+
+        // term is either null or is a cycle method, or the start of another Paint.
+        ParsedValueImpl<String,CycleMethod> cycleMethod = cycleMethod(term);
+
+        if (cycleMethod == null) {
+
+            cycleMethod = new ParsedValueImpl<String,CycleMethod>(CycleMethod.NO_CYCLE.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
+
+            // if term is not null and the last term was not a cycle method,
+            // then term starts a new series or layer of Paint
+            if (term != null) {
+                root.nextInSeries = term;
+            }
+
+            // if term is null, then we are at the end of a series.
+            // root points to 'linear', now we want the next term after root
+            // to be the term after the last stop, which may be another layer
+            else {
+                root.nextInSeries = null;
+                root.nextLayer = prev.nextLayer;
+            }
+
+
+        } else {
+            // last term was a CycleMethod, so term is not null.
+            // root points at 'linear', now we want the next term after root
+            // to be the term after cyclemethod, which may be another series
+            // of paint or another layer.
+            //
+            root.nextInSeries = term.nextInSeries;
+            root.nextLayer = term.nextLayer;
+        }
+
+        ParsedValueImpl[] values = new ParsedValueImpl[5 + stops.length];
+        int index = 0;
+        values[index++] = (startPt != null) ? startPt[0] : null;
+        values[index++] = (startPt != null) ? startPt[1] : null;
+        values[index++] = (endPt != null) ? endPt[0] : null;
+        values[index++] = (endPt != null) ? endPt[1] : null;
+        values[index++] = cycleMethod;
+        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
+        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.LinearGradientConverter.getInstance());
+    }
+
+    // Based off http://dev.w3.org/csswg/css3-images/#linear-gradients
+    //
+    // <linear-gradient> = linear-gradient(
+    //        [ [from <point> to <point>] | [ to <side-or-corner> ] ] ,]? [ [ repeat | reflect ] ,]?
+    //        <color-stop>[, <color-stop>]+
+    // )
+    //
+    //
+    // <point> = <percentage> <percentage> | <length> <length>
+    // <side-or-corner> = [left | right] || [top | bottom]
+    //
+    // If neither repeat nor reflect are given, then the CycleMethod defaults "NO_CYCLE".
+    // If neither [from <point> to <point>] nor [ to <side-or-corner> ] are given,
+    // then the gradient direction defaults to 'to bottom'.
+    // Stops are per http://dev.w3.org/csswg/css3-images/#color-stop-syntax.
+    private ParsedValueImpl parseLinearGradient(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"linear-gradient".regionMatches(true, 0, fn, 0, 15)) {
+            final String msg = "Expected \'linear-gradient\'";
+            error(root, msg);
+        }
+
+        Term arg;
+
+        if ((arg = root.firstArg) == null ||
+             arg.token == null ||
+             arg.token.getText().isEmpty()) {
+            error(root,
+                "Expected \'from <point> to <point>\' or \'to <side-or-corner>\' " +
+                "or \'<cycle-method>\' or \'<color-stop>\'");
+        }
+
+        Term prev = arg;
+//        ParsedValueImpl<Size,Size> angleVal = null;
+        ParsedValueImpl<?,Size>[] startPt = null;
+        ParsedValueImpl<?,Size>[] endPt = null;
+
+        if ("from".equalsIgnoreCase(arg.token.getText())) {
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
+
+            ParsedValueImpl<?,Size> ptX = parseSize(arg);
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
+
+            ParsedValueImpl<?,Size> ptY = parseSize(arg);
+
+            startPt = new ParsedValueImpl[] { ptX, ptY };
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'to\'");
+            if (arg.token == null ||
+                arg.token.getType() != CssLexer.IDENT ||
+                !"to".equalsIgnoreCase(arg.token.getText())) error(prev, "Expected \'to\'");
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
+
+            ptX = parseSize(arg);
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
+
+            ptY = parseSize(arg);
+
+            endPt = new ParsedValueImpl[] { ptX, ptY };
+
+            prev = arg;
+            arg = arg.nextArg;
+
+        } else if("to".equalsIgnoreCase(arg.token.getText())) {
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null ||
+                arg.token == null ||
+                arg.token.getType() != CssLexer.IDENT ||
+                arg.token.getText().isEmpty()) {
+                error (prev, "Expected \'<side-or-corner>\'");
+            }
+
+
+            int startX = 0;
+            int startY = 0;
+            int endX = 0;
+            int endY = 0;
+
+            String sideOrCorner1 = arg.token.getText().toLowerCase(Locale.ROOT);
+            // The keywords denote the direction.
+            if ("top".equals(sideOrCorner1)) {
+                // going toward the top, then start at the bottom
+                startY = 100;
+                endY = 0;
+
+            } else if ("bottom".equals(sideOrCorner1)) {
+                // going toward the bottom, then start at the top
+                startY = 0;
+                endY = 100;
+
+            } else if ("right".equals(sideOrCorner1)) {
+                // going toward the right, then start at the left
+                startX = 0;
+                endX = 100;
+
+            } else if ("left".equals(sideOrCorner1)) {
+                // going toward the left, then start at the right
+                startX = 100;
+                endX = 0;
+
+            } else {
+                error(arg, "Invalid \'<side-or-corner>\'");
+            }
+
+            prev = arg;
+            if (arg.nextInSeries != null) {
+                arg = arg.nextInSeries;
+                if (arg.token != null &&
+                    arg.token.getType() == CssLexer.IDENT &&
+                    !arg.token.getText().isEmpty()) {
+
+                    String sideOrCorner2 = arg.token.getText().toLowerCase(Locale.ROOT);
+
+                    // if right or left has already been given,
+                    // then either startX or endX will not be zero.
+                    if ("right".equals(sideOrCorner2) &&
+                        startX == 0 && endX == 0) {
+                        // start left, end right
+                        startX = 0;
+                        endX = 100;
+                    } else if ("left".equals(sideOrCorner2) &&
+                        startX == 0 && endX == 0) {
+                        // start right, end left
+                        startX = 100;
+                        endX = 0;
+
+                    // if top or bottom has already been given,
+                    // then either startY or endY will not be zero.
+                    } else if("top".equals(sideOrCorner2) &&
+                        startY == 0 && endY == 0) {
+                        // start bottom, end top
+                        startY = 100;
+                        endY = 0;
+                    } else if ("bottom".equals(sideOrCorner2) &&
+                        startY == 0 && endY == 0) {
+                        // start top, end bottom
+                        startY = 0;
+                        endY = 100;
+
+                    } else {
+                        error(arg, "Invalid \'<side-or-corner>\'");
+                    }
+
+                } else {
+                    error (prev, "Expected \'<side-or-corner>\'");
+                }
+            }
+
+
+            startPt = new ParsedValueImpl[] {
+                new ParsedValueImpl<Size,Size>(new Size(startX, SizeUnits.PERCENT), null),
+                new ParsedValueImpl<Size,Size>(new Size(startY, SizeUnits.PERCENT), null)
+            };
+
+            endPt = new ParsedValueImpl[] {
+                new ParsedValueImpl<Size,Size>(new Size(endX, SizeUnits.PERCENT), null),
+                new ParsedValueImpl<Size,Size>(new Size(endY, SizeUnits.PERCENT), null)
+            };
+
+            prev = arg;
+            arg = arg.nextArg;
+        }
+
+        if (startPt == null && endPt == null) {
+            // spec says defaults to bottom
+            startPt = new ParsedValueImpl[] {
+                new ParsedValueImpl<Size,Size>(new Size(0, SizeUnits.PERCENT), null),
+                new ParsedValueImpl<Size,Size>(new Size(0, SizeUnits.PERCENT), null)
+            };
+
+            endPt = new ParsedValueImpl[] {
+                new ParsedValueImpl<Size,Size>(new Size(0, SizeUnits.PERCENT), null),
+                new ParsedValueImpl<Size,Size>(new Size(100, SizeUnits.PERCENT), null)
+            };
+        }
+
+        if (arg == null ||
+            arg.token == null ||
+            arg.token.getText().isEmpty()) {
+            error(prev, "Expected \'<cycle-method>\' or \'<color-stop>\'");
+        }
+
+        CycleMethod cycleMethod = CycleMethod.NO_CYCLE;
+        if ("reflect".equalsIgnoreCase(arg.token.getText())) {
+            cycleMethod = CycleMethod.REFLECT;
+            prev = arg;
+            arg = arg.nextArg;
+        } else if ("repeat".equalsIgnoreCase(arg.token.getText())) {
+            cycleMethod = CycleMethod.REFLECT;
+            prev = arg;
+            arg = arg.nextArg;
+        }
+
+        if (arg == null  ||
+            arg.token == null ||
+            arg.token.getText().isEmpty()) {
+            error(prev, "Expected \'<color-stop>\'");
+        }
+
+        ParsedValueImpl<ParsedValue[],Stop>[] stops = parseColorStops(arg);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[5 + stops.length];
+        int index = 0;
+        values[index++] = (startPt != null) ? startPt[0] : null;
+        values[index++] = (startPt != null) ? startPt[1] : null;
+        values[index++] = (endPt != null) ? endPt[0] : null;
+        values[index++] = (endPt != null) ? endPt[1] : null;
+        values[index++] = new ParsedValueImpl<String,CycleMethod>(cycleMethod.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
+        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
+        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.LinearGradientConverter.getInstance());
+
+    }
+
+    // radial [focus-angle <number | percent>]? [focus-distance <size>]?
+    // [center (<size>,<size>)]? <size>
+    // stops [ ( <number> , <color> ) ]+ [ repeat | reflect ]?
+    private ParsedValueImpl<ParsedValue[], Paint> radialGradient(final Term root) throws ParseException {
+
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (fn == null || !"radial".equalsIgnoreCase(fn)) {
+            final String msg = "Expected \'radial\'";
+            error(root, msg);
+        }
+
+        if (LOGGER.isLoggable(Level.WARNING)) {
+            LOGGER.warning(formatDeprecatedMessage(root, "radial gradient"));
+        }
+
+        Term term = root;
+        Term prev = root;
+
+        if ((term = term.nextInSeries) == null) error(root, "Expected \'focus-angle <number>\', \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
+        if (term.token == null) error(term, "Expected \'focus-angle <number>\', \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
+
+
+        ParsedValueImpl<?,Size> focusAngle = null;
+        if (term.token.getType() == CssLexer.IDENT) {
+            final String keyword = term.token.getText().toLowerCase(Locale.ROOT);
+            if ("focus-angle".equals(keyword)) {
+
+                prev = term;
+                if ((term = term.nextInSeries) == null) error(prev, "Expected \'<number>\'");
+                if (term.token == null) error(prev, "Expected \'<number>\'");
+
+                focusAngle = parseSize(term);
+
+                prev = term;
+                if ((term = term.nextInSeries) == null) error(prev, "Expected \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
+                if (term.token == null) error(term,  "Expected \'focus-distance <number>\', \'center (<number>,<number>)\' or \'<size>\'");
+            }
+        }
+
+        ParsedValueImpl<?,Size> focusDistance = null;
+        if (term.token.getType() == CssLexer.IDENT) {
+            final String keyword = term.token.getText().toLowerCase(Locale.ROOT);
+            if ("focus-distance".equals(keyword)) {
+
+                prev = term;
+                if ((term = term.nextInSeries) == null) error(prev, "Expected \'<number>\'");
+                if (term.token == null) error(prev, "Expected \'<number>\'");
+
+                focusDistance = parseSize(term);
+
+                prev = term;
+                if ((term = term.nextInSeries) == null) error(prev, "Expected  \'center (<number>,<number>)\' or \'<size>\'");
+                if (term.token == null) error(term,  "Expected  \'center (<number>,<number>)\' or \'<size>\'");
+            }
+        }
+
+        ParsedValueImpl<?,Size>[] centerPoint = null;
+        if (term.token.getType() == CssLexer.IDENT) {
+            final String keyword = term.token.getText().toLowerCase(Locale.ROOT);
+            if ("center".equals(keyword)) {
+
+                prev = term;
+                if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>,<number>)\'");
+                if (term.token == null ||
+                    term.token.getType() != CssLexer.LPAREN) error(term, "Expected \'(<number>,<number>)\'");
+
+                centerPoint = point(term);
+
+                prev = term;
+                if ((term = term.nextInSeries) == null) error(prev, "Expected \'<size>\'");
+                if (term.token == null) error(term,  "Expected \'<size>\'");
+            }
+        }
+
+        ParsedValueImpl<?,Size> radius = parseSize(term);
+
+        prev = term;
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'stops\' keyword");
+        if (term.token == null ||
+            term.token.getType() != CssLexer.IDENT) error(term, "Expected \'stops\' keyword");
+
+        if (!"stops".equalsIgnoreCase(term.token.getText())) error(term, "Expected \'stops\'");
+
+        prev = term;
+        if ((term = term.nextInSeries) == null) error(prev, "Expected \'(<number>, <number>)\'");
+
+        int nStops = 0;
+        Term temp = term;
+        do {
+            nStops += 1;
+            // if next token type is IDENT, then we have CycleMethod
+        } while (((temp = temp.nextInSeries) != null) &&
+                 ((temp.token != null) && (temp.token.getType() == CssLexer.LPAREN)));
+
+        ParsedValueImpl[] stops = new ParsedValueImpl[nStops];
+        int stopIndex = 0;
+        do {
+            ParsedValueImpl<ParsedValue[],Stop> stop = stop(term);
+            if (stop != null) stops[stopIndex++] = stop;
+            prev = term;
+        } while(((term = term.nextInSeries) != null) &&
+                (term.token.getType() == CssLexer.LPAREN));
+
+        // term is either null or is a cycle method, or the start of another Paint.
+        ParsedValueImpl<String,CycleMethod> cycleMethod = cycleMethod(term);
+
+        if (cycleMethod == null) {
+
+            cycleMethod = new ParsedValueImpl<String,CycleMethod>(CycleMethod.NO_CYCLE.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
+
+            // if term is not null and the last term was not a cycle method,
+            // then term starts a new series or layer of Paint
+            if (term != null) {
+                root.nextInSeries = term;
+            }
+
+            // if term is null, then we are at the end of a series.
+            // root points to 'linear', now we want the next term after root
+            // to be the term after the last stop, which may be another layer
+            else {
+                root.nextInSeries = null;
+                root.nextLayer = prev.nextLayer;
+            }
+
+
+        } else {
+            // last term was a CycleMethod, so term is not null.
+            // root points at 'linear', now we want the next term after root
+            // to be the term after cyclemethod, which may be another series
+            // of paint or another layer.
+            //
+            root.nextInSeries = term.nextInSeries;
+            root.nextLayer = term.nextLayer;
+        }
+
+        ParsedValueImpl[] values = new ParsedValueImpl[6 + stops.length];
+        int index = 0;
+        values[index++] = focusAngle;
+        values[index++] = focusDistance;
+        values[index++] = (centerPoint != null) ? centerPoint[0] : null;
+        values[index++] = (centerPoint != null) ? centerPoint[1] : null;
+        values[index++] = radius;
+        values[index++] = cycleMethod;
+        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
+        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.RadialGradientConverter.getInstance());
+    }
+
+    // Based off http://dev.w3.org/csswg/css3-images/#radial-gradients
+    //
+    // <radial-gradient> = radial-gradient(
+    //        [ focus-angle <angle>, ]?
+    //        [ focus-distance <percentage>, ]?
+    //        [ center <point>, ]?
+    //        radius <length>,
+    //        [ [ repeat | reflect ] ,]?
+    //        <color-stop>[, <color-stop>]+ )
+    //
+    // Stops are per http://dev.w3.org/csswg/css3-images/#color-stop-syntax.
+    private ParsedValueImpl parseRadialGradient(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"radial-gradient".regionMatches(true, 0, fn, 0, 15)) {
+            final String msg = "Expected \'radial-gradient\'";
+            error(root, msg);
+        }
+
+        Term arg;
+
+        if ((arg = root.firstArg) == null ||
+             arg.token == null ||
+             arg.token.getText().isEmpty()) {
+            error(root,
+                "Expected \'focus-angle <angle>\' " +
+                "or \'focus-distance <percentage>\' " +
+                "or \'center <point>\' " +
+                "or \'radius [<length> | <percentage>]\'");
+        }
+
+        Term prev = arg;
+        ParsedValueImpl<?,Size>focusAngle = null;
+        ParsedValueImpl<?,Size>focusDistance = null;
+        ParsedValueImpl<?,Size>[] centerPoint = null;
+        ParsedValueImpl<?,Size>radius = null;
+
+        if ("focus-angle".equalsIgnoreCase(arg.token.getText())) {
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null ||
+                    !isSize(arg.token)) error(prev, "Expected \'<angle>\'");
+
+            Size angle = size(arg.token);
+            switch(angle.getUnits()) {
+                case DEG:
+                case RAD:
+                case GRAD:
+                case TURN:
+                case PX:
+                    break;
+                default:
+                    error(arg, "Expected [deg | rad | grad | turn ]");
+            }
+            focusAngle = new ParsedValueImpl<Size,Size>(angle, null);
+
+            prev = arg;
+            if ((arg = arg.nextArg) == null)
+                error(prev, "Expected \'focus-distance <percentage>\' " +
+                            "or \'center <point>\' " +
+                            "or \'radius [<length> | <percentage>]\'");
+
+        }
+
+        if ("focus-distance".equalsIgnoreCase(arg.token.getText())) {
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null ||
+                    !isSize(arg.token)) error(prev, "Expected \'<percentage>\'");
+
+            Size distance = size(arg.token);
+
+            // "The focus point is always specified relative to the center
+            // point by an angle and a distance relative to the radius."
+            switch(distance.getUnits()) {
+                case PERCENT:
+                    break;
+                default:
+                    error(arg, "Expected \'%\'");
+            }
+            focusDistance = new ParsedValueImpl<Size,Size>(distance, null);
+
+            prev = arg;
+            if ((arg = arg.nextArg) == null)
+                error(prev, "Expected \'center <center>\' " +
+                            "or \'radius <length>\'");
+
+        }
+
+        if ("center".equalsIgnoreCase(arg.token.getText())) {
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
+
+            ParsedValueImpl<?,Size> ptX = parseSize(arg);
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null) error(prev, "Expected \'<point>\'");
+
+            ParsedValueImpl<?,Size> ptY = parseSize(arg);
+
+            centerPoint = new ParsedValueImpl[] { ptX, ptY };
+
+            prev = arg;
+            if ((arg = arg.nextArg) == null)
+                error(prev, "Expected \'radius [<length> | <percentage>]\'");
+        }
+
+        if ("radius".equalsIgnoreCase(arg.token.getText())) {
+
+            prev = arg;
+            if ((arg = arg.nextInSeries) == null ||
+                !isSize(arg.token)) error(prev, "Expected \'[<length> | <percentage>]\'");
+
+            radius = parseSize(arg);
+
+            prev = arg;
+            if ((arg = arg.nextArg) == null)
+                error(prev, "Expected \'radius [<length> | <percentage>]\'");
+        }
+
+        CycleMethod cycleMethod = CycleMethod.NO_CYCLE;
+        if ("reflect".equalsIgnoreCase(arg.token.getText())) {
+            cycleMethod = CycleMethod.REFLECT;
+            prev = arg;
+            arg = arg.nextArg;
+        } else if ("repeat".equalsIgnoreCase(arg.token.getText())) {
+            cycleMethod = CycleMethod.REFLECT;
+            prev = arg;
+            arg = arg.nextArg;
+        }
+
+        if (arg == null  ||
+            arg.token == null ||
+            arg.token.getText().isEmpty()) {
+            error(prev, "Expected \'<color-stop>\'");
+        }
+
+        ParsedValueImpl<ParsedValue[],Stop>[] stops = parseColorStops(arg);
+
+        ParsedValueImpl[] values = new ParsedValueImpl[6 + stops.length];
+        int index = 0;
+        values[index++] = focusAngle;
+        values[index++] = focusDistance;
+        values[index++] = (centerPoint != null) ? centerPoint[0] : null;
+        values[index++] = (centerPoint != null) ? centerPoint[1] : null;
+        values[index++] = radius;
+        values[index++] = new ParsedValueImpl<String,CycleMethod>(cycleMethod.name(), new EnumConverter<CycleMethod>(CycleMethod.class));
+        for (int n=0; n<stops.length; n++) values[index++] = stops[n];
+        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.RadialGradientConverter.getInstance());
+
+    }
+
+    // Based off ImagePattern constructor
+    //
+    // image-pattern(<uri-string>[,<size>,<size>,<size>,<size>[,<boolean>]?]?)
+    //
+    private ParsedValueImpl<ParsedValue[], Paint> parseImagePattern(final Term root) throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"image-pattern".regionMatches(true, 0, fn, 0, 13)) {
+            final String msg = "Expected \'image-pattern\'";
+            error(root, msg);
+        }
+
+        Term arg;
+        if ((arg = root.firstArg) == null ||
+             arg.token == null ||
+             arg.token.getText().isEmpty()) {
+            error(root,
+                "Expected \'<uri-string>\'");
+        }
+
+        Term prev = arg;
+
+        final String uri = arg.token.getText();
+        ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
+            new ParsedValueImpl<String,String>(uri, StringConverter.getInstance()),
+            null // placeholder for Stylesheet URL
+        };
+        ParsedValueImpl parsedURI = new ParsedValueImpl<ParsedValue[],String>(uriValues, URLConverter.getInstance());
+
+        // If nextArg is null, then there are no remaining arguments, so we are done.
+        if (arg.nextArg == null) {
+            ParsedValueImpl[] values = new ParsedValueImpl[1];
+            values[0] = parsedURI;
+            return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.ImagePatternConverter.getInstance());
+        }
+
+        // There must now be 4 sizes in a row.
+        Token token;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
+        ParsedValueImpl<?, Size> x = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
+        ParsedValueImpl<?, Size> y = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
+        ParsedValueImpl<?, Size> w = parseSize(arg);
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<size>\'");
+        ParsedValueImpl<?, Size> h = parseSize(arg);
+
+        // If there are no more args, then we are done.
+        if (arg.nextArg == null) {
+            ParsedValueImpl[] values = new ParsedValueImpl[5];
+            values[0] = parsedURI;
+            values[1] = x;
+            values[2] = y;
+            values[3] = w;
+            values[4] = h;
+            return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.ImagePatternConverter.getInstance());
+        }
+
+        prev = arg;
+        if ((arg = arg.nextArg) == null) error(prev, "Expected \'<boolean>\'");
+        if ((token = arg.token) == null || token.getText() == null) error(arg, "Expected \'<boolean>\'");
+
+        ParsedValueImpl[] values = new ParsedValueImpl[6];
+        values[0] = parsedURI;
+        values[1] = x;
+        values[2] = y;
+        values[3] = w;
+        values[4] = h;
+        values[5] = new ParsedValueImpl<Boolean, Boolean>(Boolean.parseBoolean(token.getText()), null);
+        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.ImagePatternConverter.getInstance());
+    }
+
+    // For tiling ImagePatterns easily.
+    //
+    // repeating-image-pattern(<uri-string>)
+    //
+    private ParsedValueImpl<ParsedValue[], Paint> parseRepeatingImagePattern(final Term root) throws ParseException {
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"repeating-image-pattern".regionMatches(true, 0, fn, 0, 23)) {
+            final String msg = "Expected \'repeating-image-pattern\'";
+            error(root, msg);
+        }
+
+        Term arg;
+        if ((arg = root.firstArg) == null ||
+             arg.token == null ||
+             arg.token.getText().isEmpty()) {
+            error(root,
+                "Expected \'<uri-string>\'");
+        }
+
+        final String uri = arg.token.getText();
+        ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
+            new ParsedValueImpl<String,String>(uri, StringConverter.getInstance()),
+            null // placeholder for Stylesheet URL
+        };
+        ParsedValueImpl parsedURI = new ParsedValueImpl<ParsedValue[],String>(uriValues, URLConverter.getInstance());
+        ParsedValueImpl[] values = new ParsedValueImpl[1];
+        values[0] = parsedURI;
+        return new ParsedValueImpl<ParsedValue[], Paint>(values, PaintConverter.RepeatingImagePatternConverter.getInstance());
+    }
+
+    // parse a series of paint values separated by commas.
+    // i.e., <paint> [, <paint>]*
+    private ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]> parsePaintLayers(Term root)
+            throws ParseException {
+
+        // how many paints in the series?
+        int nPaints = numberOfLayers(root);
+
+        ParsedValueImpl<?,Paint>[] paints = new ParsedValueImpl[nPaints];
+
+        Term temp = root;
+        int paint = 0;
+
+        do {
+            if (temp.token == null ||
+                temp.token.getText() == null ||
+                temp.token.getText().isEmpty()) error(temp, "Expected \'<paint>\'");
+
+            paints[paint++] = (ParsedValueImpl<?,Paint>)parse(temp);
+
+            temp = nextLayer(temp);
+        } while (temp != null);
+
+        return new ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]>(paints, PaintConverter.SequenceConverter.getInstance());
+
+    }
+
+    // An size or a series of four size values
+    // <size> | <size> <size> <size> <size>
+    private ParsedValueImpl<?,Size>[] parseSize1to4(final Term root)
+            throws ParseException {
+
+        Term temp = root;
+        ParsedValueImpl<?,Size>[] sides = new ParsedValueImpl[4];
+        int side = 0;
+
+        while (side < 4 && temp != null) {
+            sides[side++] = parseSize(temp);
+            temp = temp.nextInSeries;
+        }
+
+        if (side < 2) sides[1] = sides[0]; // right = top
+        if (side < 3) sides[2] = sides[0]; // bottom = top
+        if (side < 4) sides[3] = sides[1]; // left = right
+
+        return sides;
+    }
+
+    // A series of inset or sets of four inset values
+    // <size> | <size> <size> <size> <size> [ , [ <size> | <size> <size> <size> <size>] ]*
+    private ParsedValueImpl<ParsedValue<ParsedValue[],Insets>[], Insets[]> parseInsetsLayers(Term root)
+            throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+
+        Term temp = root;
+        int layer = 0;
+        ParsedValueImpl<ParsedValue[],Insets>[] layers = new ParsedValueImpl[nLayers];
+
+        while(temp != null) {
+            ParsedValueImpl<?,Size>[] sides = parseSize1to4(temp);
+            layers[layer++] = new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
+            while(temp.nextInSeries != null) {
+                temp = temp.nextInSeries;
+            }
+            temp = nextLayer(temp);
+        }
+
+        return new ParsedValueImpl<ParsedValue<ParsedValue[],Insets>[], Insets[]>(layers, InsetsConverter.SequenceConverter.getInstance());
+    }
+
+    // A single inset (1, 2, 3, or 4 digits)
+    // <size> | <size> <size> <size> <size>
+    private ParsedValueImpl<ParsedValue[],Insets> parseInsetsLayer(Term root)
+            throws ParseException {
+
+        Term temp = root;
+        ParsedValueImpl<ParsedValue[],Insets> layer = null;
+
+        while(temp != null) {
+            ParsedValueImpl<?,Size>[] sides = parseSize1to4(temp);
+            layer = new ParsedValueImpl<ParsedValue[],Insets>(sides, InsetsConverter.getInstance());
+            while(temp.nextInSeries != null) {
+                temp = temp.nextInSeries;
+            }
+            temp = nextLayer(temp);
+        }
+        return layer;
+    }
+
+    // <size> | <size> <size> <size> <size>
+    private ParsedValueImpl<ParsedValue<ParsedValue[],Margins>[], Margins[]> parseMarginsLayers(Term root)
+            throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+
+        Term temp = root;
+        int layer = 0;
+        ParsedValueImpl<ParsedValue[],Margins>[] layers = new ParsedValueImpl[nLayers];
+
+        while(temp != null) {
+            ParsedValueImpl<?,Size>[] sides = parseSize1to4(temp);
+            layers[layer++] = new ParsedValueImpl<ParsedValue[],Margins>(sides, Margins.Converter.getInstance());
+            while(temp.nextInSeries != null) {
+                temp = temp.nextInSeries;
+            }
+            temp = nextLayer(temp);
+        }
+
+        return new ParsedValueImpl<ParsedValue<ParsedValue[],Margins>[], Margins[]>(layers, Margins.SequenceConverter.getInstance());
+    }
+
+    // <size> | <size> <size> <size> <size>
+    private ParsedValueImpl<Size, Size>[] parseSizeSeries(Term root)
+            throws ParseException {
+
+        if (root.token == null) error(root, "Parse error");
+
+        List<ParsedValueImpl<Size,Size>> sizes = new ArrayList<>();
+
+        Term term = root;
+        while(term != null) {
+            Token token = term.token;
+            final int ttype = token.getType();
+            switch (ttype) {
+                case CssLexer.NUMBER:
+                case CssLexer.PERCENTAGE:
+                case CssLexer.EMS:
+                case CssLexer.EXS:
+                case CssLexer.PX:
+                case CssLexer.CM:
+                case CssLexer.MM:
+                case CssLexer.IN:
+                case CssLexer.PT:
+                case CssLexer.PC:
+                case CssLexer.DEG:
+                case CssLexer.GRAD:
+                case CssLexer.RAD:
+                case CssLexer.TURN:
+                    ParsedValueImpl sizeValue = new ParsedValueImpl<Size, Size>(size(token), null);
+                    sizes.add(sizeValue);
+                    break;
+                default:
+                    error (root, "expected series of <size>");
+            }
+            term = term.nextInSeries;
+        }
+        return sizes.toArray(new ParsedValueImpl[sizes.size()]);
+
+    }
+
+    // http://www.w3.org/TR/css3-background/#the-border-radius
+    // <size>{1,4} [ '/' <size>{1,4}]? [',' <size>{1,4} [ '/' <size>{1,4}]?]?
+    private ParsedValueImpl<ParsedValue<ParsedValue<?,Size>[][],CornerRadii>[], CornerRadii[]> parseCornerRadius(Term root)
+            throws ParseException {
+
+
+        int nLayers = numberOfLayers(root);
+
+        Term term = root;
+        int layer = 0;
+        ParsedValueImpl<ParsedValue<?,Size>[][],CornerRadii>[] layers = new ParsedValueImpl[nLayers];
+
+        while(term != null) {
+
+            int nHorizontalTerms = 0;
+            Term temp = term;
+            while (temp != null) {
+                if (temp.token.getType() == CssLexer.SOLIDUS) {
+                    temp = temp.nextInSeries;
+                    break;
+                }
+                nHorizontalTerms += 1;
+                temp = temp.nextInSeries;
+            };
+
+            int nVerticalTerms = 0;
+            while (temp != null) {
+                if (temp.token.getType() == CssLexer.SOLIDUS) {
+                    error(temp, "unexpected SOLIDUS");
+                    break;
+                }
+                nVerticalTerms += 1;
+                temp = temp.nextInSeries;
+            }
+
+            if ((nHorizontalTerms == 0 || nHorizontalTerms > 4) || nVerticalTerms > 4) {
+                error(root, "expected [<length>|<percentage>]{1,4} [/ [<length>|<percentage>]{1,4}]?");
+            }
+
+            // used as index into margins[]. horizontal = 0, vertical = 1
+            int orientation = 0;
+
+            // at most, there should be four radii in the horizontal orientation and four in the vertical.
+            ParsedValueImpl<?,Size>[][] radii = new ParsedValueImpl[2][4];
+
+            ParsedValueImpl<?,Size> zero = new ParsedValueImpl<Size,Size>(new Size(0,SizeUnits.PX), null);
+            for (int r=0; r<4; r++) { radii[0][r] = zero; radii[1][r] = zero; }
+
+            int hr = 0;
+            int vr = 0;
+
+            Term lastTerm = term;
+            while ((hr <= 4) && (vr <= 4) && (term != null)) {
+
+                if (term.token.getType() == CssLexer.SOLIDUS) {
+                    orientation += 1;
+                } else  {
+                    ParsedValueImpl<?,Size> parsedValue = parseSize(term);
+                    if (orientation == 0) {
+                        radii[orientation][hr++] = parsedValue;
+                    } else {
+                        radii[orientation][vr++] = parsedValue;
+                    }
+                }
+                lastTerm = term;
+                term = term.nextInSeries;
+            }
+
+            //
+            // http://www.w3.org/TR/css3-background/#the-border-radius
+            // The four values for each radii are given in the order top-left, top-right, bottom-right, bottom-left.
+            // If bottom-left is omitted it is the same as top-right.
+            // If bottom-right is omitted it is the same as top-left.
+            // If top-right is omitted it is the same as top-left.
+            //
+            // If there is no vertical component, then set both equally.
+            // If either is zero, then both are zero.
+            //
+
+            // if hr == 0, then there were no horizontal radii (which would be an error caught above)
+            if (hr != 0) {
+                if (hr < 2) radii[0][1] = radii[0][0]; // top-right = top-left
+                if (hr < 3) radii[0][2] = radii[0][0]; // bottom-right = top-left
+                if (hr < 4) radii[0][3] = radii[0][1]; // bottom-left = top-right
+            } else {
+                assert(false);
+            }
+
+            // if vr == 0, then there were no vertical radii
+            if (vr != 0) {
+                if (vr < 2) radii[1][1] = radii[1][0]; // top-right = top-left
+                if (vr < 3) radii[1][2] = radii[1][0]; // bottom-right = top-left
+                if (vr < 4) radii[1][3] = radii[1][1]; // bottom-left = top-right
+            } else {
+                // if no vertical, the vertical value is same as horizontal
+                radii[1][0] = radii[0][0];
+                radii[1][1] = radii[0][1];
+                radii[1][2] = radii[0][2];
+                radii[1][3] = radii[0][3];
+            }
+
+            // if either is zero, both are zero
+            if (zero.equals(radii[0][0]) || zero.equals(radii[1][0])) { radii[1][0] = radii[0][0] = zero; }
+            if (zero.equals(radii[0][1]) || zero.equals(radii[1][1])) { radii[1][1] = radii[0][1] = zero; }
+            if (zero.equals(radii[0][2]) || zero.equals(radii[1][2])) { radii[1][2] = radii[0][2] = zero; }
+            if (zero.equals(radii[0][3]) || zero.equals(radii[1][3])) { radii[1][3] = radii[0][3] = zero; }
+
+            layers[layer++] = new ParsedValueImpl<ParsedValue<?,Size>[][],CornerRadii>(radii, null);
+
+            term = nextLayer(lastTerm);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue<?,Size>[][],CornerRadii>[], CornerRadii[]>(layers, CornerRadiiConverter.getInstance());
+    }
+
+    /* Constant for background position */
+    private final static ParsedValueImpl<Size,Size> ZERO_PERCENT =
+            new ParsedValueImpl<Size,Size>(new Size(0f, SizeUnits.PERCENT), null);
+    /* Constant for background position */
+    private final static ParsedValueImpl<Size,Size> FIFTY_PERCENT =
+            new ParsedValueImpl<Size,Size>(new Size(50f, SizeUnits.PERCENT), null);
+    /* Constant for background position */
+    private final static ParsedValueImpl<Size,Size> ONE_HUNDRED_PERCENT =
+            new ParsedValueImpl<Size,Size>(new Size(100f, SizeUnits.PERCENT), null);
+
+    private static boolean isPositionKeyWord(String value) {
+        return "center".equalsIgnoreCase(value) || "top".equalsIgnoreCase(value) || "bottom".equalsIgnoreCase(value) || "left".equalsIgnoreCase(value) || "right".equalsIgnoreCase(value);
+    }
+
+    /*
+     * http://www.w3.org/TR/css3-background/#the-background-position
+     *
+     * <bg-position> = [
+     *   [ top | bottom ]
+     * |
+     *   [ <percentage> | <length> | left | center | right ]
+     *   [ <percentage> | <length> | top  | center | bottom ]?
+     * |
+     *   [ center | [ left | right  ] [ <percentage> | <length> ]? ] &&
+     *   [ center | [ top  | bottom ] [ <percentage> | <length> ]? ]
+     * ]
+     *
+     * From the W3 spec:
+     *
+     * returned ParsedValueImpl is [size, size, size, size] with the semantics
+     * [top offset, right offset, bottom offset left offset]
+     */
+    private ParsedValueImpl<ParsedValue[], BackgroundPosition> parseBackgroundPosition(Term term)
+        throws ParseException {
+
+        if (term.token == null ||
+            term.token.getText() == null ||
+            term.token.getText().isEmpty()) error(term, "Expected \'<bg-position>\'");
+
+        Term  termOne = term;
+        Token valueOne = term.token;
+
+        Term  termTwo = termOne.nextInSeries;
+        Token valueTwo = (termTwo != null) ? termTwo.token : null;
+
+        Term termThree = (termTwo != null) ? termTwo.nextInSeries : null;
+        Token valueThree = (termThree != null) ? termThree.token : null;
+
+        Term termFour = (termThree != null) ? termThree.nextInSeries : null;
+        Token valueFour = (termFour != null) ? termFour.token : null;
+
+        // are the horizontal and vertical exchanged
+        if( valueOne != null && valueTwo != null && valueThree == null && valueFour == null ) {
+            // 2 values filled
+            String v1 = valueOne.getText();
+            String v2 = valueTwo.getText();
+            if( ("top".equals(v1) || "bottom".equals(v1))
+                    && ("left".equals(v2) || "right".equals(v2) || "center".equals(v2)) ) {
+                {
+                    Token tmp = valueTwo;
+                    valueTwo = valueOne;
+                    valueOne = tmp;
+                }
+
+                {
+                    Term tmp = termTwo;
+                    termTwo = termOne;
+                    termOne = tmp;
+                }
+            }
+        } else if( valueOne != null && valueTwo != null && valueThree != null ) {
+            Term[] termArray = null;
+            Token[] tokeArray = null;
+            // 4 values filled
+            if( valueFour != null ) {
+                if( ("top".equals(valueOne.getText()) || "bottom".equals(valueOne.getText()))
+                        && ("left".equals(valueThree.getText()) || "right".equals(valueThree.getText())) ) {
+                    // e.g. top 50 left 20
+                    termArray = new Term[] { termThree, termFour, termOne, termTwo };
+                    tokeArray = new Token[] { valueThree, valueFour, valueOne, valueTwo };
+                }
+            } else {
+                if( ("top".equals(valueOne.getText()) || "bottom".equals(valueOne.getText())) ) {
+                    if( ("left".equals(valueTwo.getText()) || "right".equals(valueTwo.getText())) ) {
+                        // e.g. top left 50
+                        termArray = new Term[] { termTwo, termThree, termOne, null };
+                        tokeArray = new Token[] { valueTwo, valueThree, valueOne, null };
+                    } else {
+                        // e.g. top 50 left
+                        termArray = new Term[] { termThree, termOne, termTwo, null };
+                        tokeArray = new Token[] { valueThree, valueOne, valueTwo, null };
+                    }
+                }
+            }
+
+            if( termArray != null ) {
+                termOne = termArray[0];
+                termTwo = termArray[1];
+                termThree = termArray[2];
+                termFour = termArray[3];
+
+                valueOne = tokeArray[0];
+                valueTwo = tokeArray[1];
+                valueThree = tokeArray[2];
+                valueFour = tokeArray[3];
+            }
+        }
+
+
+        ParsedValueImpl<?,Size> top, right, bottom, left;
+        top = right = bottom = left = ZERO_PERCENT;
+        {
+            if(valueOne == null && valueTwo == null && valueThree == null && valueFour == null) {
+                error(term, "No value found for background-position");
+            } else if( valueOne != null && valueTwo == null && valueThree == null && valueFour == null ) {
+                // Only one value
+                String v1 = valueOne.getText();
+
+                if( "center".equals(v1) ) {
+                    left = FIFTY_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    top = FIFTY_PERCENT;
+                    bottom = ZERO_PERCENT;
+
+                } else if("left".equals(v1)) {
+                    left = ZERO_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    top = FIFTY_PERCENT;
+                    bottom = ZERO_PERCENT;
+
+                } else if( "right".equals(v1) ) {
+                    left = ONE_HUNDRED_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    top = FIFTY_PERCENT;
+                    bottom = ZERO_PERCENT;
+
+                } else if( "top".equals(v1) ) {
+                    left = FIFTY_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    top = ZERO_PERCENT;
+                    bottom = ZERO_PERCENT;
+
+                } else if( "bottom".equals(v1) ) {
+                    left = FIFTY_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    top = ONE_HUNDRED_PERCENT;
+                    bottom = ZERO_PERCENT;
+                } else {
+                    left = parseSize(termOne);
+                    right = ZERO_PERCENT;
+                    top = FIFTY_PERCENT;
+                    bottom = ZERO_PERCENT;
+                }
+            } else if( valueOne != null && valueTwo != null && valueThree == null && valueFour == null ) {
+                // 2 values
+                String v1 = valueOne.getText().toLowerCase(Locale.ROOT);
+                String v2 = valueTwo.getText().toLowerCase(Locale.ROOT);
+
+                if( ! isPositionKeyWord(v1) ) {
+                    left = parseSize(termOne);
+                    right = ZERO_PERCENT;
+
+                    if( "top".equals(v2) ) {
+                        top = ZERO_PERCENT;
+                        bottom = ZERO_PERCENT;
+                    } else if( "bottom".equals(v2) ) {
+                        top = ONE_HUNDRED_PERCENT;
+                        bottom = ZERO_PERCENT;
+                    } else if( "center".equals(v2) ) {
+                        top = FIFTY_PERCENT;
+                        bottom = ZERO_PERCENT;
+                    } else if( !isPositionKeyWord(v2) ) {
+                        top = parseSize(termTwo);
+                        bottom = ZERO_PERCENT;
+                    } else {
+                        error(termTwo,"Expected 'top', 'bottom', 'center' or <size>");
+                    }
+                } else if( v1.equals("left") || v1.equals("right") ) {
+                    left = v1.equals("right") ? ONE_HUNDRED_PERCENT : ZERO_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    if( ! isPositionKeyWord(v2) ) {
+                        top = parseSize(termTwo);
+                        bottom = ZERO_PERCENT;
+                    } else if( v2.equals("top") || v2.equals("bottom") || v2.equals("center") ) {
+                        if( v2.equals("top") ) {
+                            top = ZERO_PERCENT;
+                            bottom = ZERO_PERCENT;
+                        } else if(v2.equals("center")) {
+                            top = FIFTY_PERCENT;
+                            bottom = ZERO_PERCENT;
+                        } else {
+                            top = ONE_HUNDRED_PERCENT;
+                            bottom = ZERO_PERCENT;
+                        }
+                    } else {
+                        error(termTwo,"Expected 'top', 'bottom', 'center' or <size>");
+                    }
+                } else if( v1.equals("center") ) {
+                    left = FIFTY_PERCENT;
+                    right = ZERO_PERCENT;
+
+                    if( v2.equals("top") ) {
+                        top = ZERO_PERCENT;
+                        bottom = ZERO_PERCENT;
+                    } else if( v2.equals("bottom") ) {
+                        top = ONE_HUNDRED_PERCENT;
+                        bottom = ZERO_PERCENT;
+                    } else if( v2.equals("center") ) {
+                        top = FIFTY_PERCENT;
+                        bottom = ZERO_PERCENT;
+                    } else if( ! isPositionKeyWord(v2) ) {
+                        top = parseSize(termTwo);
+                        bottom = ZERO_PERCENT;
+                    } else {
+                        error(termTwo,"Expected 'top', 'bottom', 'center' or <size>");
+                    }
+                }
+            } else if( valueOne != null && valueTwo != null && valueThree != null && valueFour == null ) {
+                String v1 = valueOne.getText().toLowerCase(Locale.ROOT);
+                String v2 = valueTwo.getText().toLowerCase(Locale.ROOT);
+                String v3 = valueThree.getText().toLowerCase(Locale.ROOT);
+
+                if( ! isPositionKeyWord(v1) || "center".equals(v1) ) {
+                    // 1 is horizontal
+                    // means 2 & 3 are vertical
+                    if( "center".equals(v1) ) {
+                        left = FIFTY_PERCENT;
+                    } else {
+                        left = parseSize(termOne);
+                    }
+                    right = ZERO_PERCENT;
+
+                    if( !isPositionKeyWord(v3) ) {
+                        if( "top".equals(v2) ) {
+                            top = parseSize(termThree);
+                            bottom = ZERO_PERCENT;
+                        } else if( "bottom".equals(v2) ) {
+                            top = ZERO_PERCENT;
+                            bottom = parseSize(termThree);
+                        } else {
+                            error(termTwo,"Expected 'top' or 'bottom'");
+                        }
+                    } else {
+                        error(termThree,"Expected <size>");
+                    }
+                } else if( "left".equals(v1) || "right".equals(v1)  ) {
+                    if( ! isPositionKeyWord(v2) ) {
+                        // 1 & 2 are horizontal
+                        // 3 is vertical
+                        if( "left".equals(v1) ) {
+                            left = parseSize(termTwo);
+                            right = ZERO_PERCENT;
+                        } else {
+                            left = ZERO_PERCENT;
+                            right = parseSize(termTwo);
+                        }
+
+                        if( "top".equals(v3) ) {
+                            top = ZERO_PERCENT;
+                            bottom = ZERO_PERCENT;
+                        } else if( "bottom".equals(v3) ) {
+                            top = ONE_HUNDRED_PERCENT;
+                            bottom = ZERO_PERCENT;
+                        } else if( "center".equals(v3) ) {
+                            top = FIFTY_PERCENT;
+                            bottom = ZERO_PERCENT;
+                        } else {
+                            error(termThree,"Expected 'top', 'bottom' or 'center'");
+                        }
+                    } else {
+                        // 1 is horizontal
+                        // 2 & 3 are vertical
+                        if( "left".equals(v1) ) {
+                            left = ZERO_PERCENT;
+                            right = ZERO_PERCENT;
+                        } else {
+                            left = ONE_HUNDRED_PERCENT;
+                            right = ZERO_PERCENT;
+                        }
+
+                        if( ! isPositionKeyWord(v3) ) {
+                            if( "top".equals(v2) ) {
+                                top = parseSize(termThree);
+                                bottom = ZERO_PERCENT;
+                            } else if( "bottom".equals(v2) ) {
+                                top = ZERO_PERCENT;
+                                bottom = parseSize(termThree);
+                            } else {
+                                error(termTwo,"Expected 'top' or 'bottom'");
+                            }
+                        } else {
+                            error(termThree,"Expected <size>");
+                        }
+                    }
+                }
+            } else {
+                String v1 = valueOne.getText().toLowerCase(Locale.ROOT);
+                String v2 = valueTwo.getText().toLowerCase(Locale.ROOT);
+                String v3 = valueThree.getText().toLowerCase(Locale.ROOT);
+                String v4 = valueFour.getText().toLowerCase(Locale.ROOT);
+
+                if( (v1.equals("left") || v1.equals("right")) && (v3.equals("top") || v3.equals("bottom") ) && ! isPositionKeyWord(v2) && ! isPositionKeyWord(v4) ) {
+                    if( v1.equals("left") ) {
+                        left = parseSize(termTwo);
+                        right = ZERO_PERCENT;
+                    } else {
+                        left = ZERO_PERCENT;
+                        right = parseSize(termTwo);
+                    }
+
+                    if( v3.equals("top") ) {
+                        top = parseSize(termFour);
+                        bottom = ZERO_PERCENT;
+                    } else {
+                        top = ZERO_PERCENT;
+                        bottom = parseSize(termFour);
+                    }
+
+                } else {
+                    error(term,"Expected 'left' or 'right' followed by <size> followed by 'top' or 'bottom' followed by <size>");
+                }
+            }
+        }
+
+        ParsedValueImpl<?,Size>[] values = new ParsedValueImpl[] {top, right, bottom, left};
+        return new ParsedValueImpl<ParsedValue[], BackgroundPosition>(values, BackgroundPositionConverter.getInstance());
+    }
+
+    private ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundPosition>[], BackgroundPosition[]>
+            parseBackgroundPositionLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<ParsedValue[], BackgroundPosition>[] layers = new ParsedValueImpl[nLayers];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseBackgroundPosition(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundPosition>[], BackgroundPosition[]>(layers, LayeredBackgroundPositionConverter.getInstance());
+    }
+
+    /*
+    http://www.w3.org/TR/css3-background/#the-background-repeat
+    <repeat-style> = repeat-x | repeat-y | [repeat | space | round | no-repeat]{1,2}
+    */
+    private ParsedValueImpl<String, BackgroundRepeat>[] parseRepeatStyle(final Term root)
+            throws ParseException {
+
+        BackgroundRepeat xAxis, yAxis;
+        xAxis = yAxis = BackgroundRepeat.NO_REPEAT;
+
+        Term term = root;
+
+        if (term.token == null ||
+            term.token.getType() != CssLexer.IDENT ||
+            term.token.getText() == null ||
+            term.token.getText().isEmpty()) error(term, "Expected \'<repeat-style>\'");
+
+        String text = term.token.getText().toLowerCase(Locale.ROOT);
+        if ("repeat-x".equals(text)) {
+            xAxis = BackgroundRepeat.REPEAT;
+            yAxis = BackgroundRepeat.NO_REPEAT;
+        } else if ("repeat-y".equals(text)) {
+            xAxis = BackgroundRepeat.NO_REPEAT;
+            yAxis = BackgroundRepeat.REPEAT;
+        } else if ("repeat".equals(text)) {
+            xAxis = BackgroundRepeat.REPEAT;
+            yAxis = BackgroundRepeat.REPEAT;
+        } else if ("space".equals(text)) {
+            xAxis = BackgroundRepeat.SPACE;
+            yAxis = BackgroundRepeat.SPACE;
+        } else if ("round".equals(text)) {
+            xAxis = BackgroundRepeat.ROUND;
+            yAxis = BackgroundRepeat.ROUND;
+        } else if ("no-repeat".equals(text)) {
+            xAxis = BackgroundRepeat.NO_REPEAT;
+            yAxis = BackgroundRepeat.NO_REPEAT;
+        } else if ("stretch".equals(text)) {
+            xAxis = BackgroundRepeat.NO_REPEAT;
+            yAxis = BackgroundRepeat.NO_REPEAT;
+        } else {
+            error(term, "Expected  \'<repeat-style>\' " + text);
+        }
+
+        if ((term = term.nextInSeries) != null &&
+             term.token != null &&
+             term.token.getType() == CssLexer.IDENT &&
+             term.token.getText() != null &&
+             !term.token.getText().isEmpty()) {
+
+            text = term.token.getText().toLowerCase(Locale.ROOT);
+            if ("repeat-x".equals(text)) {
+                error(term, "Unexpected \'repeat-x\'");
+            } else if ("repeat-y".equals(text)) {
+                error(term, "Unexpected \'repeat-y\'");
+            } else if ("repeat".equals(text)) {
+                yAxis = BackgroundRepeat.REPEAT;
+            } else if ("space".equals(text)) {
+                yAxis = BackgroundRepeat.SPACE;
+            } else if ("round".equals(text)) {
+                yAxis = BackgroundRepeat.ROUND;
+            } else if ("no-repeat".equals(text)) {
+                yAxis = BackgroundRepeat.NO_REPEAT;
+            } else if ("stretch".equals(text)) {
+                yAxis = BackgroundRepeat.NO_REPEAT;
+            } else {
+                error(term, "Expected  \'<repeat-style>\'");
+            }
+        }
+
+        return new ParsedValueImpl[] {
+            new ParsedValueImpl<String,BackgroundRepeat>(xAxis.name(), new EnumConverter<BackgroundRepeat>(BackgroundRepeat.class)),
+            new ParsedValueImpl<String,BackgroundRepeat>(yAxis.name(), new EnumConverter<BackgroundRepeat>(BackgroundRepeat.class))
+        };
+    }
+
+    private ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][],RepeatStruct[]>
+            parseBorderImageRepeatStyleLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<String, BackgroundRepeat>[][] layers = new ParsedValueImpl[nLayers][];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseRepeatStyle(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][],RepeatStruct[]>(layers, RepeatStructConverter.getInstance());
+    }
+
+
+    private ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][], RepeatStruct[]>
+            parseBackgroundRepeatStyleLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<String, BackgroundRepeat>[][] layers = new ParsedValueImpl[nLayers][];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseRepeatStyle(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<String, BackgroundRepeat>[][], RepeatStruct[]>(layers, RepeatStructConverter.getInstance());
+    }
+
+    /*
+    http://www.w3.org/TR/css3-background/#the-background-size
+    <bg-size> = [ <length> | <percentage> | auto ]{1,2} | cover | contain
+    */
+    private ParsedValueImpl<ParsedValue[], BackgroundSize> parseBackgroundSize(final Term root)
+        throws ParseException {
+
+        ParsedValueImpl<?,Size> height = null, width = null;
+        boolean cover = false, contain = false;
+
+        Term term = root;
+        if (term.token == null) error(term, "Expected \'<bg-size>\'");
+
+        if (term.token.getType() == CssLexer.IDENT) {
+            final String text =
+                (term.token.getText() != null) ? term.token.getText().toLowerCase(Locale.ROOT) : null;
+
+            if ("auto".equals(text)) {
+                // We don't do anything because width / height are already initialized
+            } else if ("cover".equals(text)) {
+                cover = true;
+            } else if ("contain".equals(text)) {
+                contain = true;
+            } else if ("stretch".equals(text)) {
+                width = ONE_HUNDRED_PERCENT;
+                height = ONE_HUNDRED_PERCENT;
+            } else {
+                error(term, "Expected \'auto\', \'cover\', \'contain\', or  \'stretch\'");
+            }
+        } else if (isSize(term.token)) {
+            width = parseSize(term);
+            height = null;
+        } else {
+            error(term, "Expected \'<bg-size>\'");
+        }
+
+        if ((term = term.nextInSeries) != null) {
+            if (cover || contain) error(term, "Unexpected \'<bg-size>\'");
+
+            if (term.token.getType() == CssLexer.IDENT) {
+                final String text =
+                    (term.token.getText() != null) ? term.token.getText().toLowerCase(Locale.ROOT) : null;
+
+                if ("auto".equals(text)) {
+                    height = null;
+                } else if ("cover".equals(text)) {
+                    error(term, "Unexpected \'cover\'");
+                } else if ("contain".equals(text)) {
+                    error(term, "Unexpected \'contain\'");
+                } else if ("stretch".equals(text)) {
+                    height = ONE_HUNDRED_PERCENT;
+                } else {
+                    error(term, "Expected \'auto\' or \'stretch\'");
+                }
+            } else if (isSize(term.token)) {
+                height = parseSize(term);
+            } else {
+                error(term, "Expected \'<bg-size>\'");
+            }
+
+        }
+
+        ParsedValueImpl[] values = new ParsedValueImpl[] {
+            width,
+            height,
+            // TODO: handling of booleans is really bogus
+            new ParsedValueImpl<String,Boolean>((cover ? "true" : "false"), BooleanConverter.getInstance()),
+            new ParsedValueImpl<String,Boolean>((contain ? "true" : "false"), BooleanConverter.getInstance())
+        };
+        return new ParsedValueImpl<ParsedValue[], BackgroundSize>(values, BackgroundSizeConverter.getInstance());
+    }
+
+    private ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundSize>[],  BackgroundSize[]>
+            parseBackgroundSizeLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<ParsedValue[], BackgroundSize>[] layers = new ParsedValueImpl[nLayers];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseBackgroundSize(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue[], BackgroundSize>[], BackgroundSize[]>(layers, LayeredBackgroundSizeConverter.getInstance());
+    }
+
+    private ParsedValueImpl<ParsedValue<?,Paint>[], Paint[]> parseBorderPaint(final Term root)
+        throws ParseException {
+
+        Term term = root;
+        ParsedValueImpl<?,Paint>[] paints = new ParsedValueImpl[4];
+        int paint = 0;
+
+        while(term != null) {
+            if (term.token == null || paints.length <= paint) error(term, "Expected \'<paint>\'");
+            paints[paint++] = parse(term);
+            term = term.nextInSeries;
+        }
+
+        if (paint < 2) paints[1] = paints[0]; // right = top
+        if (paint < 3) paints[2] = paints[0]; // bottom = top
+        if (paint < 4) paints[3] = paints[1]; // left = right
+
+        return new ParsedValueImpl<ParsedValue<?,Paint>[], Paint[]>(paints, StrokeBorderPaintConverter.getInstance());
+    }
+
+    private ParsedValueImpl<ParsedValue<ParsedValue<?,Paint>[],Paint[]>[], Paint[][]> parseBorderPaintLayers(final Term root)
+        throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]>[] layers = new ParsedValueImpl[nLayers];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseBorderPaint(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue<?,Paint>[],Paint[]>[], Paint[][]>(layers, LayeredBorderPaintConverter.getInstance());
+    }
+
+    // borderStyle (borderStyle (borderStyle borderStyle?)?)?
+    private ParsedValueImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]> parseBorderStyleSeries(final Term root)
+            throws ParseException {
+
+        Term term = root;
+        ParsedValueImpl<ParsedValue[],BorderStrokeStyle>[] borders = new ParsedValueImpl[4];
+        int border = 0;
+        while (term != null) {
+            borders[border++] = parseBorderStyle(term);
+            term = term.nextInSeries;
+        }
+
+        if (border < 2) borders[1] = borders[0]; // right = top
+        if (border < 3) borders[2] = borders[0]; // bottom = top
+        if (border < 4) borders[3] = borders[1]; // left = right
+
+        return new ParsedValueImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>(borders, BorderStrokeStyleSequenceConverter.getInstance());
+    }
+
+
+    private ParsedValueImpl<ParsedValue<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>[], BorderStrokeStyle[][]>
+            parseBorderStyleLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>[] layers = new ParsedValueImpl[nLayers];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseBorderStyleSeries(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue<ParsedValue[],BorderStrokeStyle>[],BorderStrokeStyle[]>[], BorderStrokeStyle[][]>(layers, LayeredBorderStyleConverter.getInstance());
+    }
+
+    // Only meant to be used from parseBorderStyle, but might be useful elsewhere
+    private String getKeyword(final Term term) {
+        if (term != null &&
+             term.token != null &&
+             term.token.getType() == CssLexer.IDENT &&
+             term.token.getText() != null &&
+             !term.token.getText().isEmpty()) {
+
+            return term.token.getText().toLowerCase(Locale.ROOT);
+        }
+        return null;
+    }
+
+    //<border-style> [ , <border-style> ]*
+    // where <border-style> =
+    //      <dash-style> [centered | inside | outside]? [line-join [miter <number> | bevel | round]]? [line-cap [square | butt | round]]?
+    // where <dash-style> =
+    //      [ none | solid | dotted | dashed ]
+    private ParsedValueImpl<ParsedValue[],BorderStrokeStyle> parseBorderStyle(final Term root)
+            throws ParseException {
+
+
+        ParsedValue<ParsedValue[],Number[]> dashStyle = null;
+        ParsedValue<ParsedValue<?,Size>,Number> dashPhase = null;
+        ParsedValue<String,StrokeType> strokeType = null;
+        ParsedValue<String,StrokeLineJoin> strokeLineJoin = null;
+        ParsedValue<ParsedValue<?,Size>,Number> strokeMiterLimit = null;
+        ParsedValue<String,StrokeLineCap> strokeLineCap = null;
+
+        Term term = root;
+
+        dashStyle = dashStyle(term);
+
+        Term prev = term;
+        term = term.nextInSeries;
+        String keyword = getKeyword(term);
+
+        // dash-style might be followed by 'phase <size>'
+        if ("phase".equals(keyword)) {
+
+            prev = term;
+            if ((term = term.nextInSeries) == null ||
+                 term.token == null ||
+                 !isSize(term.token)) error(term, "Expected \'<size>\'");
+
+            ParsedValueImpl<?,Size> sizeVal = parseSize(term);
+            dashPhase = new ParsedValueImpl<ParsedValue<?,Size>,Number>(sizeVal,SizeConverter.getInstance());
+
+            prev = term;
+            term = term.nextInSeries;
+        }
+
+        // stroke type might be next
+        strokeType = parseStrokeType(term);
+        if (strokeType != null) {
+            prev = term;
+            term = term.nextInSeries;
+        }
+
+        keyword = getKeyword(term);
+
+        if ("line-join".equals(keyword)) {
+
+            prev = term;
+            term = term.nextInSeries;
+
+            ParsedValueImpl[] lineJoinValues = parseStrokeLineJoin(term);
+            if (lineJoinValues != null) {
+                strokeLineJoin = lineJoinValues[0];
+                strokeMiterLimit = lineJoinValues[1];
+            } else {
+                error(term, "Expected \'miter <size>?\', \'bevel\' or \'round\'");
+            }
+            prev = term;
+            term = term.nextInSeries;
+            keyword = getKeyword(term);
+        }
+
+        if ("line-cap".equals(keyword)) {
+
+            prev = term;
+            term = term.nextInSeries;
+
+            strokeLineCap = parseStrokeLineCap(term);
+            if (strokeLineCap == null) {
+                error(term, "Expected \'square\', \'butt\' or \'round\'");
+            }
+
+            prev = term;
+            term = term.nextInSeries;
+        }
+
+        if (term != null) {
+            // if term is not null, then we have gotten to the end of
+            // one border style and term is start of another border style
+            root.nextInSeries = term;
+        } else {
+            // If term is null, then we have gotten to the end of
+            // a border style with no more to follow in this series.
+            // But there may be another layer.
+            root.nextInSeries = null;
+            root.nextLayer = prev.nextLayer;
+        }
+
+        final ParsedValue[] values = new ParsedValue[]{
+            dashStyle,
+            dashPhase,
+            strokeType,
+            strokeLineJoin,
+            strokeMiterLimit,
+            strokeLineCap
+        };
+
+        return new ParsedValueImpl(values, BorderStyleConverter.getInstance());
+    }
+
+    //
+    // segments(<size> [, <size>]+) | <border-style>
+    //
+    private ParsedValue<ParsedValue[],Number[]> dashStyle(final Term root) throws ParseException {
+
+        if (root.token == null) error(root, "Expected \'<dash-style>\'");
+
+        final int ttype = root.token.getType();
+
+        ParsedValue<ParsedValue[],Number[]>  segments = null;
+        if (ttype == CssLexer.IDENT) {
+            segments = borderStyle(root);
+        } else if (ttype == CssLexer.FUNCTION) {
+            segments = segments(root);
+        } else {
+            error(root, "Expected \'<dash-style>\'");
+        }
+
+        return segments;
+    }
+
+    /*
+    <border-style> = none | hidden | dotted | dashed | solid | double | groove | ridge | inset | outset
+    */
+    private ParsedValue<ParsedValue[],Number[]>  borderStyle(Term root)
+            throws ParseException {
+
+        if (root.token == null ||
+            root.token.getType() != CssLexer.IDENT ||
+            root.token.getText() == null ||
+            root.token.getText().isEmpty()) error(root, "Expected \'<border-style>\'");
+
+        final String text = root.token.getText().toLowerCase(Locale.ROOT);
+
+        if ("none".equals(text)) {
+            return BorderStyleConverter.NONE;
+        } else if ("hidden".equals(text)) {
+            // The "hidden" mode doesn't make sense for FX, because it is the
+            // same as "none" except for border-collapsed CSS tables
+            return BorderStyleConverter.NONE;
+        } else if ("dotted".equals(text)) {
+            return BorderStyleConverter.DOTTED;
+        } else if ("dashed".equals(text)) {
+            return BorderStyleConverter.DASHED;
+        } else if ("solid".equals(text)) {
+            return BorderStyleConverter.SOLID;
+        } else if ("double".equals(text)) {
+            error(root, "Unsupported <border-style> \'double\'");
+        } else if ("groove".equals(text)) {
+            error(root, "Unsupported <border-style> \'groove\'");
+        } else if ("ridge".equals(text)) {
+            error(root, "Unsupported <border-style> \'ridge\'");
+        } else if ("inset".equals(text)) {
+            error(root, "Unsupported <border-style> \'inset\'");
+        } else if ("outset".equals(text)) {
+            error(root, "Unsupported <border-style> \'outset\'");
+        } else {
+            error(root, "Unsupported <border-style> \'" + text + "\'");
+        }
+        // error throws so we should never get here.
+        // but the compiler wants a return, so here it is.
+        return BorderStyleConverter.SOLID;
+    }
+
+    private ParsedValueImpl<ParsedValue[],Number[]> segments(Term root)
+            throws ParseException {
+
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"segments".regionMatches(true, 0, fn, 0, 8)) {
+            error(root,"Expected \'segments\'");
+        }
+
+        Term arg = root.firstArg;
+        if (arg == null) error(null, "Expected \'<size>\'");
+
+        int nArgs = numberOfArgs(root);
+        ParsedValueImpl<?,Size>[] segments = new ParsedValueImpl[nArgs];
+        int segment = 0;
+        while(arg != null) {
+            segments[segment++] = parseSize(arg);
+            arg = arg.nextArg;
+        }
+
+        return new ParsedValueImpl<ParsedValue[],Number[]>(segments,SizeConverter.SequenceConverter.getInstance());
+
+    }
+
+    private ParsedValueImpl<String,StrokeType> parseStrokeType(final Term root)
+        throws ParseException {
+
+        final String keyword = getKeyword(root);
+
+
+        if ("centered".equals(keyword) ||
+            "inside".equals(keyword) ||
+            "outside".equals(keyword)) {
+
+            return new ParsedValueImpl<String,StrokeType>(keyword, new EnumConverter(StrokeType.class));
+
+        }
+        return null;
+    }
+
+    // Root term is the term just after the line-join keyword
+    // Returns an array of two Values or null.
+    // ParsedValueImpl[0] is ParsedValueImpl<StrokeLineJoin,StrokeLineJoin>
+    // ParsedValueImpl[1] is ParsedValueImpl<Value<?,Size>,Number> if miter limit is given, null otherwise.
+    // If the token is not a StrokeLineJoin, then null is returned.
+    private ParsedValueImpl[] parseStrokeLineJoin(final Term root)
+        throws ParseException {
+
+        final String keyword = getKeyword(root);
+
+        if ("miter".equals(keyword) ||
+            "bevel".equals(keyword) ||
+            "round".equals(keyword)) {
+
+            ParsedValueImpl<String,StrokeLineJoin> strokeLineJoin =
+                    new ParsedValueImpl<String,StrokeLineJoin>(keyword, new EnumConverter(StrokeLineJoin.class));
+
+            ParsedValueImpl<ParsedValue<?,Size>,Number> strokeMiterLimit = null;
+            if ("miter".equals(keyword)) {
+
+                Term next = root.nextInSeries;
+                if (next != null &&
+                    next.token != null &&
+                    isSize(next.token)) {
+
+                    root.nextInSeries = next.nextInSeries;
+                    ParsedValueImpl<?,Size> sizeVal = parseSize(next);
+                    strokeMiterLimit = new ParsedValueImpl<ParsedValue<?,Size>,Number>(sizeVal,SizeConverter.getInstance());
+                }
+
+            }
+
+            return new ParsedValueImpl[] { strokeLineJoin, strokeMiterLimit };
+        }
+        return null;
+    }
+
+    // Root term is the term just after the line-cap keyword
+    // If the token is not a StrokeLineCap, then null is returned.
+    private ParsedValueImpl<String,StrokeLineCap> parseStrokeLineCap(final Term root)
+        throws ParseException {
+
+        final String keyword = getKeyword(root);
+
+        if ("square".equals(keyword) ||
+            "butt".equals(keyword) ||
+            "round".equals(keyword)) {
+
+            return new ParsedValueImpl<String,StrokeLineCap>(keyword, new EnumConverter(StrokeLineCap.class));
+        }
+        return null;
+    }
+
+    /*
+     * http://www.w3.org/TR/css3-background/#the-border-image-slice
+     * [<number> | <percentage>]{1,4} && fill?
+     */
+    private ParsedValueImpl<ParsedValue[],BorderImageSlices> parseBorderImageSlice(final Term root)
+        throws ParseException {
+
+        Term term = root;
+        if (term.token == null || !isSize(term.token))
+                error(term, "Expected \'<size>\'");
+
+        ParsedValueImpl<?,Size>[] insets = new ParsedValueImpl[4];
+        Boolean fill = Boolean.FALSE;
+
+        int inset = 0;
+        while (inset < 4 && term != null) {
+            insets[inset++] = parseSize(term);
+
+            if ((term = term.nextInSeries) != null &&
+                 term.token != null &&
+                 term.token.getType() == CssLexer.IDENT) {
+
+                if("fill".equalsIgnoreCase(term.token.getText())) {
+                    fill = Boolean.TRUE;
+                    break;
+                }
+            }
+        }
+
+        if (inset < 2) insets[1] = insets[0]; // right = top
+        if (inset < 3) insets[2] = insets[0]; // bottom = top
+        if (inset < 4) insets[3] = insets[1]; // left = right
+
+        ParsedValueImpl[] values = new ParsedValueImpl[] {
+                new ParsedValueImpl<ParsedValue[],Insets>(insets, InsetsConverter.getInstance()),
+                new ParsedValueImpl<Boolean,Boolean>(fill, null)
+        };
+        return new ParsedValueImpl<ParsedValue[], BorderImageSlices>(values, BorderImageSliceConverter.getInstance());
+    }
+
+    private ParsedValueImpl<ParsedValue<ParsedValue[],BorderImageSlices>[],BorderImageSlices[]>
+            parseBorderImageSliceLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<ParsedValue[], BorderImageSlices>[] layers = new ParsedValueImpl[nLayers];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseBorderImageSlice(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue[],BorderImageSlices>[],BorderImageSlices[]> (layers, SliceSequenceConverter.getInstance());
+    }
+
+    /*
+     * http://www.w3.org/TR/css3-background/#border-image-width
+     * [ <length> | <percentage> | <number> | auto ]{1,4}
+     */
+    private ParsedValueImpl<ParsedValue[], BorderWidths> parseBorderImageWidth(final Term root)
+            throws ParseException {
+
+        Term term = root;
+        if (term.token == null || !isSize(term.token))
+            error(term, "Expected \'<size>\'");
+
+        ParsedValueImpl<?,Size>[] insets = new ParsedValueImpl[4];
+
+        int inset = 0;
+        while (inset < 4 && term != null) {
+            insets[inset++] = parseSize(term);
+
+            if ((term = term.nextInSeries) != null &&
+                    term.token != null &&
+                    term.token.getType() == CssLexer.IDENT) {
+            }
+        }
+
+        if (inset < 2) insets[1] = insets[0]; // right = top
+        if (inset < 3) insets[2] = insets[0]; // bottom = top
+        if (inset < 4) insets[3] = insets[1]; // left = right
+
+        return new ParsedValueImpl<ParsedValue[], BorderWidths>(insets, BorderImageWidthConverter.getInstance());
+    }
+
+    private ParsedValueImpl<ParsedValue<ParsedValue[],BorderWidths>[],BorderWidths[]>
+        parseBorderImageWidthLayers(final Term root) throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+        ParsedValueImpl<ParsedValue[], BorderWidths>[] layers = new ParsedValueImpl[nLayers];
+        int layer = 0;
+        Term term = root;
+        while (term != null) {
+            layers[layer++] = parseBorderImageWidth(term);
+            term = nextLayer(term);
+        }
+        return new ParsedValueImpl<ParsedValue<ParsedValue[],BorderWidths>[],BorderWidths[]> (layers, BorderImageWidthsSequenceConverter.getInstance());
+    }
+
+    // parse a Region value
+    // i.e., region(".styleClassForRegion") or region("#idForRegion")
+    private static final String SPECIAL_REGION_URL_PREFIX = "SPECIAL-REGION-URL:";
+    private ParsedValueImpl<String,String> parseRegion(Term root)
+            throws ParseException {
+        // first term in the chain is the function name...
+        final String fn = (root.token != null) ? root.token.getText() : null;
+        if (!"region".regionMatches(true, 0, fn, 0, 6)) {
+            error(root,"Expected \'region\'");
+        }
+
+        Term arg = root.firstArg;
+        if (arg == null) error(root, "Expected \'region(\"<styleclass-or-id-string>\")\'");
+
+        if (arg.token == null ||
+                arg.token.getType() != CssLexer.STRING ||
+                arg.token.getText() == null ||
+                arg.token.getText().isEmpty())  error(root, "Expected \'region(\"<styleclass-or-id-string>\")\'");
+
+        final String styleClassOrId = SPECIAL_REGION_URL_PREFIX+ Utils.stripQuotes(arg.token.getText());
+        return new ParsedValueImpl<String,String>(styleClassOrId, StringConverter.getInstance());
+    }
+
+    // url("<uri>") is tokenized by the lexer, so the root arg should be a URL token.
+    private ParsedValueImpl<ParsedValue[],String> parseURI(Term root)
+            throws ParseException {
+
+        if (root == null) error(root, "Expected \'url(\"<uri-string>\")\'");
+
+        if (root.token == null ||
+            root.token.getType() != CssLexer.URL ||
+            root.token.getText() == null ||
+            root.token.getText().isEmpty()) error(root, "Expected \'url(\"<uri-string>\")\'");
+
+        final String uri = root.token.getText();
+        ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
+            new ParsedValueImpl<String,String>(uri, StringConverter.getInstance()),
+            null // placeholder for Stylesheet URL
+        };
+        return new ParsedValueImpl<ParsedValue[],String>(uriValues, URLConverter.getInstance());
+    }
+
+    // parse a series of URI values separated by commas.
+    // i.e., <uri> [, <uri>]*
+    private ParsedValueImpl<ParsedValue<ParsedValue[],String>[],String[]> parseURILayers(Term root)
+            throws ParseException {
+
+        int nLayers = numberOfLayers(root);
+
+        Term temp = root;
+        int layer = 0;
+        ParsedValueImpl<ParsedValue[],String>[] layers = new ParsedValueImpl[nLayers];
+
+        while(temp != null) {
+            layers[layer++] = parseURI(temp);
+            temp = nextLayer(temp);
+        }
+
+        return new ParsedValueImpl<ParsedValue<ParsedValue[],String>[],String[]>(layers, URLConverter.SequenceConverter.getInstance());
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //
+    // http://www.w3.org/TR/css3-fonts
+    //
+    ////////////////////////////////////////////////////////////////////////////
+
+    /* http://www.w3.org/TR/css3-fonts/#font-size-the-font-size-property */
+    private ParsedValueImpl<ParsedValue<?,Size>,Number> parseFontSize(final Term root) throws ParseException {
+
+        if (root == null) return null;
+        final Token token = root.token;
+        if (token == null || !isSize(token)) error(root, "Expected \'<font-size>\'");
+
+        Size size = null;
+        if (token.getType() == CssLexer.IDENT) {
+            final String ident = token.getText().toLowerCase(Locale.ROOT);
+            double value = -1;
+            if ("inherit".equals(ident)) {
+                value = 100;
+            } else if ("xx-small".equals(ident)) {
+                value = 60;
+            } else if ("x-small".equals(ident)) {
+                value = 75;
+            } else if ("small".equals(ident)) {
+                value = 80;
+            } else if ("medium".equals(ident)) {
+                value = 100;
+            } else if ("large".equals(ident)) {
+                value = 120;
+            } else if ("x-large".equals(ident)) {
+                value = 150;
+            } else if ("xx-large".equals(ident)) {
+                value = 200;
+            } else if ("smaller".equals(ident)) {
+                value = 80;
+            } else if ("larger".equals(ident)) {
+                value = 120;
+            }
+
+            if (value > -1) {
+                size = new Size(value, SizeUnits.PERCENT);
+            }
+        }
+
+        // if size is null, then size is not one of the keywords above.
+        if (size == null) {
+            size = size(token);
+        }
+
+        ParsedValueImpl<?,Size> svalue = new ParsedValueImpl<Size,Size>(size, null);
+        return new ParsedValueImpl<ParsedValue<?,Size>,Number>(svalue, FontConverter.FontSizeConverter.getInstance());
+    }
+
+    /* http://www.w3.org/TR/css3-fonts/#font-style-the-font-style-property */
+    private ParsedValueImpl<String,FontPosture> parseFontStyle(Term root) throws ParseException {
+
+        if (root == null) return null;
+        final Token token = root.token;
+        if (token == null ||
+            token.getType() != CssLexer.IDENT ||
+            token.getText() == null ||
+            token.getText().isEmpty()) error(root, "Expected \'<font-style>\'");
+
+        final String ident = token.getText().toLowerCase(Locale.ROOT);
+        String posture = FontPosture.REGULAR.name();
+
+        if ("normal".equals(ident)) {
+            posture = FontPosture.REGULAR.name();
+        } else if ("italic".equals(ident)) {
+            posture = FontPosture.ITALIC.name();
+        } else if ("oblique".equals(ident)) {
+            posture = FontPosture.ITALIC.name();
+        } else if ("inherit".equals(ident)) {
+            posture = "inherit";
+        } else {
+            return null;
+        }
+
+        return new ParsedValueImpl<String,FontPosture>(posture, FontConverter.FontStyleConverter.getInstance());
+    }
+
+    /* http://www.w3.org/TR/css3-fonts/#font-weight-the-font-weight-property */
+    private ParsedValueImpl<String, FontWeight> parseFontWeight(Term root) throws ParseException {
+
+        if (root == null) return null;
+        final Token token = root.token;
+        if (token == null ||
+            token.getText() == null ||
+            token.getText().isEmpty()) error(root, "Expected \'<font-weight>\'");
+
+        final String ident = token.getText().toLowerCase(Locale.ROOT);
+        String weight = FontWeight.NORMAL.name();
+
+        if ("inherit".equals(ident)) {
+            weight = FontWeight.NORMAL.name();
+        } else if ("normal".equals(ident)) {
+            weight = FontWeight.NORMAL.name();
+        } else if ("bold".equals(ident)) {
+            weight = FontWeight.BOLD.name();
+        } else if ("bolder".equals(ident)) {
+            weight = FontWeight.BOLD.name();
+        } else if ("lighter".equals(ident)) {
+            weight = FontWeight.LIGHT.name();
+        } else if ("100".equals(ident)) {
+            weight = FontWeight.findByWeight(100).name();
+        } else if ("200".equals(ident)) {
+            weight = FontWeight.findByWeight(200).name();
+        } else if ("300".equals(ident)) {
+            weight = FontWeight.findByWeight(300).name();
+        } else if ("400".equals(ident)) {
+            weight = FontWeight.findByWeight(400).name();
+        } else if ("500".equals(ident)) {
+            weight = FontWeight.findByWeight(500).name();
+        } else if ("600".equals(ident)) {
+            weight = FontWeight.findByWeight(600).name();
+        } else if ("700".equals(ident)) {
+            weight = FontWeight.findByWeight(700).name();
+        } else if ("800".equals(ident)) {
+            weight = FontWeight.findByWeight(800).name();
+        } else if ("900".equals(ident)) {
+            weight = FontWeight.findByWeight(900).name();
+        } else {
+            error(root, "Expected \'<font-weight>\'");
+        }
+        return new ParsedValueImpl<String,FontWeight>(weight, FontConverter.FontWeightConverter.getInstance());
+    }
+
+    private ParsedValueImpl<String,String>  parseFontFamily(Term root) throws ParseException {
+
+        if (root == null) return null;
+        final Token token = root.token;
+        String text = null;
+        if (token == null ||
+            (token.getType() != CssLexer.IDENT &&
+             token.getType() != CssLexer.STRING) ||
+            (text = token.getText()) == null ||
+            text.isEmpty()) error(root, "Expected \'<font-family>\'");
+
+        final String fam = stripQuotes(text.toLowerCase(Locale.ROOT));
+        if ("inherit".equals(fam)) {
+            return new ParsedValueImpl<String,String>("inherit", StringConverter.getInstance());
+        } else if ("serif".equals(fam) ||
+            "sans-serif".equals(fam) ||
+            "cursive".equals(fam) ||
+            "fantasy".equals(fam) ||
+            "monospace".equals(fam)) {
+            return new ParsedValueImpl<String,String>(fam, StringConverter.getInstance());
+        } else {
+            return new ParsedValueImpl<String,String>(token.getText(), StringConverter.getInstance());
+        }
+    }
+
+    // (fontStyle || fontVariant || fontWeight)* fontSize (SOLIDUS size)? fontFamily
+    private ParsedValueImpl<ParsedValue[],Font> parseFont(Term root) throws ParseException {
+
+        // Because style, variant, weight, size and family can inherit
+        // AND style, variant and weight are optional, parsing this backwards
+        // is easier.
+        Term next = root.nextInSeries;
+        root.nextInSeries = null;
+        while (next != null) {
+            Term temp = next.nextInSeries;
+            next.nextInSeries = root;
+            root = next;
+            next = temp;
+        }
+
+        // Now, root should point to fontFamily
+        Token token = root.token;
+        int ttype = token.getType();
+        if (ttype != CssLexer.IDENT &&
+            ttype != CssLexer.STRING) error(root, "Expected \'<font-family>\'");
+        ParsedValueImpl<String,String> ffamily = parseFontFamily(root);
+
+        Term term = root;
+        if ((term = term.nextInSeries) == null) error(root, "Expected \'<size>\'");
+        if (term.token == null || !isSize(term.token)) error(term, "Expected \'<size>\'");
+
+        // Now, term could be the font size or it could be the line-height.
+        // If the next term is a forward slash, then it's line-height.
+        Term temp;
+        if (((temp = term.nextInSeries) != null) &&
+            (temp.token != null && temp.token.getType() == CssLexer.SOLIDUS)) {
+
+            root = temp;
+
+            if ((term = temp.nextInSeries) == null) error(root, "Expected \'<size>\'");
+            if (term.token == null || !isSize(term.token)) error(term, "Expected \'<size>\'");
+
+            token = term.token;
+        }
+
+        ParsedValueImpl<ParsedValue<?,Size>,Number> fsize = parseFontSize(term);
+        if (fsize == null) error(root, "Expected \'<size>\'");
+
+        ParsedValueImpl<String,FontPosture> fstyle = null;
+        ParsedValueImpl<String,FontWeight> fweight = null;
+        String fvariant = null;
+
+        while ((term = term.nextInSeries) != null) {
+
+            if (term.token == null ||
+                term.token.getType() != CssLexer.IDENT ||
+                term.token.getText() == null ||
+                term.token.getText().isEmpty())
+                error(term, "Expected \'<font-weight>\', \'<font-style>\' or \'<font-variant>\'");
+
+            if (fstyle == null && ((fstyle = parseFontStyle(term)) != null)) {
+                ;
+            } else if (fvariant == null && "small-caps".equalsIgnoreCase(term.token.getText())) {
+                fvariant = term.token.getText();
+            } else if (fweight == null && ((fweight = parseFontWeight(term)) != null)) {
+                ;
+            }
+        }
+
+        ParsedValueImpl[] values = new ParsedValueImpl[]{ ffamily, fsize, fweight, fstyle };
+        return new ParsedValueImpl<ParsedValue[],Font>(values, FontConverter.getInstance());
+    }
+
+    //
+    // Parser state machine
+    //
+    Token currentToken = null;
+
+    // return the next token that is not whitespace.
+    private Token nextToken(CssLexer lexer) {
+
+        Token token = null;
+
+        do {
+            token = lexer.nextToken();
+        } while ((token != null) &&
+                (token.getType() == CssLexer.WS) ||
+                (token.getType() == CssLexer.NL));
+
+        if (LOGGER.isLoggable(Level.FINEST)) {
+            LOGGER.finest(token.toString());
+        }
+
+        return token;
+
+    }
+
+    // keep track of what is in process of being parsed to avoid import loops
+    private static Stack<String> imports;
+
+    private void parse(Stylesheet stylesheet, CssLexer lexer) {
+
+        // need to read the first token
+        currentToken = nextToken(lexer);
+
+        while((currentToken != null) &&
+                (currentToken.getType() == CssLexer.AT_KEYWORD)) {
+
+            currentToken = nextToken(lexer);
+
+            if (currentToken == null || currentToken.getType() != CssLexer.IDENT) {
+
+                // just using ParseException for a nice error message, not for throwing the exception.
+                ParseException parseException = new ParseException("Expected IDENT", currentToken, this);
+                final String msg = parseException.toString();
+                ParseError error = createError(msg);
+                if (LOGGER.isLoggable(Level.WARNING)) {
+                    LOGGER.warning(error.toString());
+                }
+                reportError(error);
+
+                // get past EOL or SEMI
+                do {
+                    currentToken = lexer.nextToken();
+                } while ((currentToken != null) &&
+                        (currentToken.getType() == CssLexer.SEMI) ||
+                        (currentToken.getType() == CssLexer.WS) ||
+                        (currentToken.getType() == CssLexer.NL));
+                continue;
+            }
+
+            String keyword = currentToken.getText().toLowerCase(Locale.ROOT);
+            if ("font-face".equals(keyword)) {
+                FontFace fontFace = fontFace(lexer);
+                if (fontFace != null) stylesheet.getFontFaces().add(fontFace);
+                currentToken = nextToken(lexer);
+                continue;
+
+            } else if ("import".equals(keyword)) {
+
+                if (CssParser.imports == null) {
+                    CssParser.imports = new Stack<>();
+                }
+
+                if (!imports.contains(sourceOfStylesheet)) {
+
+                    imports.push(sourceOfStylesheet);
+
+                    Stylesheet importedStylesheet = handleImport(lexer);
+
+                    if (importedStylesheet != null) {
+                        stylesheet.importStylesheet(importedStylesheet);
+                    }
+
+                    imports.pop();
+
+                    if (CssParser.imports.isEmpty()) {
+                        CssParser.imports = null;
+                    }
+
+                } else {
+// Import imports import!
+                    final int line = currentToken.getLine();
+                    final int pos = currentToken.getOffset();
+                    final String msg =
+                            MessageFormat.format("Recursive @import at {2} [{0,number,#},{1,number,#}]",
+                                    line, pos, imports.peek());
+                    ParseError error = createError(msg);
+                    if (LOGGER.isLoggable(Level.WARNING)) {
+                        LOGGER.warning(error.toString());
+                    }
+                    reportError(error);
+                }
+
+                // get past EOL or SEMI
+                do {
+                    currentToken = lexer.nextToken();
+                } while ((currentToken != null) &&
+                        (currentToken.getType() == CssLexer.SEMI) ||
+                        (currentToken.getType() == CssLexer.WS) ||
+                        (currentToken.getType() == CssLexer.NL));
+
+                continue;
+
+            }
+        }
+
+        while ((currentToken != null) &&
+               (currentToken.getType() != Token.EOF)) {
+
+            List<Selector> selectors = selectors(lexer);
+            if (selectors == null) return;
+
+            if ((currentToken == null) ||
+                (currentToken.getType() != CssLexer.LBRACE)) {
+                    final int line = currentToken != null ? currentToken.getLine() : -1;
+                    final int pos = currentToken != null ? currentToken.getOffset() : -1;
+                    final String msg =
+                        MessageFormat.format("Expected LBRACE at [{0,number,#},{1,number,#}]",
+                                line, pos);
+                    ParseError error = createError(msg);
+                    if (LOGGER.isLoggable(Level.WARNING)) {
+                        LOGGER.warning(error.toString());
+                    }
+                    reportError(error);
+                currentToken = null;
+                return;
+            }
+
+            // get past the LBRACE
+            currentToken = nextToken(lexer);
+
+            List<Declaration> declarations = declarations(lexer);
+            if (declarations == null) return;
+
+            if ((currentToken != null) &&
+                (currentToken.getType() != CssLexer.RBRACE)) {
+                    final int line = currentToken.getLine();
+                    final int pos = currentToken.getOffset();
+                    final String msg =
+                        MessageFormat.format("Expected RBRACE at [{0,number,#},{1,number,#}]",
+                                line, pos);
+                    ParseError error = createError(msg);
+                    if (LOGGER.isLoggable(Level.WARNING)) {
+                        LOGGER.warning(error.toString());
+                    }
+                    reportError(error);
+                currentToken = null;
+                return;
+            }
+
+            stylesheet.getRules().add(new Rule(selectors, declarations));
+
+            currentToken = nextToken(lexer);
+
+        }
+        currentToken = null;
+    }
+
+    private FontFace fontFace(CssLexer lexer) {
+        final Map<String,String> descriptors = new HashMap<String,String>();
+        final List<FontFaceImpl.FontFaceSrc> sources = new ArrayList<FontFaceImpl.FontFaceSrc>();
+        while(true) {
+            currentToken = nextToken(lexer);
+            if (currentToken.getType() == CssLexer.IDENT) {
+                String key = currentToken.getText();
+                // ignore the colon that follows
+                currentToken = nextToken(lexer);
+                // get the next token after colon
+                currentToken = nextToken(lexer);
+                // ignore all but "src"
+                if ("src".equalsIgnoreCase(key)) {
+                    while(true) {
+                        if((currentToken != null) &&
+                                (currentToken.getType() != CssLexer.SEMI) &&
+                                (currentToken.getType() != CssLexer.RBRACE) &&
+                                (currentToken.getType() != Token.EOF)) {
+
+                            if (currentToken.getType() == CssLexer.IDENT) {
+                                // simple reference to other font-family
+                                sources.add(new FontFaceImpl.FontFaceSrc(FontFaceImpl.FontFaceSrcType.REFERENCE,currentToken.getText()));
+
+                            } else if (currentToken.getType() == CssLexer.URL) {
+
+                                // let URLConverter do the conversion
+                                ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>(currentToken.getText(), StringConverter.getInstance()),
+                                        new ParsedValueImpl<String,String>(sourceOfStylesheet, null)
+                                };
+                                ParsedValue<ParsedValue[], String> parsedValue =
+                                        new ParsedValueImpl<ParsedValue[], String>(uriValues, URLConverter.getInstance());
+                                String urlStr = parsedValue.convert(null);
+
+                                URL url = null;
+                                try {
+                                    URI fontUri = new URI(urlStr);
+                                    url = fontUri.toURL();
+                                } catch (URISyntaxException |  MalformedURLException malf) {
+
+                                    final int line = currentToken.getLine();
+                                    final int pos = currentToken.getOffset();
+                                    final String msg = MessageFormat.format("Could not resolve @font-face url [{2}] at [{0,number,#},{1,number,#}]", line, pos, urlStr);
+                                    ParseError error = createError(msg);
+                                    if (LOGGER.isLoggable(Level.WARNING)) {
+                                        LOGGER.warning(error.toString());
+                                    }
+                                    reportError(error);
+
+                                    // skip the rest.
+                                    while(currentToken != null) {
+                                        int ttype = currentToken.getType();
+                                        if (ttype == CssLexer.RBRACE ||
+                                                ttype == Token.EOF) {
+                                            return null;
+                                        }
+                                        currentToken = nextToken(lexer);
+                                    }
+                                }
+
+                                String format = null;
+                                while(true) {
+                                    currentToken = nextToken(lexer);
+                                    final int ttype = (currentToken != null) ? currentToken.getType() : Token.EOF;
+                                    if (ttype == CssLexer.FUNCTION) {
+                                        if ("format(".equalsIgnoreCase(currentToken.getText())) {
+                                            continue;
+                                        } else {
+                                            break;
+                                        }
+                                    } else if (ttype == CssLexer.IDENT ||
+                                            ttype == CssLexer.STRING) {
+
+                                        format = Utils.stripQuotes(currentToken.getText());
+                                    } else if (ttype == CssLexer.RPAREN) {
+                                        continue;
+                                    } else {
+                                        break;
+                                    }
+                                }
+                                sources.add(new FontFaceImpl.FontFaceSrc(FontFaceImpl.FontFaceSrcType.URL,url.toExternalForm(), format));
+
+                            } else if (currentToken.getType() == CssLexer.FUNCTION) {
+                                if ("local(".equalsIgnoreCase(currentToken.getText())) {
+                                    // consume the function token
+                                    currentToken = nextToken(lexer);
+                                    // parse function contents
+                                    final StringBuilder localSb = new StringBuilder();
+                                    while(true) {
+                                        if((currentToken != null) && (currentToken.getType() != CssLexer.RPAREN) &&
+                                                (currentToken.getType() != Token.EOF)) {
+                                            localSb.append(currentToken.getText());
+                                        } else {
+                                            break;
+                                        }
+                                        currentToken = nextToken(lexer);
+                                    }
+                                    int start = 0, end = localSb.length();
+                                    if (localSb.charAt(start) == '\'' || localSb.charAt(start) == '\"') start ++;
+                                    if (localSb.charAt(end-1) == '\'' || localSb.charAt(end-1) == '\"') end --;
+                                    final String local = localSb.substring(start,end);
+                                    sources.add(new FontFaceImpl.FontFaceSrc(FontFaceImpl.FontFaceSrcType.LOCAL,local));
+                                } else {
+                                    // error unknown fontface src type
+                                    final int line = currentToken.getLine();
+                                    final int pos = currentToken.getOffset();
+                                    final String msg = MessageFormat.format("Unknown @font-face src type [" + currentToken.getText() + ")] at [{0,number,#},{1,number,#}]", line, pos);
+                                    ParseError error = createError(msg);
+                                    if (LOGGER.isLoggable(Level.WARNING)) {
+                                        LOGGER.warning(error.toString());
+                                    }
+                                    reportError(error);
+
+                                }
+                            } else  if (currentToken.getType() == CssLexer.COMMA) {
+                                // ignore
+                            } else {
+                                // error unexpected token
+                                final int line = currentToken.getLine();
+                                final int pos = currentToken.getOffset();
+                                final String msg = MessageFormat.format("Unexpected TOKEN [" + currentToken.getText() + "] at [{0,number,#},{1,number,#}]", line, pos);
+                                ParseError error = createError(msg);
+                                if (LOGGER.isLoggable(Level.WARNING)) {
+                                    LOGGER.warning(error.toString());
+                                }
+                                reportError(error);
+                            }
+                        } else {
+                            break;
+                        }
+                        currentToken = nextToken(lexer);
+                    }
+                } else {
+                    StringBuilder descriptorVal = new StringBuilder();
+                    while(true) {
+                        if((currentToken != null) && (currentToken.getType() != CssLexer.SEMI) &&
+                            (currentToken.getType() != Token.EOF)) {
+                            descriptorVal.append(currentToken.getText());
+                        } else {
+                            break;
+                        }
+                        currentToken = nextToken(lexer);
+                    }
+                    descriptors.put(key,descriptorVal.toString());
+                }
+//                continue;
+            }
+
+            if ((currentToken == null) ||
+                (currentToken.getType() == CssLexer.RBRACE) ||
+                (currentToken.getType() == Token.EOF)) {
+                break;
+            }
+
+        }
+        return new FontFaceImpl(descriptors, sources);
+    }
+
+    private Stylesheet handleImport(CssLexer lexer) {
+        currentToken = nextToken(lexer);
+
+        if (currentToken == null || currentToken.getType() == Token.EOF) {
+            return null;
+        }
+
+        int ttype = currentToken.getType();
+
+        String fname = null;
+        if (ttype == CssLexer.STRING || ttype == CssLexer.URL) {
+            fname = currentToken.getText();
+        }
+
+        Stylesheet importedStylesheet = null;
+        final String _sourceOfStylesheet = sourceOfStylesheet;
+
+        if (fname != null) {
+            // let URLConverter do the conversion
+            ParsedValueImpl[] uriValues = new ParsedValueImpl[] {
+                    new ParsedValueImpl<String,String>(fname, StringConverter.getInstance()),
+                    new ParsedValueImpl<String,String>(sourceOfStylesheet, null)
+            };
+            ParsedValue<ParsedValue[], String> parsedValue =
+                    new ParsedValueImpl<ParsedValue[], String>(uriValues, URLConverter.getInstance());
+
+            String urlString = parsedValue.convert(null);
+            importedStylesheet = StyleManager.loadStylesheet(urlString);
+
+            // When we load an imported stylesheet, the sourceOfStylesheet field
+            // gets set to the new stylesheet. Once it is done loading we must reset
+            // this field back to the previous value, otherwise we will potentially
+            // run into problems (for example, see RT-40346).
+            sourceOfStylesheet = _sourceOfStylesheet;
+        }
+        if (importedStylesheet == null) {
+            final String msg =
+                    MessageFormat.format("Could not import {0}", fname);
+            ParseError error = createError(msg);
+            if (LOGGER.isLoggable(Level.WARNING)) {
+                LOGGER.warning(error.toString());
+            }
+            reportError(error);
+        }
+        return importedStylesheet;
+    }
+
+    private List<Selector> selectors(CssLexer lexer) {
+
+        List<Selector> selectors = new ArrayList<Selector>();
+
+        while(true) {
+            Selector selector = selector(lexer);
+            if (selector == null) {
+                // some error happened, skip the rule...
+                while ((currentToken != null) &&
+                       (currentToken.getType() != CssLexer.RBRACE) &&
+                       (currentToken.getType() != Token.EOF)) {
+                    currentToken = nextToken(lexer);
+                }
+
+                // current token is either RBRACE or EOF. Calling
+                // currentToken will get the next token or EOF.
+                currentToken = nextToken(lexer);
+
+                // skipped the last rule?
+                if (currentToken == null || currentToken.getType() == Token.EOF) {
+                    currentToken = null;
+                    return null;
+                }
+
+                continue;
+            }
+            selectors.add(selector);
+
+            if ((currentToken != null) &&
+                (currentToken.getType() == CssLexer.COMMA)) {
+                // get past the comma
+                currentToken = nextToken(lexer);
+                continue;
+            }
+
+            // currentToken was either null or not a comma
+            // so we are done with selectors.
+            break;
+        }
+
+        return selectors;
+    }
+
+    private Selector selector(CssLexer lexer) {
+
+        List<Combinator> combinators = null;
+        List<SimpleSelector> sels = null;
+
+        SimpleSelector ancestor = simpleSelector(lexer);
+        if (ancestor == null) return null;
+
+        while (true) {
+            Combinator comb = combinator(lexer);
+            if (comb != null) {
+                if (combinators == null) {
+                    combinators = new ArrayList<Combinator>();
+                }
+                combinators.add(comb);
+                SimpleSelector descendant = simpleSelector(lexer);
+                if (descendant == null) return null;
+                if (sels == null) {
+                    sels = new ArrayList<SimpleSelector>();
+                    sels.add(ancestor);
+                }
+                sels.add(descendant);
+            } else {
+                break;
+            }
+        }
+
+        // RT-15473
+        // We might return from selector with a NL token instead of an
+        // LBRACE, so skip past the NL here.
+        if (currentToken != null && currentToken.getType() == CssLexer.NL) {
+            currentToken = nextToken(lexer);
+        }
+
+
+        if (sels == null) {
+            return ancestor;
+        } else {
+            return new CompoundSelector(sels,combinators);
+        }
+
+    }
+
+    private SimpleSelector simpleSelector(CssLexer lexer) {
+
+        String esel = "*"; // element selector. default to universal
+        String isel = ""; // id selector
+        List<String> csels = null; // class selector
+        List<String> pclasses = null; // pseudoclasses
+
+        while (true) {
+
+            final int ttype =
+                (currentToken != null) ? currentToken.getType() : Token.INVALID;
+
+            switch(ttype) {
+                // element selector
+                case CssLexer.STAR:
+                case CssLexer.IDENT:
+                    esel = currentToken.getText();
+                    break;
+
+                // class selector
+                case CssLexer.DOT:
+                    currentToken = nextToken(lexer);
+                    if (currentToken != null &&
+                        currentToken.getType() == CssLexer.IDENT) {
+                        if (csels == null) {
+                            csels = new ArrayList<String>();
+                        }
+                        csels.add(currentToken.getText());
+                    } else {
+                        currentToken = Token.INVALID_TOKEN;
+                        return null;
+                    }
+                    break;
+
+                // id selector
+                case CssLexer.HASH:
+                    isel = currentToken.getText().substring(1);
+                    break;
+
+                case CssLexer.COLON:
+                    currentToken = nextToken(lexer);
+                    if (currentToken != null && pclasses == null) {
+                        pclasses = new ArrayList<String>();
+                    }
+
+                    if (currentToken.getType() == CssLexer.IDENT) {
+                        pclasses.add(currentToken.getText());
+                    } else if (currentToken.getType() == CssLexer.FUNCTION){
+                        String pclass = functionalPseudo(lexer);
+                        pclasses.add(pclass);
+                    } else {
+                        currentToken = Token.INVALID_TOKEN;
+                    }
+
+                    if (currentToken.getType() == Token.INVALID) {
+                        return null;
+                    }
+                    break;
+
+                case CssLexer.NL:
+                case CssLexer.WS:
+                case CssLexer.COMMA:
+                case CssLexer.GREATER:
+                case CssLexer.LBRACE:
+                case Token.EOF:
+                    return new SimpleSelector(esel, csels, pclasses, isel);
+
+                default:
+                    return null;
+
+
+            }
+
+            // get the next token, but don't skip whitespace
+            // since it may be a combinator
+            currentToken = lexer.nextToken();
+            if (LOGGER.isLoggable(Level.FINEST)) {
+                LOGGER.finest(currentToken.toString());
+            }
+        }
+    }
+
+    // From http://www.w3.org/TR/selectors/#grammar
+    //  functional_pseudo
+    //      : FUNCTION S* expression ')'
+    //      ;
+    //  expression
+    //      /* In CSS3, the expressions are identifiers, strings, */
+    //      /* or of the form "an+b" */
+    //      : [ [ PLUS | '-' | DIMENSION | NUMBER | STRING | IDENT ] S* ]+
+    //      ;
+    private String functionalPseudo(CssLexer lexer) {
+
+        // TODO: This is not how we should handle functional pseudo-classes in the long-run!
+
+        StringBuilder pclass = new StringBuilder(currentToken.getText());
+
+        while(true) {
+
+            currentToken = nextToken(lexer);
+
+            switch(currentToken.getType()) {
+
+                // TODO: lexer doesn't really scan right and isn't CSS3,
+                // so PLUS, '-', NUMBER, etc are all useless at this point.
+                case CssLexer.STRING:
+                case CssLexer.IDENT:
+                    pclass.append(currentToken.getText());
+                    break;
+
+                case CssLexer.RPAREN:
+                    pclass.append(')');
+                    return pclass.toString();
+
+                default:
+                    currentToken = Token.INVALID_TOKEN;
+                    return null;
+            }
+        }
+
+    }
+
+    private Combinator combinator(CssLexer lexer) {
+
+        Combinator combinator = null;
+
+        while (true) {
+
+            final int ttype =
+                (currentToken != null) ? currentToken.getType() : Token.INVALID;
+
+            switch(ttype) {
+
+                case CssLexer.WS:
+                    // need to check if combinator is null since child token
+                    // might be surrounded by whitespace.
+                    if (combinator == null && " ".equals(currentToken.getText())) {
+                        combinator = Combinator.DESCENDANT;
+                    }
+                    break;
+
+                case CssLexer.GREATER:
+                    // no need to check if combinator is null here
+                    combinator = Combinator.CHILD;
+                    break;
+
+                case CssLexer.STAR:
+                case CssLexer.IDENT:
+                case CssLexer.DOT:
+                case CssLexer.HASH:
+                case CssLexer.COLON:
+                    return combinator;
+
+                default:
+                    // only selector is expected
+                    return null;
+
+            }
+
+            // get the next token, but don't skip whitespace
+            currentToken = lexer.nextToken();
+            if (LOGGER.isLoggable(Level.FINEST)) {
+                LOGGER.finest(currentToken.toString());
+            }
+        }
+    }
+
+    private List<Declaration> declarations(CssLexer lexer) {
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+
+        while (true) {
+
+            Declaration decl = declaration(lexer);
+            if (decl != null) {
+                declarations.add(decl);
+            } else {
+                // some error happened, skip the decl...
+                while ((currentToken != null) &&
+                       (currentToken.getType() != CssLexer.SEMI) &&
+                       (currentToken.getType() != CssLexer.RBRACE) &&
+                       (currentToken.getType() != Token.EOF)) {
+                    currentToken = nextToken(lexer);
+                }
+
+                // current token is either SEMI, RBRACE or EOF.
+                if (currentToken != null &&
+                    currentToken.getType() != CssLexer.SEMI)
+                    return declarations;
+            }
+
+            // declaration; declaration; ???
+            // RT-17830 - allow declaration;;
+            while ((currentToken != null) &&
+                    (currentToken.getType() == CssLexer.SEMI)) {
+                currentToken = nextToken(lexer);
+            }
+
+            // if it is delcaration; declaration, then the
+            // next token should be an IDENT.
+            if ((currentToken != null) &&
+                (currentToken.getType() == CssLexer.IDENT)) {
+                continue;
+            }
+
+            break;
+        }
+
+        return declarations;
+    }
+
+    private Declaration declaration(CssLexer lexer) {
+
+        final int ttype =
+            (currentToken != null) ? currentToken.getType() : Token.INVALID;
+
+        if ((currentToken == null) ||
+            (currentToken.getType() != CssLexer.IDENT)) {
+//
+//            RT-16547: this warning was misleading because an empty rule
+//            not invalid. Some people put in empty rules just as placeholders.
+//
+//            if (LOGGER.isLoggable(PlatformLogger.WARNING)) {
+//                final int line = currentToken != null ? currentToken.getLine() : -1;
+//                final int pos = currentToken != null ? currentToken.getOffset() : -1;
+//                final String url =
+//                    (stylesheet != null && stylesheet.getUrl() != null) ?
+//                        stylesheet.getUrl().toExternalForm() : "?";
+//                LOGGER.warning("Expected IDENT at {0}[{1,number,#},{2,number,#}]",
+//                    url,line,pos);
+//            }
+            return null;
+        }
+
+        String property = currentToken.getText();
+
+        currentToken = nextToken(lexer);
+
+        if ((currentToken == null) ||
+            (currentToken.getType() != CssLexer.COLON)) {
+                final int line = currentToken.getLine();
+                final int pos = currentToken.getOffset();
+                final String msg =
+                        MessageFormat.format("Expected COLON at [{0,number,#},{1,number,#}]",
+                                line, pos);
+                ParseError error = createError(msg);
+                if (LOGGER.isLoggable(Level.WARNING)) {
+                    LOGGER.warning(error.toString());
+                }
+                reportError(error);
+            return null;
+        }
+
+        currentToken = nextToken(lexer);
+
+        Term root = expr(lexer);
+        ParsedValueImpl value = null;
+        try {
+            value = (root != null) ? valueFor(property, root, lexer) : null;
+        } catch (ParseException re) {
+                Token badToken = re.tok;
+                final int line = badToken != null ? badToken.getLine() : -1;
+                final int pos = badToken != null ? badToken.getOffset() : -1;
+                final String msg =
+                        MessageFormat.format("{2} while parsing ''{3}'' at [{0,number,#},{1,number,#}]",
+                    line,pos,re.getMessage(),property);
+                ParseError error = createError(msg);
+                if (LOGGER.isLoggable(Level.WARNING)) {
+                    LOGGER.warning(error.toString());
+                }
+                reportError(error);
+            return null;
+        }
+
+        boolean important = currentToken.getType() == CssLexer.IMPORTANT_SYM;
+        if (important) currentToken = nextToken(lexer);
+
+        Declaration decl = (value != null)
+                ? new Declaration(property.toLowerCase(Locale.ROOT), value, important) : null;
+        return decl;
+    }
+
+    private Term expr(CssLexer lexer) {
+
+        final Term expr = term(lexer);
+        Term current = expr;
+
+        while(true) {
+
+            // if current is null, then term returned null
+            final int ttype =
+                (current != null && currentToken != null)
+                    ? currentToken.getType() : Token.INVALID;
+
+            if (ttype == Token.INVALID) {
+                skipExpr(lexer);
+                return null;
+            } else if (ttype == CssLexer.SEMI ||
+                ttype == CssLexer.IMPORTANT_SYM ||
+                ttype == CssLexer.RBRACE ||
+                ttype == Token.EOF) {
+                return expr;
+            } else if (ttype == CssLexer.COMMA) {
+            // comma breaks up sequences of terms.
+                // next series of terms chains off the last term in
+                // the current series.
+                currentToken = nextToken(lexer);
+                current = current.nextLayer = term(lexer);
+            } else {
+                current = current.nextInSeries = term(lexer);
+            }
+
+        }
+    }
+
+    private void skipExpr(CssLexer lexer) {
+
+        while(true) {
+
+            currentToken = nextToken(lexer);
+
+            final int ttype =
+                (currentToken != null) ? currentToken.getType() : Token.INVALID;
+
+            if (ttype == CssLexer.SEMI ||
+                ttype == CssLexer.RBRACE ||
+                ttype == Token.EOF) {
+                return;
+            }
+        }
+    }
+
+    private Term term(CssLexer lexer) {
+
+        final int ttype =
+            (currentToken != null) ? currentToken.getType() : Token.INVALID;
+
+        switch (ttype) {
+
+            case CssLexer.NUMBER:
+            case CssLexer.CM:
+            case CssLexer.EMS:
+            case CssLexer.EXS:
+            case CssLexer.IN:
+            case CssLexer.MM:
+            case CssLexer.PC:
+            case CssLexer.PT:
+            case CssLexer.PX:
+            case CssLexer.DEG:
+            case CssLexer.GRAD:
+            case CssLexer.RAD:
+            case CssLexer.TURN:
+            case CssLexer.PERCENTAGE:
+            case CssLexer.SECONDS:
+            case CssLexer.MS:
+                break;
+
+            case CssLexer.STRING:
+                break;
+            case CssLexer.IDENT:
+                break;
+
+            case CssLexer.HASH:
+                break;
+
+            case CssLexer.FUNCTION:
+            case CssLexer.LPAREN:
+
+                Term function = new Term(currentToken);
+                currentToken = nextToken(lexer);
+
+                Term arg = term(lexer);
+                function.firstArg = arg;
+
+                while(true) {
+
+                    final int operator =
+                        currentToken != null ? currentToken.getType() : Token.INVALID;
+
+                    if (operator == CssLexer.RPAREN) {
+                        currentToken = nextToken(lexer);
+                        return function;
+                    } else if (operator == CssLexer.COMMA) {
+                        // comma breaks up sequences of terms.
+                        // next series of terms chains off the last term in
+                        // the current series.
+                        currentToken = nextToken(lexer);
+                        arg = arg.nextArg = term(lexer);
+
+                    } else {
+                        arg = arg.nextInSeries = term(lexer);
+                    }
+
+                }
+
+            case CssLexer.URL:
+                break;
+
+            case CssLexer.SOLIDUS:
+                break;
+
+            default:
+                final int line = currentToken != null ? currentToken.getLine() : -1;
+                final int pos = currentToken != null ? currentToken.getOffset() : -1;
+                final String text = currentToken != null ? currentToken.getText() : "";
+                final String msg =
+                    MessageFormat.format("Unexpected token {0}{1}{0} at [{2,number,#},{3,number,#}]",
+                    "\'",text,line,pos);
+                ParseError error = createError(msg);
+                if (LOGGER.isLoggable(Level.WARNING)) {
+                    LOGGER.warning(error.toString());
+                }
+                reportError(error);
+                return null;
+//                currentToken = nextToken(lexer);
+//
+//                return new Term(Token.INVALID_TOKEN);
+        }
+
+        Term term = new Term(currentToken);
+        currentToken = nextToken(lexer);
+        return term;
+    }
+
+    public static ObservableList<ParseError> errorsProperty() {
+        return StyleManager.errorsProperty();
+    }
+
+
+
+    /**
+     * Encapsulate information about the source and nature of errors encountered
+     * while parsing CSS or applying styles to Nodes.
+     */
+    public static class ParseError {
+
+        /** @return The error message from the CSS code. */
+        public final String getMessage() {
+            return message;
+        }
+
+        public ParseError(String message) {
+            this.message = message;
+        }
+
+        final String message;
+
+        @Override public String toString() {
+            return "CSS Error: " + message;
+        }
+
+        /** Encapsulate errors arising from parsing of stylesheet files */
+        public final static class StylesheetParsingError extends ParseError {
+
+            StylesheetParsingError(String url, String message) {
+                super(message);
+                this.url = url;
+            }
+
+            String getURL() {
+                return url;
+            }
+
+            private final String url;
+
+            @Override public String toString() {
+                final String path = url != null ? url : "?";
+                // TBD: i18n
+                return "CSS Error parsing " + path + ": " + message;
+            }
+
+        }
+
+        /** Encapsulate errors arising from parsing of Node's style property */
+        public final static class InlineStyleParsingError extends ParseError {
+
+            InlineStyleParsingError(Styleable styleable, String message) {
+                super(message);
+                this.styleable = styleable;
+            }
+
+            Styleable getStyleable() {
+                return styleable;
+            }
+
+            private final Styleable styleable;
+
+            @Override public String toString() {
+                final String inlineStyle = styleable.getStyle();
+                final String source = styleable.toString();
+                // TBD: i18n
+                return "CSS Error parsing in-line style \'" + inlineStyle +
+                        "\' from " + source + ": " + message;
+            }
+        }
+
+        /**
+         * Encapsulate errors arising from parsing when the style is not
+         * an in-line style nor is the style from a stylesheet. Primarily to
+         * support unit testing.
+         */
+        public final static class StringParsingError extends ParseError {
+            private final String style;
+
+            StringParsingError(String style, String message) {
+                super(message);
+                this.style = style;
+            }
+
+            String getStyle() {
+                return style;
+            }
+
+            @Override public String toString() {
+                // TBD: i18n
+                return "CSS Error parsing \'" + style + ": " + message;
+            }
+        }
+
+        /** Encapsulates errors arising from applying a style to a Node. */
+        public final static class PropertySetError extends ParseError {
+            private final CssMetaData styleableProperty;
+            private final Styleable styleable;
+
+            public PropertySetError(CssMetaData styleableProperty,
+                    Styleable styleable, String message) {
+                super(message);
+                this.styleableProperty = styleableProperty;
+                this.styleable = styleable;
+            }
+
+            Styleable getStyleable() {
+                return styleable;
+            }
+
+            CssMetaData getProperty() {
+                return styleableProperty;
+            }
+
+            @Override public String toString() {
+                // TBD: i18n
+                return "CSS Error parsing \'" + styleableProperty + ": " + message;
+            }
+        }
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Declaration.java	2015-09-03 15:31:34.694364900 -0700
+++ /dev/null	2015-09-03 15:31:35.000000000 -0700
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2008, 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.css;
-
-import com.sun.javafx.css.converters.URLConverter;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.css.StyleOrigin;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-final public class Declaration {
-    final String property;
-    final ParsedValueImpl parsedValue;
-    final boolean important;   
-    // The Rule to which this Declaration belongs.
-    Rule rule;
-
-    public Declaration(final String propertyName, final ParsedValueImpl parsedValue,
-            final boolean important) {
-        this.property = propertyName;
-        this.parsedValue = parsedValue;
-        this.important = important;
-        if (propertyName == null) { 
-            throw new IllegalArgumentException("propertyName cannot be null");
-        }
-        if (parsedValue == null) { 
-            throw new IllegalArgumentException("parsedValue cannot be null");
-        }
-    }
-
-    /** @return ParsedValue contains the parsed declaration. */
-    public ParsedValue getParsedValue() {
-        return parsedValue;
-    }
-    
-    /** @return ParsedValue contains the parsed declaration. */
-    ParsedValueImpl getParsedValueImpl() {
-        return parsedValue;
-    }
-    
-    /** @return The CSS property name */
-    public String getProperty() {
-        return property;
-    }
-    
-    /** @return The Rule to which this Declaration belongs. */
-    public Rule getRule() {
-        return rule;
-    }
-    
-    public boolean isImportant() {
-        return important;
-    }
-
-    /** Helper */
-    private StyleOrigin getOrigin() {
-        Rule rule = getRule();
-        if (rule != null)  {
-            return rule.getOrigin();
-        }
-        return null;
-    }
-    /** 
-     * One declaration is the equal to another regardless of the Rule to which
-     * the Declaration belongs. Only the property, value and importance are
-     * considered.
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Declaration other = (Declaration) obj;
-        if (this.important != other.important) {
-            return false;
-        }
-        if (this.getOrigin() != other.getOrigin()) {
-            return false;
-        }
-        if ((this.property == null) ? (other.property != null) : !this.property.equals(other.property)) {
-            return false;
-        }
-        if (this.parsedValue != other.parsedValue && (this.parsedValue == null || !this.parsedValue.equals(other.parsedValue))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 89 * hash + (this.property != null ? this.property.hashCode() : 0);
-        hash = 89 * hash + (this.parsedValue != null ? this.parsedValue.hashCode() : 0);
-        hash = 89 * hash + (this.important ? 1 : 0);
-        return hash;
-    }
-
-    @Override public String toString() {
-        StringBuilder sbuf = new StringBuilder(property);
-        sbuf.append(": ");
-        sbuf.append(parsedValue);
-        if (important) sbuf.append(" !important");
-        return sbuf.toString();
-    }
-    
-    //
-    // RT-21964
-    //
-    // We know when the .css file is parsed what the stylesheet URL is,
-    // but that might not be the URL of the deployed file. So for URL
-    // types, the parser inserts a null placeholder for the URL and we
-    // fix it up here. This method is called from Rule#setStylesheet
-    // and from Rule#declarations onChanged method.
-    // 
-    void fixUrl(String stylesheetUrl) {
-        
-        if (stylesheetUrl == null) return;
-        
-        final StyleConverter converter = parsedValue.getConverter();        
-        
-        // code is tightly coupled to the way URLConverter works
-        if (converter == URLConverter.getInstance()) {
-            
-            final ParsedValue[] values = (ParsedValue[])parsedValue.getValue();
-            values[1] = new ParsedValueImpl<String,String>(stylesheetUrl, null);
-            
-        } else if (converter == URLConverter.SequenceConverter.getInstance()) {
-
-            final ParsedValue<ParsedValue[], String>[] layers = 
-                (ParsedValue<ParsedValue[], String>[])parsedValue.getValue();
-            
-            for (int layer = 0; layer < layers.length; layer++) {
-                final ParsedValue[] values = layers[layer].getValue();
-                values[1] = new ParsedValueImpl<String,String>(stylesheetUrl, null);
-            }
-            
-        }
-                
-    }
-
-    final void writeBinary(final DataOutputStream os, final StringStore stringStore)
-        throws IOException
-    {
-        os.writeShort(stringStore.addString(getProperty()));
-        getParsedValueImpl().writeBinary(os,stringStore);
-        os.writeBoolean(isImportant());            
-    }
-
-    static Declaration readBinary(int bssVersion, DataInputStream is, String[] strings)
-        throws IOException
-    {
-        final String propertyName = strings[is.readShort()];
-        final ParsedValueImpl parsedValue = ParsedValueImpl.readBinary(bssVersion,is,strings);
-        final boolean important = is.readBoolean();
-        return new Declaration(propertyName, parsedValue, important);
-            
-    }
-}
-
--- /dev/null	2015-09-03 15:31:36.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Declaration.java	2015-09-03 15:31:33.855316900 -0700
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+import com.sun.javafx.css.ParsedValueImpl;
+import javafx.css.converter.URLConverter;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/**
+ * @since 9
+ */
+final public class Declaration {
+    final String property;
+    final ParsedValue parsedValue;
+    final boolean important;   
+    // The Rule to which this Declaration belongs.
+    Rule rule;
+
+    Declaration(final String propertyName, final ParsedValue parsedValue,
+                final boolean important) {
+        this.property = propertyName;
+        this.parsedValue = parsedValue;
+        this.important = important;
+        if (propertyName == null) { 
+            throw new IllegalArgumentException("propertyName cannot be null");
+        }
+        if (parsedValue == null) { 
+            throw new IllegalArgumentException("parsedValue cannot be null");
+        }
+    }
+
+    /** @return ParsedValue contains the parsed declaration. */
+    public ParsedValue getParsedValue() {
+        return parsedValue;
+    }
+    
+    /** @return The CSS property name */
+    public String getProperty() {
+        return property;
+    }
+    
+    /** @return The Rule to which this Declaration belongs. */
+    public Rule getRule() {
+        return rule;
+    }
+    
+    boolean isImportant() {
+        return important;
+    }
+
+    /** Helper */
+    private StyleOrigin getOrigin() {
+        Rule rule = getRule();
+        if (rule != null)  {
+            return rule.getOrigin();
+        }
+        return null;
+    }
+    /** 
+     * One declaration is the equal to another regardless of the Rule to which
+     * the Declaration belongs. Only the property, value and importance are
+     * considered.
+     */
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Declaration other = (Declaration) obj;
+        if (this.important != other.important) {
+            return false;
+        }
+        if (this.getOrigin() != other.getOrigin()) {
+            return false;
+        }
+        if ((this.property == null) ? (other.property != null) : !this.property.equals(other.property)) {
+            return false;
+        }
+        if (this.parsedValue != other.parsedValue && (this.parsedValue == null || !this.parsedValue.equals(other.parsedValue))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override public int hashCode() {
+        int hash = 5;
+        hash = 89 * hash + (this.property != null ? this.property.hashCode() : 0);
+        hash = 89 * hash + (this.parsedValue != null ? this.parsedValue.hashCode() : 0);
+        hash = 89 * hash + (this.important ? 1 : 0);
+        return hash;
+    }
+
+    @Override public String toString() {
+        StringBuilder sbuf = new StringBuilder(property);
+        sbuf.append(": ");
+        sbuf.append(parsedValue);
+        if (important) sbuf.append(" !important");
+        return sbuf.toString();
+    }
+    
+    //
+    // RT-21964
+    //
+    // We know when the .css file is parsed what the stylesheet URL is,
+    // but that might not be the URL of the deployed file. So for URL
+    // types, the parser inserts a null placeholder for the URL and we
+    // fix it up here. This method is called from Rule#setStylesheet
+    // and from Rule#declarations onChanged method.
+    // 
+    void fixUrl(String stylesheetUrl) {
+        
+        if (stylesheetUrl == null) return;
+        
+        final StyleConverter converter = parsedValue.getConverter();        
+        
+        // code is tightly coupled to the way URLConverter works
+        if (converter == URLConverter.getInstance()) {
+            
+            final ParsedValue[] values = (ParsedValue[])parsedValue.getValue();
+            values[1] = new ParsedValueImpl<String,String>(stylesheetUrl, null);
+            
+        } else if (converter == URLConverter.SequenceConverter.getInstance()) {
+
+            final ParsedValue<ParsedValue[], String>[] layers = 
+                (ParsedValue<ParsedValue[], String>[])parsedValue.getValue();
+            
+            for (int layer = 0; layer < layers.length; layer++) {
+                final ParsedValue[] values = layers[layer].getValue();
+                values[1] = new ParsedValueImpl<String,String>(stylesheetUrl, null);
+            }
+            
+        }
+                
+    }
+
+    final void writeBinary(final DataOutputStream os, final StyleConverter.StringStore stringStore)
+        throws IOException
+    {
+        if (parsedValue instanceof ParsedValueImpl) {
+            os.writeShort(stringStore.addString(getProperty()));
+            ((ParsedValueImpl)parsedValue).writeBinary(os,stringStore);
+            os.writeBoolean(isImportant());            
+        }
+    }
+
+    static Declaration readBinary(int bssVersion, DataInputStream is, String[] strings)
+        throws IOException
+    {
+        final String propertyName = strings[is.readShort()];
+        final ParsedValueImpl parsedValue = ParsedValueImpl.readBinary(bssVersion,is,strings);
+        final boolean important = is.readBoolean();
+        return new Declaration(propertyName, parsedValue, important);
+            
+    }
+}
+
--- /dev/null	2015-09-03 15:31:43.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/FontFace.java	2015-09-03 15:31:42.059786200 -0700
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015, 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.css;
+
+/**
+ * A FontFace is a @font-face definition from CSS file
+ *
+ * @since 9
+ */
+public abstract class FontFace {
+    /**
+     * Constructor for private implementation class only.
+     */
+    protected FontFace() {}
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Match.java	2015-09-03 15:31:48.231139200 -0700
+++ /dev/null	2015-09-03 15:31:49.000000000 -0700
@@ -1,71 +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.css;
-
-import static javafx.geometry.NodeOrientation.INHERIT;
-
-
-/**
- * Used by {@link Rule} to determine whether or not the selector applies to a
- * given object.
- *
-/**
- * Returned by {@link Selector#matches} in the event of a match.
- */
-final class Match implements Comparable<Match> {
-
-    final Selector selector;
-    final PseudoClassState pseudoClasses;
-    final int idCount;
-    final int styleClassCount;
-
-    // CSS3 spec gives weight to id count, then style class count,
-    // then pseudoclass count, and finally matching types (i.e., java name count)
-    final int specificity;
-
-    Match(final Selector selector, PseudoClassState pseudoClasses,
-            int idCount, int styleClassCount) {
-        assert selector != null;
-        this.selector = selector;
-        this.idCount = idCount;
-        this.styleClassCount = styleClassCount;
-        this.pseudoClasses = pseudoClasses;
-        int nPseudoClasses = pseudoClasses != null ? pseudoClasses.size() : 0;
-        if (selector instanceof SimpleSelector) {
-            final SimpleSelector simple = (SimpleSelector)selector;
-            if (simple.getNodeOrientation() != INHERIT) {
-                nPseudoClasses += 1;
-            }
-        }
-        specificity = (idCount << 8) | (styleClassCount << 4) | nPseudoClasses;
-    }
-        
-    @Override
-    public int compareTo(Match o) {
-        return specificity - o.specificity;
-    }
-
-}
--- /dev/null	2015-09-03 15:31:49.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Match.java	2015-09-03 15:31:47.485096500 -0700
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css;
+
+import com.sun.javafx.css.PseudoClassState;
+
+import static javafx.geometry.NodeOrientation.INHERIT;
+
+
+/**
+ * Used by {@link Rule} to determine whether or not the selector applies to a
+ * given object.
+ *
+ * Returned by {@link Selector#matches} in the event of a match.
+ *
+ * @since 9
+ */
+public final class Match implements Comparable<Match> {
+
+    final Selector selector;
+    final PseudoClassState pseudoClasses;
+    final int idCount;
+    final int styleClassCount;
+
+    // CSS3 spec gives weight to id count, then style class count,
+    // then pseudoclass count, and finally matching types (i.e., java name count)
+    final int specificity;
+
+    Match(final Selector selector, PseudoClassState pseudoClasses, int idCount, int styleClassCount) {
+        assert selector != null;
+        this.selector = selector;
+        this.idCount = idCount;
+        this.styleClassCount = styleClassCount;
+        this.pseudoClasses = pseudoClasses;
+        int nPseudoClasses = pseudoClasses != null ? pseudoClasses.size() : 0;
+        if (selector instanceof SimpleSelector) {
+            final SimpleSelector simple = (SimpleSelector)selector;
+            if (simple.getNodeOrientation() != INHERIT) {
+                nPseudoClasses += 1;
+            }
+        }
+        specificity = (idCount << 8) | (styleClassCount << 4) | nPseudoClasses;
+    }
+        
+    Selector getSelector() {
+        return selector;
+    }
+
+    PseudoClassState getPseudoClasses() {
+        return pseudoClasses;
+    }
+
+    int getSpecificity() {
+        return specificity;
+    }
+
+    @Override public int compareTo(Match o) {
+        return specificity - o.specificity;
+    }
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Rule.java	2015-09-03 15:31:56.420607600 -0700
+++ /dev/null	2015-09-03 15:31:57.000000000 -0700
@@ -1,385 +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.css;
-
-import com.sun.javafx.collections.TrackableObservableList;
-import javafx.collections.ListChangeListener.Change;
-import javafx.collections.ObservableList;
-import javafx.css.PseudoClass;
-import javafx.css.StyleOrigin;
-import javafx.scene.Node;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/*
- * A selector is a collection of selectors and declarations.
- */
-final public class Rule {
-
-    private List<Selector> selectors = null;
-
-    /**
-     * The list returned from this method should be treated as unmodifiable.
-     * Tools should use {@link #getSelectors()} which tracks adds and removes.
-     */
-    public List<Selector>  getUnobservedSelectorList() {
-        if (selectors == null) {
-            selectors = new ArrayList<Selector>();
-        }
-        return selectors;
-    }
-
-    private List<Declaration> declarations = null;
-    /**
-     * The list returned from this method should be treated as unmodifiable.
-     * Tools should use {@link #getDeclarations()} which tracks adds and removes.
-     */
-    public List<Declaration> getUnobservedDeclarationList() {
-
-        if (declarations == null && serializedDecls != null) {
-
-            try {
-                ByteArrayInputStream bis = new ByteArrayInputStream(serializedDecls);
-                DataInputStream dis = new DataInputStream(bis);
-
-                short nDeclarations = dis.readShort();
-                declarations = new ArrayList<Declaration>(nDeclarations);
-                for (int i = 0; i < nDeclarations; i++) {
-
-                    Declaration decl = Declaration.readBinary(bssVersion, dis, stylesheet.getStringStore());
-                    decl.rule = Rule.this;
-
-                    if (stylesheet != null && stylesheet.getUrl() != null) {
-                        String stylesheetUrl = stylesheet.getUrl();
-                        decl.fixUrl(stylesheetUrl);
-                    }
-
-                    declarations.add(decl);
-                }
-
-            } catch (IOException ioe) {
-                declarations = new ArrayList<>();
-                assert false; ioe.getMessage();
-
-            } finally {
-                serializedDecls = null;
-            }
-
-        }
-
-        return declarations;
-    }
-
-    private Observables observables = null;
-
-    /**
-     * This method is to support tooling that may want to add declarations to
-     * or remove declarations from a Rule. Changes to the list are tracked
-     * so that added declarations are tagged as belonging to this rule, and
-     * the rule for removed declarations is nulled out.
-     * If the list is not going to be modified, then it is more efficient to
-     * call {@link #getUnobservedDeclarationList()}, but the returned list
-     * must be treated as unmodifiable.
-     * @return
-     */
-    public final ObservableList<Declaration> getDeclarations() {
-
-        if (observables == null) {
-            observables = new Observables(this);
-        }
-
-        return observables.getDeclarations();
-    }
-
-    /**
-     * This method is to support tooling that may want to add selectors to
-     * or remove selectors from a Rule. Changes to the list are tracked
-     * so that added selectors are tagged as belonging to this rule, and
-     * the rule for removed selectors is nulled out.
-     * If the list is not going to be modified, then it is more efficient to
-     * call {@link #getUnobservedSelectorList()}, but the returned list
-     * must be treated as unmodifiable.
-     * @return
-     */
-    public final ObservableList<Selector> getSelectors() {
-
-        if (observables == null) {
-            observables = new Observables(this);
-        }
-
-        return observables.getSelectors();
-    }
-
-    /** The stylesheet this selector belongs to */
-    private Stylesheet stylesheet;
-    public Stylesheet getStylesheet() {
-        return stylesheet;
-    }
-
-    /* package */
-    void setStylesheet(Stylesheet stylesheet) {
-
-        this.stylesheet = stylesheet;
-        
-        if (stylesheet != null && stylesheet.getUrl() != null) {
-            final String stylesheetUrl = stylesheet.getUrl();
-
-            int nDeclarations = declarations != null ? declarations.size() : 0;
-            for (int d=0; d<nDeclarations; d++) {
-                declarations.get(d).fixUrl(stylesheetUrl);
-            }
-        }
-    }
-
-    public StyleOrigin getOrigin() {
-        return stylesheet != null ? stylesheet.getOrigin() : null;
-    }
-
-
-    public Rule(List<Selector> selectors, List<Declaration> declarations) {
-
-        this.selectors = selectors;
-        this.declarations = declarations;
-        serializedDecls = null;
-        this.bssVersion = Stylesheet.BINARY_CSS_VERSION;
-
-        int sMax = selectors != null ? selectors.size() : 0;
-        for(int i = 0; i < sMax; i++) {
-            Selector sel = selectors.get(i);
-            sel.setRule(Rule.this);
-        }
-
-        int dMax = declarations != null ? declarations.size() : 0;
-        for (int d=0; d<dMax; d++) {
-            Declaration decl = declarations.get(d);
-            decl.rule = this;
-        }
-    }
-
-    private byte[] serializedDecls;
-    private final int bssVersion;
-
-    private Rule(List<Selector> selectors, byte[] buf, int bssVersion) {
-
-        this.selectors = selectors;
-        this.declarations = null;
-        this.serializedDecls = buf;
-        this.bssVersion = bssVersion;
-
-        int sMax = selectors != null ? selectors.size() : 0;
-        for(int i = 0; i < sMax; i++) {
-            Selector sel = selectors.get(i);
-            sel.setRule(Rule.this);
-        }
-
-    }
-
-    // Return mask of selectors that match
-    long applies(Node node, Set<PseudoClass>[] triggerStates) {
-        long mask = 0;
-        for (int i = 0; i < selectors.size(); i++) {
-            Selector sel = selectors.get(i);
-            if (sel.applies(node, triggerStates, 0)) {                
-                mask |= 1l << i;
-            }
-        }
-        return mask;
-    }
-
-    /** Converts this object to a string. */
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        if (selectors.size()>0) {
-            sb.append(selectors.get(0));
-        }
-        for (int n=1; n<selectors.size(); n++) {
-            sb.append(',');
-            sb.append(selectors.get(n));
-        }
-        sb.append("{\n");
-        int nDeclarations = declarations != null ? declarations.size() : 0;
-        for (int n=0; n<nDeclarations; n++) {
-            sb.append("\t");
-            sb.append(declarations.get(n));
-            sb.append("\n");
-        }
-        sb .append("}");
-        return sb.toString();
-    }
-
-    /*
-     * If an authoring tool adds or removes a selector or declaration,
-     * then the selector or declaration needs to be tweaked to know that
-     * this is the Rule to which it belongs.
-     */
-    private final static class Observables {
-
-        private Observables(Rule rule) {
-
-            this.rule = rule;
-
-            selectorObservableList = new TrackableObservableList<Selector>(rule.getUnobservedSelectorList()) {
-                @Override protected void onChanged(Change<Selector> c) {
-                    while (c.next()) {
-                        if (c.wasAdded()) {
-                            List<Selector> added = c.getAddedSubList();
-                            for(int i = 0, max = added.size(); i < max; i++) {
-                                Selector sel = added.get(i);
-                                sel.setRule(Observables.this.rule);
-                            }
-                        }
-
-                        if (c.wasRemoved()) {
-                            List<Selector> removed = c.getAddedSubList();
-                            for(int i = 0, max = removed.size(); i < max; i++) {
-                                Selector sel = removed.get(i);
-                                if (sel.getRule() == Observables.this.rule) {
-                                    sel.setRule(null);
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-
-            declarationObservableList = new TrackableObservableList<Declaration>(rule.getUnobservedDeclarationList()) {
-                @Override protected void onChanged(Change<Declaration> c) {
-                    while (c.next()) {
-                        if (c.wasAdded()) {
-                            List<Declaration> added = c.getAddedSubList();
-                            for(int i = 0, max = added.size(); i < max; i++) {
-                                Declaration decl = added.get(i);
-                                decl.rule = Observables.this.rule;
-
-                                Stylesheet stylesheet = Observables.this.rule.stylesheet;
-                                if (stylesheet != null && stylesheet.getUrl() != null) {
-                                    final String stylesheetUrl = stylesheet.getUrl();
-                                    decl.fixUrl(stylesheetUrl);
-                                }
-                            }
-                        }
-
-                        if (c.wasRemoved()) {
-                            List<Declaration> removed = c.getRemoved();
-                            for(int i = 0, max = removed.size(); i < max; i++) {
-                                Declaration decl = removed.get(i);
-                                if (decl.rule == Observables.this.rule) {
-                                    decl.rule = null;
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-
-        }
-
-        private ObservableList<Selector> getSelectors() {
-            return selectorObservableList;
-        }
-
-        private ObservableList<Declaration> getDeclarations() {
-            return declarationObservableList;
-        }
-
-        private final Rule rule;
-        private final ObservableList<Selector> selectorObservableList;
-        private final ObservableList<Declaration> declarationObservableList;
-
-    }
-
-    final void writeBinary(DataOutputStream os, StringStore stringStore)
-            throws IOException {
-
-        final int nSelectors = this.selectors != null ? this.selectors.size() : 0;
-        os.writeShort(nSelectors);
-        for (int i = 0; i < nSelectors; i++) {
-            Selector sel = this.selectors.get(i);
-            sel.writeBinary(os, stringStore);
-        }
-
-        List<Declaration> decls = getUnobservedDeclarationList();
-        if (decls != null) {
-
-            ByteArrayOutputStream bos = new ByteArrayOutputStream(5192);
-            DataOutputStream dos = new DataOutputStream(bos);
-
-            int nDeclarations =  decls.size();
-            dos.writeShort(nDeclarations);
-
-            for (int i = 0; i < nDeclarations; i++) {
-                Declaration decl = declarations.get(i);
-                decl.writeBinary(dos, stringStore);
-            }
-
-            os.writeInt(bos.size());
-            os.write(bos.toByteArray());
-
-        } else {
-            // no declarations!
-            os.writeShort(0);
-        }
-    }
-
-    static Rule readBinary(int bssVersion, DataInputStream is, String[] strings)
-            throws IOException
-    {
-        short nSelectors = is.readShort();
-        List<Selector> selectors = new ArrayList<Selector>(nSelectors);
-        for (int i = 0; i < nSelectors; i++) {
-            Selector s = Selector.readBinary(bssVersion, is, strings);
-            selectors.add(s);
-        }
-
-        if (bssVersion < 4) {
-            short nDeclarations = is.readShort();
-            List<Declaration> declarations = new ArrayList<Declaration>(nDeclarations);
-            for (int i = 0; i < nDeclarations; i++) {
-                Declaration d = Declaration.readBinary(bssVersion, is, strings);
-                declarations.add(d);
-            }
-
-            return new Rule(selectors, declarations);
-        }
-
-        // de-serialize decls into byte array
-        int nBytes = is.readInt();
-        byte[] buf = new byte[nBytes];
-
-        if (nBytes > 0) {
-            is.readFully(buf);
-        }
-        return new Rule(selectors, buf, bssVersion);
-    }
-}
--- /dev/null	2015-09-03 15:31:57.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Rule.java	2015-09-03 15:31:55.676565000 -0700
@@ -0,0 +1,385 @@
+/*
+ * 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.css;
+
+import javafx.collections.ListChangeListener.Change;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+
+import com.sun.javafx.collections.TrackableObservableList;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/*
+ * A selector is a collection of selectors and declarations.
+ *
+ * @since 9
+ */
+final public class Rule {
+
+    private List<Selector> selectors = null;
+
+    /**
+     * The list returned from this method should be treated as unmodifiable.
+     * Tools should use {@link #getSelectors()} which tracks adds and removes.
+     */
+    List<Selector>  getUnobservedSelectorList() {
+        if (selectors == null) {
+            selectors = new ArrayList<Selector>();
+        }
+        return selectors;
+    }
+
+    private List<Declaration> declarations = null;
+    /**
+     * The list returned from this method should be treated as unmodifiable.
+     * Tools should use {@link #getDeclarations()} which tracks adds and removes.
+     */
+    List<Declaration> getUnobservedDeclarationList() {
+
+        if (declarations == null && serializedDecls != null) {
+
+            try {
+                ByteArrayInputStream bis = new ByteArrayInputStream(serializedDecls);
+                DataInputStream dis = new DataInputStream(bis);
+
+                short nDeclarations = dis.readShort();
+                declarations = new ArrayList<Declaration>(nDeclarations);
+                for (int i = 0; i < nDeclarations; i++) {
+
+                    Declaration decl = Declaration.readBinary(bssVersion, dis, stylesheet.getStringStore());
+                    decl.rule = Rule.this;
+
+                    if (stylesheet != null && stylesheet.getUrl() != null) {
+                        String stylesheetUrl = stylesheet.getUrl();
+                        decl.fixUrl(stylesheetUrl);
+                    }
+
+                    declarations.add(decl);
+                }
+
+            } catch (IOException ioe) {
+                declarations = new ArrayList<>();
+                assert false; ioe.getMessage();
+
+            } finally {
+                serializedDecls = null;
+            }
+
+        }
+
+        return declarations;
+    }
+
+    private Observables observables = null;
+
+    /**
+     * This method is to support tooling that may want to add declarations to
+     * or remove declarations from a Rule. Changes to the list are tracked
+     * so that added declarations are tagged as belonging to this rule, and
+     * the rule for removed declarations is nulled out.
+     * If the list is not going to be modified, then it is more efficient to
+     * call {@link #getUnobservedDeclarationList()}, but the returned list
+     * must be treated as unmodifiable.
+     * @return
+     */
+    public final ObservableList<Declaration> getDeclarations() {
+
+        if (observables == null) {
+            observables = new Observables(this);
+        }
+
+        return observables.getDeclarations();
+    }
+
+    /**
+     * This method is to support tooling that may want to add selectors to
+     * or remove selectors from a Rule. Changes to the list are tracked
+     * so that added selectors are tagged as belonging to this rule, and
+     * the rule for removed selectors is nulled out.
+     * If the list is not going to be modified, then it is more efficient to
+     * call {@link #getUnobservedSelectorList()}, but the returned list
+     * must be treated as unmodifiable.
+     * @return
+     */
+    public final ObservableList<Selector> getSelectors() {
+
+        if (observables == null) {
+            observables = new Observables(this);
+        }
+
+        return observables.getSelectors();
+    }
+
+    /** The stylesheet this selector belongs to */
+    private Stylesheet stylesheet;
+    public Stylesheet getStylesheet() {
+        return stylesheet;
+    }
+
+    /* package */
+    void setStylesheet(Stylesheet stylesheet) {
+
+        this.stylesheet = stylesheet;
+        
+        if (stylesheet != null && stylesheet.getUrl() != null) {
+            final String stylesheetUrl = stylesheet.getUrl();
+
+            int nDeclarations = declarations != null ? declarations.size() : 0;
+            for (int d=0; d<nDeclarations; d++) {
+                declarations.get(d).fixUrl(stylesheetUrl);
+            }
+        }
+    }
+
+    public StyleOrigin getOrigin() {
+        return stylesheet != null ? stylesheet.getOrigin() : null;
+    }
+
+
+    Rule(List<Selector> selectors, List<Declaration> declarations) {
+
+        this.selectors = selectors;
+        this.declarations = declarations;
+        serializedDecls = null;
+        this.bssVersion = Stylesheet.BINARY_CSS_VERSION;
+
+        int sMax = selectors != null ? selectors.size() : 0;
+        for(int i = 0; i < sMax; i++) {
+            Selector sel = selectors.get(i);
+            sel.setRule(Rule.this);
+        }
+
+        int dMax = declarations != null ? declarations.size() : 0;
+        for (int d=0; d<dMax; d++) {
+            Declaration decl = declarations.get(d);
+            decl.rule = this;
+        }
+    }
+
+    private byte[] serializedDecls;
+    private final int bssVersion;
+
+    private Rule(List<Selector> selectors, byte[] buf, int bssVersion) {
+
+        this.selectors = selectors;
+        this.declarations = null;
+        this.serializedDecls = buf;
+        this.bssVersion = bssVersion;
+
+        int sMax = selectors != null ? selectors.size() : 0;
+        for(int i = 0; i < sMax; i++) {
+            Selector sel = selectors.get(i);
+            sel.setRule(Rule.this);
+        }
+
+    }
+
+    // Return mask of selectors that match
+    long applies(Node node, Set<PseudoClass>[] triggerStates) {
+        long mask = 0;
+        for (int i = 0; i < selectors.size(); i++) {
+            Selector sel = selectors.get(i);
+            if (sel.applies(node, triggerStates, 0)) {                
+                mask |= 1l << i;
+            }
+        }
+        return mask;
+    }
+
+    /** Converts this object to a string. */
+    @Override public String toString() {
+        StringBuilder sb = new StringBuilder();
+        if (selectors.size()>0) {
+            sb.append(selectors.get(0));
+        }
+        for (int n=1; n<selectors.size(); n++) {
+            sb.append(',');
+            sb.append(selectors.get(n));
+        }
+        sb.append("{\n");
+        int nDeclarations = declarations != null ? declarations.size() : 0;
+        for (int n=0; n<nDeclarations; n++) {
+            sb.append("\t");
+            sb.append(declarations.get(n));
+            sb.append("\n");
+        }
+        sb .append("}");
+        return sb.toString();
+    }
+
+    /*
+     * If an authoring tool adds or removes a selector or declaration,
+     * then the selector or declaration needs to be tweaked to know that
+     * this is the Rule to which it belongs.
+     */
+    private final static class Observables {
+
+        private Observables(Rule rule) {
+
+            this.rule = rule;
+
+            selectorObservableList = new TrackableObservableList<Selector>(rule.getUnobservedSelectorList()) {
+                @Override protected void onChanged(Change<Selector> c) {
+                    while (c.next()) {
+                        if (c.wasAdded()) {
+                            List<Selector> added = c.getAddedSubList();
+                            for(int i = 0, max = added.size(); i < max; i++) {
+                                Selector sel = added.get(i);
+                                sel.setRule(Observables.this.rule);
+                            }
+                        }
+
+                        if (c.wasRemoved()) {
+                            List<Selector> removed = c.getAddedSubList();
+                            for(int i = 0, max = removed.size(); i < max; i++) {
+                                Selector sel = removed.get(i);
+                                if (sel.getRule() == Observables.this.rule) {
+                                    sel.setRule(null);
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+            declarationObservableList = new TrackableObservableList<Declaration>(rule.getUnobservedDeclarationList()) {
+                @Override protected void onChanged(Change<Declaration> c) {
+                    while (c.next()) {
+                        if (c.wasAdded()) {
+                            List<Declaration> added = c.getAddedSubList();
+                            for(int i = 0, max = added.size(); i < max; i++) {
+                                Declaration decl = added.get(i);
+                                decl.rule = Observables.this.rule;
+
+                                Stylesheet stylesheet = Observables.this.rule.stylesheet;
+                                if (stylesheet != null && stylesheet.getUrl() != null) {
+                                    final String stylesheetUrl = stylesheet.getUrl();
+                                    decl.fixUrl(stylesheetUrl);
+                                }
+                            }
+                        }
+
+                        if (c.wasRemoved()) {
+                            List<Declaration> removed = c.getRemoved();
+                            for(int i = 0, max = removed.size(); i < max; i++) {
+                                Declaration decl = removed.get(i);
+                                if (decl.rule == Observables.this.rule) {
+                                    decl.rule = null;
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+
+        }
+
+        private ObservableList<Selector> getSelectors() {
+            return selectorObservableList;
+        }
+
+        private ObservableList<Declaration> getDeclarations() {
+            return declarationObservableList;
+        }
+
+        private final Rule rule;
+        private final ObservableList<Selector> selectorObservableList;
+        private final ObservableList<Declaration> declarationObservableList;
+
+    }
+
+    final void writeBinary(DataOutputStream os, StyleConverter.StringStore stringStore)
+            throws IOException {
+
+        final int nSelectors = this.selectors != null ? this.selectors.size() : 0;
+        os.writeShort(nSelectors);
+        for (int i = 0; i < nSelectors; i++) {
+            Selector sel = this.selectors.get(i);
+            sel.writeBinary(os, stringStore);
+        }
+
+        List<Declaration> decls = getUnobservedDeclarationList();
+        if (decls != null) {
+
+            ByteArrayOutputStream bos = new ByteArrayOutputStream(5192);
+            DataOutputStream dos = new DataOutputStream(bos);
+
+            int nDeclarations =  decls.size();
+            dos.writeShort(nDeclarations);
+
+            for (int i = 0; i < nDeclarations; i++) {
+                Declaration decl = declarations.get(i);
+                decl.writeBinary(dos, stringStore);
+            }
+
+            os.writeInt(bos.size());
+            os.write(bos.toByteArray());
+
+        } else {
+            // no declarations!
+            os.writeShort(0);
+        }
+    }
+
+    static Rule readBinary(int bssVersion, DataInputStream is, String[] strings)
+            throws IOException
+    {
+        short nSelectors = is.readShort();
+        List<Selector> selectors = new ArrayList<Selector>(nSelectors);
+        for (int i = 0; i < nSelectors; i++) {
+            Selector s = Selector.readBinary(bssVersion, is, strings);
+            selectors.add(s);
+        }
+
+        if (bssVersion < 4) {
+            short nDeclarations = is.readShort();
+            List<Declaration> declarations = new ArrayList<Declaration>(nDeclarations);
+            for (int i = 0; i < nDeclarations; i++) {
+                Declaration d = Declaration.readBinary(bssVersion, is, strings);
+                declarations.add(d);
+            }
+
+            return new Rule(selectors, declarations);
+        }
+
+        // de-serialize decls into byte array
+        int nBytes = is.readInt();
+        byte[] buf = new byte[nBytes];
+
+        if (nBytes > 0) {
+            is.readFully(buf);
+        }
+        return new Rule(selectors, buf, bssVersion);
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Selector.java	2015-09-03 15:32:04.843089300 -0700
+++ /dev/null	2015-09-03 15:32:06.000000000 -0700
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2008, 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.css;
-
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Used by CSSRule to determine whether or not the selector applies to a
- * given object.
- *
- */
-abstract public class Selector {
-
-    private static class UniversalSelector {
-        private static final Selector INSTANCE =
-            new SimpleSelector("*", null, null, null);
-    }
-
-    public static Selector getUniversalSelector() {
-        return UniversalSelector.INSTANCE;
-    }
-
-    private Rule rule;
-    void setRule(Rule rule) {
-        this.rule = rule;
-    }
-    Rule getRule() {
-        return rule;
-    }
-
-    private int ordinal = -1;
-    void setOrdinal(int ordinal) {
-        this.ordinal = ordinal;
-    }
-    int getOrdinal() {
-        return ordinal;
-    }
-
-    abstract Match createMatch();
-
-    // same as the matches method expect return true/false rather than a match
-    public abstract boolean applies(Styleable styleable);
-    
-    // same as applies, but will return pseudoclass state that it finds along the way
-    abstract boolean applies(Styleable styleable, Set<PseudoClass>[] triggerStates, int bit);
-    
-    /**
-     * Determines whether the current state of the node and its parents
-     * matches the pseudo-classes defined (if any) for this selector.
-     */
-    public abstract boolean stateMatches(Styleable styleable, Set<PseudoClass> state);
-
-    private static final int TYPE_SIMPLE = 1;
-    private static final int TYPE_COMPOUND = 2;
-
-    protected void writeBinary(DataOutputStream os, StringStore stringStore)
-        throws IOException {
-        if (this instanceof SimpleSelector) {
-            os.writeByte(TYPE_SIMPLE);
-        } else {
-            os.writeByte(TYPE_COMPOUND);
-        }
-    }
-
-    static Selector readBinary(int bssVersion, DataInputStream is, String[] strings)
-        throws IOException {
-        final int type = is.readByte();
-        if (type == TYPE_SIMPLE)
-            return SimpleSelector.readBinary(bssVersion, is,strings);
-        else
-            return CompoundSelector.readBinary(bssVersion, is,strings);
-    }
-    
-    public static Selector createSelector(final String cssSelector) {
-        if (cssSelector == null || cssSelector.length() == 0) {
-            return null; // actually return a default no-match selector
-        }
-        
-        // A very primitive parser
-        List<SimpleSelector> selectors = new ArrayList<SimpleSelector>();
-        List<Combinator> combinators = new ArrayList<Combinator>();
-        List<String> parts = new ArrayList<String>();
-        int start = 0;
-        int end = -1;
-        char combinator = '\0';
-        for (int i=0; i<cssSelector.length(); i++) {
-            char ch = cssSelector.charAt(i);
-            if (ch == ' ') {
-                if (combinator == '\0') {
-                    combinator = ch;
-                    end = i;
-                }
-            } else if (ch == '>') {
-                if (combinator == '\0') end = i;
-                combinator = ch;
-            } else if (combinator != '\0'){
-                parts.add(cssSelector.substring(start, end));
-                start = i;
-                combinators.add(combinator == ' ' ? Combinator.DESCENDANT : Combinator.CHILD);
-                combinator = '\0';
-            }
-        }
-        parts.add(cssSelector.substring(start));
-        
-        for (int i=0; i<parts.size(); i++) {
-            final String part = parts.get(i);
-            if (part != null && !part.equals("")) {
-                // Now we have the parts, we can split off the pseudo classes
-                String[] pseudoClassParts = part.split(":");
-                List<String> pseudoClasses = new ArrayList<String>();
-                for (int j=1; j<pseudoClassParts.length; j++) {
-                    if (pseudoClassParts[j] != null && !pseudoClassParts[j].equals("")) {
-                        pseudoClasses.add(pseudoClassParts[j].trim());
-                    }
-                }
-                
-                // Now that we've read off the pseudo classes, we can go ahead and pull
-                // apart the beginning.
-                final String selector = pseudoClassParts[0].trim();
-                // There might be style classes, so lets peel those off next
-                String[] styleClassParts = selector.split("\\.");
-                List<String> styleClasses = new ArrayList<String>();
-                
-                // If the first one is an empty string, then it started with a pseudo class
-                // If the first one starts with a #, it was an id
-                // Otherwise, it was a name
-                for (int j=1; j<styleClassParts.length; j++) {
-                    if (styleClassParts[j] != null && !styleClassParts[j].equals("")) {
-                        styleClasses.add(styleClassParts[j].trim());
-                    }
-                }
-                String name = null, id = null;
-                if (styleClassParts[0].equals("")) {
-                    // Do nothing!
-                } else if (styleClassParts[0].charAt(0) == '#') {
-                    id = styleClassParts[0].substring(1).trim();
-                } else {
-                    name = styleClassParts[0].trim();
-                }
-                
-                selectors.add(new SimpleSelector(name, styleClasses, pseudoClasses, id));
-            }
-        }
-        
-        if (selectors.size() == 1) {
-            return selectors.get(0);
-        } else {
-            return new CompoundSelector(selectors, combinators);
-        }
-    }
-    
-}
--- /dev/null	2015-09-03 15:32:06.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Selector.java	2015-09-03 15:32:04.029042800 -0700
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+import com.sun.javafx.css.Combinator;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Used by CSSRule to determine whether or not the selector applies to a
+ * given object.
+ *
+ * @since 9
+ */
+abstract public class Selector {
+
+    private static class UniversalSelector {
+        private static final Selector INSTANCE =
+            new SimpleSelector("*", null, null, null);
+    }
+
+    static Selector getUniversalSelector() {
+        return UniversalSelector.INSTANCE;
+    }
+
+    private Rule rule;
+    void setRule(Rule rule) {
+        this.rule = rule;
+    }
+    public Rule getRule() {
+        return rule;
+    }
+
+    private int ordinal = -1;
+    public void setOrdinal(int ordinal) {
+        this.ordinal = ordinal;
+    }
+    public int getOrdinal() {
+        return ordinal;
+    }
+
+    public abstract Match createMatch();
+
+    // same as the matches method expect return true/false rather than a match
+    public abstract boolean applies(Styleable styleable);
+    
+    // same as applies, but will return pseudoclass state that it finds along the way
+    public abstract boolean applies(Styleable styleable, Set<PseudoClass>[] triggerStates, int bit);
+    
+    /**
+     * Determines whether the current state of the node and its parents
+     * matches the pseudo-classes defined (if any) for this selector.
+     */
+    public abstract boolean stateMatches(Styleable styleable, Set<PseudoClass> state);
+
+    private static final int TYPE_SIMPLE = 1;
+    private static final int TYPE_COMPOUND = 2;
+
+    protected void writeBinary(DataOutputStream os, StyleConverter.StringStore stringStore)
+        throws IOException {
+        if (this instanceof SimpleSelector) {
+            os.writeByte(TYPE_SIMPLE);
+        } else {
+            os.writeByte(TYPE_COMPOUND);
+        }
+    }
+
+    static Selector readBinary(int bssVersion, DataInputStream is, String[] strings)
+        throws IOException {
+        final int type = is.readByte();
+        if (type == TYPE_SIMPLE)
+            return SimpleSelector.readBinary(bssVersion, is,strings);
+        else
+            return CompoundSelector.readBinary(bssVersion, is,strings);
+    }
+    
+    public static Selector createSelector(final String cssSelector) {
+        if (cssSelector == null || cssSelector.length() == 0) {
+            return null; // actually return a default no-match selector
+        }
+        
+        // A very primitive parser
+        List<SimpleSelector> selectors = new ArrayList<SimpleSelector>();
+        List<Combinator> combinators = new ArrayList<Combinator>();
+        List<String> parts = new ArrayList<String>();
+        int start = 0;
+        int end = -1;
+        char combinator = '\0';
+        for (int i=0; i<cssSelector.length(); i++) {
+            char ch = cssSelector.charAt(i);
+            if (ch == ' ') {
+                if (combinator == '\0') {
+                    combinator = ch;
+                    end = i;
+                }
+            } else if (ch == '>') {
+                if (combinator == '\0') end = i;
+                combinator = ch;
+            } else if (combinator != '\0'){
+                parts.add(cssSelector.substring(start, end));
+                start = i;
+                combinators.add(combinator == ' ' ? Combinator.DESCENDANT : Combinator.CHILD);
+                combinator = '\0';
+            }
+        }
+        parts.add(cssSelector.substring(start));
+        
+        for (int i=0; i<parts.size(); i++) {
+            final String part = parts.get(i);
+            if (part != null && !part.equals("")) {
+                // Now we have the parts, we can split off the pseudo classes
+                String[] pseudoClassParts = part.split(":");
+                List<String> pseudoClasses = new ArrayList<String>();
+                for (int j=1; j<pseudoClassParts.length; j++) {
+                    if (pseudoClassParts[j] != null && !pseudoClassParts[j].equals("")) {
+                        pseudoClasses.add(pseudoClassParts[j].trim());
+                    }
+                }
+                
+                // Now that we've read off the pseudo classes, we can go ahead and pull
+                // apart the beginning.
+                final String selector = pseudoClassParts[0].trim();
+                // There might be style classes, so lets peel those off next
+                String[] styleClassParts = selector.split("\\.");
+                List<String> styleClasses = new ArrayList<String>();
+                
+                // If the first one is an empty string, then it started with a pseudo class
+                // If the first one starts with a #, it was an id
+                // Otherwise, it was a name
+                for (int j=1; j<styleClassParts.length; j++) {
+                    if (styleClassParts[j] != null && !styleClassParts[j].equals("")) {
+                        styleClasses.add(styleClassParts[j].trim());
+                    }
+                }
+                String name = null, id = null;
+                if (styleClassParts[0].equals("")) {
+                    // Do nothing!
+                } else if (styleClassParts[0].charAt(0) == '#') {
+                    id = styleClassParts[0].substring(1).trim();
+                } else {
+                    name = styleClassParts[0].trim();
+                }
+                
+                selectors.add(new SimpleSelector(name, styleClasses, pseudoClasses, id));
+            }
+        }
+        
+        if (selectors.size() == 1) {
+            return selectors.get(0);
+        } else {
+            return new CompoundSelector(selectors, combinators);
+        }
+    }
+    
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/SimpleSelector.java	2015-09-03 15:32:13.642592600 -0700
+++ /dev/null	2015-09-03 15:32:14.000000000 -0700
@@ -1,404 +0,0 @@
-/*
- * Copyright (c) 2008, 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.css;
-
-import javafx.css.PseudoClass;
-import javafx.css.Styleable;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.Node;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import static javafx.geometry.NodeOrientation.INHERIT;
-import static javafx.geometry.NodeOrientation.LEFT_TO_RIGHT;
-import static javafx.geometry.NodeOrientation.RIGHT_TO_LEFT;
-
-/**
- * A simple selector which behaves according to the CSS standard.
- *
- */
-final public class SimpleSelector extends Selector {
-    
-    /**
-     * If specified in the CSS file, the name of the java class to which
-     * this selector is applied. For example, if the CSS file had:
-     * <code><pre>
-     *   Rectangle { }
-     * </pre></code>
-     * then name would be "Rectangle".
-     */
-    final private String name;
-    /**
-     * @return The name of the java class to which this selector is applied, or *.
-     */
-    public String getName() {
-        return name;
-    }
-    
-    /**
-     * @return Immutable List&lt;String&gt; of style-classes of the selector
-     */
-    public List<String> getStyleClasses() {
-        
-        final List<String> names = new ArrayList<String>();
-        
-        Iterator<StyleClass> iter = styleClassSet.iterator();
-        while (iter.hasNext()) {
-            names.add(iter.next().getStyleClassName());
-        }
-        
-        return Collections.unmodifiableList(names);
-    }
-
-    Set<StyleClass> getStyleClassSet() {
-        return styleClassSet;
-    }
-    
-    /** styleClasses converted to a set of bit masks */
-    final private StyleClassSet styleClassSet;
-    
-    final private String id;
-    /*
-     * @return The value of the selector id, which may be an empty string.
-     */
-    public String getId() {
-        return id;
-    }
-    
-    // a mask of bits corresponding to the pseudoclasses
-    final private PseudoClassState pseudoClassState;
-    
-    Set<PseudoClass> getPseudoClassStates() {
-        return pseudoClassState;
-    }
-
-    /**
-     * @return Immutable List&lt;String&gt; of pseudo-classes of the selector
-     */
-    public List<String> getPseudoclasses() {
-        
-        final List<String> names = new ArrayList<String>();
-        
-        Iterator<PseudoClass> iter = pseudoClassState.iterator();
-        while (iter.hasNext()) {
-            names.add(iter.next().getPseudoClassName());
-        }
-        
-        if (nodeOrientation == RIGHT_TO_LEFT) {
-            names.add("dir(rtl)");
-        } else if (nodeOrientation == LEFT_TO_RIGHT) {
-            names.add("dir(ltr)");
-        }
-                    
-        return Collections.unmodifiableList(names);
-    }
-        
-    // true if name is not a wildcard
-    final private boolean matchOnName;
-
-    // true if id given
-    final private boolean matchOnId;
-
-    // true if style class given
-    final private boolean matchOnStyleClass;
-
-    // dir(ltr) or dir(rtl), otherwise inherit
-    final private NodeOrientation nodeOrientation;
-    
-    // Used in Match. If nodeOrientation is ltr or rtl, 
-    // then count it as a pseudoclass
-    NodeOrientation getNodeOrientation() {
-        return nodeOrientation;
-    }
-    
-    // TODO: The parser passes styleClasses as a List. Should be array?
-    public SimpleSelector(final String name, final List<String> styleClasses,
-            final List<String> pseudoClasses, final String id)
-    {
-        this.name = name == null ? "*" : name;
-        // if name is not null and not empty or wildcard, 
-        // then match needs to check name
-        this.matchOnName = (name != null && !("".equals(name)) && !("*".equals(name)));
-
-        this.styleClassSet = new StyleClassSet();
-        
-        int nMax = styleClasses != null ? styleClasses.size() : 0;
-        for(int n=0; n<nMax; n++) { 
-            
-            final String styleClassName = styleClasses.get(n);
-            if (styleClassName == null || styleClassName.isEmpty()) continue;
-            
-            final StyleClass styleClass = StyleClassSet.getStyleClass(styleClassName);
-            this.styleClassSet.add(styleClass);
-        }
-        
-        this.matchOnStyleClass = (this.styleClassSet.size() > 0);
-
-        this.pseudoClassState = new PseudoClassState();
-        
-        nMax = pseudoClasses != null ? pseudoClasses.size() : 0;
-
-        NodeOrientation dir = NodeOrientation.INHERIT;
-        for(int n=0; n<nMax; n++) { 
-            
-            final String pclass = pseudoClasses.get(n);
-            if (pclass == null || pclass.isEmpty()) continue;
-            
-            // TODO: This is not how we should handle functional pseudo-classes in the long-run!
-            if ("dir(".regionMatches(true, 0, pclass, 0, 4)) {
-                final boolean rtl = "dir(rtl)".equalsIgnoreCase(pclass);
-                dir = rtl ? RIGHT_TO_LEFT : LEFT_TO_RIGHT;
-                continue;
-            }
-            
-            final PseudoClass pseudoClass = PseudoClassState.getPseudoClass(pclass);
-            this.pseudoClassState.add(pseudoClass);
-        }
-        
-        this.nodeOrientation = dir;
-        this.id = id == null ? "" : id;
-        // if id is not null and not empty, then match needs to check id
-        this.matchOnId = (id != null && !("".equals(id)));
-
-    }
-
-    Match createMatch() {
-        final int idCount = (matchOnId) ? 1 : 0;
-        int styleClassCount = styleClassSet.size();
-        return new Match(this, pseudoClassState, idCount, styleClassCount);
-    }
-
-    @Override 
-    public boolean applies(Styleable styleable) {
-        
-        // handle functional pseudo-class :dir()
-        // INHERIT applies to both :dir(rtl) and :dir(ltr)
-        if (nodeOrientation != INHERIT && styleable instanceof Node) {
-            final Node node = (Node)styleable;
-            final NodeOrientation orientation = node.getNodeOrientation();
-
-            if (orientation == INHERIT
-                    ? node.getEffectiveNodeOrientation() != nodeOrientation
-                    : orientation != nodeOrientation)
-            {
-                return false;
-            }
-        }
-
-        // if the selector has an id,
-        // then bail if it doesn't match the node's id
-        // (do this first since it is potentially the cheapest check)
-        if (matchOnId) {
-            final String otherId = styleable.getId();
-            final boolean idMatch = id.equals(otherId);
-            if (!idMatch) return false;
-        }
-
-        // If name is not a wildcard,
-        // then bail if it doesn't match the node's class name
-        // if not wildcard, then match name with node's class name
-        if (matchOnName) {
-            final String otherName = styleable.getTypeSelector();
-            final boolean classMatch = this.name.equals(otherName);
-            if (!classMatch) return false;
-        }
-
-        if (matchOnStyleClass) {
-            
-            final StyleClassSet otherStyleClassSet = new StyleClassSet();
-            final List<String> styleClasses = styleable.getStyleClass();
-            for(int n=0, nMax = styleClasses.size(); n<nMax; n++) { 
-
-                final String styleClassName = styleClasses.get(n);
-                if (styleClassName == null || styleClassName.isEmpty()) continue;
-
-                final StyleClass styleClass = StyleClassSet.getStyleClass(styleClassName);
-                otherStyleClassSet.add(styleClass);
-            }
-            
-            boolean styleClassMatch = matchStyleClasses(otherStyleClassSet); 
-            if (!styleClassMatch) return false;
-        }
-        
-        return true;
-    }
-    
-    @Override 
-    boolean applies(Styleable styleable, Set<PseudoClass>[] pseudoClasses, int depth) {
-
-        
-        final boolean applies = applies(styleable);
-        
-        //
-        // We only need the pseudo-classes if the selector applies to the node.
-        // 
-        if (applies && pseudoClasses != null && depth < pseudoClasses.length) {
-
-            if (pseudoClasses[depth] == null) {
-                pseudoClasses[depth] = new PseudoClassState();
-            }
-            
-            pseudoClasses[depth].addAll(pseudoClassState);
-            
-        }
-        return applies;
-    }
-
-    @Override
-    public boolean stateMatches(final Styleable styleable, Set<PseudoClass> states) {
-        // [foo bar] matches [foo bar bang], 
-        // but [foo bar bang] doesn't match [foo bar]
-        return states != null ? states.containsAll(pseudoClassState) : false;
-    }
-
-    // Are the Selector's style classes a subset of the Node's style classes?
-    //
-    // http://www.w3.org/TR/css3-selectors/#class-html
-    // The following selector matches any P element whose class attribute has been
-    // assigned a list of whitespace-separated values that includes both
-    // pastoral and marine:
-    //
-    //     p.pastoral.marine { color: green }
-    //
-    // This selector matches when class="pastoral blue aqua marine" but does not
-    // match for class="pastoral blue".
-    private boolean matchStyleClasses(StyleClassSet otherStyleClasses) {
-        return otherStyleClasses.containsAll(styleClassSet);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final SimpleSelector other = (SimpleSelector) obj;
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) {
-            return false;
-        }
-        if (this.styleClassSet.equals(other.styleClassSet) == false) {
-            return false;
-        }
-        if (this.pseudoClassState.equals(other.pseudoClassState) == false) {
-            return false;
-        } 
-        
-        return true;
-    }
-
-    /* Hash code is used in Style's hash code and Style's hash 
-       code is used by StyleHelper */
-    @Override public int hashCode() {
-        int hash = 7;
-        hash = 31 * (hash + name.hashCode());
-        hash = 31 * (hash + styleClassSet.hashCode());
-        hash = 31 * (hash + styleClassSet.hashCode());
-        hash = (id != null) ? 31 * (hash + id.hashCode()) : 0;
-        hash = 31 * (hash + pseudoClassState.hashCode());
-        return hash;
-    }
-
-    /** Converts this object to a string. */
-    @Override public String toString() {
-        
-        StringBuilder sbuf = new StringBuilder();
-        if (name != null && name.isEmpty() == false) sbuf.append(name);
-        else sbuf.append("*");
-        Iterator<StyleClass> iter1 = styleClassSet.iterator();
-        while(iter1.hasNext()) {
-            final StyleClass styleClass = iter1.next();
-            sbuf.append('.').append(styleClass.getStyleClassName());
-        }
-        if (id != null && id.isEmpty() == false) {
-            sbuf.append('#');
-            sbuf.append(id);
-        }
-        Iterator<PseudoClass> iter2 = pseudoClassState.iterator();
-        while(iter2.hasNext()) {
-            final PseudoClass pseudoClass = iter2.next();
-            sbuf.append(':').append(pseudoClass.getPseudoClassName());
-        }
-            
-        return sbuf.toString();
-    }
-
-    public final void writeBinary(final DataOutputStream os, final StringStore stringStore)
-        throws IOException
-    {
-        super.writeBinary(os, stringStore);
-        os.writeShort(stringStore.addString(name));
-        os.writeShort(styleClassSet.size());
-        Iterator<StyleClass> iter1 = styleClassSet.iterator();
-        while(iter1.hasNext()) {
-            final StyleClass sc = iter1.next();
-            os.writeShort(stringStore.addString(sc.getStyleClassName()));
-        }
-        os.writeShort(stringStore.addString(id));
-        int pclassSize = pseudoClassState.size()
-                + (nodeOrientation == RIGHT_TO_LEFT || nodeOrientation == LEFT_TO_RIGHT ? 1 : 0);
-        os.writeShort(pclassSize);
-        Iterator<PseudoClass> iter2 = pseudoClassState.iterator();
-        while(iter2.hasNext()) {
-            final PseudoClass pc = iter2.next();
-            os.writeShort(stringStore.addString(pc.getPseudoClassName()));
-        }
-        if (nodeOrientation == RIGHT_TO_LEFT) {
-            os.writeShort(stringStore.addString("dir(rtl)"));
-        } else if (nodeOrientation == LEFT_TO_RIGHT) {
-            os.writeShort(stringStore.addString("dir(ltr)"));
-        }
-    }
-
-    static SimpleSelector readBinary(int bssVersion, final DataInputStream is, final String[] strings)
-        throws IOException
-    {
-        final String name = strings[is.readShort()];
-        final int nStyleClasses = is.readShort();
-        final List<String> styleClasses = new ArrayList<String>();
-        for (int n=0; n < nStyleClasses; n++) {
-            styleClasses.add(strings[is.readShort()]);
-        }
-        final String id = strings[is.readShort()];
-        final int nPseudoclasses = is.readShort();
-        final List<String> pseudoclasses = new ArrayList<String>();
-        for(int n=0; n < nPseudoclasses; n++) {
-            pseudoclasses.add(strings[is.readShort()]);
-        }
-        return new SimpleSelector(name, styleClasses, pseudoclasses, id);
-    }
-}
--- /dev/null	2015-09-03 15:32:15.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/SimpleSelector.java	2015-09-03 15:32:12.880549000 -0700
@@ -0,0 +1,402 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+import javafx.geometry.NodeOrientation;
+import javafx.scene.Node;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import com.sun.javafx.css.PseudoClassState;
+import com.sun.javafx.css.StyleClassSet;
+
+import static javafx.geometry.NodeOrientation.INHERIT;
+import static javafx.geometry.NodeOrientation.LEFT_TO_RIGHT;
+import static javafx.geometry.NodeOrientation.RIGHT_TO_LEFT;
+
+/**
+ * A simple selector which behaves according to the CSS standard.
+ *
+ * @since 9
+ */
+final public class SimpleSelector extends Selector {
+    
+    /**
+     * If specified in the CSS file, the name of the java class to which
+     * this selector is applied. For example, if the CSS file had:
+     * <code><pre>
+     *   Rectangle { }
+     * </pre></code>
+     * then name would be "Rectangle".
+     */
+    final private String name;
+    /**
+     * @return The name of the java class to which this selector is applied, or *.
+     */
+    public String getName() {
+        return name;
+    }
+    
+    /**
+     * @return Immutable List&lt;String&gt; of style-classes of the selector
+     */
+    public List<String> getStyleClasses() {
+        
+        final List<String> names = new ArrayList<String>();
+        
+        Iterator<StyleClass> iter = styleClassSet.iterator();
+        while (iter.hasNext()) {
+            names.add(iter.next().getStyleClassName());
+        }
+        
+        return Collections.unmodifiableList(names);
+    }
+
+    public Set<StyleClass> getStyleClassSet() {
+        return styleClassSet;
+    }
+    
+    /** styleClasses converted to a set of bit masks */
+    final private StyleClassSet styleClassSet;
+    
+    final private String id;
+    /*
+     * @return The value of the selector id, which may be an empty string.
+     */
+    public String getId() {
+        return id;
+    }
+    
+    // a mask of bits corresponding to the pseudoclasses
+    final private PseudoClassState pseudoClassState;
+    
+    Set<PseudoClass> getPseudoClassStates() {
+        return pseudoClassState;
+    }
+
+    /**
+     * @return Immutable List&lt;String&gt; of pseudo-classes of the selector
+     */
+    List<String> getPseudoclasses() {
+        
+        final List<String> names = new ArrayList<String>();
+        
+        Iterator<PseudoClass> iter = pseudoClassState.iterator();
+        while (iter.hasNext()) {
+            names.add(iter.next().getPseudoClassName());
+        }
+        
+        if (nodeOrientation == RIGHT_TO_LEFT) {
+            names.add("dir(rtl)");
+        } else if (nodeOrientation == LEFT_TO_RIGHT) {
+            names.add("dir(ltr)");
+        }
+                    
+        return Collections.unmodifiableList(names);
+    }
+        
+    // true if name is not a wildcard
+    final private boolean matchOnName;
+
+    // true if id given
+    final private boolean matchOnId;
+
+    // true if style class given
+    final private boolean matchOnStyleClass;
+
+    // dir(ltr) or dir(rtl), otherwise inherit
+    final private NodeOrientation nodeOrientation;
+    
+    // Used in Match. If nodeOrientation is ltr or rtl, 
+    // then count it as a pseudoclass
+    public NodeOrientation getNodeOrientation() {
+        return nodeOrientation;
+    }
+    
+    // TODO: The parser passes styleClasses as a List. Should be array?
+    SimpleSelector(final String name, final List<String> styleClasses,
+            final List<String> pseudoClasses, final String id)
+    {
+        this.name = name == null ? "*" : name;
+        // if name is not null and not empty or wildcard, 
+        // then match needs to check name
+        this.matchOnName = (name != null && !("".equals(name)) && !("*".equals(name)));
+
+        this.styleClassSet = new StyleClassSet();
+        
+        int nMax = styleClasses != null ? styleClasses.size() : 0;
+        for(int n=0; n<nMax; n++) { 
+            
+            final String styleClassName = styleClasses.get(n);
+            if (styleClassName == null || styleClassName.isEmpty()) continue;
+            
+            final StyleClass styleClass = StyleClassSet.getStyleClass(styleClassName);
+            this.styleClassSet.add(styleClass);
+        }
+        
+        this.matchOnStyleClass = (this.styleClassSet.size() > 0);
+
+        this.pseudoClassState = new PseudoClassState();
+        
+        nMax = pseudoClasses != null ? pseudoClasses.size() : 0;
+
+        NodeOrientation dir = NodeOrientation.INHERIT;
+        for(int n=0; n<nMax; n++) { 
+            
+            final String pclass = pseudoClasses.get(n);
+            if (pclass == null || pclass.isEmpty()) continue;
+            
+            // TODO: This is not how we should handle functional pseudo-classes in the long-run!
+            if ("dir(".regionMatches(true, 0, pclass, 0, 4)) {
+                final boolean rtl = "dir(rtl)".equalsIgnoreCase(pclass);
+                dir = rtl ? RIGHT_TO_LEFT : LEFT_TO_RIGHT;
+                continue;
+            }
+            
+            final PseudoClass pseudoClass = PseudoClassState.getPseudoClass(pclass);
+            this.pseudoClassState.add(pseudoClass);
+        }
+        
+        this.nodeOrientation = dir;
+        this.id = id == null ? "" : id;
+        // if id is not null and not empty, then match needs to check id
+        this.matchOnId = (id != null && !("".equals(id)));
+
+    }
+
+    @Override public Match createMatch() {
+        final int idCount = (matchOnId) ? 1 : 0;
+        int styleClassCount = styleClassSet.size();
+        return new Match(this, pseudoClassState, idCount, styleClassCount);
+    }
+
+    @Override public boolean applies(Styleable styleable) {
+        
+        // handle functional pseudo-class :dir()
+        // INHERIT applies to both :dir(rtl) and :dir(ltr)
+        if (nodeOrientation != INHERIT && styleable instanceof Node) {
+            final Node node = (Node)styleable;
+            final NodeOrientation orientation = node.getNodeOrientation();
+
+            if (orientation == INHERIT
+                    ? node.getEffectiveNodeOrientation() != nodeOrientation
+                    : orientation != nodeOrientation)
+            {
+                return false;
+            }
+        }
+
+        // if the selector has an id,
+        // then bail if it doesn't match the node's id
+        // (do this first since it is potentially the cheapest check)
+        if (matchOnId) {
+            final String otherId = styleable.getId();
+            final boolean idMatch = id.equals(otherId);
+            if (!idMatch) return false;
+        }
+
+        // If name is not a wildcard,
+        // then bail if it doesn't match the node's class name
+        // if not wildcard, then match name with node's class name
+        if (matchOnName) {
+            final String otherName = styleable.getTypeSelector();
+            final boolean classMatch = this.name.equals(otherName);
+            if (!classMatch) return false;
+        }
+
+        if (matchOnStyleClass) {
+            
+            final StyleClassSet otherStyleClassSet = new StyleClassSet();
+            final List<String> styleClasses = styleable.getStyleClass();
+            for(int n=0, nMax = styleClasses.size(); n<nMax; n++) { 
+
+                final String styleClassName = styleClasses.get(n);
+                if (styleClassName == null || styleClassName.isEmpty()) continue;
+
+                final StyleClass styleClass = StyleClassSet.getStyleClass(styleClassName);
+                otherStyleClassSet.add(styleClass);
+            }
+            
+            boolean styleClassMatch = matchStyleClasses(otherStyleClassSet); 
+            if (!styleClassMatch) return false;
+        }
+        
+        return true;
+    }
+    
+    @Override public boolean applies(Styleable styleable, Set<PseudoClass>[] pseudoClasses, int depth) {
+
+        
+        final boolean applies = applies(styleable);
+        
+        //
+        // We only need the pseudo-classes if the selector applies to the node.
+        // 
+        if (applies && pseudoClasses != null && depth < pseudoClasses.length) {
+
+            if (pseudoClasses[depth] == null) {
+                pseudoClasses[depth] = new PseudoClassState();
+            }
+            
+            pseudoClasses[depth].addAll(pseudoClassState);
+            
+        }
+        return applies;
+    }
+
+    @Override public boolean stateMatches(final Styleable styleable, Set<PseudoClass> states) {
+        // [foo bar] matches [foo bar bang], 
+        // but [foo bar bang] doesn't match [foo bar]
+        return states != null ? states.containsAll(pseudoClassState) : false;
+    }
+
+    // Are the Selector's style classes a subset of the Node's style classes?
+    //
+    // http://www.w3.org/TR/css3-selectors/#class-html
+    // The following selector matches any P element whose class attribute has been
+    // assigned a list of whitespace-separated values that includes both
+    // pastoral and marine:
+    //
+    //     p.pastoral.marine { color: green }
+    //
+    // This selector matches when class="pastoral blue aqua marine" but does not
+    // match for class="pastoral blue".
+    private boolean matchStyleClasses(StyleClassSet otherStyleClasses) {
+        return otherStyleClasses.containsAll(styleClassSet);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final SimpleSelector other = (SimpleSelector) obj;
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) {
+            return false;
+        }
+        if (this.styleClassSet.equals(other.styleClassSet) == false) {
+            return false;
+        }
+        if (this.pseudoClassState.equals(other.pseudoClassState) == false) {
+            return false;
+        } 
+        
+        return true;
+    }
+
+    /* Hash code is used in Style's hash code and Style's hash 
+       code is used by StyleHelper */
+    @Override public int hashCode() {
+        int hash = 7;
+        hash = 31 * (hash + name.hashCode());
+        hash = 31 * (hash + styleClassSet.hashCode());
+        hash = 31 * (hash + styleClassSet.hashCode());
+        hash = (id != null) ? 31 * (hash + id.hashCode()) : 0;
+        hash = 31 * (hash + pseudoClassState.hashCode());
+        return hash;
+    }
+
+    /** Converts this object to a string. */
+    @Override public String toString() {
+        
+        StringBuilder sbuf = new StringBuilder();
+        if (name != null && name.isEmpty() == false) sbuf.append(name);
+        else sbuf.append("*");
+        Iterator<StyleClass> iter1 = styleClassSet.iterator();
+        while(iter1.hasNext()) {
+            final StyleClass styleClass = iter1.next();
+            sbuf.append('.').append(styleClass.getStyleClassName());
+        }
+        if (id != null && id.isEmpty() == false) {
+            sbuf.append('#');
+            sbuf.append(id);
+        }
+        Iterator<PseudoClass> iter2 = pseudoClassState.iterator();
+        while(iter2.hasNext()) {
+            final PseudoClass pseudoClass = iter2.next();
+            sbuf.append(':').append(pseudoClass.getPseudoClassName());
+        }
+            
+        return sbuf.toString();
+    }
+
+    @Override protected final void writeBinary(final DataOutputStream os, final StyleConverter.StringStore stringStore)
+        throws IOException
+    {
+        super.writeBinary(os, stringStore);
+        os.writeShort(stringStore.addString(name));
+        os.writeShort(styleClassSet.size());
+        Iterator<StyleClass> iter1 = styleClassSet.iterator();
+        while(iter1.hasNext()) {
+            final StyleClass sc = iter1.next();
+            os.writeShort(stringStore.addString(sc.getStyleClassName()));
+        }
+        os.writeShort(stringStore.addString(id));
+        int pclassSize = pseudoClassState.size()
+                + (nodeOrientation == RIGHT_TO_LEFT || nodeOrientation == LEFT_TO_RIGHT ? 1 : 0);
+        os.writeShort(pclassSize);
+        Iterator<PseudoClass> iter2 = pseudoClassState.iterator();
+        while(iter2.hasNext()) {
+            final PseudoClass pc = iter2.next();
+            os.writeShort(stringStore.addString(pc.getPseudoClassName()));
+        }
+        if (nodeOrientation == RIGHT_TO_LEFT) {
+            os.writeShort(stringStore.addString("dir(rtl)"));
+        } else if (nodeOrientation == LEFT_TO_RIGHT) {
+            os.writeShort(stringStore.addString("dir(ltr)"));
+        }
+    }
+
+    static SimpleSelector readBinary(int bssVersion, final DataInputStream is, final String[] strings)
+        throws IOException
+    {
+        final String name = strings[is.readShort()];
+        final int nStyleClasses = is.readShort();
+        final List<String> styleClasses = new ArrayList<String>();
+        for (int n=0; n < nStyleClasses; n++) {
+            styleClasses.add(strings[is.readShort()]);
+        }
+        final String id = strings[is.readShort()];
+        final int nPseudoclasses = is.readShort();
+        final List<String> pseudoclasses = new ArrayList<String>();
+        for(int n=0; n < nPseudoclasses; n++) {
+            pseudoclasses.add(strings[is.readShort()]);
+        }
+        return new SimpleSelector(name, styleClasses, pseudoclasses, id);
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Size.java	2015-09-03 15:32:22.100076400 -0700
+++ /dev/null	2015-09-03 15:32:23.000000000 -0700
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2008, 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.scene.text.Font;
-
-/**
- * Represents a size specified in a particular unit, such as 14px or 0.2em.
- */
-final public class Size {
-
-    final private double value;
-    final private SizeUnits units;
-    public Size(double value, SizeUnits units) {
-        this.value = value;
-        this.units = (units != null) ? units : SizeUnits.PX;
-    }
-
-    /** */
-    public double getValue() {
-        return value;
-    }
-
-    /** */
-    public SizeUnits getUnits() {
-        return units;
-    }
-    
-    /**
-     * Return whether or not this Size is an absolute value or a relative value.
-     */
-    public boolean isAbsolute() {
-        return units.isAbsolute();
-    }
-    
-    /** Convert this size into Points units, a Point is 1/72 of a inch */
-    public double points(Font font) {
-        return points(1.0, font);
-    }
-
-    /**
-      * Convert this size into points
-      *
-      * @param multiplier   The multiplier for PERCENTAGE sizes
-      * @param font         The font for EM sizes
-      */
-    public double points(double multiplier, Font font) {
-        return units.points(value, multiplier, font);
-    }
-
-    /**
-      * Convert this size into pixels
-      *
-      * @param multiplier   The multiplier for PERCENTAGE sizes
-      * @param font         The font for EM sizes
-      */
-    public double pixels(double multiplier, Font font) {
-        return units.pixels(value, multiplier, font);
-    }
-
-    /**
-      * If size is not an absolute size, return the product of font size in pixels
-      * and value. Otherwise, return the absolute value.
-      */
-    public double pixels(Font font) {
-        return pixels(1.0f, font);
-    }
-
-    /**
-      * If size is not an absolute size, return the product of multiplier
-      * and value. Otherwise, return the absolute value.
-      */
-    public double pixels(double multiplier) {
-        return pixels(multiplier, null);
-    }
-
-    /**
-      * A convenience method for calling <code>pixels(1)</code>
-      */
-    public double pixels() {
-        return pixels(1.0f, null);
-    }
-
-    @Override public String toString() {
-        return Double.toString(value) + units.toString();
-    }
-
-    @Override public int hashCode() {
-        long bits = 17L;
-        bits = 37L * bits + Double.doubleToLongBits(value);
-        bits = 37L * bits + units.hashCode();
-        return (int) (bits ^ (bits >> 32));
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) return true;
-
-        if (obj == null || obj.getClass() != this.getClass()) {
-            return false;
-        }
-        final Size other = (Size)obj;
-
-        if (units != other.units) {
-            return false;
-        }
-
-        if (value == other.value) {
-            return true;
-        }
-
-        if ((value > 0) ? other.value > 0 : other.value < 0) {
-            //
-            // double == double is not reliable since a double is kind of
-            // a fuzzy value. And Double.compare is too precise.
-            // For javafx, most sizes are rounded to the nearest tenth
-            // (see SizeUnits.round) so comparing  here to the nearest
-            // millionth is more than adequate. In the case of rads and
-            // percents, this is also be more than adequate.
-            //
-            // Math.abs is too slow!
-            final double v0 = value > 0 ? value : -value;
-            final double v1 = other.value > 0 ? other.value : -other.value;
-            final double diff = value  - other.value;
-            if (diff < -0.000001 || 0.000001 < diff) {
-                return false;
-            }
-
-            return true;
-        }
-        return false;
-    }
-
-}
-
--- /dev/null	2015-09-03 15:32:23.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Size.java	2015-09-03 15:32:21.295030300 -0700
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+import javafx.scene.text.Font;
+
+
+/**
+ * Represents a size specified in a particular unit, such as 14px or 0.2em.
+ *
+ * @since 9
+ */
+final public class Size {
+
+    final private double value;
+    final private SizeUnits units;
+    public Size(double value, SizeUnits units) {
+        this.value = value;
+        this.units = (units != null) ? units : SizeUnits.PX;
+    }
+
+    /** */
+    public double getValue() {
+        return value;
+    }
+
+    /** */
+    public SizeUnits getUnits() {
+        return units;
+    }
+    
+    /**
+     * Return whether or not this Size is an absolute value or a relative value.
+     */
+    public boolean isAbsolute() {
+        return units.isAbsolute();
+    }
+    
+    /** Convert this size into Points units, a Point is 1/72 of a inch */
+    double points(Font font) {
+        return points(1.0, font);
+    }
+
+    /**
+      * Convert this size into points
+      *
+      * @param multiplier   The multiplier for PERCENTAGE sizes
+      * @param font         The font for EM sizes
+      */
+    double points(double multiplier, Font font) {
+        return units.points(value, multiplier, font);
+    }
+
+    /**
+      * Convert this size into pixels
+      *
+      * @param multiplier   The multiplier for PERCENTAGE sizes
+      * @param font         The font for EM sizes
+      */
+    public double pixels(double multiplier, Font font) {
+        return units.pixels(value, multiplier, font);
+    }
+
+    /**
+      * If size is not an absolute size, return the product of font size in pixels
+      * and value. Otherwise, return the absolute value.
+      */
+    public double pixels(Font font) {
+        return pixels(1.0f, font);
+    }
+
+    /**
+      * If size is not an absolute size, return the product of multiplier
+      * and value. Otherwise, return the absolute value.
+      */
+    double pixels(double multiplier) {
+        return pixels(multiplier, null);
+    }
+
+    /**
+      * A convenience method for calling <code>pixels(1)</code>
+      */
+    public double pixels() {
+        return pixels(1.0f, null);
+    }
+
+    @Override public String toString() {
+        return Double.toString(value) + units.toString();
+    }
+
+    @Override public int hashCode() {
+        long bits = 17L;
+        bits = 37L * bits + Double.doubleToLongBits(value);
+        bits = 37L * bits + units.hashCode();
+        return (int) (bits ^ (bits >> 32));
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) return true;
+
+        if (obj == null || obj.getClass() != this.getClass()) {
+            return false;
+        }
+        final Size other = (Size)obj;
+
+        if (units != other.units) {
+            return false;
+        }
+
+        if (value == other.value) {
+            return true;
+        }
+
+        if ((value > 0) ? other.value > 0 : other.value < 0) {
+            //
+            // double == double is not reliable since a double is kind of
+            // a fuzzy value. And Double.compare is too precise.
+            // For javafx, most sizes are rounded to the nearest tenth
+            // (see SizeUnits.round) so comparing  here to the nearest
+            // millionth is more than adequate. In the case of rads and
+            // percents, this is also be more than adequate.
+            //
+            // Math.abs is too slow!
+            final double v0 = value > 0 ? value : -value;
+            final double v1 = other.value > 0 ? other.value : -other.value;
+            final double diff = value  - other.value;
+            if (diff < -0.000001 || 0.000001 < diff) {
+                return false;
+            }
+
+            return true;
+        }
+        return false;
+    }
+
+}
+
--- old/modules/graphics/src/main/java/com/sun/javafx/css/SizeUnits.java	2015-09-03 15:32:29.964526200 -0700
+++ /dev/null	2015-09-03 15:32:30.000000000 -0700
@@ -1,326 +0,0 @@
-/*
- * Copyright (c) 2008, 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.css;
-
-import javafx.scene.text.Font;
-
-/**
- * Represents a size specified in a particular unit, such as 14px or 0.2em.
- */
-public enum SizeUnits {
-    
-    PERCENT(false) {
-
-        @Override
-	public String toString() { return "%"; }
-
-        @Override
-	public double points(double value, double multiplier, Font font_not_used) {
-            return (value/100.0) * multiplier;
-        }
-
-        @Override
-	public double pixels(double value, double multiplier, Font font_not_used) {
-            return (value/100.0) * multiplier;
-        }
-
-    },
-    IN(true) {
-
-        @Override
-	public String toString() { return "in"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return value * POINTS_PER_INCH;
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return value * DOTS_PER_INCH;
-        }
-
-    },
-    CM(true) {
-
-        @Override
-	public String toString() { return "cm"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return (value / CM_PER_INCH) * POINTS_PER_INCH;
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return (value / CM_PER_INCH) * DOTS_PER_INCH;
-        }
-
-    },
-    MM(true) {
-
-        @Override
-	public String toString() { return "mm"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return (value / MM_PER_INCH) * POINTS_PER_INCH;
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return (value / MM_PER_INCH) * DOTS_PER_INCH;
-        }
-
-    },
-    EM(false) {
-
-        @Override
-	public String toString() { return "em"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font) {
-            return round(value * pointSize(font));
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font) {
-            return round(value * pixelSize(font));
-        }
-
-    },
-    EX(false) {
-
-        @Override
-	public String toString() { return "ex"; }
-
-        // In the absence of font metrics, one ex is taken to be half an em
-        @Override
-	public double points(double value, double multiplier_not_used, Font font) {
-            return round(value / 2.0 * pointSize(font));
-        }
-
-        // In the absence of font metrics, one ex is taken to be half an em
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font) {
-            return round(value / 2.0 * pixelSize(font));
-        }
-
-    },
-    PT(true) {
-        @Override
-	public String toString() { return "pt"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return value;
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return value * (DOTS_PER_INCH / POINTS_PER_INCH);
-        }
-
-    },
-    PC(true) {
-        @Override
-	public String toString() { return "pc"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return value * POINTS_PER_PICA;
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return (value * POINTS_PER_PICA) * (DOTS_PER_INCH / POINTS_PER_INCH);
-        }
-
-    },
-    PX(true) {
-        @Override
-	public String toString() { return "px"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return value * (POINTS_PER_INCH / DOTS_PER_INCH);
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return value;
-        }
-
-    },
-
-    DEG(true) {
-        @Override
-	public String toString() { return "deg"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return round(value);
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return round(value);
-        }
-
-    },
-
-    GRAD(true) {
-
-        @Override
-	public String toString() { return "grad"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            // convert to degrees - 360deg = 400grad
-            return round(value*9/10);
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            // convert to degrees - 360deg = 400grad
-            return round(value*9/10);
-        }
-
-    },
-
-    RAD(true) {
-
-        @Override
-	public String toString() { return "rad"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            // convert to degrees - 360deg = 2pi rad
-            return round(value*180/Math.PI);
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            // convert to degrees - 360deg = 2pi rad
-            return round(value*180/Math.PI);
-        }
-
-    },
-
-    TURN(true) {
-
-        @Override
-	public String toString() { return "turn"; }
-
-        @Override
-	public double points(double value, double multiplier_not_used, Font font_not_used) {
-            // convert to degrees - 360deg = 1 turn
-            return round(value*360);
-        }
-
-        @Override
-	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return round(value*360);
-        }
-
-    },
-
-
-    S(true) {
-
-        @Override
-        public String toString() { return "s"; }
-
-        @Override
-        public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return value;
-        }
-
-        @Override
-        public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return value;
-        }
-
-    },
-
-    MS(true) {
-
-        @Override
-        public String toString() { return "ms"; }
-
-        @Override
-        public double points(double value, double multiplier_not_used, Font font_not_used) {
-            return value;
-        }
-
-        @Override
-        public double pixels(double value, double multiplier_not_used, Font font_not_used) {
-            return value;
-        }
-
-    };
-
-    abstract double points(double value, double multiplier, Font font);
-    abstract double pixels(double value, double multiplier, Font font);
-
-    private SizeUnits(boolean absolute) {
-        this.absolute = absolute;
-    }
-
-    private final boolean absolute;
-    public boolean isAbsolute() {
-        return absolute;
-    }
-
-    // RT-14711: The spec says 1px is equal to 0.75pt
-    //           72 / 0.75 = 96
-    static final private double DOTS_PER_INCH = 96.0;
-    static final private double POINTS_PER_INCH = 72.0;
-    static final private double CM_PER_INCH = 2.54;
-    static final private double MM_PER_INCH = CM_PER_INCH * 10;
-    static final private double POINTS_PER_PICA = 12.0;
-
-    /* Get the font size in points */
-    private static double pointSize(Font font) {
-        return pixelSize(font) * (POINTS_PER_INCH/DOTS_PER_INCH);
-    }
-
-    /* Get the font size in pixels to points */
-    private static double pixelSize(Font font) {
-        return (font != null) ? font.getSize() : Font.getDefault().getSize();
-    }
-
-    /* round to nearest 10th */
-    private static double round(double d) {
-
-        if (d == 0) return d;
-        
-        final double r = (d < 0) ? -0.05 : 0.05;
-        return ((long)((d + r) * 10)) / 10.0;
-    }
-
-
-}
--- /dev/null	2015-09-03 15:32:31.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/SizeUnits.java	2015-09-03 15:32:29.213483200 -0700
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2008, 2015, 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.css;
+
+import javafx.scene.text.Font;
+
+/**
+ * Represents a size specified in a particular unit, such as 14px or 0.2em.
+ *
+ * @since 9
+ */
+public enum SizeUnits {
+    
+    PERCENT(false) {
+
+        @Override
+	public String toString() { return "%"; }
+
+        @Override
+	public double points(double value, double multiplier, Font font_not_used) {
+            return (value/100.0) * multiplier;
+        }
+
+        @Override
+	public double pixels(double value, double multiplier, Font font_not_used) {
+            return (value/100.0) * multiplier;
+        }
+
+    },
+    IN(true) {
+
+        @Override
+	public String toString() { return "in"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return value * POINTS_PER_INCH;
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return value * DOTS_PER_INCH;
+        }
+
+    },
+    CM(true) {
+
+        @Override
+	public String toString() { return "cm"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return (value / CM_PER_INCH) * POINTS_PER_INCH;
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return (value / CM_PER_INCH) * DOTS_PER_INCH;
+        }
+
+    },
+    MM(true) {
+
+        @Override
+	public String toString() { return "mm"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return (value / MM_PER_INCH) * POINTS_PER_INCH;
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return (value / MM_PER_INCH) * DOTS_PER_INCH;
+        }
+
+    },
+    EM(false) {
+
+        @Override
+	public String toString() { return "em"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font) {
+            return round(value * pointSize(font));
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font) {
+            return round(value * pixelSize(font));
+        }
+
+    },
+    EX(false) {
+
+        @Override
+	public String toString() { return "ex"; }
+
+        // In the absence of font metrics, one ex is taken to be half an em
+        @Override
+	public double points(double value, double multiplier_not_used, Font font) {
+            return round(value / 2.0 * pointSize(font));
+        }
+
+        // In the absence of font metrics, one ex is taken to be half an em
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font) {
+            return round(value / 2.0 * pixelSize(font));
+        }
+
+    },
+    PT(true) {
+        @Override
+	public String toString() { return "pt"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return value;
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return value * (DOTS_PER_INCH / POINTS_PER_INCH);
+        }
+
+    },
+    PC(true) {
+        @Override
+	public String toString() { return "pc"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return value * POINTS_PER_PICA;
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return (value * POINTS_PER_PICA) * (DOTS_PER_INCH / POINTS_PER_INCH);
+        }
+
+    },
+    PX(true) {
+        @Override
+	public String toString() { return "px"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return value * (POINTS_PER_INCH / DOTS_PER_INCH);
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return value;
+        }
+
+    },
+
+    DEG(true) {
+        @Override
+	public String toString() { return "deg"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return round(value);
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return round(value);
+        }
+
+    },
+
+    GRAD(true) {
+
+        @Override
+	public String toString() { return "grad"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            // convert to degrees - 360deg = 400grad
+            return round(value*9/10);
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            // convert to degrees - 360deg = 400grad
+            return round(value*9/10);
+        }
+
+    },
+
+    RAD(true) {
+
+        @Override
+	public String toString() { return "rad"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            // convert to degrees - 360deg = 2pi rad
+            return round(value*180/Math.PI);
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            // convert to degrees - 360deg = 2pi rad
+            return round(value*180/Math.PI);
+        }
+
+    },
+
+    TURN(true) {
+
+        @Override
+	public String toString() { return "turn"; }
+
+        @Override
+	public double points(double value, double multiplier_not_used, Font font_not_used) {
+            // convert to degrees - 360deg = 1 turn
+            return round(value*360);
+        }
+
+        @Override
+	public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return round(value*360);
+        }
+
+    },
+
+
+    S(true) {
+
+        @Override
+        public String toString() { return "s"; }
+
+        @Override
+        public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return value;
+        }
+
+        @Override
+        public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return value;
+        }
+
+    },
+
+    MS(true) {
+
+        @Override
+        public String toString() { return "ms"; }
+
+        @Override
+        public double points(double value, double multiplier_not_used, Font font_not_used) {
+            return value;
+        }
+
+        @Override
+        public double pixels(double value, double multiplier_not_used, Font font_not_used) {
+            return value;
+        }
+
+    };
+
+    public abstract double points(double value, double multiplier, Font font);
+    public abstract double pixels(double value, double multiplier, Font font);
+
+    private SizeUnits(boolean absolute) {
+        this.absolute = absolute;
+    }
+
+    private final boolean absolute;
+    public boolean isAbsolute() {
+        return absolute;
+    }
+
+    // RT-14711: The spec says 1px is equal to 0.75pt
+    //           72 / 0.75 = 96
+    static final private double DOTS_PER_INCH = 96.0;
+    static final private double POINTS_PER_INCH = 72.0;
+    static final private double CM_PER_INCH = 2.54;
+    static final private double MM_PER_INCH = CM_PER_INCH * 10;
+    static final private double POINTS_PER_PICA = 12.0;
+
+    /* Get the font size in points */
+    private static double pointSize(Font font) {
+        return pixelSize(font) * (POINTS_PER_INCH/DOTS_PER_INCH);
+    }
+
+    /* Get the font size in pixels to points */
+    private static double pixelSize(Font font) {
+        return (font != null) ? font.getSize() : Font.getDefault().getSize();
+    }
+
+    /* round to nearest 10th */
+    private static double round(double d) {
+
+        if (d == 0) return d;
+        
+        final double r = (d < 0) ? -0.05 : 0.05;
+        return ((long)((d + r) * 10)) / 10.0;
+    }
+
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Style.java	2015-09-03 15:32:37.788973700 -0700
+++ /dev/null	2015-09-03 15:32:39.000000000 -0700
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2008, 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;
-
-
-/** 
- * A Style is just the selector and declaration from a Rule. 
- */
-final public class Style {
-    
-    /**
-     * A selector might have more than one selector. This is the one that was
-     * matched.
-     */
-    public Selector getSelector() {
-        return selector;
-    }
-    
-    /**
-     * The Declaration that is the source of the style that is about
-     * to be applied or has just been applied. May be null if the
-     * value comes from the CSSProperty's initial (default) value. 
-     */
-    public Declaration getDeclaration() {
-        return declaration;
-    }
-
-    public Style(Selector selector, Declaration declaration) {
-        this.selector = selector;
-        this.declaration = declaration;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Style other = (Style) obj;
-        if (this.selector != other.selector && (this.selector == null || !this.selector.equals(other.selector))) {
-            return false;
-        }
-        if (this.declaration != other.declaration && (this.declaration == null || !this.declaration.equals(other.declaration))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override public int hashCode() {
-        int hash = 3;
-        hash = 83 * hash + (this.selector != null ? this.selector.hashCode() : 0);
-        hash = 83 * hash + (this.declaration != null ? this.declaration.hashCode() : 0);
-        return hash;
-    }
-    
-    @Override public String toString() {
-        final StringBuilder sb = new StringBuilder()
-                .append(String.valueOf(selector))
-                .append(" { ")
-                .append(String.valueOf(declaration))
-                .append( " } ");
-        return sb.toString();
-
-    }    
-    
-    private final Selector selector;
-    private final Declaration declaration;
-}
-
--- /dev/null	2015-09-03 15:32:39.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Style.java	2015-09-03 15:32:36.967926800 -0700
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2008, 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.css;
+
+
+/** 
+ * A Style is just the selector and declaration from a Rule. 
+ *
+ * @since 9
+ */
+final public class Style {
+    
+    /**
+     * A selector might have more than one selector. This is the one that was
+     * matched.
+     */
+    public Selector getSelector() {
+        return selector;
+    }
+    
+    /**
+     * The Declaration that is the source of the style that is about
+     * to be applied or has just been applied. May be null if the
+     * value comes from the CSSProperty's initial (default) value. 
+     */
+    public Declaration getDeclaration() {
+        return declaration;
+    }
+
+    public Style(Selector selector, Declaration declaration) {
+        this.selector = selector;
+        this.declaration = declaration;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Style other = (Style) obj;
+        if (this.selector != other.selector && (this.selector == null || !this.selector.equals(other.selector))) {
+            return false;
+        }
+        if (this.declaration != other.declaration && (this.declaration == null || !this.declaration.equals(other.declaration))) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override public int hashCode() {
+        int hash = 3;
+        hash = 83 * hash + (this.selector != null ? this.selector.hashCode() : 0);
+        hash = 83 * hash + (this.declaration != null ? this.declaration.hashCode() : 0);
+        return hash;
+    }
+    
+    @Override public String toString() {
+        final StringBuilder sb = new StringBuilder()
+                .append(String.valueOf(selector))
+                .append(" { ")
+                .append(String.valueOf(declaration))
+                .append( " } ");
+        return sb.toString();
+
+    }    
+    
+    private final Selector selector;
+    private final Declaration declaration;
+}
+
--- old/modules/graphics/src/main/java/com/sun/javafx/css/StyleClass.java	2015-09-03 15:32:46.209455300 -0700
+++ /dev/null	2015-09-03 15:32:47.000000000 -0700
@@ -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 com.sun.javafx.css;
-
-/**
- * 
- */
-final class StyleClass {
-
-
-    StyleClass(String styleClassName, int index) {
-        this.styleClassName = styleClassName;
-        this.index = index;
-    }
-
-    /** @return the style-class */
-    public String getStyleClassName() {
-        return styleClassName;
-    }
-
-    /** @return the style-class */
-    @Override public String toString() {
-        return styleClassName;
-    }
-
-    public int getIndex() {
-       return index;
-    }
-
-    private final String styleClassName;
-
-    // index of this StyleClass in styleClasses list.
-    private final int index;
-   
-}
--- /dev/null	2015-09-03 15:32:47.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/StyleClass.java	2015-09-03 15:32:45.358406700 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css;
+
+/**
+ * 
+ * @since 9
+ */
+public final class StyleClass {
+
+    public StyleClass(String styleClassName, int index) {
+        this.styleClassName = styleClassName;
+        this.index = index;
+    }
+
+    /** @return the style-class */
+    public String getStyleClassName() {
+        return styleClassName;
+    }
+
+    /** @return the style-class */
+    @Override public String toString() {
+        return styleClassName;
+    }
+
+    public int getIndex() {
+       return index;
+    }
+
+    private final String styleClassName;
+
+    // index of this StyleClass in styleClasses list.
+    private final int index;
+   
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/Stylesheet.java	2015-09-03 15:32:54.021902200 -0700
+++ /dev/null	2015-09-03 15:32:54.000000000 -0700
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.collections.TrackableObservableList;
-import com.sun.javafx.css.parser.CSSParser;
-import javafx.collections.ListChangeListener.Change;
-import javafx.collections.ObservableList;
-import javafx.css.StyleOrigin;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A stylesheet which can apply properties to a tree of objects.  A stylesheet 
- * is a collection of zero or more {@link Rule Rules}, each of which is applied 
- * to each object in the tree.  Typically the selector will examine the object to
- * determine whether or not it is applicable, and if so it will apply certain 
- * property values to the object.
- * <p>
- */
-public class Stylesheet {
-
-    /**
-     * Version number of binary CSS format. The value is incremented whenever the format of the
-     * binary stream changes. This number does not correlate with JavaFX versions.
-     * Version 5: persist @font-face
-     */
-    final static int BINARY_CSS_VERSION = 5;
-            
-    private final String url;
-    /** The URL from which the stylesheet was loaded.
-     * @return The URL from which the stylesheet was loaded, or null if 
-     *         the stylesheet was created from an inline style. 
-     */
-    public String getUrl() {
-        return url;
-    }
-
-    /**
-     * True if this style came from user stylesheet, we need to know this so 
-     * that we can make user important styles have higher priority than
-     * author styles
-     */
-    private StyleOrigin origin = StyleOrigin.AUTHOR;
-    public StyleOrigin getOrigin() {
-        return origin;
-    }
-    public void setOrigin(StyleOrigin origin) {
-        this.origin = origin;
-    }
-
-    /** All the rules contained in the stylesheet in the order they are in the file */
-    private final ObservableList<Rule> rules = new TrackableObservableList<Rule>() {
-
-        @Override
-        protected void onChanged(Change<Rule> c) {
-            c.reset();
-            while (c.next()) {
-                if (c.wasAdded()) {
-                    for(Rule rule : c.getAddedSubList()) {
-                        rule.setStylesheet(Stylesheet.this);
-                    }
-                } else if (c.wasRemoved()) {
-                    for (Rule rule : c.getRemoved()) {
-                        if (rule.getStylesheet() == Stylesheet.this) rule.setStylesheet(null);
-                    }
-                }
-            }
-        }
-    };
-
-    /** List of all font faces */
-    private final List<FontFace> fontFaces = new ArrayList<FontFace>();
-
-    /**
-     * Constructs a stylesheet with the base URI defaulting to the root
-     * path of the application.
-     */
-    public Stylesheet() {
-
-//        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-//        this.url = (cl != null) ? cl.getResource("") : null;
-        //
-        // RT-17344
-        // The above code is unreliable. The getResource call is intended
-        // to return the root path of the Application instance, but it sometimes
-        // returns null. Here, we'll set url to null and then when a url is 
-        // resolved, the url path can be used in the getResource call. For 
-        // example, if the css is -fx-image: url("images/duke.png"), we can
-        // do cl.getResouce("images/duke.png") in URLConverter
-        //
-
-        this(null);
-    }
-
-    /**
-     * Constructs a Stylesheet using the given URL as the base URI. The
-     * parameter may not be null.
-     * @param url
-     */
-    public Stylesheet(String url) {
-
-        this.url = url;
-        
-    }
-
-    public List<Rule> getRules() {
-        return rules;
-    }
-
-    public List<FontFace> getFontFaces() {
-        return fontFaces;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj instanceof Stylesheet) {
-            Stylesheet other = (Stylesheet)obj;
-            
-            if (this.url == null && other.url == null) {
-                return true;
-            } else if (this.url == null || other.url == null) {
-                return false;
-            } else {
-                return this.url.equals(other.url);
-            }
-        }
-        return false;
-    }
-    
-    @Override public int hashCode() {
-        int hash = 7;
-        hash = 13 * hash + (this.url != null ? this.url.hashCode() : 0);
-        return hash;
-    }
-
-    /** Returns a string representation of this object. */
-    @Override public String toString() {
-        StringBuilder sbuf = new StringBuilder();
-        sbuf.append("/* ");
-        if (url != null) sbuf.append(url);
-        if (rules.isEmpty()) {
-            sbuf.append(" */");
-        } else {
-            sbuf.append(" */\n");
-            for(int r=0; r<rules.size(); r++) {
-                sbuf.append(rules.get(r));
-                sbuf.append('\n');
-            }
-        }
-        return sbuf.toString();
-    }
-
-    // protected for unit testing
-    final void writeBinary(final DataOutputStream os, final StringStore stringStore)
-        throws IOException 
-    {
-        // Note: url is not written since it depends on runtime environment.
-        int index = stringStore.addString(origin.name());
-        os.writeShort(index);
-        os.writeShort(rules.size());
-        for (Rule r : rules) r.writeBinary(os,stringStore);
-
-        // Version 5 adds persistence of FontFace
-        List<FontFace> fontFaceList = getFontFaces();
-        int nFontFaces = fontFaceList != null ? fontFaceList.size() : 0;
-        os.writeShort(nFontFaces);
-
-        for(int n=0; n<nFontFaces; n++) {
-            FontFace fontFace = fontFaceList.get(n);
-            fontFace.writeBinary(os, stringStore);
-        }
-    }
-    
-    // protected for unit testing 
-    final void readBinary(int bssVersion, DataInputStream is, String[] strings)
-        throws IOException 
-    {
-        this.stringStore = strings;
-        final int index = is.readShort();
-        this.setOrigin(StyleOrigin.valueOf(strings[index]));
-        final int nRules = is.readShort();
-        List<Rule> persistedRules = new ArrayList<Rule>(nRules);
-        for (int n=0; n<nRules; n++) {
-            persistedRules.add(Rule.readBinary(bssVersion,is,strings));
-        }
-        this.rules.addAll(persistedRules);
-
-        if (bssVersion >= 5) {
-            List<FontFace> fontFaceList = this.getFontFaces();
-            int nFontFaces = is.readShort();
-            for (int n=0; n<nFontFaces; n++) {
-                FontFace fontFace = FontFace.readBinary(bssVersion, is, strings);
-                fontFaceList.add(fontFace);
-            }
-        }
-    }
-
-    private String[] stringStore;
-    final String[] getStringStore() { return stringStore; }
-
-    /** Load a binary stylesheet file from a input stream */
-    public static Stylesheet loadBinary(URL url) throws IOException {
-
-        if (url == null) return null;
-
-        Stylesheet stylesheet = null;
-
-        try (DataInputStream dataInputStream =
-                     new DataInputStream(new BufferedInputStream(url.openStream(), 40 * 1024))) {
-
-            // read file version
-            final int bssVersion = dataInputStream.readShort();
-            if (bssVersion > Stylesheet.BINARY_CSS_VERSION) {
-                throw new IOException(url.toString() + " wrong binary CSS version: "
-                        + bssVersion + ". Expected version less than or equal to" +
-                        Stylesheet.BINARY_CSS_VERSION);
-            }
-            // read strings
-            final String[] strings = StringStore.readBinary(dataInputStream);
-            // read binary data
-            stylesheet = new Stylesheet(url.toExternalForm());
-
-            try {
-
-                dataInputStream.mark(Integer.MAX_VALUE);
-                stylesheet.readBinary(bssVersion, dataInputStream, strings);
-
-            } catch (Exception e) {
-
-                stylesheet = new Stylesheet(url.toExternalForm());
-
-                dataInputStream.reset();
-
-                if (bssVersion == 2) {
-                    // RT-31022
-                    stylesheet.readBinary(3, dataInputStream, strings);
-                } else {
-                    stylesheet.readBinary(Stylesheet.BINARY_CSS_VERSION, dataInputStream, strings);
-                }
-            }
-
-        } catch (FileNotFoundException fnfe) {
-            // This comes from url.openStream() and is expected.
-            // It just means that the .bss file doesn't exist.
-        }
-
-        // return stylesheet
-        return stylesheet;
-    }
-
-    /**
-     * Convert the .css file referenced by urlIn to binary format and write to urlOut.
-     * @param source is the JavaFX .css file to convert
-     * @param destination is the file to which the binary conversion is written
-     * @throws IOException
-     * @throws IllegalArgumentException if either parameter is null, if source and destination are the same,
-     * if source cannot be read, or if destination cannot be written.
-     */
-    public static void convertToBinary(File source, File destination) throws IOException {
-
-        if (source == null || destination == null) {
-            throw new IllegalArgumentException("parameters may not be null");
-        }
-
-        if (source.getAbsolutePath().equals(destination.getAbsolutePath())) {
-            throw new IllegalArgumentException("source and destination may not be the same");
-        }
-
-        if (source.canRead() == false) {
-            throw new IllegalArgumentException("cannot read source file");
-        }
-
-        if (destination.exists() ? (destination.canWrite() == false) : (destination.createNewFile() == false)) {
-            throw new IllegalArgumentException("cannot write destination file");
-        }
-
-        URI sourceURI = source.toURI();
-        Stylesheet stylesheet = new CSSParser().parse(sourceURI.toURL());
-
-        // first write all the css binary data into the buffer and collect strings on way
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        DataOutputStream dos = new DataOutputStream(baos);
-        StringStore stringStore = new StringStore();
-        stylesheet.writeBinary(dos, stringStore);
-        dos.flush();
-        dos.close();
-
-        FileOutputStream fos = new FileOutputStream(destination);
-        DataOutputStream os = new DataOutputStream(fos);
-
-        // write file version
-        os.writeShort(BINARY_CSS_VERSION);
-
-        // write strings
-        stringStore.writeBinary(os);
-
-        // write binary css
-        os.write(baos.toByteArray());
-        os.flush();
-        os.close();
-    }
-
-    // Add the rules from the other stylesheet to this one
-    public void importStylesheet(Stylesheet importedStylesheet) {
-        if (importedStylesheet == null) return;
-
-        List<Rule> rulesToImport = importedStylesheet.getRules();
-        if (rulesToImport == null || rulesToImport.isEmpty()) return;
-
-        List<Rule> importedRules = new ArrayList<>(rulesToImport.size());
-        for (Rule rule : rulesToImport) {
-            List<Selector> selectors = rule.getSelectors();
-            List<Declaration> declarations = rule.getUnobservedDeclarationList();
-            importedRules.add(new Rule(selectors, declarations));
-        }
-
-        rules.addAll(importedRules);
-    }
-}
--- /dev/null	2015-09-03 15:32:55.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/Stylesheet.java	2015-09-03 15:32:53.355864100 -0700
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) 2010, 2015, 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.css;
+
+import javafx.css.StyleConverter.StringStore;
+
+import javafx.collections.ListChangeListener.Change;
+import javafx.collections.ObservableList;
+
+import com.sun.javafx.collections.TrackableObservableList;
+import com.sun.javafx.css.FontFaceImpl;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A stylesheet which can apply properties to a tree of objects.  A stylesheet 
+ * is a collection of zero or more {@link Rule Rules}, each of which is applied 
+ * to each object in the tree.  Typically the selector will examine the object to
+ * determine whether or not it is applicable, and if so it will apply certain 
+ * property values to the object.
+ *
+ * @since 9
+ */
+public class Stylesheet {
+
+    /**
+     * Version number of binary CSS format. The value is incremented whenever the format of the
+     * binary stream changes. This number does not correlate with JavaFX versions.
+     * Version 5: persist @font-face
+     * Version 6: converter classes moved to public package
+     */
+    final static int BINARY_CSS_VERSION = 6;
+            
+    private final String url;
+    /** The URL from which the stylesheet was loaded.
+     * @return The URL from which the stylesheet was loaded, or null if 
+     *         the stylesheet was created from an inline style. 
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * True if this style came from user stylesheet, we need to know this so 
+     * that we can make user important styles have higher priority than
+     * author styles
+     */
+    private StyleOrigin origin = StyleOrigin.AUTHOR;
+    public StyleOrigin getOrigin() {
+        return origin;
+    }
+    public void setOrigin(StyleOrigin origin) {
+        this.origin = origin;
+    }
+
+    /** All the rules contained in the stylesheet in the order they are in the file */
+    private final ObservableList<Rule> rules = new TrackableObservableList<Rule>() {
+
+        @Override protected void onChanged(Change<Rule> c) {
+            c.reset();
+            while (c.next()) {
+                if (c.wasAdded()) {
+                    for(Rule rule : c.getAddedSubList()) {
+                        rule.setStylesheet(Stylesheet.this);
+                    }
+                } else if (c.wasRemoved()) {
+                    for (Rule rule : c.getRemoved()) {
+                        if (rule.getStylesheet() == Stylesheet.this) rule.setStylesheet(null);
+                    }
+                }
+            }
+        }
+    };
+
+    /** List of all font faces */
+    private final List<FontFace> fontFaces = new ArrayList<FontFace>();
+
+    /**
+     * Constructs a stylesheet with the base URI defaulting to the root
+     * path of the application.
+     */
+    Stylesheet() {
+
+//        ClassLoader cl = Thread.currentThread().getContextClassLoader();
+//        this.url = (cl != null) ? cl.getResource("") : null;
+        //
+        // RT-17344
+        // The above code is unreliable. The getResource call is intended
+        // to return the root path of the Application instance, but it sometimes
+        // returns null. Here, we'll set url to null and then when a url is 
+        // resolved, the url path can be used in the getResource call. For 
+        // example, if the css is -fx-image: url("images/duke.png"), we can
+        // do cl.getResouce("images/duke.png") in URLConverter
+        //
+
+        this(null);
+    }
+
+    /**
+     * Constructs a Stylesheet using the given URL as the base URI. The
+     * parameter may not be null.
+     * @param url
+     */
+    Stylesheet(String url) {
+
+        this.url = url;
+        
+    }
+
+    public List<Rule> getRules() {
+        return rules;
+    }
+
+    public List<FontFace> getFontFaces() {
+        return fontFaces;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj instanceof Stylesheet) {
+            Stylesheet other = (Stylesheet)obj;
+            
+            if (this.url == null && other.url == null) {
+                return true;
+            } else if (this.url == null || other.url == null) {
+                return false;
+            } else {
+                return this.url.equals(other.url);
+            }
+        }
+        return false;
+    }
+    
+    @Override public int hashCode() {
+        int hash = 7;
+        hash = 13 * hash + (this.url != null ? this.url.hashCode() : 0);
+        return hash;
+    }
+
+    /** Returns a string representation of this object. */
+    @Override public String toString() {
+        StringBuilder sbuf = new StringBuilder();
+        sbuf.append("/* ");
+        if (url != null) sbuf.append(url);
+        if (rules.isEmpty()) {
+            sbuf.append(" */");
+        } else {
+            sbuf.append(" */\n");
+            for(int r=0; r<rules.size(); r++) {
+                sbuf.append(rules.get(r));
+                sbuf.append('\n');
+            }
+        }
+        return sbuf.toString();
+    }
+
+    // protected for unit testing
+    final void writeBinary(final DataOutputStream os, final StringStore stringStore)
+        throws IOException 
+    {
+        // Note: url is not written since it depends on runtime environment.
+        int index = stringStore.addString(origin.name());
+        os.writeShort(index);
+        os.writeShort(rules.size());
+        for (Rule r : rules) r.writeBinary(os,stringStore);
+
+        // Version 5 adds persistence of FontFace
+        List<FontFace> fontFaceList = getFontFaces();
+        int nFontFaces = fontFaceList != null ? fontFaceList.size() : 0;
+        os.writeShort(nFontFaces);
+
+        for(int n=0; n<nFontFaces; n++) {
+            FontFace fontFace = fontFaceList.get(n);
+            if (fontFace instanceof FontFaceImpl) {
+                ((FontFaceImpl)fontFace).writeBinary(os, stringStore);
+            }
+        }
+    }
+    
+    // protected for unit testing 
+    final void readBinary(int bssVersion, DataInputStream is, String[] strings)
+        throws IOException 
+    {
+        this.stringStore = strings;
+        final int index = is.readShort();
+        this.setOrigin(StyleOrigin.valueOf(strings[index]));
+        final int nRules = is.readShort();
+        List<Rule> persistedRules = new ArrayList<Rule>(nRules);
+        for (int n=0; n<nRules; n++) {
+            persistedRules.add(Rule.readBinary(bssVersion,is,strings));
+        }
+        this.rules.addAll(persistedRules);
+
+        if (bssVersion >= 5) {
+            List<FontFace> fontFaceList = this.getFontFaces();
+            int nFontFaces = is.readShort();
+            for (int n=0; n<nFontFaces; n++) {
+                FontFace fontFace = FontFaceImpl.readBinary(bssVersion, is, strings);
+                fontFaceList.add(fontFace);
+            }
+        }
+    }
+
+    private String[] stringStore;
+    final String[] getStringStore() { return stringStore; }
+
+    /** Load a binary stylesheet file from a input stream */
+    public static Stylesheet loadBinary(URL url) throws IOException {
+
+        if (url == null) return null;
+
+        Stylesheet stylesheet = null;
+
+        try (DataInputStream dataInputStream =
+                     new DataInputStream(new BufferedInputStream(url.openStream(), 40 * 1024))) {
+
+            // read file version
+            final int bssVersion = dataInputStream.readShort();
+            if (bssVersion > Stylesheet.BINARY_CSS_VERSION) {
+                throw new IOException(url.toString() + " wrong binary CSS version: "
+                        + bssVersion + ". Expected version less than or equal to" +
+                        Stylesheet.BINARY_CSS_VERSION);
+            }
+            // read strings
+            final String[] strings = StringStore.readBinary(dataInputStream);
+            // read binary data
+            stylesheet = new Stylesheet(url.toExternalForm());
+
+            try {
+
+                dataInputStream.mark(Integer.MAX_VALUE);
+                stylesheet.readBinary(bssVersion, dataInputStream, strings);
+
+            } catch (Exception e) {
+
+                stylesheet = new Stylesheet(url.toExternalForm());
+
+                dataInputStream.reset();
+
+                if (bssVersion == 2) {
+                    // RT-31022
+                    stylesheet.readBinary(3, dataInputStream, strings);
+                } else {
+                    stylesheet.readBinary(Stylesheet.BINARY_CSS_VERSION, dataInputStream, strings);
+                }
+            }
+
+        } catch (FileNotFoundException fnfe) {
+            // This comes from url.openStream() and is expected.
+            // It just means that the .bss file doesn't exist.
+        }
+
+        // return stylesheet
+        return stylesheet;
+    }
+
+    /**
+     * Convert the .css file referenced by urlIn to binary format and write to urlOut.
+     * @param source is the JavaFX .css file to convert
+     * @param destination is the file to which the binary conversion is written
+     * @throws IOException
+     * @throws IllegalArgumentException if either parameter is null, if source and destination are the same,
+     * if source cannot be read, or if destination cannot be written.
+     */
+    public static void convertToBinary(File source, File destination) throws IOException {
+
+        if (source == null || destination == null) {
+            throw new IllegalArgumentException("parameters may not be null");
+        }
+
+        if (source.getAbsolutePath().equals(destination.getAbsolutePath())) {
+            throw new IllegalArgumentException("source and destination may not be the same");
+        }
+
+        if (source.canRead() == false) {
+            throw new IllegalArgumentException("cannot read source file");
+        }
+
+        if (destination.exists() ? (destination.canWrite() == false) : (destination.createNewFile() == false)) {
+            throw new IllegalArgumentException("cannot write destination file");
+        }
+
+        URI sourceURI = source.toURI();
+        Stylesheet stylesheet = new CssParser().parse(sourceURI.toURL());
+
+        // first write all the css binary data into the buffer and collect strings on way
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        DataOutputStream dos = new DataOutputStream(baos);
+        StringStore stringStore = new StringStore();
+        stylesheet.writeBinary(dos, stringStore);
+        dos.flush();
+        dos.close();
+
+        FileOutputStream fos = new FileOutputStream(destination);
+        DataOutputStream os = new DataOutputStream(fos);
+
+        // write file version
+        os.writeShort(BINARY_CSS_VERSION);
+
+        // write strings
+        stringStore.writeBinary(os);
+
+        // write binary css
+        os.write(baos.toByteArray());
+        os.flush();
+        os.close();
+    }
+
+    // Add the rules from the other stylesheet to this one
+    void importStylesheet(Stylesheet importedStylesheet) {
+        if (importedStylesheet == null) return;
+
+        List<Rule> rulesToImport = importedStylesheet.getRules();
+        if (rulesToImport == null || rulesToImport.isEmpty()) return;
+
+        List<Rule> importedRules = new ArrayList<>(rulesToImport.size());
+        for (Rule rule : rulesToImport) {
+            List<Selector> selectors = rule.getSelectors();
+            List<Declaration> declarations = rule.getUnobservedDeclarationList();
+            importedRules.add(new Rule(selectors, declarations));
+        }
+
+        rules.addAll(importedRules);
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/BooleanConverter.java	2015-09-03 15:33:01.761344900 -0700
+++ /dev/null	2015-09-03 15:33:02.000000000 -0700
@@ -1,58 +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.css.converters;
-
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.text.Font;
-
-public final class BooleanConverter extends StyleConverterImpl<String, Boolean> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final BooleanConverter INSTANCE = new BooleanConverter();
-    }
-
-    public static StyleConverter<String, Boolean> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private BooleanConverter() {
-        super();
-    }
-
-    @Override
-    public Boolean convert(ParsedValue<String, Boolean> value, Font not_used) {
-        String str = value.getValue();
-        return Boolean.valueOf(str);
-    }
-
-    @Override
-    public String toString() {
-        return "BooleanConverter";
-    }
-}
--- /dev/null	2015-09-03 15:33:03.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/BooleanConverter.java	2015-09-03 15:33:00.997301200 -0700
@@ -0,0 +1,60 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.text.Font;
+
+/**
+ * @since 9
+ */
+public final class BooleanConverter extends StyleConverter<String, Boolean> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final BooleanConverter INSTANCE = new BooleanConverter();
+    }
+
+    public static StyleConverter<String, Boolean> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private BooleanConverter() {
+        super();
+    }
+
+    @Override
+    public Boolean convert(ParsedValue<String, Boolean> value, Font not_used) {
+        String str = value.getValue();
+        return Boolean.valueOf(str);
+    }
+
+    @Override
+    public String toString() {
+        return "BooleanConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/ColorConverter.java	2015-09-03 15:33:10.372837400 -0700
+++ /dev/null	2015-09-03 15:33:11.000000000 -0700
@@ -1,78 +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.css.converters;
-
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-
-public final class ColorConverter extends StyleConverterImpl<String, Color> {
-
-    private static class Holder {
-        static final ColorConverter COLOR_INSTANCE = new ColorConverter();
-    }
-
-    // lazy, thread-safe instatiation
-    public static StyleConverter<String, Color> getInstance() {
-        return Holder.COLOR_INSTANCE;
-    }
-
-    private ColorConverter() {
-        super();
-    }
-
-    @Override
-    public Color convert(ParsedValue<String, Color> value, Font font) {
-        Object val = value.getValue();
-        if (val == null) {
-            return null;
-        }
-        if (val instanceof Color) {
-            return (Color)val;
-        }
-        if (val instanceof String) {
-            String str = (String)val;
-            if (str.isEmpty() || "null".equals(str)) {
-                return null;
-            }
-            try {
-                return Color.web((String)val);
-            } catch (IllegalArgumentException iae) {
-                // fall through pending RT-34551
-            }
-        }
-        // pending RT-34551
-        System.err.println("not a color: " + value);
-        return Color.BLACK;
-    }
-
-    @Override
-    public String toString() {
-        return "ColorConverter";
-    }
-}
--- /dev/null	2015-09-03 15:33:11.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/ColorConverter.java	2015-09-03 15:33:09.534789500 -0700
@@ -0,0 +1,80 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+
+/**
+ * @since 9
+ */
+public final class ColorConverter extends StyleConverter<String, Color> {
+
+    private static class Holder {
+        static final ColorConverter COLOR_INSTANCE = new ColorConverter();
+    }
+
+    // lazy, thread-safe instatiation
+    public static StyleConverter<String, Color> getInstance() {
+        return Holder.COLOR_INSTANCE;
+    }
+
+    private ColorConverter() {
+        super();
+    }
+
+    @Override
+    public Color convert(ParsedValue<String, Color> value, Font font) {
+        Object val = value.getValue();
+        if (val == null) {
+            return null;
+        }
+        if (val instanceof Color) {
+            return (Color)val;
+        }
+        if (val instanceof String) {
+            String str = (String)val;
+            if (str.isEmpty() || "null".equals(str)) {
+                return null;
+            }
+            try {
+                return Color.web((String)val);
+            } catch (IllegalArgumentException iae) {
+                // fall through pending RT-34551
+            }
+        }
+        // pending RT-34551
+        System.err.println("not a color: " + value);
+        return Color.BLACK;
+    }
+
+    @Override
+    public String toString() {
+        return "ColorConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/CursorConverter.java	2015-09-03 15:33:18.952328100 -0700
+++ /dev/null	2015-09-03 15:33:20.000000000 -0700
@@ -1,75 +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.css.converters;
-
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.Cursor;
-import javafx.scene.text.Font;
-
-public final class CursorConverter extends StyleConverterImpl<String, Cursor> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final CursorConverter INSTANCE = new CursorConverter();
-    }
-
-    public static StyleConverter<String, Cursor> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private CursorConverter() {
-        super();
-    }
-
-    @Override
-    public Cursor convert(ParsedValue<String, Cursor> value, Font not_used) {
-
-        // the parser doesn't covert cusor, so convert it from the raw value
-        String string = value.getValue();
-
-        if (string != null) {
-
-            int index = string.indexOf("Cursor.");
-            if (index > -1) {
-                string = string.substring(index+"Cursor.".length());
-            }
-            string = string.replace('-','_').toUpperCase();
-        }
-
-        try {
-            return Cursor.cursor(string);
-        } catch (IllegalArgumentException | NullPointerException exception) {
-            return Cursor.DEFAULT;
-        }
-    }
-
-    @Override
-    public String toString() {
-        return "CursorConverter";
-    }
-}
--- /dev/null	2015-09-03 15:33:20.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/CursorConverter.java	2015-09-03 15:33:18.179283900 -0700
@@ -0,0 +1,77 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.Cursor;
+import javafx.scene.text.Font;
+
+/**
+ * @since 9
+ */
+public final class CursorConverter extends StyleConverter<String, Cursor> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final CursorConverter INSTANCE = new CursorConverter();
+    }
+
+    public static StyleConverter<String, Cursor> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private CursorConverter() {
+        super();
+    }
+
+    @Override
+    public Cursor convert(ParsedValue<String, Cursor> value, Font not_used) {
+
+        // the parser doesn't covert cusor, so convert it from the raw value
+        String string = value.getValue();
+
+        if (string != null) {
+
+            int index = string.indexOf("Cursor.");
+            if (index > -1) {
+                string = string.substring(index+"Cursor.".length());
+            }
+            string = string.replace('-','_').toUpperCase();
+        }
+
+        try {
+            return Cursor.cursor(string);
+        } catch (IllegalArgumentException | NullPointerException exception) {
+            return Cursor.DEFAULT;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "CursorConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/DeriveColorConverter.java	2015-09-03 15:33:27.108794600 -0700
+++ /dev/null	2015-09-03 15:33:28.000000000 -0700
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.parser;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-
-/**
- * Derive a Color from a Color and a brightness value
- */
-public final class DeriveColorConverter extends StyleConverterImpl<ParsedValue[], Color> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final DeriveColorConverter INSTANCE = new DeriveColorConverter();
-    }
-
-    public static DeriveColorConverter getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private DeriveColorConverter() {
-        super();
-    }
-
-    @Override
-    public Color convert(ParsedValue<ParsedValue[], Color> value, Font font) {
-        ParsedValue[] values = value.getValue();
-        final Color color = (Color) values[0].convert(font);
-        final Size brightness = (Size) values[1].convert(font);
-        return com.sun.javafx.util.Utils.deriveColor(color, brightness.pixels(font));
-    }
-
-    @Override
-    public String toString() {
-        return "DeriveColorConverter";
-    }
-}
--- /dev/null	2015-09-03 15:33:28.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/DeriveColorConverter.java	2015-09-03 15:33:26.323749700 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.StyleConverter;
+import javafx.css.ParsedValue;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+
+/**
+ * Derive a Color from a Color and a brightness value
+ */
+public final class DeriveColorConverter extends StyleConverter<ParsedValue[], Color> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final DeriveColorConverter INSTANCE = new DeriveColorConverter();
+    }
+
+    public static DeriveColorConverter getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private DeriveColorConverter() {
+        super();
+    }
+
+    @Override
+    public Color convert(ParsedValue<ParsedValue[], Color> value, Font font) {
+        ParsedValue[] values = value.getValue();
+        final Color color = (Color) values[0].convert(font);
+        final Size brightness = (Size) values[1].convert(font);
+        return com.sun.javafx.util.Utils.deriveColor(color, brightness.pixels(font));
+    }
+
+    @Override
+    public String toString() {
+        return "DeriveColorConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/DeriveSizeConverter.java	2015-09-03 15:33:34.666226900 -0700
+++ /dev/null	2015-09-03 15:33:35.000000000 -0700
@@ -1,65 +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.css.parser;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.scene.text.Font;
-
-/**
- * A type that combines two Size values.  The primary purpose of
- * this type is to handle "convert(size1, size2)" expressions in CSS.
- */
-public final class DeriveSizeConverter extends StyleConverterImpl<ParsedValue<Size, Size>[], Size> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final DeriveSizeConverter INSTANCE = new DeriveSizeConverter();
-    }
-
-    public static DeriveSizeConverter getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private DeriveSizeConverter() {
-        super();
-    }
-
-    @Override
-    public Size convert(ParsedValue<ParsedValue<Size, Size>[], Size> value, Font font) {
-        final ParsedValue<Size, Size>[] sizes = value.getValue();
-        final double px1 = sizes[0].convert(font).pixels(font);
-        final double px2 = sizes[1].convert(font).pixels(font);
-        return new Size(px1 + px2, SizeUnits.PX);
-    }
-
-    @Override
-    public String toString() {
-        return "DeriveSizeConverter";
-    }
-}
--- /dev/null	2015-09-03 15:33:35.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/DeriveSizeConverter.java	2015-09-03 15:33:33.915183900 -0700
@@ -0,0 +1,65 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.SizeUnits;
+import javafx.css.StyleConverter;
+import javafx.css.ParsedValue;
+import javafx.scene.text.Font;
+
+/**
+ * A type that combines two Size values.  The primary purpose of
+ * this type is to handle "convert(size1, size2)" expressions in CSS.
+ */
+public final class DeriveSizeConverter extends StyleConverter<ParsedValue<Size, Size>[], Size> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final DeriveSizeConverter INSTANCE = new DeriveSizeConverter();
+    }
+
+    public static DeriveSizeConverter getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private DeriveSizeConverter() {
+        super();
+    }
+
+    @Override
+    public Size convert(ParsedValue<ParsedValue<Size, Size>[], Size> value, Font font) {
+        final ParsedValue<Size, Size>[] sizes = value.getValue();
+        final double px1 = sizes[0].convert(font).pixels(font);
+        final double px2 = sizes[1].convert(font).pixels(font);
+        return new Size(px1 + px2, SizeUnits.PX);
+    }
+
+    @Override
+    public String toString() {
+        return "DeriveSizeConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/DurationConverter.java	2015-09-03 15:33:42.679685200 -0700
+++ /dev/null	2015-09-03 15:33:43.000000000 -0700
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 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.css.converters;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.text.Font;
-import javafx.util.Duration;
-
-/* Convert a Size to Duration */
-public final class DurationConverter extends StyleConverterImpl<ParsedValue<?, Size>, Duration> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final DurationConverter INSTANCE = new DurationConverter();
-    }
-
-    public static StyleConverter<ParsedValue<?, Size>, Duration> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private DurationConverter() {
-        super();
-    }
-
-    @Override
-    public Duration convert(ParsedValue<ParsedValue<?, Size>, Duration> value, Font font) {
-        ParsedValue<?, Size> parsedValue = value.getValue();
-        Size size = parsedValue.convert(font);
-        double time = size.getValue();
-        Duration duration = null;
-        if (time < Double.POSITIVE_INFINITY) {
-            switch (size.getUnits()) {
-                case S:  duration = Duration.seconds(time); break;
-                case MS: duration = Duration.millis(time);  break;
-                default: duration = Duration.UNKNOWN;
-            }
-        } else {
-            duration = Duration.INDEFINITE;
-        }
-        return duration;
-    }
-
-    @Override
-    public String toString() {
-        return "DurationConverter";
-    }
-
-}
--- /dev/null	2015-09-03 15:33:43.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/DurationConverter.java	2015-09-03 15:33:41.896640500 -0700
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.text.Font;
+import javafx.util.Duration;
+
+/**
+ * Convert a Size to Duration
+ *
+ * @since 9
+ */
+public final class DurationConverter extends StyleConverter<ParsedValue<?, Size>, Duration> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final DurationConverter INSTANCE = new DurationConverter();
+    }
+
+    public static StyleConverter<ParsedValue<?, Size>, Duration> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private DurationConverter() {
+        super();
+    }
+
+    @Override
+    public Duration convert(ParsedValue<ParsedValue<?, Size>, Duration> value, Font font) {
+        ParsedValue<?, Size> parsedValue = value.getValue();
+        Size size = parsedValue.convert(font);
+        double time = size.getValue();
+        Duration duration = null;
+        if (time < Double.POSITIVE_INFINITY) {
+            switch (size.getUnits()) {
+                case S:  duration = Duration.seconds(time); break;
+                case MS: duration = Duration.millis(time);  break;
+                default: duration = Duration.UNKNOWN;
+            }
+        } else {
+            duration = Duration.INDEFINITE;
+        }
+        return duration;
+    }
+
+    @Override
+    public String toString() {
+        return "DurationConverter";
+    }
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/EffectConverter.java	2015-09-03 15:33:50.536134600 -0700
+++ /dev/null	2015-09-03 15:33:51.000000000 -0700
@@ -1,218 +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.css.converters;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.effect.BlurType;
-import javafx.scene.effect.DropShadow;
-import javafx.scene.effect.Effect;
-import javafx.scene.effect.InnerShadow;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-
-import java.util.Map;
-
-public class EffectConverter extends StyleConverterImpl<ParsedValue[], Effect> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final EffectConverter EFFECT_CONVERTER =
-                new EffectConverter();
-        static final DropShadowConverter DROP_SHADOW_INSTANCE =
-                new DropShadowConverter();
-        static final InnerShadowConverter INNER_SHADOW_INSTANCE =
-                new InnerShadowConverter();
-    }
-
-    public static StyleConverter<ParsedValue[], Effect> getInstance() {
-        return Holder.EFFECT_CONVERTER;
-    }
-    
-    @Override
-    public Effect convert(ParsedValue<ParsedValue[], Effect> value, Font font) {
-        throw new IllegalArgumentException("Parsed value is not an Effect");
-    }    
-
-    protected EffectConverter() {
-        super();
-    }
-
-    @Override
-    public String toString() {
-        return "EffectConverter";
-    }
-
-    public static final class DropShadowConverter extends EffectConverter {
-
-        public static DropShadowConverter getInstance() {
-            return Holder.DROP_SHADOW_INSTANCE;
-        }
-
-        private DropShadowConverter() {
-            super();
-        }
-
-        // dropshadow( <blur-type> , <color> , <number> , <number> , <number> , <number> )
-        // <blur-type> = [      gaussian | one-pass-box | three-pass-box | two-pass-box ]
-        // <color> The shadow Color.
-        // <number> The radius of the shadow blur kernel. In the range
-        //          [0.0 ... 127.0], typical value 10.
-        // <number> he spread of the shadow. The spread is the portion of
-        //          the radius where the contribution of the source material
-        //          will be 100%. The remaining portion of the radius will
-        //          have a contribution controlled by the blur kernel. A
-        //          spread of 0.0 will result in a distribution of the shadow
-        //          determined entirely by the blur algorithm. A spread of
-        //          1.0 will result in a solid growth outward of the source
-        //          material opacity to the limit of the radius with a very
-        //          sharp cutoff to transparency at the radius. In the range
-        //          [0.0 ... 1.0] a value of 0.0 is no spread.
-        // <number> The shadow offset in the x direction, in pixels.
-        // <number> The shadow offset in the y direction, in pixels.
-        @Override
-        public Effect convert(ParsedValue<ParsedValue[], Effect> value, Font font) {
-
-            Effect effect = super.getCachedValue(value);
-            if (effect != null) return effect;
-
-            final ParsedValue[] values = value.getValue();
-            final BlurType blurType = (BlurType) values[0].convert(font);
-            final Color color = (Color) values[1].convert(font);
-            final Double radius = ((Size) values[2].convert(font)).pixels(font);
-            final Double spread = ((Size) values[3].convert(font)).pixels(font);
-            final Double offsetX = ((Size) values[4].convert(font)).pixels(font);
-            final Double offsetY = ((Size) values[5].convert(font)).pixels(font);
-            DropShadow dropShadow = new DropShadow();
-            if (blurType != null) {
-                dropShadow.setBlurType(blurType);
-            }
-            if (color != null) {
-                dropShadow.setColor(color);
-            }
-            if (spread != null) {
-                dropShadow.setSpread(spread);
-            }
-            if (radius != null) {
-                dropShadow.setRadius(radius);
-            }
-            if (offsetX != null) {
-                dropShadow.setOffsetX(offsetX);
-            }
-            if (offsetY != null) {
-                dropShadow.setOffsetY(offsetY);
-            }
-
-            super.cacheValue(value, dropShadow);
-
-            return dropShadow;
-        }
-
-        @Override
-        public String toString() {
-            return "DropShadowConverter";
-        }
-    }
-
-    public static final class InnerShadowConverter extends EffectConverter {
-
-        public static InnerShadowConverter getInstance() {
-            return Holder.INNER_SHADOW_INSTANCE;
-        }
-
-        private InnerShadowConverter() {
-            super();
-        }
-
-        // innershadow( <blur-type> , <color> , <number> , <number> , <number> , <number> )
-        // <blur-type> = [      gaussian | one-pass-box | three-pass-box | two-pass-box ]
-        // <color> The shadow Color.
-        // <number> The radius of the shadow blur kernel. In the range
-        //          [0.0 ... 127.0], typical value 10.
-        // <number> The choke of the shadow. The choke is the portion of the
-        //          radius where the contribution of the source material will
-        //          be 100%. The remaining portion of the radius will have a
-        //          contribution controlled by the blur kernel. A choke of 0.0
-        //          will result in a distribution of the shadow determined
-        //          entirely by the blur algorithm. A choke of 1.0 will result
-        //          in a solid growth inward of the shadow from the edges to
-        //          the limit of the radius with a very sharp cutoff to
-        //          transparency inside the radius. In the range [0.0 ... 1.0]
-        //          a value of 0.0 is no spread.
-        // <number> The shadow offset in the x direction, in pixels.
-        // <number> The shadow offset in the y direction, in pixels.
-        @Override
-        public Effect convert(ParsedValue<ParsedValue[], Effect> value, Font font) {
-
-            Effect effect = super.getCachedValue(value);
-            if (effect != null) return effect;
-
-            final ParsedValue[] values = value.getValue();
-            final BlurType blurType = (BlurType) values[0].convert(font);
-            final Color color = (Color) values[1].convert(font);
-            final Double radius = ((Size) values[2].convert(font)).pixels(font);
-            final Double choke = ((Size) values[3].convert(font)).pixels(font);
-            final Double offsetX = ((Size) values[4].convert(font)).pixels(font);
-            final Double offsetY = ((Size) values[5].convert(font)).pixels(font);
-            InnerShadow innerShadow = new InnerShadow();
-            if (blurType != null) {
-                innerShadow.setBlurType(blurType);
-            }
-            if (color != null) {
-                innerShadow.setColor(color);
-            }
-            if (radius != null) {
-                innerShadow.setRadius(radius);
-            }
-            if (choke != null) {
-                innerShadow.setChoke(choke);
-            }
-            if (offsetX != null) {
-                innerShadow.setOffsetX(offsetX);
-            }
-            if (offsetY != null) {
-                innerShadow.setOffsetY(offsetY);
-            }
-
-            super.cacheValue(value, innerShadow);
-
-            return innerShadow;
-        }
-
-        @Override
-        public String toString() {
-            return "InnerShadowConverter";
-        }
-    }
-
-    private static Map<ParsedValue<ParsedValue[], Effect>, Effect> cache;
-
-    public static void clearCache() { if (cache != null) cache.clear(); }
-
-}
-
--- /dev/null	2015-09-03 15:33:51.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/EffectConverter.java	2015-09-03 15:33:49.867096300 -0700
@@ -0,0 +1,220 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.effect.BlurType;
+import javafx.scene.effect.DropShadow;
+import javafx.scene.effect.Effect;
+import javafx.scene.effect.InnerShadow;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+
+import java.util.Map;
+
+/**
+ * @since 9
+ */
+public class EffectConverter extends StyleConverter<ParsedValue[], Effect> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final EffectConverter EFFECT_CONVERTER =
+                new EffectConverter();
+        static final DropShadowConverter DROP_SHADOW_INSTANCE =
+                new DropShadowConverter();
+        static final InnerShadowConverter INNER_SHADOW_INSTANCE =
+                new InnerShadowConverter();
+    }
+
+    public static StyleConverter<ParsedValue[], Effect> getInstance() {
+        return Holder.EFFECT_CONVERTER;
+    }
+    
+    @Override
+    public Effect convert(ParsedValue<ParsedValue[], Effect> value, Font font) {
+        throw new IllegalArgumentException("Parsed value is not an Effect");
+    }    
+
+    protected EffectConverter() {
+        super();
+    }
+
+    @Override
+    public String toString() {
+        return "EffectConverter";
+    }
+
+    public static final class DropShadowConverter extends EffectConverter {
+
+        public static DropShadowConverter getInstance() {
+            return Holder.DROP_SHADOW_INSTANCE;
+        }
+
+        private DropShadowConverter() {
+            super();
+        }
+
+        // dropshadow( <blur-type> , <color> , <number> , <number> , <number> , <number> )
+        // <blur-type> = [      gaussian | one-pass-box | three-pass-box | two-pass-box ]
+        // <color> The shadow Color.
+        // <number> The radius of the shadow blur kernel. In the range
+        //          [0.0 ... 127.0], typical value 10.
+        // <number> he spread of the shadow. The spread is the portion of
+        //          the radius where the contribution of the source material
+        //          will be 100%. The remaining portion of the radius will
+        //          have a contribution controlled by the blur kernel. A
+        //          spread of 0.0 will result in a distribution of the shadow
+        //          determined entirely by the blur algorithm. A spread of
+        //          1.0 will result in a solid growth outward of the source
+        //          material opacity to the limit of the radius with a very
+        //          sharp cutoff to transparency at the radius. In the range
+        //          [0.0 ... 1.0] a value of 0.0 is no spread.
+        // <number> The shadow offset in the x direction, in pixels.
+        // <number> The shadow offset in the y direction, in pixels.
+        @Override
+        public Effect convert(ParsedValue<ParsedValue[], Effect> value, Font font) {
+
+            Effect effect = super.getCachedValue(value);
+            if (effect != null) return effect;
+
+            final ParsedValue[] values = value.getValue();
+            final BlurType blurType = (BlurType) values[0].convert(font);
+            final Color color = (Color) values[1].convert(font);
+            final Double radius = ((Size) values[2].convert(font)).pixels(font);
+            final Double spread = ((Size) values[3].convert(font)).pixels(font);
+            final Double offsetX = ((Size) values[4].convert(font)).pixels(font);
+            final Double offsetY = ((Size) values[5].convert(font)).pixels(font);
+            DropShadow dropShadow = new DropShadow();
+            if (blurType != null) {
+                dropShadow.setBlurType(blurType);
+            }
+            if (color != null) {
+                dropShadow.setColor(color);
+            }
+            if (spread != null) {
+                dropShadow.setSpread(spread);
+            }
+            if (radius != null) {
+                dropShadow.setRadius(radius);
+            }
+            if (offsetX != null) {
+                dropShadow.setOffsetX(offsetX);
+            }
+            if (offsetY != null) {
+                dropShadow.setOffsetY(offsetY);
+            }
+
+            super.cacheValue(value, dropShadow);
+
+            return dropShadow;
+        }
+
+        @Override
+        public String toString() {
+            return "DropShadowConverter";
+        }
+    }
+
+    public static final class InnerShadowConverter extends EffectConverter {
+
+        public static InnerShadowConverter getInstance() {
+            return Holder.INNER_SHADOW_INSTANCE;
+        }
+
+        private InnerShadowConverter() {
+            super();
+        }
+
+        // innershadow( <blur-type> , <color> , <number> , <number> , <number> , <number> )
+        // <blur-type> = [      gaussian | one-pass-box | three-pass-box | two-pass-box ]
+        // <color> The shadow Color.
+        // <number> The radius of the shadow blur kernel. In the range
+        //          [0.0 ... 127.0], typical value 10.
+        // <number> The choke of the shadow. The choke is the portion of the
+        //          radius where the contribution of the source material will
+        //          be 100%. The remaining portion of the radius will have a
+        //          contribution controlled by the blur kernel. A choke of 0.0
+        //          will result in a distribution of the shadow determined
+        //          entirely by the blur algorithm. A choke of 1.0 will result
+        //          in a solid growth inward of the shadow from the edges to
+        //          the limit of the radius with a very sharp cutoff to
+        //          transparency inside the radius. In the range [0.0 ... 1.0]
+        //          a value of 0.0 is no spread.
+        // <number> The shadow offset in the x direction, in pixels.
+        // <number> The shadow offset in the y direction, in pixels.
+        @Override
+        public Effect convert(ParsedValue<ParsedValue[], Effect> value, Font font) {
+
+            Effect effect = super.getCachedValue(value);
+            if (effect != null) return effect;
+
+            final ParsedValue[] values = value.getValue();
+            final BlurType blurType = (BlurType) values[0].convert(font);
+            final Color color = (Color) values[1].convert(font);
+            final Double radius = ((Size) values[2].convert(font)).pixels(font);
+            final Double choke = ((Size) values[3].convert(font)).pixels(font);
+            final Double offsetX = ((Size) values[4].convert(font)).pixels(font);
+            final Double offsetY = ((Size) values[5].convert(font)).pixels(font);
+            InnerShadow innerShadow = new InnerShadow();
+            if (blurType != null) {
+                innerShadow.setBlurType(blurType);
+            }
+            if (color != null) {
+                innerShadow.setColor(color);
+            }
+            if (radius != null) {
+                innerShadow.setRadius(radius);
+            }
+            if (choke != null) {
+                innerShadow.setChoke(choke);
+            }
+            if (offsetX != null) {
+                innerShadow.setOffsetX(offsetX);
+            }
+            if (offsetY != null) {
+                innerShadow.setOffsetY(offsetY);
+            }
+
+            super.cacheValue(value, innerShadow);
+
+            return innerShadow;
+        }
+
+        @Override
+        public String toString() {
+            return "InnerShadowConverter";
+        }
+    }
+
+    private static Map<ParsedValue<ParsedValue[], Effect>, Effect> cache;
+
+    public static void clearCache() { if (cache != null) cache.clear(); }
+
+}
+
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/EnumConverter.java	2015-09-03 15:33:58.085566400 -0700
+++ /dev/null	2015-09-03 15:33:59.000000000 -0700
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.converters;
-
-import com.sun.javafx.util.Logging;
-import com.sun.javafx.css.StringStore;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.text.Font;
-import sun.util.logging.PlatformLogger;
-import sun.util.logging.PlatformLogger.Level;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-public final class EnumConverter<E extends Enum<E>> extends StyleConverterImpl<String, E> {
-
-    // package for unit testing
-    final Class<E> enumClass;
-
-    public EnumConverter(Class<E> enumClass) {
-        this.enumClass = enumClass;
-    }
-
-    @Override
-    public E convert(ParsedValue<String, E> value, Font not_used) {
-        if (enumClass == null) {
-            return null;
-        }
-        String string = value.getValue();
-        final int dotPos = string.lastIndexOf('.');
-        if (dotPos > -1) {
-            string = string.substring(dotPos + 1);
-        }
-        try {
-            string = string.replace('-', '_');
-            return Enum.valueOf(enumClass, string.toUpperCase(Locale.ROOT));
-        } catch (IllegalArgumentException e) {
-            // may throw another IllegalArgumentException
-            return Enum.valueOf(enumClass, string);
-        }
-    }
-
-    @Override
-    public void writeBinary(DataOutputStream os, StringStore sstore) throws IOException {
-        super.writeBinary(os,sstore);
-        String ename = enumClass.getName();
-        int index = sstore.addString(ename);
-        os.writeShort(index);
-    }
-
-
-    public static StyleConverter<?,?> readBinary(DataInputStream is, String[] strings)
-            throws IOException {
-
-        short index = is.readShort();
-        String ename = 0 <= index && index <= strings.length ? strings[index] : null;
-
-        if (ename == null || ename.isEmpty()) return null;
-
-        if (converters == null || converters.containsKey(ename) == false) {
-            StyleConverter<?,?> converter = getInstance(ename);
-
-            if (converter == null) {
-                final PlatformLogger logger = Logging.getCSSLogger();
-                if (logger.isLoggable(Level.SEVERE)) {
-                    logger.severe("could not deserialize EnumConverter for " + ename);
-                }
-            }
-
-            if (converters == null) converters = new HashMap<String,StyleConverter<?,?>>();
-            converters.put(ename, converter);
-            return converter;
-        }
-        return converters.get(ename);
-    }
-
-    private static Map<String,StyleConverter<?,?>> converters;
-
-    // package for unit testing
-    static public StyleConverter<?,?> getInstance(final String ename) {
-
-        StyleConverter<?,?> converter = null;
-
-        switch (ename) {
-        case "com.sun.javafx.cursor.CursorType" :
-            converter = new EnumConverter<com.sun.javafx.cursor.CursorType>(com.sun.javafx.cursor.CursorType.class);
-            break;
-        case "javafx.scene.layout.BackgroundRepeat" :
-        case "com.sun.javafx.scene.layout.region.Repeat" :
-            converter = new EnumConverter<javafx.scene.layout.BackgroundRepeat>(javafx.scene.layout.BackgroundRepeat.class);
-            break;
-        case "javafx.geometry.HPos" :
-            converter = new EnumConverter<javafx.geometry.HPos>(javafx.geometry.HPos.class);
-            break;
-        case "javafx.geometry.Orientation" :
-            converter = new EnumConverter<javafx.geometry.Orientation>(javafx.geometry.Orientation.class);
-            break;
-        case "javafx.geometry.Pos" :
-            converter = new EnumConverter<javafx.geometry.Pos>(javafx.geometry.Pos.class);
-            break;
-        case "javafx.geometry.Side" :
-            converter = new EnumConverter<javafx.geometry.Side>(javafx.geometry.Side.class);
-            break;
-        case "javafx.geometry.VPos" :
-            converter = new EnumConverter<javafx.geometry.VPos>(javafx.geometry.VPos.class);
-            break;
-        case "javafx.scene.effect.BlendMode" :
-            converter = new EnumConverter<javafx.scene.effect.BlendMode>(javafx.scene.effect.BlendMode.class);
-            break;
-        case "javafx.scene.effect.BlurType" :
-            converter = new EnumConverter<javafx.scene.effect.BlurType>(javafx.scene.effect.BlurType.class);
-            break;
-        case "javafx.scene.paint.CycleMethod" :
-            converter = new EnumConverter<javafx.scene.paint.CycleMethod>(javafx.scene.paint.CycleMethod.class);
-            break;
-        case "javafx.scene.shape.ArcType" :
-            converter = new EnumConverter<javafx.scene.shape.ArcType>(javafx.scene.shape.ArcType.class);
-            break;
-        case "javafx.scene.shape.StrokeLineCap" :
-            converter = new EnumConverter<javafx.scene.shape.StrokeLineCap>(javafx.scene.shape.StrokeLineCap.class);
-            break;
-        case "javafx.scene.shape.StrokeLineJoin" :
-            converter = new EnumConverter<javafx.scene.shape.StrokeLineJoin>(javafx.scene.shape.StrokeLineJoin.class);
-            break;
-        case "javafx.scene.shape.StrokeType" :
-            converter = new EnumConverter<javafx.scene.shape.StrokeType>(javafx.scene.shape.StrokeType.class);
-            break;
-        case "javafx.scene.text.FontPosture" :
-            converter = new EnumConverter<javafx.scene.text.FontPosture>(javafx.scene.text.FontPosture.class);
-            break;
-        case "javafx.scene.text.FontSmoothingType" :
-            converter = new EnumConverter<javafx.scene.text.FontSmoothingType>(javafx.scene.text.FontSmoothingType.class);
-            break;
-        case "javafx.scene.text.FontWeight" :
-            converter = new EnumConverter<javafx.scene.text.FontWeight>(javafx.scene.text.FontWeight.class);
-            break;
-        case "javafx.scene.text.TextAlignment" :
-            converter = new EnumConverter<javafx.scene.text.TextAlignment>(javafx.scene.text.TextAlignment.class);
-            break;
-
-        default :
-            //
-            // Enum types that are not in the javafx-ui-common source tree.
-            //
-            // Because the parser doesn't explicitly know about these enums
-            // outside of the javafx-ui-common package, I don't expect these
-            // EnumConverters to have been persisted. For example, the
-            // -fx-text-overrun and -fx-content-display properties, will yield
-            // a ParsedValue<String,String> with a null converter.
-            //
-            // If assertions are disabled, then null is returned. The StyleHelper
-            // code will use the StyleableProperty's converter in this case.
-            //
-            assert false : "EnumConverter<"+ ename + "> not expected";
-
-            final PlatformLogger logger = Logging.getCSSLogger();
-            if (logger.isLoggable(Level.SEVERE)) {
-                logger.severe("EnumConverter : converter Class is null for : "+ename);
-            }
-            break;
-        }
-
-        return converter;
-    }
-
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) return true;
-        if (other == null || !(other instanceof EnumConverter)) return false;
-        return (enumClass.equals(((EnumConverter)other).enumClass));
-    }
-
-    @Override
-    public int hashCode() {
-        return enumClass.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return "EnumConveter[" + enumClass.getName() + "]";
-    }
-}
--- /dev/null	2015-09-03 15:33:59.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/EnumConverter.java	2015-09-03 15:33:57.410527800 -0700
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css.converter;
+
+import com.sun.javafx.util.Logging;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.text.Font;
+import sun.util.logging.PlatformLogger;
+import sun.util.logging.PlatformLogger.Level;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @since 9
+ */
+public final class EnumConverter<E extends Enum<E>> extends StyleConverter<String, E> {
+
+    // package for unit testing
+    final Class<E> enumClass;
+
+    public EnumConverter(Class<E> enumClass) {
+        this.enumClass = enumClass;
+    }
+
+    @Override
+    public E convert(ParsedValue<String, E> value, Font not_used) {
+        if (enumClass == null) {
+            return null;
+        }
+        String string = value.getValue();
+        final int dotPos = string.lastIndexOf('.');
+        if (dotPos > -1) {
+            string = string.substring(dotPos + 1);
+        }
+        try {
+            string = string.replace('-', '_');
+            return Enum.valueOf(enumClass, string.toUpperCase(Locale.ROOT));
+        } catch (IllegalArgumentException e) {
+            // may throw another IllegalArgumentException
+            return Enum.valueOf(enumClass, string);
+        }
+    }
+
+    @Override
+    public void writeBinary(DataOutputStream os, StringStore sstore) throws IOException {
+        super.writeBinary(os,sstore);
+        String ename = enumClass.getName();
+        int index = sstore.addString(ename);
+        os.writeShort(index);
+    }
+
+
+    public static StyleConverter<?,?> readBinary(DataInputStream is, String[] strings)
+            throws IOException {
+
+        short index = is.readShort();
+        String ename = 0 <= index && index <= strings.length ? strings[index] : null;
+
+        if (ename == null || ename.isEmpty()) return null;
+
+        if (converters == null || converters.containsKey(ename) == false) {
+            StyleConverter<?,?> converter = getInstance(ename);
+
+            if (converter == null) {
+                final PlatformLogger logger = Logging.getCSSLogger();
+                if (logger.isLoggable(Level.SEVERE)) {
+                    logger.severe("could not deserialize EnumConverter for " + ename);
+                }
+            }
+
+            if (converters == null) converters = new HashMap<String,StyleConverter<?,?>>();
+            converters.put(ename, converter);
+            return converter;
+        }
+        return converters.get(ename);
+    }
+
+    private static Map<String,StyleConverter<?,?>> converters;
+
+    // package for unit testing
+    static public StyleConverter<?,?> getInstance(final String ename) {
+
+        StyleConverter<?,?> converter = null;
+
+        switch (ename) {
+        case "com.sun.javafx.cursor.CursorType" :
+            converter = new EnumConverter<com.sun.javafx.cursor.CursorType>(com.sun.javafx.cursor.CursorType.class);
+            break;
+        case "javafx.scene.layout.BackgroundRepeat" :
+        case "com.sun.javafx.scene.layout.region.Repeat" :
+            converter = new EnumConverter<javafx.scene.layout.BackgroundRepeat>(javafx.scene.layout.BackgroundRepeat.class);
+            break;
+        case "javafx.geometry.HPos" :
+            converter = new EnumConverter<javafx.geometry.HPos>(javafx.geometry.HPos.class);
+            break;
+        case "javafx.geometry.Orientation" :
+            converter = new EnumConverter<javafx.geometry.Orientation>(javafx.geometry.Orientation.class);
+            break;
+        case "javafx.geometry.Pos" :
+            converter = new EnumConverter<javafx.geometry.Pos>(javafx.geometry.Pos.class);
+            break;
+        case "javafx.geometry.Side" :
+            converter = new EnumConverter<javafx.geometry.Side>(javafx.geometry.Side.class);
+            break;
+        case "javafx.geometry.VPos" :
+            converter = new EnumConverter<javafx.geometry.VPos>(javafx.geometry.VPos.class);
+            break;
+        case "javafx.scene.effect.BlendMode" :
+            converter = new EnumConverter<javafx.scene.effect.BlendMode>(javafx.scene.effect.BlendMode.class);
+            break;
+        case "javafx.scene.effect.BlurType" :
+            converter = new EnumConverter<javafx.scene.effect.BlurType>(javafx.scene.effect.BlurType.class);
+            break;
+        case "javafx.scene.paint.CycleMethod" :
+            converter = new EnumConverter<javafx.scene.paint.CycleMethod>(javafx.scene.paint.CycleMethod.class);
+            break;
+        case "javafx.scene.shape.ArcType" :
+            converter = new EnumConverter<javafx.scene.shape.ArcType>(javafx.scene.shape.ArcType.class);
+            break;
+        case "javafx.scene.shape.StrokeLineCap" :
+            converter = new EnumConverter<javafx.scene.shape.StrokeLineCap>(javafx.scene.shape.StrokeLineCap.class);
+            break;
+        case "javafx.scene.shape.StrokeLineJoin" :
+            converter = new EnumConverter<javafx.scene.shape.StrokeLineJoin>(javafx.scene.shape.StrokeLineJoin.class);
+            break;
+        case "javafx.scene.shape.StrokeType" :
+            converter = new EnumConverter<javafx.scene.shape.StrokeType>(javafx.scene.shape.StrokeType.class);
+            break;
+        case "javafx.scene.text.FontPosture" :
+            converter = new EnumConverter<javafx.scene.text.FontPosture>(javafx.scene.text.FontPosture.class);
+            break;
+        case "javafx.scene.text.FontSmoothingType" :
+            converter = new EnumConverter<javafx.scene.text.FontSmoothingType>(javafx.scene.text.FontSmoothingType.class);
+            break;
+        case "javafx.scene.text.FontWeight" :
+            converter = new EnumConverter<javafx.scene.text.FontWeight>(javafx.scene.text.FontWeight.class);
+            break;
+        case "javafx.scene.text.TextAlignment" :
+            converter = new EnumConverter<javafx.scene.text.TextAlignment>(javafx.scene.text.TextAlignment.class);
+            break;
+
+        default :
+            //
+            // Enum types that are not in the javafx-ui-common source tree.
+            //
+            // Because the parser doesn't explicitly know about these enums
+            // outside of the javafx-ui-common package, I don't expect these
+            // EnumConverters to have been persisted. For example, the
+            // -fx-text-overrun and -fx-content-display properties, will yield
+            // a ParsedValue<String,String> with a null converter.
+            //
+            // If assertions are disabled, then null is returned. The StyleHelper
+            // code will use the StyleableProperty's converter in this case.
+            //
+            assert false : "EnumConverter<"+ ename + "> not expected";
+
+            final PlatformLogger logger = Logging.getCSSLogger();
+            if (logger.isLoggable(Level.SEVERE)) {
+                logger.severe("EnumConverter : converter Class is null for : "+ename);
+            }
+            break;
+        }
+
+        return converter;
+    }
+
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) return true;
+        if (other == null || !(other instanceof EnumConverter)) return false;
+        return (enumClass.equals(((EnumConverter)other).enumClass));
+    }
+
+    @Override
+    public int hashCode() {
+        return enumClass.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "EnumConveter[" + enumClass.getName() + "]";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/FontConverter.java	2015-09-03 15:34:06.439044200 -0700
+++ /dev/null	2015-09-03 15:34:07.000000000 -0700
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.converters;
-
-import com.sun.javafx.util.Utils;
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.CssMetaData;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.css.Styleable;
-import javafx.scene.text.Font;
-import javafx.scene.text.FontPosture;
-import javafx.scene.text.FontWeight;
-
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public final class FontConverter extends StyleConverterImpl<ParsedValue[], Font> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final FontConverter INSTANCE = new FontConverter();
-    }
-
-    public static StyleConverter<ParsedValue[], Font> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private FontConverter() {
-        super();
-    }
-
-    @Override 
-    public Font convert(ParsedValue<ParsedValue[], Font> value, Font font) {
-        ParsedValue[] values = value.getValue();
-        Font aFont = (font != null) ? font : Font.getDefault();
-        String family = (values[0] != null) ? Utils.stripQuotes((String) values[0].convert(aFont)) : aFont.getFamily();
-        // if font size is given in terms of percent, then we have to call
-        // pixels directly in order to pass the multiplier.
-        double fsize = aFont.getSize();
-        if (values[1] != null) {
-            ParsedValue<?, ?> pv = (ParsedValue<?, ?>) values[1].getValue();
-            Size size = (Size) pv.convert(aFont);
-            fsize = size.pixels(aFont.getSize(), aFont);
-        }
-        FontWeight weight = (values[2] != null) ? (FontWeight) values[2].convert(aFont) : FontWeight.NORMAL;
-        FontPosture style = (values[3] != null) ? (FontPosture) values[3].convert(aFont) : FontPosture.REGULAR;
-        Font f = Font.font(family, weight, style, fsize);
-        return f;
-    }
-
-    @Override
-    public Font convert(Map<CssMetaData<? extends Styleable, ?>, Object> convertedValues) {
-        Font font = Font.getDefault();
-        double size = font.getSize();
-        String family = font.getFamily();
-        FontWeight weight = FontWeight.NORMAL;
-        FontPosture style = FontPosture.REGULAR;
-        
-        for (Entry<CssMetaData<? extends Styleable, ?>, Object> entry : convertedValues.entrySet()) {
-
-            Object value = entry.getValue();
-            if (value == null) {
-                continue;
-            }
-            final String prop = entry.getKey().getProperty();
-            if (prop.endsWith("font-size")) {
-                size = ((Number) value).doubleValue();
-            } else if (prop.endsWith("font-family")) {
-                family = Utils.stripQuotes((String) value);
-            } else if (prop.endsWith("font-weight")) {
-                weight = (FontWeight) value;
-            } else if (prop.endsWith("font-style")) {
-                style = (FontPosture) value;
-            }
-        }
-        final Font f = Font.font(family, weight, style, size);
-        return f;
-    }
-
-    @Override
-    public String toString() {
-        return "FontConverter";
-    }
-
-    public static final class FontStyleConverter extends StyleConverterImpl<String, FontPosture> {
-
-        // lazy, thread-safe instatiation
-        private static class Holder {
-            static final FontStyleConverter INSTANCE = new FontStyleConverter();
-        }
-
-        public static FontStyleConverter getInstance() {
-            return Holder.INSTANCE;
-        }
-
-        private FontStyleConverter() {
-            super();
-        }
-
-        @Override
-        public FontPosture convert(ParsedValue<String, FontPosture> value, Font font) {
-
-            // Testing for RT-31022 exposed a ClassCastException where value
-            // wraps a String (e.g., "ITALIC", not a FontUnits.Style).
-            final Object val = value.getValue();
-
-            FontPosture style = null;
-
-            if (val instanceof String) {
-                try {
-                    String sval = ((String)val).toUpperCase(Locale.ROOT);
-                    style = Enum.valueOf(FontPosture.class, sval);
-                } catch (IllegalArgumentException iae) {
-                    style =  FontPosture.REGULAR;
-                } catch (NullPointerException npe) {
-                    style =  FontPosture.REGULAR;
-                }
-
-            } else if (val instanceof FontPosture) {
-                style = (FontPosture)val;
-            }
-            return style;
-        }
-
-        @Override
-        public String toString() {
-            return "FontConverter.StyleConverter";
-        }
-    }
-
-    public static final class FontWeightConverter extends StyleConverterImpl<String, FontWeight> {
-
-        // lazy, thread-safe instatiation
-        private static class Holder {
-            static final FontWeightConverter INSTANCE = new FontWeightConverter();
-        }
-
-        public static FontWeightConverter getInstance() {
-            return Holder.INSTANCE;
-        }
-
-        private FontWeightConverter() {
-            super();
-        }
-
-        @Override
-        public FontWeight convert(ParsedValue<String, FontWeight> value, Font font) {
-
-            // Testing for RT-31022 exposed a ClassCastException where value
-            // wraps a String (e.g., "ITALIC", not a FontUnits.Style).
-            final Object val = value.getValue();
-
-            FontWeight weight = null;
-
-            if (val instanceof String) {
-                try {
-                    String sval = ((String)val).toUpperCase(Locale.ROOT);
-                    weight = Enum.valueOf(FontWeight.class, sval);
-                } catch (IllegalArgumentException iae) {
-                    weight =  FontWeight.NORMAL;
-                } catch (NullPointerException npe) {
-                    weight =  FontWeight.NORMAL;
-                }
-
-            } else if (val instanceof FontWeight) {
-                weight = (FontWeight)val;
-            }
-
-            return weight;
-        }
-
-        @Override
-        public String toString() {
-            return "FontConverter.WeightConverter";
-        }
-    }
-    
-    public static final class FontSizeConverter extends StyleConverterImpl<ParsedValue<?, Size>, Number> {
-
-        // lazy, thread-safe instatiation
-        private static class Holder {
-            static final FontSizeConverter INSTANCE = new FontSizeConverter();
-        }
-
-        public static FontSizeConverter getInstance() {
-            return Holder.INSTANCE;
-        }
-
-        private FontSizeConverter() {
-            super();
-        }
-
-        @Override
-        public Number convert(ParsedValue<ParsedValue<?, Size>, Number> value, Font font) {
-            final ParsedValue<?, Size> size = value.getValue();
-            return size.convert(font).pixels(font.getSize(), font);
-        }
-
-        @Override
-        public String toString() {
-            return "FontConverter.FontSizeConverter";
-        }
-    }    
-
-}
--- /dev/null	2015-09-03 15:34:07.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/FontConverter.java	2015-09-03 15:34:05.549993400 -0700
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css.converter;
+
+import com.sun.javafx.util.Utils;
+import javafx.css.Size;
+import javafx.css.CssMetaData;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.css.Styleable;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontPosture;
+import javafx.scene.text.FontWeight;
+
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @since 9
+ */
+public final class FontConverter extends StyleConverter<ParsedValue[], Font> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final FontConverter INSTANCE = new FontConverter();
+    }
+
+    public static StyleConverter<ParsedValue[], Font> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private FontConverter() {
+        super();
+    }
+
+    @Override 
+    public Font convert(ParsedValue<ParsedValue[], Font> value, Font font) {
+        ParsedValue[] values = value.getValue();
+        Font aFont = (font != null) ? font : Font.getDefault();
+        String family = (values[0] != null) ? Utils.stripQuotes((String) values[0].convert(aFont)) : aFont.getFamily();
+        // if font size is given in terms of percent, then we have to call
+        // pixels directly in order to pass the multiplier.
+        double fsize = aFont.getSize();
+        if (values[1] != null) {
+            ParsedValue<?, ?> pv = (ParsedValue<?, ?>) values[1].getValue();
+            Size size = (Size) pv.convert(aFont);
+            fsize = size.pixels(aFont.getSize(), aFont);
+        }
+        FontWeight weight = (values[2] != null) ? (FontWeight) values[2].convert(aFont) : FontWeight.NORMAL;
+        FontPosture style = (values[3] != null) ? (FontPosture) values[3].convert(aFont) : FontPosture.REGULAR;
+        Font f = Font.font(family, weight, style, fsize);
+        return f;
+    }
+
+    @Override
+    public Font convert(Map<CssMetaData<? extends Styleable, ?>, Object> convertedValues) {
+        Font font = Font.getDefault();
+        double size = font.getSize();
+        String family = font.getFamily();
+        FontWeight weight = FontWeight.NORMAL;
+        FontPosture style = FontPosture.REGULAR;
+        
+        for (Entry<CssMetaData<? extends Styleable, ?>, Object> entry : convertedValues.entrySet()) {
+
+            Object value = entry.getValue();
+            if (value == null) {
+                continue;
+            }
+            final String prop = entry.getKey().getProperty();
+            if (prop.endsWith("font-size")) {
+                size = ((Number) value).doubleValue();
+            } else if (prop.endsWith("font-family")) {
+                family = Utils.stripQuotes((String) value);
+            } else if (prop.endsWith("font-weight")) {
+                weight = (FontWeight) value;
+            } else if (prop.endsWith("font-style")) {
+                style = (FontPosture) value;
+            }
+        }
+        final Font f = Font.font(family, weight, style, size);
+        return f;
+    }
+
+    @Override
+    public String toString() {
+        return "FontConverter";
+    }
+
+    public static final class FontStyleConverter extends StyleConverter<String, FontPosture> {
+
+        // lazy, thread-safe instatiation
+        private static class Holder {
+            static final FontStyleConverter INSTANCE = new FontStyleConverter();
+        }
+
+        public static FontStyleConverter getInstance() {
+            return Holder.INSTANCE;
+        }
+
+        private FontStyleConverter() {
+            super();
+        }
+
+        @Override
+        public FontPosture convert(ParsedValue<String, FontPosture> value, Font font) {
+
+            // Testing for RT-31022 exposed a ClassCastException where value
+            // wraps a String (e.g., "ITALIC", not a FontUnits.Style).
+            final Object val = value.getValue();
+
+            FontPosture style = null;
+
+            if (val instanceof String) {
+                try {
+                    String sval = ((String)val).toUpperCase(Locale.ROOT);
+                    style = Enum.valueOf(FontPosture.class, sval);
+                } catch (IllegalArgumentException iae) {
+                    style =  FontPosture.REGULAR;
+                } catch (NullPointerException npe) {
+                    style =  FontPosture.REGULAR;
+                }
+
+            } else if (val instanceof FontPosture) {
+                style = (FontPosture)val;
+            }
+            return style;
+        }
+
+        @Override
+        public String toString() {
+            return "FontConverter.StyleConverter";
+        }
+    }
+
+    public static final class FontWeightConverter extends StyleConverter<String, FontWeight> {
+
+        // lazy, thread-safe instatiation
+        private static class Holder {
+            static final FontWeightConverter INSTANCE = new FontWeightConverter();
+        }
+
+        public static FontWeightConverter getInstance() {
+            return Holder.INSTANCE;
+        }
+
+        private FontWeightConverter() {
+            super();
+        }
+
+        @Override
+        public FontWeight convert(ParsedValue<String, FontWeight> value, Font font) {
+
+            // Testing for RT-31022 exposed a ClassCastException where value
+            // wraps a String (e.g., "ITALIC", not a FontUnits.Style).
+            final Object val = value.getValue();
+
+            FontWeight weight = null;
+
+            if (val instanceof String) {
+                try {
+                    String sval = ((String)val).toUpperCase(Locale.ROOT);
+                    weight = Enum.valueOf(FontWeight.class, sval);
+                } catch (IllegalArgumentException iae) {
+                    weight =  FontWeight.NORMAL;
+                } catch (NullPointerException npe) {
+                    weight =  FontWeight.NORMAL;
+                }
+
+            } else if (val instanceof FontWeight) {
+                weight = (FontWeight)val;
+            }
+
+            return weight;
+        }
+
+        @Override
+        public String toString() {
+            return "FontConverter.WeightConverter";
+        }
+    }
+    
+    public static final class FontSizeConverter extends StyleConverter<ParsedValue<?, Size>, Number> {
+
+        // lazy, thread-safe instatiation
+        private static class Holder {
+            static final FontSizeConverter INSTANCE = new FontSizeConverter();
+        }
+
+        public static FontSizeConverter getInstance() {
+            return Holder.INSTANCE;
+        }
+
+        private FontSizeConverter() {
+            super();
+        }
+
+        @Override
+        public Number convert(ParsedValue<ParsedValue<?, Size>, Number> value, Font font) {
+            final ParsedValue<?, Size> size = value.getValue();
+            return size.convert(font).pixels(font.getSize(), font);
+        }
+
+        @Override
+        public String toString() {
+            return "FontConverter.FontSizeConverter";
+        }
+    }    
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/InsetsConverter.java	2015-09-03 15:34:14.533507200 -0700
+++ /dev/null	2015-09-03 15:34:15.000000000 -0700
@@ -1,102 +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.css.converters;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.geometry.Insets;
-import javafx.scene.text.Font;
-
-/**
- * Convert <size>{1,4} to Insets. The size values are interpreted as
- * top, right, bottom, left.
- * If only top is given, that value is used on all sides.
- * If there is only top and right, then bottom is set to top and left is set to right.
- * If top, right and bottom are given, then left is set to right.
- */
-public final class InsetsConverter extends StyleConverterImpl<ParsedValue[], Insets> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final InsetsConverter INSTANCE = new InsetsConverter();
-        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
-    }
-
-    public static StyleConverter<ParsedValue[], Insets> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private InsetsConverter() {
-        super();
-    }
-
-    @Override
-    public Insets convert(ParsedValue<ParsedValue[], Insets> value, Font font) {
-        ParsedValue[] sides = value.getValue();
-        double top = ((Size)sides[0].convert(font)).pixels(font);
-        double right = (sides.length > 1) ? ((Size)sides[1].convert(font)).pixels(font) : top;
-        double bottom = (sides.length > 2) ? ((Size)sides[2].convert(font)).pixels(font) : top;
-        double left = (sides.length > 3) ? ((Size)sides[3].convert(font)).pixels(font) : right;
-        return new Insets(top, right, bottom, left);
-    }
-
-    @Override
-    public String toString() {
-        return "InsetsConverter";
-    }
-
-    /**
-     * Convert a <size>{1,4} [,<size>{1,4}]*  an Insets[]
-     */
-    public static final class SequenceConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], Insets>[], Insets[]> {
-
-        public static SequenceConverter getInstance() {
-            return Holder.SEQUENCE_INSTANCE;
-        }
-
-        private SequenceConverter() {
-            super();
-        }
-
-        @Override
-        public Insets[] convert(ParsedValue<ParsedValue<ParsedValue[], Insets>[], Insets[]> value, Font font) {
-            ParsedValue<ParsedValue[], Insets>[] layers = value.getValue();
-            Insets[] insets = new Insets[layers.length];
-            for (int layer = 0; layer < layers.length; layer++) {
-                insets[layer] = InsetsConverter.getInstance().convert(layers[layer], font);
-            }
-            return insets;
-        }
-
-        @Override
-        public String toString() {
-            return "InsetsSequenceConverter";
-        }
-    }
-}
-
--- /dev/null	2015-09-03 15:34:15.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/InsetsConverter.java	2015-09-03 15:34:13.726461000 -0700
@@ -0,0 +1,103 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.geometry.Insets;
+import javafx.scene.text.Font;
+
+/**
+ * Convert <size>{1,4} to Insets. The size values are interpreted as
+ * top, right, bottom, left.
+ * If only top is given, that value is used on all sides.
+ * If there is only top and right, then bottom is set to top and left is set to right.
+ * If top, right and bottom are given, then left is set to right.
+ *
+ * @since 9
+ */
+public final class InsetsConverter extends StyleConverter<ParsedValue[], Insets> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final InsetsConverter INSTANCE = new InsetsConverter();
+        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
+    }
+
+    public static StyleConverter<ParsedValue[], Insets> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private InsetsConverter() {
+        super();
+    }
+
+    @Override
+    public Insets convert(ParsedValue<ParsedValue[], Insets> value, Font font) {
+        ParsedValue[] sides = value.getValue();
+        double top = ((Size)sides[0].convert(font)).pixels(font);
+        double right = (sides.length > 1) ? ((Size)sides[1].convert(font)).pixels(font) : top;
+        double bottom = (sides.length > 2) ? ((Size)sides[2].convert(font)).pixels(font) : top;
+        double left = (sides.length > 3) ? ((Size)sides[3].convert(font)).pixels(font) : right;
+        return new Insets(top, right, bottom, left);
+    }
+
+    @Override
+    public String toString() {
+        return "InsetsConverter";
+    }
+
+    /**
+     * Convert a <size>{1,4} [,<size>{1,4}]*  an Insets[]
+     */
+    public static final class SequenceConverter extends StyleConverter<ParsedValue<ParsedValue[], Insets>[], Insets[]> {
+
+        public static SequenceConverter getInstance() {
+            return Holder.SEQUENCE_INSTANCE;
+        }
+
+        private SequenceConverter() {
+            super();
+        }
+
+        @Override
+        public Insets[] convert(ParsedValue<ParsedValue<ParsedValue[], Insets>[], Insets[]> value, Font font) {
+            ParsedValue<ParsedValue[], Insets>[] layers = value.getValue();
+            Insets[] insets = new Insets[layers.length];
+            for (int layer = 0; layer < layers.length; layer++) {
+                insets[layer] = InsetsConverter.getInstance().convert(layers[layer], font);
+            }
+            return insets;
+        }
+
+        @Override
+        public String toString() {
+            return "InsetsSequenceConverter";
+        }
+    }
+}
+
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/LadderConverter.java	2015-09-03 15:34:22.536965000 -0700
+++ /dev/null	2015-09-03 15:34:23.000000000 -0700
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.parser;
-
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Stop;
-import javafx.scene.text.Font;
-
-public final class LadderConverter extends StyleConverterImpl<ParsedValue[], Color> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final LadderConverter INSTANCE = new LadderConverter();
-    }
-
-    public static LadderConverter getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private LadderConverter() {
-        super();
-    }
-
-    @Override
-    public Color convert(ParsedValue<ParsedValue[], Color> value, Font font) {
-        final ParsedValue[] values = value.getValue();
-        final Color color = (Color) values[0].convert(font);
-        Stop[] stops = new Stop[values.length - 1];
-        for (int v = 1; v < values.length; v++) {
-            stops[v - 1] = (Stop) values[v].convert(font);
-        }
-        return com.sun.javafx.util.Utils.ladder(color, stops);
-    }
-
-    @Override
-    public String toString() {
-        return "LadderConverter";
-    }
-}
--- /dev/null	2015-09-03 15:34:24.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/LadderConverter.java	2015-09-03 15:34:21.778921600 -0700
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css.converter;
+
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+
+public final class LadderConverter extends StyleConverter<ParsedValue[], Color> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final LadderConverter INSTANCE = new LadderConverter();
+    }
+
+    public static LadderConverter getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private LadderConverter() {
+        super();
+    }
+
+    @Override
+    public Color convert(ParsedValue<ParsedValue[], Color> value, Font font) {
+        final ParsedValue[] values = value.getValue();
+        final Color color = (Color) values[0].convert(font);
+        Stop[] stops = new Stop[values.length - 1];
+        for (int v = 1; v < values.length; v++) {
+            stops[v - 1] = (Stop) values[v].convert(font);
+        }
+        return com.sun.javafx.util.Utils.ladder(color, stops);
+    }
+
+    @Override
+    public String toString() {
+        return "LadderConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/PaintConverter.java	2015-09-03 15:34:30.912444000 -0700
+++ /dev/null	2015-09-03 15:34:32.000000000 -0700
@@ -1,286 +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.css.converters;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.SizeUnits;
-import com.sun.javafx.css.StyleConverterImpl;
-import com.sun.javafx.css.StyleManager;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.image.Image;
-import javafx.scene.paint.CycleMethod;
-import javafx.scene.paint.ImagePattern;
-import javafx.scene.paint.LinearGradient;
-import javafx.scene.paint.Paint;
-import javafx.scene.paint.RadialGradient;
-import javafx.scene.paint.Stop;
-import javafx.scene.text.Font;
-
-
-public final class PaintConverter extends StyleConverterImpl<ParsedValue<?, Paint>, Paint> {
-
-    // lazy, thread-safe instantiation
-    private static class Holder {
-        static final PaintConverter INSTANCE = new PaintConverter();
-        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
-        static final LinearGradientConverter LINEAR_GRADIENT_INSTANCE = new LinearGradientConverter();
-        static final ImagePatternConverter IMAGE_PATTERN_INSTANCE = new ImagePatternConverter();
-        static final RepeatingImagePatternConverter REPEATING_IMAGE_PATTERN_INSTANCE = new RepeatingImagePatternConverter();
-        static final RadialGradientConverter RADIAL_GRADIENT_INSTANCE = new RadialGradientConverter();
-    }
-
-    public static StyleConverter<ParsedValue<?, Paint>, Paint> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private PaintConverter() {
-        super();
-    }
-
-    @Override
-    public Paint convert(ParsedValue<ParsedValue<?, Paint>, Paint> value, Font font) {
-        Object obj = value.getValue();
-        if (obj instanceof Paint) {
-            return (Paint) obj;
-        }
-        return value.getValue().convert(font);
-    }
-
-    @Override
-    public String toString() {
-        return "PaintConverter";
-    }
-
-    /**
-     * Convert [<paint]+ to Paint[]
-     */
-    public static final class SequenceConverter extends StyleConverterImpl<ParsedValue<?, Paint>[], Paint[]> {
-
-        public static SequenceConverter getInstance() {
-            return Holder.SEQUENCE_INSTANCE;
-        }
-
-        private SequenceConverter() {
-            super();
-        }
-
-        @Override
-        public Paint[] convert(ParsedValue<ParsedValue<?, Paint>[], Paint[]> value, Font font) {
-            ParsedValue<?, Paint>[] values = value.getValue();
-            Paint[] paints = new Paint[values.length];
-            for (int p = 0; p < values.length; p++) {
-                paints[p] = values[p].convert(font);
-            }
-            return paints;
-        }
-
-        @Override
-        public String toString() {
-            return "Paint.SequenceConverter";
-        }
-    }
-
-    public static final class LinearGradientConverter extends StyleConverterImpl<ParsedValue[], Paint> {
-
-        public static LinearGradientConverter getInstance() {
-            return Holder.LINEAR_GRADIENT_INSTANCE;
-        }
-
-        private LinearGradientConverter() {
-            super();
-        }
-
-        @Override 
-        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
-
-            Paint paint = super.getCachedValue(value);
-            if (paint != null) return paint;
-
-            ParsedValue[] values = value.getValue();
-            int v = 0;
-            final Size startX = (Size) values[v++].convert(font);
-            final Size startY = (Size) values[v++].convert(font);
-            final Size endX = (Size) values[v++].convert(font);
-            final Size endY = (Size) values[v++].convert(font);
-            boolean proportional = startX.getUnits() == SizeUnits.PERCENT && startX.getUnits() == startY.getUnits() && startX.getUnits() == endX.getUnits() && startX.getUnits() == endY.getUnits();
-            final CycleMethod cycleMethod = (CycleMethod) values[v++].convert(font);
-            final Stop[] stops = new Stop[values.length - v];
-            for (int s = v; s < values.length; s++) {
-                stops[s - v] = (Stop) values[s].convert(font);
-            }
-            paint = new LinearGradient(startX.pixels(font), startY.pixels(font), endX.pixels(font), endY.pixels(font), proportional, cycleMethod, stops);
-
-            super.cacheValue(value, paint);
-            return paint;
-        }
-
-        @Override
-        public String toString() {
-            return "LinearGradientConverter";
-        }
-    }
-
-    public static final class ImagePatternConverter extends StyleConverterImpl<ParsedValue[], Paint> {
-
-        public static ImagePatternConverter getInstance() {
-            return Holder.IMAGE_PATTERN_INSTANCE;
-        }
-
-        private ImagePatternConverter() {
-            super();
-        }
-
-        @Override
-        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
-
-            Paint paint = super.getCachedValue(value);
-            if (paint != null) return paint;
-
-            ParsedValue[] values = value.getValue();
-            ParsedValue<?,?> urlParsedValue = values[0];
-            String url = (String) urlParsedValue.convert(font);
-            if (values.length == 1) {
-                return new ImagePattern(StyleManager.getInstance().getCachedImage(url));
-            }
-
-            Size x = (Size) values[1].convert(font);
-            Size y = (Size) values[2].convert(font);
-            Size w = (Size) values[3].convert(font);
-            Size h = (Size) values[4].convert(font);
-            boolean p = values.length < 6 ? true : (Boolean) values[5].getValue();
-
-            paint = new ImagePattern(
-                    new Image(url),
-                    x.getValue(),
-                    y.getValue(),
-                    w.getValue(),
-                    h.getValue(), p);
-
-            super.cacheValue(value, paint);
-            return paint;
-        }
-
-        @Override
-        public String toString() {
-            return "ImagePatternConverter";
-        }
-    }
-
-    public static final class RepeatingImagePatternConverter extends StyleConverterImpl<ParsedValue[], Paint> {
-
-        public static RepeatingImagePatternConverter getInstance() {
-            return Holder.REPEATING_IMAGE_PATTERN_INSTANCE;
-        }
-
-        private RepeatingImagePatternConverter() {
-            super();
-        }
-
-        @Override
-        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
-
-            Paint paint = super.getCachedValue(value);
-            if (paint != null) return paint;
-
-            ParsedValue[] values = value.getValue();
-            ParsedValue<?, ?> url = values[0];
-            String u = (String) url.convert(font);
-            // If u is null, then we failed to locate the image associated with the url specified in the CSS file.
-            if (u == null) return null;
-            final Image image = new Image(u);
-            paint = new ImagePattern(image, 0, 0, image.getWidth(), image.getHeight(), false);
-
-            super.cacheValue(value, paint);
-            return paint;
-        }
-
-        @Override
-        public String toString() {
-            return "RepeatingImagePatternConverter";
-        }
-    }
-
-    public static final class RadialGradientConverter extends StyleConverterImpl<ParsedValue[], Paint> {
-
-        public static RadialGradientConverter getInstance() {
-            return Holder.RADIAL_GRADIENT_INSTANCE;
-        }
-
-        private RadialGradientConverter() {
-            super();
-        }
-
-        @Override
-        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
-
-            Paint paint = super.getCachedValue(value);
-            if (paint != null) return paint;
-
-            final ParsedValue[] values = value.getValue();
-            int v = 0;
-            // First four values are for startX, startY, endX, endY
-            // and are type ParsedValue<Value<?,Size>,Double>. To figure out
-            // proportional, we need to get to the Size. getValue() will
-            // return ParsedValue<?,Size>, so getValue().convert(font) will
-            // give us the size.
-            final Size focusAngle = values[v++] != null ? (Size) values[v-1].convert(font) : null;
-            final Size focusDistance = values[v++] != null ? (Size) values[v-1].convert(font) : null;
-            final Size centerX = values[v++] != null ? (Size) values[v-1].convert(font) : null;
-            final Size centerY = values[v++] != null ? (Size) values[v-1].convert(font) : null;
-            final Size radius = (Size) values[v++].convert(font);
-            boolean proportional = radius.getUnits().equals(SizeUnits.PERCENT);
-            boolean unitsAgree = centerX != null ? proportional == centerX.getUnits().equals(SizeUnits.PERCENT) : true;
-            unitsAgree = unitsAgree && centerY != null ? proportional == centerY.getUnits().equals(SizeUnits.PERCENT) : true;
-            if (!unitsAgree) {
-                throw new IllegalArgumentException("units do not agree");
-            }
-            final CycleMethod cycleMethod = (CycleMethod) values[v++].convert(font);
-            final Stop[] stops = new Stop[values.length - v];
-            for (int s = v; s < values.length; s++) {
-                stops[s - v] = (Stop) values[s].convert(font);
-            }
-            //If the focus-angle is a percentage, the value is mutiplied
-            // by 360, modulo 360.
-            double fa = 0;
-            if (focusAngle != null) {
-                fa = focusAngle.pixels(font);
-                if (focusAngle.getUnits().equals(SizeUnits.PERCENT)) {
-                    fa = (fa * 360) % 360;
-                }
-            }
-            paint = new RadialGradient(fa, focusDistance != null ? focusDistance.pixels() : 0, centerX != null ? centerX.pixels() : 0, centerY != null ? centerY.pixels() : 0, radius != null ? radius.pixels() : 1, proportional, cycleMethod, stops);
-
-            super.cacheValue(value, paint);
-            return paint;
-        }
-
-        @Override
-        public String toString() {
-            return "RadialGradientConverter";
-        }
-    }
-}
--- /dev/null	2015-09-03 15:34:32.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/PaintConverter.java	2015-09-03 15:34:30.064395500 -0700
@@ -0,0 +1,288 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.SizeUnits;
+import com.sun.javafx.css.StyleManager;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.image.Image;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+
+
+/**
+ * @since 9
+ */
+public final class PaintConverter extends StyleConverter<ParsedValue<?, Paint>, Paint> {
+
+    // lazy, thread-safe instantiation
+    private static class Holder {
+        static final PaintConverter INSTANCE = new PaintConverter();
+        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
+        static final LinearGradientConverter LINEAR_GRADIENT_INSTANCE = new LinearGradientConverter();
+        static final ImagePatternConverter IMAGE_PATTERN_INSTANCE = new ImagePatternConverter();
+        static final RepeatingImagePatternConverter REPEATING_IMAGE_PATTERN_INSTANCE = new RepeatingImagePatternConverter();
+        static final RadialGradientConverter RADIAL_GRADIENT_INSTANCE = new RadialGradientConverter();
+    }
+
+    public static StyleConverter<ParsedValue<?, Paint>, Paint> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private PaintConverter() {
+        super();
+    }
+
+    @Override
+    public Paint convert(ParsedValue<ParsedValue<?, Paint>, Paint> value, Font font) {
+        Object obj = value.getValue();
+        if (obj instanceof Paint) {
+            return (Paint) obj;
+        }
+        return value.getValue().convert(font);
+    }
+
+    @Override
+    public String toString() {
+        return "PaintConverter";
+    }
+
+    /**
+     * Convert [<paint]+ to Paint[]
+     */
+    public static final class SequenceConverter extends StyleConverter<ParsedValue<?, Paint>[], Paint[]> {
+
+        public static SequenceConverter getInstance() {
+            return Holder.SEQUENCE_INSTANCE;
+        }
+
+        private SequenceConverter() {
+            super();
+        }
+
+        @Override
+        public Paint[] convert(ParsedValue<ParsedValue<?, Paint>[], Paint[]> value, Font font) {
+            ParsedValue<?, Paint>[] values = value.getValue();
+            Paint[] paints = new Paint[values.length];
+            for (int p = 0; p < values.length; p++) {
+                paints[p] = values[p].convert(font);
+            }
+            return paints;
+        }
+
+        @Override
+        public String toString() {
+            return "Paint.SequenceConverter";
+        }
+    }
+
+    public static final class LinearGradientConverter extends StyleConverter<ParsedValue[], Paint> {
+
+        public static LinearGradientConverter getInstance() {
+            return Holder.LINEAR_GRADIENT_INSTANCE;
+        }
+
+        private LinearGradientConverter() {
+            super();
+        }
+
+        @Override 
+        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
+
+            Paint paint = super.getCachedValue(value);
+            if (paint != null) return paint;
+
+            ParsedValue[] values = value.getValue();
+            int v = 0;
+            final Size startX = (Size) values[v++].convert(font);
+            final Size startY = (Size) values[v++].convert(font);
+            final Size endX = (Size) values[v++].convert(font);
+            final Size endY = (Size) values[v++].convert(font);
+            boolean proportional = startX.getUnits() == SizeUnits.PERCENT && startX.getUnits() == startY.getUnits() && startX.getUnits() == endX.getUnits() && startX.getUnits() == endY.getUnits();
+            final CycleMethod cycleMethod = (CycleMethod) values[v++].convert(font);
+            final Stop[] stops = new Stop[values.length - v];
+            for (int s = v; s < values.length; s++) {
+                stops[s - v] = (Stop) values[s].convert(font);
+            }
+            paint = new LinearGradient(startX.pixels(font), startY.pixels(font), endX.pixels(font), endY.pixels(font), proportional, cycleMethod, stops);
+
+            super.cacheValue(value, paint);
+            return paint;
+        }
+
+        @Override
+        public String toString() {
+            return "LinearGradientConverter";
+        }
+    }
+
+    public static final class ImagePatternConverter extends StyleConverter<ParsedValue[], Paint> {
+
+        public static ImagePatternConverter getInstance() {
+            return Holder.IMAGE_PATTERN_INSTANCE;
+        }
+
+        private ImagePatternConverter() {
+            super();
+        }
+
+        @Override
+        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
+
+            Paint paint = super.getCachedValue(value);
+            if (paint != null) return paint;
+
+            ParsedValue[] values = value.getValue();
+            ParsedValue<?,?> urlParsedValue = values[0];
+            String url = (String) urlParsedValue.convert(font);
+            if (values.length == 1) {
+                return new ImagePattern(StyleManager.getInstance().getCachedImage(url));
+            }
+
+            Size x = (Size) values[1].convert(font);
+            Size y = (Size) values[2].convert(font);
+            Size w = (Size) values[3].convert(font);
+            Size h = (Size) values[4].convert(font);
+            boolean p = values.length < 6 ? true : (Boolean) values[5].getValue();
+
+            paint = new ImagePattern(
+                    new Image(url),
+                    x.getValue(),
+                    y.getValue(),
+                    w.getValue(),
+                    h.getValue(), p);
+
+            super.cacheValue(value, paint);
+            return paint;
+        }
+
+        @Override
+        public String toString() {
+            return "ImagePatternConverter";
+        }
+    }
+
+    public static final class RepeatingImagePatternConverter extends StyleConverter<ParsedValue[], Paint> {
+
+        public static RepeatingImagePatternConverter getInstance() {
+            return Holder.REPEATING_IMAGE_PATTERN_INSTANCE;
+        }
+
+        private RepeatingImagePatternConverter() {
+            super();
+        }
+
+        @Override
+        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
+
+            Paint paint = super.getCachedValue(value);
+            if (paint != null) return paint;
+
+            ParsedValue[] values = value.getValue();
+            ParsedValue<?, ?> url = values[0];
+            String u = (String) url.convert(font);
+            // If u is null, then we failed to locate the image associated with the url specified in the CSS file.
+            if (u == null) return null;
+            final Image image = new Image(u);
+            paint = new ImagePattern(image, 0, 0, image.getWidth(), image.getHeight(), false);
+
+            super.cacheValue(value, paint);
+            return paint;
+        }
+
+        @Override
+        public String toString() {
+            return "RepeatingImagePatternConverter";
+        }
+    }
+
+    public static final class RadialGradientConverter extends StyleConverter<ParsedValue[], Paint> {
+
+        public static RadialGradientConverter getInstance() {
+            return Holder.RADIAL_GRADIENT_INSTANCE;
+        }
+
+        private RadialGradientConverter() {
+            super();
+        }
+
+        @Override
+        public Paint convert(ParsedValue<ParsedValue[], Paint> value, Font font) {
+
+            Paint paint = super.getCachedValue(value);
+            if (paint != null) return paint;
+
+            final ParsedValue[] values = value.getValue();
+            int v = 0;
+            // First four values are for startX, startY, endX, endY
+            // and are type ParsedValue<Value<?,Size>,Double>. To figure out
+            // proportional, we need to get to the Size. getValue() will
+            // return ParsedValue<?,Size>, so getValue().convert(font) will
+            // give us the size.
+            final Size focusAngle = values[v++] != null ? (Size) values[v-1].convert(font) : null;
+            final Size focusDistance = values[v++] != null ? (Size) values[v-1].convert(font) : null;
+            final Size centerX = values[v++] != null ? (Size) values[v-1].convert(font) : null;
+            final Size centerY = values[v++] != null ? (Size) values[v-1].convert(font) : null;
+            final Size radius = (Size) values[v++].convert(font);
+            boolean proportional = radius.getUnits().equals(SizeUnits.PERCENT);
+            boolean unitsAgree = centerX != null ? proportional == centerX.getUnits().equals(SizeUnits.PERCENT) : true;
+            unitsAgree = unitsAgree && centerY != null ? proportional == centerY.getUnits().equals(SizeUnits.PERCENT) : true;
+            if (!unitsAgree) {
+                throw new IllegalArgumentException("units do not agree");
+            }
+            final CycleMethod cycleMethod = (CycleMethod) values[v++].convert(font);
+            final Stop[] stops = new Stop[values.length - v];
+            for (int s = v; s < values.length; s++) {
+                stops[s - v] = (Stop) values[s].convert(font);
+            }
+            //If the focus-angle is a percentage, the value is mutiplied
+            // by 360, modulo 360.
+            double fa = 0;
+            if (focusAngle != null) {
+                fa = focusAngle.pixels(font);
+                if (focusAngle.getUnits().equals(SizeUnits.PERCENT)) {
+                    fa = (fa * 360) % 360;
+                }
+            }
+            paint = new RadialGradient(fa, focusDistance != null ? focusDistance.pixels() : 0, centerX != null ? centerX.pixels() : 0, centerY != null ? centerY.pixels() : 0, radius != null ? radius.pixels() : 1, proportional, cycleMethod, stops);
+
+            super.cacheValue(value, paint);
+            return paint;
+        }
+
+        @Override
+        public String toString() {
+            return "RadialGradientConverter";
+        }
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/ShapeConverter.java	2015-09-03 15:34:39.291923300 -0700
+++ /dev/null	2015-09-03 15:34:40.000000000 -0700
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2012, 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.converters;
-
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.shape.SVGPath;
-import javafx.scene.shape.Shape;
-import javafx.scene.text.Font;
-
-import java.util.Map;
-
-/**
- * Converts an SVG shape string into a Shape object.
- */
-public class ShapeConverter extends StyleConverterImpl<String, Shape> {
-    private static final ShapeConverter INSTANCE = new ShapeConverter();
-
-    public static StyleConverter<String, Shape> getInstance() { return INSTANCE; }
-
-    @Override public Shape convert(ParsedValue<String, Shape> value, Font font) {
-
-        Shape shape = super.getCachedValue(value);
-        if (shape != null) return shape;
-
-        String svg = value.getValue();
-        if (svg == null || svg.isEmpty()) return null;
-        SVGPath path = new SVGPath();
-        path.setContent(svg);
-
-        super.cacheValue(value, path);
-
-        return path;
-    }
-
-    private static Map<ParsedValue<String, Shape>, Shape> cache;
-
-    public static void clearCache() { if (cache != null) cache.clear(); }
-
-}
--- /dev/null	2015-09-03 15:34:40.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/ShapeConverter.java	2015-09-03 15:34:38.485877200 -0700
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2012, 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.css.converter;
+
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.shape.SVGPath;
+import javafx.scene.shape.Shape;
+import javafx.scene.text.Font;
+
+import java.util.Map;
+
+/**
+ * Converts an SVG shape string into a Shape object.
+ *
+ * @since 9
+ */
+public class ShapeConverter extends StyleConverter<String, Shape> {
+    private static final ShapeConverter INSTANCE = new ShapeConverter();
+
+    public static StyleConverter<String, Shape> getInstance() { return INSTANCE; }
+
+    @Override public Shape convert(ParsedValue<String, Shape> value, Font font) {
+
+        Shape shape = super.getCachedValue(value);
+        if (shape != null) return shape;
+
+        String svg = value.getValue();
+        if (svg == null || svg.isEmpty()) return null;
+        SVGPath path = new SVGPath();
+        path.setContent(svg);
+
+        super.cacheValue(value, path);
+
+        return path;
+    }
+
+    private static Map<ParsedValue<String, Shape>, Shape> cache;
+
+    public static void clearCache() { if (cache != null) cache.clear(); }
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/SizeConverter.java	2015-09-03 15:34:47.241378000 -0700
+++ /dev/null	2015-09-03 15:34:48.000000000 -0700
@@ -1,91 +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.css.converters;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.text.Font;
-
-/* Convert a Size to Number */
-public final class SizeConverter extends StyleConverterImpl<ParsedValue<?, Size>, Number> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final SizeConverter INSTANCE = new SizeConverter();
-        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
-    }
-
-    public static StyleConverter<ParsedValue<?, Size>, Number> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private SizeConverter() {
-        super();
-    }
-
-    @Override
-    public Number convert(ParsedValue<ParsedValue<?, Size>, Number> value, Font font) {
-        ParsedValue<?, Size> size = value.getValue();
-        return size.convert(font).pixels(font);
-    }
-
-    @Override
-    public String toString() {
-        return "SizeConverter";
-    }
-
-    /*
-     * Convert [<size>]+ to an array of Number[].
-     */
-    public static final class SequenceConverter extends StyleConverterImpl<ParsedValue[], Number[]> {
-
-        public static SequenceConverter getInstance() {
-            return Holder.SEQUENCE_INSTANCE;
-        }
-
-        private SequenceConverter() {
-            super();
-        }
-
-        @Override
-        public Number[] convert(ParsedValue<ParsedValue[], Number[]> value, Font font) {
-            ParsedValue[] sizes = value.getValue();
-            Number[] doubles = new Number[sizes.length];
-            for (int i = 0; i < sizes.length; i++) {
-                doubles[i] = ((Size)sizes[i].convert(font)).pixels(font);
-            }
-            return doubles;
-        }
-
-        @Override
-        public String toString() {
-            return "Size.SequenceConverter";
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:34:48.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/SizeConverter.java	2015-09-03 15:34:46.527337100 -0700
@@ -0,0 +1,94 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.text.Font;
+
+/**
+ * Convert a Size to Number
+ *
+ * @since 9
+ */
+public final class SizeConverter extends StyleConverter<ParsedValue<?, Size>, Number> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final SizeConverter INSTANCE = new SizeConverter();
+        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
+    }
+
+    public static StyleConverter<ParsedValue<?, Size>, Number> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private SizeConverter() {
+        super();
+    }
+
+    @Override
+    public Number convert(ParsedValue<ParsedValue<?, Size>, Number> value, Font font) {
+        ParsedValue<?, Size> size = value.getValue();
+        return size.convert(font).pixels(font);
+    }
+
+    @Override
+    public String toString() {
+        return "SizeConverter";
+    }
+
+    /*
+     * Convert [<size>]+ to an array of Number[].
+     */
+    public static final class SequenceConverter extends StyleConverter<ParsedValue[], Number[]> {
+
+        public static SequenceConverter getInstance() {
+            return Holder.SEQUENCE_INSTANCE;
+        }
+
+        private SequenceConverter() {
+            super();
+        }
+
+        @Override
+        public Number[] convert(ParsedValue<ParsedValue[], Number[]> value, Font font) {
+            ParsedValue[] sizes = value.getValue();
+            Number[] doubles = new Number[sizes.length];
+            for (int i = 0; i < sizes.length; i++) {
+                doubles[i] = ((Size)sizes[i].convert(font)).pixels(font);
+            }
+            return doubles;
+        }
+
+        @Override
+        public String toString() {
+            return "Size.SequenceConverter";
+        }
+    }
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/parser/StopConverter.java	2015-09-03 15:34:54.948818800 -0700
+++ /dev/null	2015-09-03 15:34:56.000000000 -0700
@@ -1,65 +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.css.parser;
-
-import com.sun.javafx.css.Size;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Stop;
-import javafx.scene.text.Font;
-
-/**
- * convert a Stop from a Size and a Color
- */
-public final class StopConverter extends StyleConverterImpl<ParsedValue[], Stop> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final StopConverter INSTANCE = new StopConverter();
-    }
-
-    public static StopConverter getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private StopConverter() {
-        super();
-    }
-
-    @Override
-    public Stop convert(ParsedValue<ParsedValue[], Stop> value, Font font) {
-        ParsedValue[] values = value.getValue();
-        final Double offset = ((Size) values[0].convert(font)).pixels(font);
-        final Color color = (Color) values[1].convert(font);
-        return new Stop(offset, color);
-    }
-
-    @Override
-    public String toString() {
-        return "StopConverter";
-    }
-}
--- /dev/null	2015-09-03 15:34:56.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/StopConverter.java	2015-09-03 15:34:54.127771800 -0700
@@ -0,0 +1,65 @@
+/*
+ * 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.css.converter;
+
+import javafx.css.Size;
+import javafx.css.StyleConverter;
+import javafx.css.ParsedValue;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+
+/**
+ * convert a Stop from a Size and a Color
+ */
+public final class StopConverter extends StyleConverter<ParsedValue[], Stop> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final StopConverter INSTANCE = new StopConverter();
+    }
+
+    public static StopConverter getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private StopConverter() {
+        super();
+    }
+
+    @Override
+    public Stop convert(ParsedValue<ParsedValue[], Stop> value, Font font) {
+        ParsedValue[] values = value.getValue();
+        final Double offset = ((Size) values[0].convert(font)).pixels(font);
+        final Color color = (Color) values[1].convert(font);
+        return new Stop(offset, color);
+    }
+
+    @Override
+    public String toString() {
+        return "StopConverter";
+    }
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/StringConverter.java	2015-09-03 15:35:03.236292800 -0700
+++ /dev/null	2015-09-03 15:35:04.000000000 -0700
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.converters;
-
-import com.sun.javafx.util.Utils;
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.text.Font;
-
-/**
- * String type converts embedded unicode characters
- */
-public final class StringConverter extends StyleConverterImpl<String, String> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final StringConverter INSTANCE = new StringConverter();
-        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
-    }
-
-    public static StyleConverter<String, String> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private StringConverter() {
-        super();
-    }
-
-    @Override
-    public String convert(ParsedValue<String, String> value, Font font) {
-        String string = value.getValue();
-        if (string == null) {
-            return null;
-        } // escaping for those
-        return Utils.convertUnicode(string);
-    }
-
-    @Override
-    public String toString() {
-        return "StringConverter";
-    }
-
-    public static final class SequenceConverter extends StyleConverterImpl<ParsedValue<String, String>[], String[]> {
-
-
-        public static SequenceConverter getInstance() {
-            return Holder.SEQUENCE_INSTANCE;
-        }
-
-        private SequenceConverter() {
-            super();
-        }
-
-        @Override
-        public String[] convert(ParsedValue<ParsedValue<String, String>[], String[]> value, Font font) {
-            ParsedValue<String, String>[] layers = value.getValue();
-            String[] strings = new String[layers.length];
-            for (int layer = 0; layer < layers.length; layer++) {
-                strings[layer] = StringConverter.getInstance().convert(layers[layer], font);
-            }
-            return strings;
-        }
-
-        @Override
-        public String toString() {
-            return "String.SequenceConverter";
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:35:04.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/StringConverter.java	2015-09-03 15:35:02.479249500 -0700
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css.converter;
+
+import com.sun.javafx.util.Utils;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.text.Font;
+
+/**
+ * String type converts embedded unicode characters
+ *
+ * @since 9
+ */
+public final class StringConverter extends StyleConverter<String, String> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final StringConverter INSTANCE = new StringConverter();
+        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
+    }
+
+    public static StyleConverter<String, String> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private StringConverter() {
+        super();
+    }
+
+    @Override
+    public String convert(ParsedValue<String, String> value, Font font) {
+        String string = value.getValue();
+        if (string == null) {
+            return null;
+        } // escaping for those
+        return Utils.convertUnicode(string);
+    }
+
+    @Override
+    public String toString() {
+        return "StringConverter";
+    }
+
+    public static final class SequenceConverter extends StyleConverter<ParsedValue<String, String>[], String[]> {
+
+
+        public static SequenceConverter getInstance() {
+            return Holder.SEQUENCE_INSTANCE;
+        }
+
+        private SequenceConverter() {
+            super();
+        }
+
+        @Override
+        public String[] convert(ParsedValue<ParsedValue<String, String>[], String[]> value, Font font) {
+            ParsedValue<String, String>[] layers = value.getValue();
+            String[] strings = new String[layers.length];
+            for (int layer = 0; layer < layers.length; layer++) {
+                strings[layer] = StringConverter.getInstance().convert(layers[layer], font);
+            }
+            return strings;
+        }
+
+        @Override
+        public String toString() {
+            return "String.SequenceConverter";
+        }
+    }
+
+}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/converters/URLConverter.java	2015-09-03 15:35:11.357757300 -0700
+++ /dev/null	2015-09-03 15:35:12.000000000 -0700
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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.converters;
-
-import com.sun.javafx.css.StyleConverterImpl;
-import javafx.application.Application;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.scene.text.Font;
-import sun.util.logging.PlatformLogger;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.CodeSource;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.security.ProtectionDomain;
-
-/**
- * Convert url("<path>") a URL string resolved relative to the location of the stylesheet.
- */
-public final class URLConverter extends StyleConverterImpl<ParsedValue[], String> {
-
-    // lazy, thread-safe instatiation
-    private static class Holder {
-        static final URLConverter INSTANCE = new URLConverter();
-        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
-    }
-
-    public static StyleConverter<ParsedValue[], String> getInstance() {
-        return Holder.INSTANCE;
-    }
-
-    private URLConverter() {
-        super();
-    }
-
-    @Override
-    public String convert(ParsedValue<ParsedValue[], String> value, Font font) {
-
-        String url = null;
-
-        ParsedValue[] values = value.getValue();
-
-        String resource = values.length > 0 ? StringConverter.getInstance().convert(values[0], font) : null;
-
-        if (resource != null && resource.trim().isEmpty() == false) {
-
-            if (resource.startsWith("url(")) {
-                resource = com.sun.javafx.util.Utils.stripQuotes(resource.substring(4, resource.length() - 1));
-            } else {
-                resource = com.sun.javafx.util.Utils.stripQuotes(resource);
-            }
-
-            String stylesheetURL = values.length > 1 && values[1] != null ? (String)values[1].getValue() : null;
-            URL resolvedURL = resolve(stylesheetURL, resource);
-
-            if (resolvedURL != null) url = resolvedURL.toExternalForm();
-        }
-
-        return url;
-    }
-
-    // package for testing
-    URL resolve(String stylesheetUrl, String resource) {
-
-
-        final String resourcePath = (resource != null) ? resource.trim() : null;
-        if (resourcePath == null || resourcePath.isEmpty()) return null;
-
-        try {
-
-            // Note: the same code (pretty much) also appears in StyleManager
-
-            // if stylesheetUri is null, then we're dealing with an in-line style.
-            // If there is no scheme part, then the url is interpreted as being relative to the application's class-loader.
-            URI resourceUri = new URI(resourcePath);
-
-            if (resourceUri.isAbsolute()) {
-                return resourceUri.toURL();
-            }
-
-            URL rtJarUrl = resolveRuntimeImport(resourceUri);
-            if (rtJarUrl != null) {
-                return rtJarUrl;
-            }
-
-            final String path = resourceUri.getPath();
-            if (path.startsWith("/")) {
-                final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-                return contextClassLoader.getResource(path.substring(1));
-            }
-
-            final String stylesheetPath = (stylesheetUrl != null) ?  stylesheetUrl.trim() : null;
-
-            if (stylesheetPath != null && stylesheetPath.isEmpty() == false) {
-
-                URI stylesheetUri = new URI(stylesheetPath);
-
-                if (stylesheetUri.isOpaque() == false) {
-
-                    URI resolved = stylesheetUri.resolve(resourceUri);
-                    return resolved.toURL();
-
-                } else {
-
-                    // stylesheet URI is something like jar:file:
-                    URL url = stylesheetUri.toURL();
-                    return new URL(url, resourceUri.getPath());
-                }
-            }
-
-
-            // URL doesn't have scheme or stylesheetUrl is null
-            final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-            return contextClassLoader.getResource(path);
-
-
-        } catch (final MalformedURLException|URISyntaxException e) {
-            PlatformLogger cssLogger = com.sun.javafx.util.Logging.getCSSLogger();
-            if (cssLogger.isLoggable(PlatformLogger.Level.WARNING)) {
-                cssLogger.warning(e.getLocalizedMessage());
-            }
-
-            return null;
-        }
-
-    }
-
-
-    //
-    // Resolve a path from an @import that implies jfxrt.jar,
-    // e.g., @import "com/sun/javafx/scene/control/skin/modena/modena.css".
-    //
-    // See also StyleSheet#loadStylesheet(String)
-    //
-    private URL resolveRuntimeImport(final URI resourceUri) {
-
-
-        final String path = resourceUri.getPath();
-        final String resourcePath = path.startsWith("/") ? path.substring(1) : path;
-
-        if ((resourcePath.startsWith("com/sun/javafx/scene/control/skin/modena/") ||
-             resourcePath.startsWith("com/sun/javafx/scene/control/skin/caspian/")) &&
-            (resourcePath.endsWith(".css") || resourcePath.endsWith(".bss"))) {
-
-            final SecurityManager sm = System.getSecurityManager();
-            if (sm == null) {
-                // If the SecurityManager is not null, then just look up the resource on the class-path.
-                // If there is a SecurityManager, the URLClassPath getResource call will return null,
-                // so fall through and create a URL from the code-source URI
-                final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-                final URL resolved = contextClassLoader.getResource(resourcePath);
-                return resolved;
-            }
-
-            // check whether the path is file from our runtime jar
-            try {
-                final URL rtJarURL = AccessController.doPrivileged((PrivilegedExceptionAction<URL>) () -> {
-                    // getProtectionDomain either throws a SecurityException or returns a non-null value
-                    final ProtectionDomain protectionDomain = Application.class.getProtectionDomain();
-                    // If we're running with a SecurityManager, then the ProtectionDomain will have a CodeSource
-                    final CodeSource codeSource = protectionDomain.getCodeSource();
-                    // The CodeSource location will be our runtime jar
-                    return codeSource.getLocation();
-                });
-
-                final URI rtJarURI = rtJarURL.toURI();
-
-                String scheme = rtJarURI.getScheme();
-                String rtJarPath = rtJarURI.getPath();
-
-                //
-                // Just because we're running with a SecurityManager doesn't mean the jfxrt jar path is
-                // a jar: URL. But the code in StyleManager wants it to be. So if we have
-                // file:/blah/rt/lib/ext/jfxrt.jar make it jar:file:/blah/rt/lib/ext/jfxrt.jar!/
-                //
-                // If the path doesn't end with .jar, then we are just dealing with a normal file: path
-                //
-                if ("file".equals(scheme) && rtJarPath.endsWith(".jar")) {
-                    if ("file".equals(scheme)) {
-                        scheme = "jar:file";
-                        rtJarPath = rtJarPath.concat("!/");
-                    }
-                }
-                rtJarPath = rtJarPath.concat(resourcePath);
-
-                final String rtJarUserInfo = rtJarURI.getUserInfo();
-                final String rtJarHost = rtJarURI.getHost();
-                final int rtJarPort = rtJarURI.getPort();
-
-                //
-                // Put together a new URI from the pieces of rtJarURI. We cannot use resolve here since
-                // the scheme and path may have been munged.
-                //
-                URI resolved = new URI(scheme, rtJarUserInfo, rtJarHost, rtJarPort, rtJarPath, null, null);
-                return resolved.toURL();
-
-            } catch (URISyntaxException | MalformedURLException | PrivilegedActionException ignored) {
-                // Allow this method to return null so the caller will try to further resolve the path.
-                // If nothing else, an error message will result when the converted URL is consumed.
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public String toString() {
-        return "URLType";
-    }
-
-    public static final class SequenceConverter extends StyleConverterImpl<ParsedValue<ParsedValue[], String>[], String[]> {
-
-        public static SequenceConverter getInstance() {
-            return Holder.SEQUENCE_INSTANCE;
-        }
-
-        private SequenceConverter() {
-            super();
-        }
-
-        @Override
-        public String[] convert(ParsedValue<ParsedValue<ParsedValue[], String>[], String[]> value, Font font) {
-            ParsedValue<ParsedValue[], String>[] layers = value.getValue();
-            String[] urls = new String[layers.length];
-            for (int layer = 0; layer < layers.length; layer++) {
-                urls[layer] = URLConverter.getInstance().convert(layers[layer], font);
-            }
-            return urls;
-        }
-
-        @Override
-        public String toString() {
-            return "URLSeqType";
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:35:12.000000000 -0700
+++ new/modules/graphics/src/main/java/javafx/css/converter/URLConverter.java	2015-09-03 15:35:10.531710100 -0700
@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css.converter;
+
+import javafx.application.Application;
+import javafx.css.ParsedValue;
+import javafx.css.StyleConverter;
+import javafx.scene.text.Font;
+import sun.util.logging.PlatformLogger;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.security.ProtectionDomain;
+
+/**
+ * Convert url("<path>") a URL string resolved relative to the location of the stylesheet.
+ *
+ * @since 9
+ */
+public final class URLConverter extends StyleConverter<ParsedValue[], String> {
+
+    // lazy, thread-safe instatiation
+    private static class Holder {
+        static final URLConverter INSTANCE = new URLConverter();
+        static final SequenceConverter SEQUENCE_INSTANCE = new SequenceConverter();
+    }
+
+    public static StyleConverter<ParsedValue[], String> getInstance() {
+        return Holder.INSTANCE;
+    }
+
+    private URLConverter() {
+        super();
+    }
+
+    @Override
+    public String convert(ParsedValue<ParsedValue[], String> value, Font font) {
+
+        String url = null;
+
+        ParsedValue[] values = value.getValue();
+
+        String resource = values.length > 0 ? StringConverter.getInstance().convert(values[0], font) : null;
+
+        if (resource != null && resource.trim().isEmpty() == false) {
+
+            if (resource.startsWith("url(")) {
+                resource = com.sun.javafx.util.Utils.stripQuotes(resource.substring(4, resource.length() - 1));
+            } else {
+                resource = com.sun.javafx.util.Utils.stripQuotes(resource);
+            }
+
+            String stylesheetURL = values.length > 1 && values[1] != null ? (String)values[1].getValue() : null;
+            URL resolvedURL = resolve(stylesheetURL, resource);
+
+            if (resolvedURL != null) url = resolvedURL.toExternalForm();
+        }
+
+        return url;
+    }
+
+    // package for testing
+    URL resolve(String stylesheetUrl, String resource) {
+
+
+        final String resourcePath = (resource != null) ? resource.trim() : null;
+        if (resourcePath == null || resourcePath.isEmpty()) return null;
+
+        try {
+
+            // Note: the same code (pretty much) also appears in StyleManager
+
+            // if stylesheetUri is null, then we're dealing with an in-line style.
+            // If there is no scheme part, then the url is interpreted as being relative to the application's class-loader.
+            URI resourceUri = new URI(resourcePath);
+
+            if (resourceUri.isAbsolute()) {
+                return resourceUri.toURL();
+            }
+
+            URL rtJarUrl = resolveRuntimeImport(resourceUri);
+            if (rtJarUrl != null) {
+                return rtJarUrl;
+            }
+
+            final String path = resourceUri.getPath();
+            if (path.startsWith("/")) {
+                final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+                return contextClassLoader.getResource(path.substring(1));
+            }
+
+            final String stylesheetPath = (stylesheetUrl != null) ?  stylesheetUrl.trim() : null;
+
+            if (stylesheetPath != null && stylesheetPath.isEmpty() == false) {
+
+                URI stylesheetUri = new URI(stylesheetPath);
+
+                if (stylesheetUri.isOpaque() == false) {
+
+                    URI resolved = stylesheetUri.resolve(resourceUri);
+                    return resolved.toURL();
+
+                } else {
+
+                    // stylesheet URI is something like jar:file:
+                    URL url = stylesheetUri.toURL();
+                    return new URL(url, resourceUri.getPath());
+                }
+            }
+
+
+            // URL doesn't have scheme or stylesheetUrl is null
+            final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+            return contextClassLoader.getResource(path);
+
+
+        } catch (final MalformedURLException|URISyntaxException e) {
+            PlatformLogger cssLogger = com.sun.javafx.util.Logging.getCSSLogger();
+            if (cssLogger.isLoggable(PlatformLogger.Level.WARNING)) {
+                cssLogger.warning(e.getLocalizedMessage());
+            }
+
+            return null;
+        }
+
+    }
+
+
+    //
+    // Resolve a path from an @import that implies jfxrt.jar,
+    // e.g., @import "com/sun/javafx/scene/control/skin/modena/modena.css".
+    //
+    // See also StyleSheet#loadStylesheet(String)
+    //
+    private URL resolveRuntimeImport(final URI resourceUri) {
+
+
+        final String path = resourceUri.getPath();
+        final String resourcePath = path.startsWith("/") ? path.substring(1) : path;
+
+        if ((resourcePath.startsWith("com/sun/javafx/scene/control/skin/modena/") ||
+             resourcePath.startsWith("com/sun/javafx/scene/control/skin/caspian/")) &&
+            (resourcePath.endsWith(".css") || resourcePath.endsWith(".bss"))) {
+
+            final SecurityManager sm = System.getSecurityManager();
+            if (sm == null) {
+                // If the SecurityManager is not null, then just look up the resource on the class-path.
+                // If there is a SecurityManager, the URLClassPath getResource call will return null,
+                // so fall through and create a URL from the code-source URI
+                final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+                final URL resolved = contextClassLoader.getResource(resourcePath);
+                return resolved;
+            }
+
+            // check whether the path is file from our runtime jar
+            try {
+                final URL rtJarURL = AccessController.doPrivileged((PrivilegedExceptionAction<URL>) () -> {
+                    // getProtectionDomain either throws a SecurityException or returns a non-null value
+                    final ProtectionDomain protectionDomain = Application.class.getProtectionDomain();
+                    // If we're running with a SecurityManager, then the ProtectionDomain will have a CodeSource
+                    final CodeSource codeSource = protectionDomain.getCodeSource();
+                    // The CodeSource location will be our runtime jar
+                    return codeSource.getLocation();
+                });
+
+                final URI rtJarURI = rtJarURL.toURI();
+
+                String scheme = rtJarURI.getScheme();
+                String rtJarPath = rtJarURI.getPath();
+
+                //
+                // Just because we're running with a SecurityManager doesn't mean the jfxrt jar path is
+                // a jar: URL. But the code in StyleManager wants it to be. So if we have
+                // file:/blah/rt/lib/ext/jfxrt.jar make it jar:file:/blah/rt/lib/ext/jfxrt.jar!/
+                //
+                // If the path doesn't end with .jar, then we are just dealing with a normal file: path
+                //
+                if ("file".equals(scheme) && rtJarPath.endsWith(".jar")) {
+                    if ("file".equals(scheme)) {
+                        scheme = "jar:file";
+                        rtJarPath = rtJarPath.concat("!/");
+                    }
+                }
+                rtJarPath = rtJarPath.concat(resourcePath);
+
+                final String rtJarUserInfo = rtJarURI.getUserInfo();
+                final String rtJarHost = rtJarURI.getHost();
+                final int rtJarPort = rtJarURI.getPort();
+
+                //
+                // Put together a new URI from the pieces of rtJarURI. We cannot use resolve here since
+                // the scheme and path may have been munged.
+                //
+                URI resolved = new URI(scheme, rtJarUserInfo, rtJarHost, rtJarPort, rtJarPath, null, null);
+                return resolved.toURL();
+
+            } catch (URISyntaxException | MalformedURLException | PrivilegedActionException ignored) {
+                // Allow this method to return null so the caller will try to further resolve the path.
+                // If nothing else, an error message will result when the converted URL is consumed.
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return "URLType";
+    }
+
+    public static final class SequenceConverter extends StyleConverter<ParsedValue<ParsedValue[], String>[], String[]> {
+
+        public static SequenceConverter getInstance() {
+            return Holder.SEQUENCE_INSTANCE;
+        }
+
+        private SequenceConverter() {
+            super();
+        }
+
+        @Override
+        public String[] convert(ParsedValue<ParsedValue<ParsedValue[], String>[], String[]> value, Font font) {
+            ParsedValue<ParsedValue[], String>[] layers = value.getValue();
+            String[] urls = new String[layers.length];
+            for (int layer = 0; layer < layers.length; layer++) {
+                urls[layer] = URLConverter.getInstance().convert(layers[layer], font);
+            }
+            return urls;
+        }
+
+        @Override
+        public String toString() {
+            return "URLSeqType";
+        }
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/parser/CSSLexerTest.java	2015-09-03 15:35:19.490222500 -0700
+++ /dev/null	2015-09-03 15:35:20.000000000 -0700
@@ -1,847 +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.css.parser;
-
-import java.io.CharArrayReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-
-public class CSSLexerTest {
-    
-    public CSSLexerTest() {
-    }
-    
-    private void checkTokens(List<Token> resultTokens, Token... expectedTokens) 
-        throws org.junit.ComparisonFailure {
-                
-        if (expectedTokens.length != resultTokens.size()) {
-            throw new org.junit.ComparisonFailure(
-                "lengths do not match",
-                    Arrays.toString(expectedTokens),
-                resultTokens.toString()
-            );
-        }
-        
-        for (int n = 0; n<expectedTokens.length; n++) {
-            
-            final Token result = resultTokens.get(n);
-            final Token expected = expectedTokens[n];
-            
-            if (expected.getType() != result.getType()) {
-                throw new org.junit.ComparisonFailure(
-                    "token " + n + " types do not match", 
-                    Arrays.toString(expectedTokens),
-                    resultTokens.toString()
-                );
-            }
-            
-            final String expectedText = expected.getText();
-            final String resultText = result.getText();
-            
-            if (expectedText == null ? resultText != null : !expectedText.equals(resultText)) {
-                throw new org.junit.ComparisonFailure(
-                    "token " + n + " text does not match", 
-                    Arrays.toString(expectedTokens),
-                    resultTokens.toString()
-                );
-            }
-        }
-    }
-    
-    List<Token> getTokens(String string) {
-        
-        Reader reader = new CharArrayReader(string.toCharArray());
-        final CSSLexer lexer = CSSLexer.getInstance();
-        lexer.setReader(reader);
-        
-        final List<Token> tokens = new ArrayList<Token>();
-        
-        Token token = null;
-        do {
-            token = lexer.nextToken();
-            tokens.add(token);
-        } while (token.getType() != Token.EOF);
-
-        return Collections.unmodifiableList(tokens);
-    }
-    
-    private void lexDigitsWithUnits(String units, int type) throws org.junit.ComparisonFailure {
-        
-        checkTokens(getTokens("123"+units), new Token(type, "123"+units), Token.EOF_TOKEN);
-        checkTokens(getTokens("123.45"+units), new Token(type, "123.45"+units), Token.EOF_TOKEN);
-        checkTokens(getTokens(".45"+units), new Token(type, ".45"+units), Token.EOF_TOKEN);
-        checkTokens(getTokens("-123"+units), new Token(type, "-123"+units), Token.EOF_TOKEN);
-        checkTokens(getTokens("-.45"+units), new Token(type, "-.45"+units), Token.EOF_TOKEN);
-        checkTokens(getTokens("+123"+units), new Token(type, "+123"+units), Token.EOF_TOKEN);
-        checkTokens(getTokens("+.45"+units), new Token(type, "+.45"+units), Token.EOF_TOKEN);
-    }
-    
-    @Test
-    public void testLexValidDigits() {        
-        lexDigitsWithUnits("", CSSLexer.NUMBER);
-    }        
-
-    @Test
-    public void testLexValidDigitsWithCM() {        
-        lexDigitsWithUnits("cm", CSSLexer.CM);
-        // case should be ignored
-        lexDigitsWithUnits("cM", CSSLexer.CM);
-    }        
-    @Test
-    public void testLexValidDigitsWithDEG() {        
-        lexDigitsWithUnits("deg", CSSLexer.DEG);
-        // case should be ignored
-        lexDigitsWithUnits("dEg", CSSLexer.DEG);
-    }        
-    @Test
-    public void testLexValidDigitsWithEM() {        
-        lexDigitsWithUnits("em", CSSLexer.EMS);
-        // case should be ignored
-        lexDigitsWithUnits("Em", CSSLexer.EMS);
-    }        
-    @Test
-    public void testLexValidDigitsWithEX() {        
-        lexDigitsWithUnits("ex", CSSLexer.EXS);
-        // case should be ignored
-        lexDigitsWithUnits("Ex", CSSLexer.EXS);
-    }        
-    @Test
-    public void testLexValidDigitsWithGRAD() {        
-        lexDigitsWithUnits("grad", CSSLexer.GRAD);
-        // case should be ignored
-        lexDigitsWithUnits("gRad", CSSLexer.GRAD);
-    }        
-    @Test
-    public void testLexValidDigitsWithIN() {        
-        lexDigitsWithUnits("in", CSSLexer.IN);
-        // case should be ignored
-        lexDigitsWithUnits("In", CSSLexer.IN);
-    }        
-    @Test
-    public void testLexValidDigitsWithMM() {        
-        lexDigitsWithUnits("mm", CSSLexer.MM);
-        // case should be ignored
-        lexDigitsWithUnits("mM", CSSLexer.MM);
-    }        
-    @Test
-    public void testLexValidDigitsWithPC() {        
-        lexDigitsWithUnits("pc", CSSLexer.PC);
-        // case should be ignored
-        lexDigitsWithUnits("Pc", CSSLexer.PC);
-    }        
-    @Test
-    public void testLexValidDigitsWithPT() {        
-        lexDigitsWithUnits("pt", CSSLexer.PT);
-        // case should be ignored
-        lexDigitsWithUnits("PT", CSSLexer.PT);
-    }        
-    @Test
-    public void testLexValidDigitsWithPX() {        
-        lexDigitsWithUnits("px", CSSLexer.PX);
-        // case should be ignored
-        lexDigitsWithUnits("Px", CSSLexer.PX);
-    }        
-    @Test
-    public void testLexValidDigitsWithRAD() {        
-        lexDigitsWithUnits("rad", CSSLexer.RAD);
-        // case should be ignored
-        lexDigitsWithUnits("RaD", CSSLexer.RAD);
-    }
-    @Test
-    public void testLexValidDigitsWithTURN() {        
-        lexDigitsWithUnits("turn", CSSLexer.TURN);
-        // case should be ignored
-        lexDigitsWithUnits("TurN", CSSLexer.TURN);
-    }
-    @Test
-    public void testLexValidDigitsWithS() {
-        lexDigitsWithUnits("s", CSSLexer.SECONDS);
-        // case should be ignored
-        lexDigitsWithUnits("S", CSSLexer.SECONDS);
-    }
-    @Test
-    public void testLexValidDigitsWithMS() {
-        lexDigitsWithUnits("ms", CSSLexer.MS);
-        // case should be ignored
-        lexDigitsWithUnits("mS", CSSLexer.MS);
-    }
-    @Test
-    public void testLexValidDigitsWithPCT() {        
-        lexDigitsWithUnits("%", CSSLexer.PERCENTAGE);
-    }        
-    @Test
-    public void testLexValidDigitsWithBadUnits() { 
-        lexDigitsWithUnits("xyzzy", Token.INVALID);
-    }
-    @Test 
-    public void textLexValidDigitsValidDigits() {
-        checkTokens(
-            getTokens("foo: 10pt; bar: 20%;"),
-            new Token(CSSLexer.IDENT, "foo"),  
-            new Token(CSSLexer.COLON, ":"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PT, "10pt"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.IDENT, "bar"),  
-            new Token(CSSLexer.COLON, ":"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PERCENTAGE, "20%"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            Token.EOF_TOKEN
-        );
-    }
-    @Test 
-    public void textLexInvalidDigitsValidDigits() {
-        checkTokens(
-            getTokens("foo: 10pz; bar: 20%;"),
-            new Token(CSSLexer.IDENT, "foo"),  
-            new Token(CSSLexer.COLON, ":"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(Token.INVALID, "10pz"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.IDENT, "bar"),  
-            new Token(CSSLexer.COLON, ":"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PERCENTAGE, "20%"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            Token.EOF_TOKEN
-        );
-    }
-    @Test 
-    public void textLexValidDigitsBangImportant() {
-        checkTokens(
-            getTokens("foo: 10pt !important;"),
-            new Token(CSSLexer.IDENT, "foo"),  
-            new Token(CSSLexer.COLON, ":"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PT, "10pt"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.IMPORTANT_SYM, "!important"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            Token.EOF_TOKEN
-        );
-    }
-    @Test 
-    public void textLexInvalidDigitsBangImportant() {
-        checkTokens(
-            getTokens("foo: 10pz !important;"),
-            new Token(CSSLexer.IDENT, "foo"),  
-            new Token(CSSLexer.COLON, ":"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(Token.INVALID, "10pz"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.IMPORTANT_SYM, "!important"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            Token.EOF_TOKEN
-        );
-    }
-    @Test 
-    public void textLexValidDigitsInSequence() {
-        checkTokens(
-            getTokens("-1 0px 1pt .5em;"),
-            new Token(CSSLexer.NUMBER, "-1"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PX, "0px"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PT, "1pt"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.EMS, ".5em"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            Token.EOF_TOKEN
-        );
-    }
-    @Test 
-    public void textLexInvalidDigitsInSequence() {
-        checkTokens(
-            getTokens("-1 0px 1pz .5em;"),
-            new Token(CSSLexer.NUMBER, "-1"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.PX, "0px"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(Token.INVALID, "1pz"),  
-            new Token(CSSLexer.WS, " "),  
-            new Token(CSSLexer.EMS, ".5em"),  
-            new Token(CSSLexer.SEMI, ";"),  
-            Token.EOF_TOKEN
-        );
-    }
-
-    @Test 
-    public void testTokenOffset() {
-        
-        String str =  "a: b;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3),
-            new Token(CSSLexer.SEMI,  ";", 1, 4),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-                
-    }
-    
-    @Test 
-    public void testTokenLineAndOffsetWithCR() {
-        
-        String str =  "a: b;\rc: d;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3),
-            new Token(CSSLexer.SEMI,  ";", 1, 4),
-            new Token(CSSLexer.NL,  "\\r", 1, 5),
-            new Token(CSSLexer.IDENT, "c", 2, 0),
-            new Token(CSSLexer.COLON, ":", 2, 1),
-            new Token(CSSLexer.WS,    " ", 2, 2),
-            new Token(CSSLexer.IDENT, "d", 2, 3),
-            new Token(CSSLexer.SEMI,  ";", 2, 4),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-                
-    }
-
-    @Test 
-    public void testTokenLineAndOffsetWithLF() {
-        
-        String str =  "a: b;\nc: d;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3),
-            new Token(CSSLexer.SEMI,  ";", 1, 4),
-            new Token(CSSLexer.NL,  "\\n", 1, 5),
-            new Token(CSSLexer.IDENT, "c", 2, 0),
-            new Token(CSSLexer.COLON, ":", 2, 1),
-            new Token(CSSLexer.WS,    " ", 2, 2),
-            new Token(CSSLexer.IDENT, "d", 2, 3),
-            new Token(CSSLexer.SEMI,  ";", 2, 4),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-                
-    }
-
-    @Test 
-    public void testTokenLineAndOffsetWithCRLF() {
-        //             012345   01234
-        String str =  "a: b;\r\nc: d;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3),
-            new Token(CSSLexer.SEMI,  ";", 1, 4),
-            new Token(CSSLexer.NL,  "\\r\\n", 1, 5),
-            new Token(CSSLexer.IDENT, "c", 2, 0),
-            new Token(CSSLexer.COLON, ":", 2, 1),
-            new Token(CSSLexer.WS,    " ", 2, 2),
-            new Token(CSSLexer.IDENT, "d", 2, 3),
-            new Token(CSSLexer.SEMI,  ";", 2, 4),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-                
-    }
-    
-    @Test 
-    public void testTokenOffsetWithEmbeddedComment() {
-        //             0123456789012345
-        String str =  "a: /*comment*/b;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 14), 
-            new Token(CSSLexer.SEMI,  ";", 1, 15),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-
-    @Test 
-    public void testTokenLineAndOffsetWithLeadingComment() {
-        //             012345678901 01234
-        String str =  "/*comment*/\na: b;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.NL, "\\n", 1, 11),
-            new Token(CSSLexer.IDENT, "a", 2, 0),
-            new Token(CSSLexer.COLON, ":", 2, 1),
-            new Token(CSSLexer.WS,    " ", 2, 2),
-            new Token(CSSLexer.IDENT, "b", 2, 3), 
-            new Token(CSSLexer.SEMI,  ";", 2, 4),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-    
-    @Test 
-    public void testTokenOffsetWithFunction() {
-        //             01234567890
-        String str =  "a: b(arg);";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3), 
-            new Token(CSSLexer.LPAREN, "(", 1, 4), 
-            new Token(CSSLexer.IDENT, "arg", 1, 5), 
-            new Token(CSSLexer.RPAREN, ")", 1, 8), 
-            new Token(CSSLexer.SEMI,  ";", 1, 9),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-    
-    @Test 
-    public void testTokenOffsetWithHash() {
-        //             01234567890
-        String str =  "a: #012345;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.HASH, "#012345", 1, 3), 
-            new Token(CSSLexer.SEMI,  ";", 1, 10),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
- 
-    @Test 
-    public void testTokenOffsetWithDigits() {
-        //             01234567890
-        String str =  "a: 123.45;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.NUMBER, "123.45", 1, 3), 
-            new Token(CSSLexer.SEMI,  ";", 1, 9),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-
-    @Test 
-    public void testTokenOffsetWithBangImportant() {
-        //             0123456789012345
-        String str =  "a: b !important;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3),
-            new Token(CSSLexer.WS,    " ", 1, 4),
-            new Token(CSSLexer.IMPORTANT_SYM, "!important", 1, 5), 
-            new Token(CSSLexer.SEMI,  ";", 1, 15),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-
-    @Test 
-    public void testTokenOffsetWithSkip() {
-        //             0123456789012345
-        String str =  "a: b !imporzant;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(CSSLexer.IDENT, "b", 1, 3),
-            new Token(CSSLexer.WS,    " ", 1, 4),
-            new Token(Token.SKIP, "!imporz", 1, 5), 
-            new Token(CSSLexer.SEMI,  ";", 1, 15),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-    
-    @Test 
-    public void testTokenOffsetWithInvalid() {
-        //             0123456789012345
-        String str =  "a: 1pz;";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.IDENT, "a", 1, 0),
-            new Token(CSSLexer.COLON, ":", 1, 1),
-            new Token(CSSLexer.WS,    " ", 1, 2),
-            new Token(Token.INVALID, "1pz", 1, 3),
-            new Token(CSSLexer.SEMI,  ";", 1, 6),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-
-    @Test
-    public void testTokenLineAndOffsetMoreFully() {
-        //             1            2                 3         4
-        //             012345678901 0123456789012345  012345678 0
-        String str =  "/*comment*/\n*.foo#bar:baz {\n\ta: 1em;\n}";
-        // [?][0] = line
-        // [?][1] = offset
-        Token[] expected = {
-            new Token(CSSLexer.NL,     "\\n",  1, 11),
-            new Token(CSSLexer.STAR,   "*",    2, 0),
-            new Token(CSSLexer.DOT,    ".",    2, 1),
-            new Token(CSSLexer.IDENT,  "foo",  2, 2),
-            new Token(CSSLexer.HASH,   "#bar", 2, 5),
-            new Token(CSSLexer.COLON,  ":",    2, 9),
-            new Token(CSSLexer.IDENT,  "baz",  2, 10),
-            new Token(CSSLexer.WS,     " ",    2, 13),
-            new Token(CSSLexer.LBRACE, "{",    2, 14),
-            new Token(CSSLexer.NL,     "\\n",  2, 15),
-            new Token(CSSLexer.WS,     "\t",   3, 0),
-            new Token(CSSLexer.IDENT,  "a",    3, 1),
-            new Token(CSSLexer.COLON,  ":",    3, 2),
-            new Token(CSSLexer.WS,     " ",    3, 3),
-            new Token(CSSLexer.EMS,    "1em",  3, 4), 
-            new Token(CSSLexer.SEMI,   ";",    3, 7),
-            new Token(CSSLexer.NL,     "\\n",  3, 8),
-            new Token(CSSLexer.RBRACE, "}",    4, 0),
-            Token.EOF_TOKEN
-        };
-        
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-        
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-    }
-
-    @Test
-    public void testScanUrl() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(http://foo.bar.com/fonts/serif/fubar.ttf)";
-        Token[] expected = new Token[]{
-            new Token(CSSLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-            Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanUrlWithWhiteSpace() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(    http://foo.bar.com/fonts/serif/fubar.ttf\t)";
-        Token[] expected = new Token[]{
-                new Token(CSSLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanQuotedUrlWithWhiteSpace() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(    'http://foo.bar.com/fonts/serif/fubar.ttf'\t)";
-        Token[] expected = new Token[]{
-                new Token(CSSLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanQuotedUrl() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(\"http://foo.bar.com/fonts/serif/fubar.ttf\")";
-        Token[] expected = new Token[]{
-                new Token(CSSLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanUrlWithEscapes() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(http://foo.bar.com/fonts/true\\ type/fubar.ttf)";
-        Token[] expected = new Token[]{
-                new Token(CSSLexer.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanQuotedUrlWithEscapes() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(\"http://foo.bar.com/fonts/true\\ type/fubar.ttf\")";
-        Token[] expected = new Token[]{
-                new Token(CSSLexer.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanUrlWithSyntaxError() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url(http://foo.bar.com/fonts/true'type/fubar.ttf)";
-        Token[] expected = new Token[]{
-                new Token(Token.INVALID, "http://foo.bar.com/fonts/true", 1, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-    @Test
-    public void testScanQuotedUrlWithSyntaxError() {
-
-        //             1           2               3        4
-        //             01234567890101234567890123450123456780123456789
-        String str =  "url('http://foo.bar.com/fonts/true\rtype/fubar.ttf')";
-        Token[] expected = new Token[]{
-                new Token(Token.INVALID, "http://foo.bar.com/fonts/true", 2, 0),
-                Token.EOF_TOKEN
-        };
-
-        List<Token> tlist = getTokens(str);
-        checkTokens(tlist, expected);
-
-        for(int n=0; n<tlist.size(); n++) {
-            Token tok = tlist.get(n);
-            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
-            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
-        }
-
-    }
-
-}
--- /dev/null	2015-09-03 15:35:20.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/CssLexerTest.java	2015-09-03 15:35:18.716178200 -0700
@@ -0,0 +1,849 @@
+/*
+ * 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.css;
+
+import com.sun.javafx.css.parser.Token;
+
+import java.io.CharArrayReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+
+public class CssLexerTest {
+    
+    public CssLexerTest() {
+    }
+    
+    private void checkTokens(List<Token> resultTokens, Token... expectedTokens) 
+        throws org.junit.ComparisonFailure {
+                
+        if (expectedTokens.length != resultTokens.size()) {
+            throw new org.junit.ComparisonFailure(
+                "lengths do not match",
+                    Arrays.toString(expectedTokens),
+                resultTokens.toString()
+            );
+        }
+        
+        for (int n = 0; n<expectedTokens.length; n++) {
+            
+            final Token result = resultTokens.get(n);
+            final Token expected = expectedTokens[n];
+            
+            if (expected.getType() != result.getType()) {
+                throw new org.junit.ComparisonFailure(
+                    "token " + n + " types do not match", 
+                    Arrays.toString(expectedTokens),
+                    resultTokens.toString()
+                );
+            }
+            
+            final String expectedText = expected.getText();
+            final String resultText = result.getText();
+            
+            if (expectedText == null ? resultText != null : !expectedText.equals(resultText)) {
+                throw new org.junit.ComparisonFailure(
+                    "token " + n + " text does not match", 
+                    Arrays.toString(expectedTokens),
+                    resultTokens.toString()
+                );
+            }
+        }
+    }
+    
+    List<Token> getTokens(String string) {
+        
+        Reader reader = new CharArrayReader(string.toCharArray());
+        final CssLexer lexer = new CssLexer();
+        lexer.setReader(reader);
+        
+        final List<Token> tokens = new ArrayList<Token>();
+        
+        Token token = null;
+        do {
+            token = lexer.nextToken();
+            tokens.add(token);
+        } while (token.getType() != Token.EOF);
+
+        return Collections.unmodifiableList(tokens);
+    }
+    
+    private void lexDigitsWithUnits(String units, int type) throws org.junit.ComparisonFailure {
+        
+        checkTokens(getTokens("123"+units), new Token(type, "123"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("123.45"+units), new Token(type, "123.45"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens(".45"+units), new Token(type, ".45"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("-123"+units), new Token(type, "-123"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("-.45"+units), new Token(type, "-.45"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("+123"+units), new Token(type, "+123"+units), Token.EOF_TOKEN);
+        checkTokens(getTokens("+.45"+units), new Token(type, "+.45"+units), Token.EOF_TOKEN);
+    }
+    
+    @Test
+    public void testLexValidDigits() {        
+        lexDigitsWithUnits("", CssLexer.NUMBER);
+    }        
+
+    @Test
+    public void testLexValidDigitsWithCM() {        
+        lexDigitsWithUnits("cm", CssLexer.CM);
+        // case should be ignored
+        lexDigitsWithUnits("cM", CssLexer.CM);
+    }        
+    @Test
+    public void testLexValidDigitsWithDEG() {        
+        lexDigitsWithUnits("deg", CssLexer.DEG);
+        // case should be ignored
+        lexDigitsWithUnits("dEg", CssLexer.DEG);
+    }        
+    @Test
+    public void testLexValidDigitsWithEM() {        
+        lexDigitsWithUnits("em", CssLexer.EMS);
+        // case should be ignored
+        lexDigitsWithUnits("Em", CssLexer.EMS);
+    }        
+    @Test
+    public void testLexValidDigitsWithEX() {        
+        lexDigitsWithUnits("ex", CssLexer.EXS);
+        // case should be ignored
+        lexDigitsWithUnits("Ex", CssLexer.EXS);
+    }        
+    @Test
+    public void testLexValidDigitsWithGRAD() {        
+        lexDigitsWithUnits("grad", CssLexer.GRAD);
+        // case should be ignored
+        lexDigitsWithUnits("gRad", CssLexer.GRAD);
+    }        
+    @Test
+    public void testLexValidDigitsWithIN() {        
+        lexDigitsWithUnits("in", CssLexer.IN);
+        // case should be ignored
+        lexDigitsWithUnits("In", CssLexer.IN);
+    }        
+    @Test
+    public void testLexValidDigitsWithMM() {        
+        lexDigitsWithUnits("mm", CssLexer.MM);
+        // case should be ignored
+        lexDigitsWithUnits("mM", CssLexer.MM);
+    }        
+    @Test
+    public void testLexValidDigitsWithPC() {        
+        lexDigitsWithUnits("pc", CssLexer.PC);
+        // case should be ignored
+        lexDigitsWithUnits("Pc", CssLexer.PC);
+    }        
+    @Test
+    public void testLexValidDigitsWithPT() {        
+        lexDigitsWithUnits("pt", CssLexer.PT);
+        // case should be ignored
+        lexDigitsWithUnits("PT", CssLexer.PT);
+    }        
+    @Test
+    public void testLexValidDigitsWithPX() {        
+        lexDigitsWithUnits("px", CssLexer.PX);
+        // case should be ignored
+        lexDigitsWithUnits("Px", CssLexer.PX);
+    }        
+    @Test
+    public void testLexValidDigitsWithRAD() {        
+        lexDigitsWithUnits("rad", CssLexer.RAD);
+        // case should be ignored
+        lexDigitsWithUnits("RaD", CssLexer.RAD);
+    }
+    @Test
+    public void testLexValidDigitsWithTURN() {        
+        lexDigitsWithUnits("turn", CssLexer.TURN);
+        // case should be ignored
+        lexDigitsWithUnits("TurN", CssLexer.TURN);
+    }
+    @Test
+    public void testLexValidDigitsWithS() {
+        lexDigitsWithUnits("s", CssLexer.SECONDS);
+        // case should be ignored
+        lexDigitsWithUnits("S", CssLexer.SECONDS);
+    }
+    @Test
+    public void testLexValidDigitsWithMS() {
+        lexDigitsWithUnits("ms", CssLexer.MS);
+        // case should be ignored
+        lexDigitsWithUnits("mS", CssLexer.MS);
+    }
+    @Test
+    public void testLexValidDigitsWithPCT() {        
+        lexDigitsWithUnits("%", CssLexer.PERCENTAGE);
+    }        
+    @Test
+    public void testLexValidDigitsWithBadUnits() { 
+        lexDigitsWithUnits("xyzzy", Token.INVALID);
+    }
+    @Test 
+    public void textLexValidDigitsValidDigits() {
+        checkTokens(
+            getTokens("foo: 10pt; bar: 20%;"),
+            new Token(CssLexer.IDENT, "foo"),  
+            new Token(CssLexer.COLON, ":"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PT, "10pt"),  
+            new Token(CssLexer.SEMI, ";"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.IDENT, "bar"),  
+            new Token(CssLexer.COLON, ":"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PERCENTAGE, "20%"),  
+            new Token(CssLexer.SEMI, ";"),  
+            Token.EOF_TOKEN
+        );
+    }
+    @Test 
+    public void textLexInvalidDigitsValidDigits() {
+        checkTokens(
+            getTokens("foo: 10pz; bar: 20%;"),
+            new Token(CssLexer.IDENT, "foo"),  
+            new Token(CssLexer.COLON, ":"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(Token.INVALID, "10pz"),  
+            new Token(CssLexer.SEMI, ";"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.IDENT, "bar"),  
+            new Token(CssLexer.COLON, ":"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PERCENTAGE, "20%"),  
+            new Token(CssLexer.SEMI, ";"),  
+            Token.EOF_TOKEN
+        );
+    }
+    @Test 
+    public void textLexValidDigitsBangImportant() {
+        checkTokens(
+            getTokens("foo: 10pt !important;"),
+            new Token(CssLexer.IDENT, "foo"),  
+            new Token(CssLexer.COLON, ":"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PT, "10pt"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.IMPORTANT_SYM, "!important"),  
+            new Token(CssLexer.SEMI, ";"),  
+            Token.EOF_TOKEN
+        );
+    }
+    @Test 
+    public void textLexInvalidDigitsBangImportant() {
+        checkTokens(
+            getTokens("foo: 10pz !important;"),
+            new Token(CssLexer.IDENT, "foo"),  
+            new Token(CssLexer.COLON, ":"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(Token.INVALID, "10pz"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.IMPORTANT_SYM, "!important"),  
+            new Token(CssLexer.SEMI, ";"),  
+            Token.EOF_TOKEN
+        );
+    }
+    @Test 
+    public void textLexValidDigitsInSequence() {
+        checkTokens(
+            getTokens("-1 0px 1pt .5em;"),
+            new Token(CssLexer.NUMBER, "-1"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PX, "0px"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PT, "1pt"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.EMS, ".5em"),  
+            new Token(CssLexer.SEMI, ";"),  
+            Token.EOF_TOKEN
+        );
+    }
+    @Test 
+    public void textLexInvalidDigitsInSequence() {
+        checkTokens(
+            getTokens("-1 0px 1pz .5em;"),
+            new Token(CssLexer.NUMBER, "-1"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.PX, "0px"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(Token.INVALID, "1pz"),  
+            new Token(CssLexer.WS, " "),  
+            new Token(CssLexer.EMS, ".5em"),  
+            new Token(CssLexer.SEMI, ";"),  
+            Token.EOF_TOKEN
+        );
+    }
+
+    @Test 
+    public void testTokenOffset() {
+        
+        String str =  "a: b;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+                
+    }
+    
+    @Test 
+    public void testTokenLineAndOffsetWithCR() {
+        
+        String str =  "a: b;\rc: d;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            new Token(CssLexer.NL,  "\\r", 1, 5),
+            new Token(CssLexer.IDENT, "c", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "d", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+                
+    }
+
+    @Test 
+    public void testTokenLineAndOffsetWithLF() {
+        
+        String str =  "a: b;\nc: d;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            new Token(CssLexer.NL,  "\\n", 1, 5),
+            new Token(CssLexer.IDENT, "c", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "d", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+                
+    }
+
+    @Test 
+    public void testTokenLineAndOffsetWithCRLF() {
+        //             012345   01234
+        String str =  "a: b;\r\nc: d;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 4),
+            new Token(CssLexer.NL,  "\\r\\n", 1, 5),
+            new Token(CssLexer.IDENT, "c", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "d", 2, 3),
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+                
+    }
+    
+    @Test 
+    public void testTokenOffsetWithEmbeddedComment() {
+        //             0123456789012345
+        String str =  "a: /*comment*/b;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 14), 
+            new Token(CssLexer.SEMI,  ";", 1, 15),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+
+    @Test 
+    public void testTokenLineAndOffsetWithLeadingComment() {
+        //             012345678901 01234
+        String str =  "/*comment*/\na: b;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.NL, "\\n", 1, 11),
+            new Token(CssLexer.IDENT, "a", 2, 0),
+            new Token(CssLexer.COLON, ":", 2, 1),
+            new Token(CssLexer.WS,    " ", 2, 2),
+            new Token(CssLexer.IDENT, "b", 2, 3), 
+            new Token(CssLexer.SEMI,  ";", 2, 4),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+    
+    @Test 
+    public void testTokenOffsetWithFunction() {
+        //             01234567890
+        String str =  "a: b(arg);";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3), 
+            new Token(CssLexer.LPAREN, "(", 1, 4), 
+            new Token(CssLexer.IDENT, "arg", 1, 5), 
+            new Token(CssLexer.RPAREN, ")", 1, 8), 
+            new Token(CssLexer.SEMI,  ";", 1, 9),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+    
+    @Test 
+    public void testTokenOffsetWithHash() {
+        //             01234567890
+        String str =  "a: #012345;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.HASH, "#012345", 1, 3), 
+            new Token(CssLexer.SEMI,  ";", 1, 10),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+ 
+    @Test 
+    public void testTokenOffsetWithDigits() {
+        //             01234567890
+        String str =  "a: 123.45;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.NUMBER, "123.45", 1, 3), 
+            new Token(CssLexer.SEMI,  ";", 1, 9),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+
+    @Test 
+    public void testTokenOffsetWithBangImportant() {
+        //             0123456789012345
+        String str =  "a: b !important;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.WS,    " ", 1, 4),
+            new Token(CssLexer.IMPORTANT_SYM, "!important", 1, 5), 
+            new Token(CssLexer.SEMI,  ";", 1, 15),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+
+    @Test 
+    public void testTokenOffsetWithSkip() {
+        //             0123456789012345
+        String str =  "a: b !imporzant;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(CssLexer.IDENT, "b", 1, 3),
+            new Token(CssLexer.WS,    " ", 1, 4),
+            new Token(Token.SKIP, "!imporz", 1, 5), 
+            new Token(CssLexer.SEMI,  ";", 1, 15),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+    
+    @Test 
+    public void testTokenOffsetWithInvalid() {
+        //             0123456789012345
+        String str =  "a: 1pz;";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.IDENT, "a", 1, 0),
+            new Token(CssLexer.COLON, ":", 1, 1),
+            new Token(CssLexer.WS,    " ", 1, 2),
+            new Token(Token.INVALID, "1pz", 1, 3),
+            new Token(CssLexer.SEMI,  ";", 1, 6),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+
+    @Test
+    public void testTokenLineAndOffsetMoreFully() {
+        //             1            2                 3         4
+        //             012345678901 0123456789012345  012345678 0
+        String str =  "/*comment*/\n*.foo#bar:baz {\n\ta: 1em;\n}";
+        // [?][0] = line
+        // [?][1] = offset
+        Token[] expected = {
+            new Token(CssLexer.NL,     "\\n",  1, 11),
+            new Token(CssLexer.STAR,   "*",    2, 0),
+            new Token(CssLexer.DOT,    ".",    2, 1),
+            new Token(CssLexer.IDENT,  "foo",  2, 2),
+            new Token(CssLexer.HASH,   "#bar", 2, 5),
+            new Token(CssLexer.COLON,  ":",    2, 9),
+            new Token(CssLexer.IDENT,  "baz",  2, 10),
+            new Token(CssLexer.WS,     " ",    2, 13),
+            new Token(CssLexer.LBRACE, "{",    2, 14),
+            new Token(CssLexer.NL,     "\\n",  2, 15),
+            new Token(CssLexer.WS,     "\t",   3, 0),
+            new Token(CssLexer.IDENT,  "a",    3, 1),
+            new Token(CssLexer.COLON,  ":",    3, 2),
+            new Token(CssLexer.WS,     " ",    3, 3),
+            new Token(CssLexer.EMS,    "1em",  3, 4), 
+            new Token(CssLexer.SEMI,   ";",    3, 7),
+            new Token(CssLexer.NL,     "\\n",  3, 8),
+            new Token(CssLexer.RBRACE, "}",    4, 0),
+            Token.EOF_TOKEN
+        };
+        
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+        
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+    }
+
+    @Test
+    public void testScanUrl() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(http://foo.bar.com/fonts/serif/fubar.ttf)";
+        Token[] expected = new Token[]{
+            new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+            Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanUrlWithWhiteSpace() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(    http://foo.bar.com/fonts/serif/fubar.ttf\t)";
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanQuotedUrlWithWhiteSpace() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(    'http://foo.bar.com/fonts/serif/fubar.ttf'\t)";
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanQuotedUrl() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(\"http://foo.bar.com/fonts/serif/fubar.ttf\")";
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/serif/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanUrlWithEscapes() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(http://foo.bar.com/fonts/true\\ type/fubar.ttf)";
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanQuotedUrlWithEscapes() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(\"http://foo.bar.com/fonts/true\\ type/fubar.ttf\")";
+        Token[] expected = new Token[]{
+                new Token(CssLexer.URL, "http://foo.bar.com/fonts/true type/fubar.ttf", 1, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanUrlWithSyntaxError() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url(http://foo.bar.com/fonts/true'type/fubar.ttf)";
+        Token[] expected = new Token[]{
+                new Token(Token.INVALID, "http://foo.bar.com/fonts/true", 1, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+    @Test
+    public void testScanQuotedUrlWithSyntaxError() {
+
+        //             1           2               3        4
+        //             01234567890101234567890123450123456780123456789
+        String str =  "url('http://foo.bar.com/fonts/true\rtype/fubar.ttf')";
+        Token[] expected = new Token[]{
+                new Token(Token.INVALID, "http://foo.bar.com/fonts/true", 2, 0),
+                Token.EOF_TOKEN
+        };
+
+        List<Token> tlist = getTokens(str);
+        checkTokens(tlist, expected);
+
+        for(int n=0; n<tlist.size(); n++) {
+            Token tok = tlist.get(n);
+            assertEquals("bad line. tok="+tok, expected[n].getLine(), tok.getLine());
+            assertEquals("bad offset. tok="+tok, expected[n].getOffset(), tok.getOffset());
+        }
+
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/CssMetaDataTest.java	2015-09-03 15:35:27.320670400 -0700
+++ /dev/null	2015-09-03 15:35:28.000000000 -0700
@@ -1,1290 +0,0 @@
-/*
- * Copyright (c) 2010, 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.css;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import com.sun.javafx.sg.prism.NGNode;
-import javafx.beans.value.WritableValue;
-import javafx.css.CssMetaData;
-import javafx.css.FontCssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.StyleConverter;
-import javafx.css.StyleOrigin;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-import javafx.stage.Stage;
-import com.sun.javafx.css.converters.BooleanConverter;
-import com.sun.javafx.css.parser.CSSParser;
-import com.sun.javafx.geom.BaseBounds;
-import com.sun.javafx.geom.transform.BaseTransform;
-import com.sun.javafx.jmx.MXNodeAlgorithm;
-import com.sun.javafx.jmx.MXNodeAlgorithmContext;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-
-public class CssMetaDataTest {
-
-    public CssMetaDataTest() {
-    }
-
-    private static CssMetaData get(List<CssMetaData<? extends Styleable, ?>> list, String prop) {
-        for (CssMetaData styleable : list) {
-            if (prop.equals(styleable.getProperty())) return styleable;
-        }
-        return null;
-    }
-
-    /**
-     * Test of getCssMetaData method of class Styleable.
-     */
-    @Test
-    public void testGetCssMetaData_Styleable() {
-        Styleable styleable = new TestNode();
-        List<CssMetaData<? extends Styleable, ?>> expResult = TestNode.getClassCssMetaData();
-        List result = styleable.getCssMetaData();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetJavafxBeansProperty() {
-        TestNode testNode = new TestNode();
-        WritableValue prop = TestNodeBase.StyleableProperties.TEST.getStyleableProperty(testNode);
-        assert(prop != null);
-        CssMetaData result = ((StyleableProperty)prop).getCssMetaData();
-        assert(result == TestNodeBase.StyleableProperties.TEST);
-    }
-
-    /**
-     * Test of getProperty method, of class CssMetaData.
-     */
-    @Test
-    public void testGetProperty() {
-
-        String expResult = "-fx-test";
-        String result = TestNodeBase.StyleableProperties.TEST.getProperty();
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of getConverter method, of class CssMetaData.
-     */
-    @Test
-    public void testGetConverter() {
-
-        StyleConverter expResult = BooleanConverter.getInstance();
-        StyleConverter result = TestNodeBase.StyleableProperties.TEST.getConverter();
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of getInitialValue method, of class CssMetaData.
-     */
-    @Test
-    public void testGetInitialValue() {
-
-        TestNode testNode = new TestNode();
-        Double expResult = testNode.getXyzzy();
-        Double result = (Double)TestNode.StyleableProperties.XYZZY.getInitialValue(testNode);
-        assertEquals(expResult, result);
-
-    }
-
-    /**
-     * Test of getSubProperties method, of class CssMetaData.
-     */
-    @Test
-    public void testGetSubProperties() {
-
-        CssMetaData<TestNode,Font> fontProp =
-                new FontCssMetaData<TestNode>("-fx-font", Font.getDefault()) {
-
-                    @Override
-                    public boolean isSettable(TestNode n) {
-                        return true;
-                    }
-
-                    @Override
-                    public StyleableProperty<Font> getStyleableProperty(TestNode n) {
-                        return null;
-                    }
-                };
-
-        List<CssMetaData<? extends Styleable, ?>> list = fontProp.getSubProperties();
-        assertNotNull(list);
-
-    }
-
-    /**
-     * Test of isInherits method, of class CssMetaData.
-     */
-    @Test
-    public void testIsInherits() {
-
-        boolean expResult = false;
-        boolean result = TestNode.StyleableProperties.XYZZY.isInherits();
-        assertEquals(expResult, result);
-
-    }
-
-    /**
-     * Test of toString method, of class CssMetaData.
-     */
-    @Test
-    public void testToString() {
-
-        CssMetaData<TestNode,Font> fontProp =
-                new FontCssMetaData<TestNode>("-fx-font", Font.getDefault()) {
-
-                    @Override
-                    public boolean isSettable(TestNode n) {
-                        return true;
-                    }
-
-                    @Override
-                    public StyleableProperty<Font> getStyleableProperty(TestNode n) {
-                        return null;
-                    }
-                };
-
-        String string = fontProp.toString();
-        assertNotNull(string);
-
-    }
-
-    /**
-     * Test of equals method, of class CssMetaData.
-     */
-    @Test
-    public void testEquals() {
-        TestNode testNode = new TestNode();
-        Node node = new Node() {
-
-            @Override
-            protected NGNode impl_createPeer() {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public BaseBounds impl_computeGeomBounds(BaseBounds bb, BaseTransform bt) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            protected boolean impl_computeContains(double d, double d1) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-
-            @Override
-            public Object impl_processMXNode(MXNodeAlgorithm mxna, MXNodeAlgorithmContext mxnac) {
-                throw new UnsupportedOperationException("Not supported yet.");
-            }
-        };
-
-        CssMetaData testNodeOpacity = get(TestNode.getClassCssMetaData(), "-fx-opacity");
-        CssMetaData nodeOpacity = get(Node.getClassCssMetaData(), "-fx-opacity");
-
-        assertTrue(testNodeOpacity.equals(nodeOpacity));
-    }
-
-    static int ord = 0;
-    static CascadingStyle createCascadingStyle(Selector selector, Declaration declaration) {
-
-        Set<PseudoClass> pseudoClasses = null;
-        if (selector instanceof SimpleSelector) {
-
-            pseudoClasses = ((SimpleSelector)selector).getPseudoClassStates();
-        } else {
-
-            pseudoClasses = new PseudoClassState();
-            for (SimpleSelector sel : ((CompoundSelector)selector).getSelectors()) {
-
-                Set<PseudoClass> selectorPseudoClasses = sel.getPseudoClassStates();
-                pseudoClasses.addAll(selectorPseudoClasses);
-            }
-        }
-
-        return new CascadingStyle(
-                new Style(selector, declaration),
-                pseudoClasses,
-                0,
-                ord++
-        );
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStyles() {
-
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
-        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
-
-        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
-        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxBase, fxColor);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .rect { -fx-fill: -fx-color; }
-        //
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("rect");
-
-        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rect);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        // .rect:hover { -fx-fill: yellow; }
-        List<String> pseudoclasses = new ArrayList<String>();
-        pseudoclasses.add("hover");
-
-        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
-
-        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
-        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rectHover);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFillHover);
-
-        Rule rectHoverRule = new Rule(selectors, declarations);
-        rules.add(rectHoverRule);
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(root, fxBase),
-                           new Style(root, fxColor),
-                           new Style(rect, fxFill),
-                           new Style(rectHover, fxFillHover)
-        );
-
-        final Rectangle rectangle = new Rectangle();
-        rectangle.getStyleClass().add("rect");
-
-        final Group group = new Group();
-        group.getChildren().add(rectangle);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail();
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesWithInlineStyleOnParent() {
-
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
-        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
-
-        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
-        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxBase, fxColor);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .rect { -fx-fill: -fx-color; }
-        //
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("rect");
-
-        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rect);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        // .rect:hover { -fx-fill: yellow; }
-        List<String> pseudoclasses = new ArrayList<String>();
-        pseudoclasses.add("hover");
-
-        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
-
-        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
-        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rectHover);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFillHover);
-
-        Rule rectHoverRule = new Rule(selectors, declarations);
-        rules.add(rectHoverRule);
-
-        // Declaration now checks origin, so we need to make this expected
-        // value look like it came from an inline
-        final Declaration decl = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
-
-        Stylesheet ss = new Stylesheet() {
-            {
-                setOrigin(StyleOrigin.INLINE);
-                getRules().add(
-                        new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(decl))
-                );
-            }
-        };
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(SimpleSelector.getUniversalSelector(), decl),
-                           new Style(root, fxBase),
-                           new Style(root, fxColor),
-                           new Style(rect, fxFill),
-                           new Style(rectHover, fxFillHover)
-        );
-
-        final Rectangle rectangle = new Rectangle();
-        rectangle.getStyleClass().add("rect");
-
-        final Group group = new Group();
-        group.setStyle("-fx-base: green;");
-        group.getChildren().add(rectangle);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        // inline style should be first
-        assertEquals(expecteds.get(0), actuals.get(0));
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail();
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesWithInlineStyleOnLeaf() {
-
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
-        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
-
-        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
-        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxBase, fxColor);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .rect { -fx-fill: -fx-color; }
-        //
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("rect");
-
-        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rect);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        // .rect:hover { -fx-fill: yellow; }
-        List<String> pseudoclasses = new ArrayList<String>();
-        pseudoclasses.add("hover");
-
-        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
-
-        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
-        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rectHover);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFillHover);
-
-        Rule rectHoverRule = new Rule(selectors, declarations);
-        rules.add(rectHoverRule);
-
-        // Declaration now checks origin, so we need to make this expected
-        // value look like it came from an inline
-        final Declaration decl = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
-
-        Stylesheet ss = new Stylesheet() {
-            {
-                setOrigin(StyleOrigin.INLINE);
-                getRules().add(
-                        new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(decl))
-                );
-            }
-        };
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(SimpleSelector.getUniversalSelector(), decl),
-                           new Style(root, fxBase),
-                           new Style(root, fxColor),
-                           new Style(rect, fxFill),
-                           new Style(rectHover, fxFillHover)
-        );
-
-        final Rectangle rectangle = new Rectangle();
-        rectangle.getStyleClass().add("rect");
-        rectangle.setStyle("-fx-base: green;");
-
-        final Group group = new Group();
-        group.getChildren().add(rectangle);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        // inline style should be first
-        assertEquals(expecteds.get(0), actuals.get(0));
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail();
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
-
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
-        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
-
-        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
-        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxBase, fxColor);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .rect { -fx-fill: -fx-color; }
-        //
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("rect");
-
-        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rect);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        // .rect:hover { -fx-fill: yellow; }
-        List<String> pseudoclasses = new ArrayList<String>();
-        pseudoclasses.add("hover");
-
-        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
-
-        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
-        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rectHover);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFillHover);
-
-        Rule rectHoverRule = new Rule(selectors, declarations);
-        rules.add(rectHoverRule);
-
-        // Declaration now checks origin, so we need to make this expected
-        // value look like it came from an inline
-        final Declaration gdecl = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
-        final Declaration ydecl = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
-
-        Stylesheet ss = new Stylesheet() {
-            {
-                setOrigin(StyleOrigin.INLINE);
-                Collections.addAll(getRules(),
-                                   new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(gdecl)),
-                                   new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(ydecl))
-                );
-            }
-        };
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(SimpleSelector.getUniversalSelector(), ydecl),
-                           new Style(SimpleSelector.getUniversalSelector(), gdecl),
-                           new Style(root, fxBase),
-                           new Style(root, fxColor),
-                           new Style(rect, fxFill),
-                           new Style(rectHover, fxFillHover)
-        );
-
-        final Rectangle rectangle = new Rectangle();
-        rectangle.getStyleClass().add("rect");
-        rectangle.setStyle("-fx-base: green;");
-
-        final Group group = new Group();
-        group.setStyle("-fx-color: yellow;");
-        group.getChildren().add(rectangle);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        // inline style should be first
-        assertEquals(expecteds.get(0), actuals.get(0));
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail(style.toString());
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited() {
-
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
-        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
-
-        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
-        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
-
-        ParsedValueImpl<Color,Color> fxFillShouldNotMatchValue = new ParsedValueImpl<Color,Color>(Color.RED, null);
-        Declaration fxFillShouldNotMatch = new Declaration("-fx-fill", fxFillShouldNotMatchValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxBase, fxColor, fxFillShouldNotMatch);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .rect { -fx-fill: -fx-color; }
-        //
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("rect");
-
-        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rect);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        // .rect:hover { -fx-fill: yellow; }
-        List<String> pseudoclasses = new ArrayList<String>();
-        pseudoclasses.add("hover");
-
-        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
-
-        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
-        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rectHover);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFillHover);
-
-        Rule rectHoverRule = new Rule(selectors, declarations);
-        rules.add(rectHoverRule);
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(root, fxBase),
-                           new Style(root, fxColor),
-                           new Style(rect, fxFill),
-                           new Style(rectHover, fxFillHover)
-        );
-
-        final Rectangle rectangle = new Rectangle();
-        rectangle.getStyleClass().add("rect");
-
-        final Group group = new Group();
-        group.getChildren().add(rectangle);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail();
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInherited() {
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("rect");
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl fxBaseValue = CSSParser.getInstance().parseExpr("-fx-base", "red");
-        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
-
-        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
-        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
-
-        ParsedValueImpl<Color,Color> fxFillShouldNotMatchValue = new ParsedValueImpl<Color,Color>(Color.RED, null);
-        Declaration fxFillShouldNotMatch = new Declaration("-fx-fill", fxFillShouldNotMatchValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxBase, fxColor, fxFillShouldNotMatch);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .rect { -fx-fill: -fx-color; }
-        //
-        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "-fx-color");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rect);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        // .rect:hover { -fx-fill: yellow; }
-        List<String> pseudoclasses = new ArrayList<String>();
-        pseudoclasses.add("hover");
-
-        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
-
-        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
-        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, rectHover);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFillHover);
-
-        Rule rectHoverRule = new Rule(selectors, declarations);
-        rules.add(rectHoverRule);
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(root, fxBase),
-                           new Style(root, fxColor),
-                           new Style(rect, fxFill),
-                           new Style(rectHover, fxFillHover)
-        );
-
-        final Rectangle rectangle = new Rectangle();
-        rectangle.getStyleClass().add("rect");
-
-        final Group group = new Group();
-        group.getChildren().add(rectangle);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        for (Style style : expecteds) {
-            actuals.remove(style);
-        }
-        assertTrue(actuals.toString(), actuals.isEmpty());
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesReturnsInheritedProperty() {
-
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl<Color,Color> fxFontShouldInheritValue = CSSParser.getInstance().parseExpr("-fx-font", "12px system");
-        Declaration fxFontShouldInherit = new Declaration("-fx-font", fxFontShouldInheritValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFontShouldInherit);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .text { -fx-fill: -fx-color; }
-        //
-        List<String> textStyleClass = new ArrayList<String>();
-        textStyleClass.add("text");
-
-        Selector textSelector = new SimpleSelector("*", textStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "red");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, textSelector);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(root, fxFontShouldInherit)
-        );
-
-        final Text text = new Text("text");
-        text.getStyleClass().add("text");
-
-        final Group group = new Group();
-        group.getChildren().add(text);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail();
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-    @Test @org.junit.Ignore
-    public void testGetMatchingStylesReturnsSubProperty() {
-
-        final Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final List<Rule> rules = stylesheet.getRules();
-
-        //
-        // .root { -fx-base: red; -fx-color: -fx-base; }
-        //
-        List<String> rootStyleClass = new ArrayList<String>();
-        rootStyleClass.add("root");
-
-        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
-
-        ParsedValueImpl<Color,Color> fxFontShouldInheritValue = CSSParser.getInstance().parseExpr("-fx-font", "12px system");
-        Declaration fxFontShouldInherit = new Declaration("-fx-font", fxFontShouldInheritValue, false);
-
-        List<Selector> selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, root);
-
-        List<Declaration> declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFontShouldInherit);
-
-        Rule baseRule = new Rule(selectors, declarations);
-        rules.add(baseRule);
-
-        //
-        // .text { -fx-fill: -fx-color; }
-        //
-        List<String> rectStyleClass = new ArrayList<String>();
-        rectStyleClass.add("text");
-
-        Selector textSelector = new SimpleSelector("*", rectStyleClass, null, null);
-
-        ParsedValueImpl fxFillValue = CSSParser.getInstance().parseExpr("-fx-fill", "red");
-        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
-
-        ParsedValueImpl fxFontFamilyValue = CSSParser.getInstance().parseExpr("-fx-font-family", "arial");
-        Declaration fxFontFamily = new Declaration("-fx-font-family", fxFontFamilyValue, false);
-
-        selectors = new ArrayList<Selector>();
-        Collections.addAll(selectors, textSelector);
-
-        declarations = new ArrayList<Declaration>();
-        Collections.addAll(declarations, fxFill, fxFontFamily);
-
-        Rule rectRule = new Rule(selectors, declarations);
-        rules.add(rectRule);
-
-        List<Style> expecteds = new ArrayList<Style>();
-        Collections.addAll(expecteds,
-                           new Style(textSelector, fxFontFamily),
-                           new Style(root, fxFontShouldInherit)
-        );
-
-        final Text text  = new Text();
-        text.getStyleClass().add("text");
-
-        final Group group = new Group();
-        group.getChildren().add(text);
-
-        Scene scene = new Scene(group);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
-        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
-
-        //        System.err.println("matchingStyles: " + matchingStyles);
-        //        System.err.println("expecteds: " + expecteds);
-        //        System.err.println("actuals: " + actuals);
-
-        assertEquals(expecteds.size(), actuals.size(), 0);
-
-        for (Style style : expecteds) {
-            if (!actuals.remove(style)) fail();
-        }
-        assertTrue(actuals.isEmpty());
-    }
-
-    @Test
-    public void testRT18097() {
-        try {
-            File f = System.getProperties().containsKey("CSS_META_DATA_TEST_DIR") ?
-                    new File(System.getProperties().get("CSS_META_DATA_TEST_DIR").toString()) :
-                    null;
-            if (f == null) {
-                ClassLoader cl = Thread.currentThread().getContextClassLoader();
-                URL base = cl.getResource("javafx/../javafx");
-                f = new File(base.toURI());
-            }
-            //System.err.println(f.getPath());
-            recursiveCheck(f, f.getPath().length() - 7);
-        } catch (Exception ex) {
-            ex.printStackTrace(System.err);
-            fail(ex.getMessage());
-        }
-    }
-
-    private static void checkClass(Class someClass) {
-
-        if (javafx.scene.Node.class.isAssignableFrom(someClass) &&
-                Modifier.isAbstract(someClass.getModifiers()) == false) {
-
-            String what = someClass.getName();
-            try {
-                // should get NoSuchMethodException if ctor is not public
-                //                Constructor ctor = someClass.getConstructor((Class[])null);
-                Method m = someClass.getMethod("getClassCssMetaData", (Class[]) null);
-                //                Node node = (Node)ctor.newInstance((Object[])null);
-                Node node = (Node)someClass.newInstance();
-                List<CssMetaData<? extends Styleable, ?>> list = (List<CssMetaData<? extends Styleable, ?>>)m.invoke(null);
-                if(list == null || list.isEmpty()) return;
-
-                for (CssMetaData styleable : list) {
-
-                    what = someClass.getName() + " " + styleable.getProperty();
-                    WritableValue writable = styleable.getStyleableProperty(node);
-                    assertNotNull(what, writable);
-
-                    Object defaultValue = writable.getValue();
-                    Object initialValue = styleable.getInitialValue((Node) someClass.newInstance());
-
-                    if (defaultValue instanceof Number) {
-                        // 5 and 5.0 are not the same according to equals,
-                        // but they should be...
-                        assert(initialValue instanceof Number);
-                        double d1 = ((Number)defaultValue).doubleValue();
-                        double d2 = ((Number)initialValue).doubleValue();
-                        assertEquals(what, d1, d2, .001);
-
-                    } else if (defaultValue != null && defaultValue.getClass().isArray()) {
-                        assertTrue(what, Arrays.equals((Object[])defaultValue, (Object[])initialValue));
-                    } else {
-                        assertEquals(what, defaultValue, initialValue);
-                    }
-
-                }
-
-            } catch (NoSuchMethodException ex) {
-                System.err.println("NoSuchMethodException: " + what);
-            } catch (IllegalAccessException ex) {
-                System.err.println("IllegalAccessException: " + what);
-            } catch (IllegalArgumentException ex) {
-                System.err.println("IllegalArgumentException: " + what);
-            } catch (InvocationTargetException ex) {
-                System.err.println("InvocationTargetException: " + what);
-            } catch (InstantiationException ex) {
-                System.err.println("InstantiationException: " + what);
-            }
-        }
-    }
-
-    private static void checkDirectory(File directory, final int pathLength) {
-        if (directory.isDirectory()) {
-
-            for (File file : directory.listFiles()) {
-                if (file.isFile() && file.getName().endsWith(".class")) {
-                    final int len = file.getPath().length() - ".class".length();
-                    final String clName =
-                            file.getPath().substring(pathLength+1, len).replace(File.separatorChar,'.');
-                    try {
-                        final Class cl = Class.forName(clName);
-                        if (cl != null) checkClass(cl);
-                    } catch(ClassNotFoundException ex) {
-                        System.err.println(ex.toString() + " " + clName);
-                    }
-                }
-            }
-        }
-    }
-
-    private static void recursiveCheck(File directory, int pathLength) {
-        if (directory.isDirectory()) {
-            //            System.err.println(directory.getPath());
-            checkDirectory(directory, pathLength);
-
-            for (File subFile : directory.listFiles()) {
-                recursiveCheck(subFile, pathLength);
-            }
-        }
-    }
-
-    @Test @org.junit.Ignore("tested CssMetaData#set method, which is deprecated")
-    public void testRT_21185() {
-
-        Color c1 = new Color(.1,.2,.3,1.0);
-        Color c2 = new Color(.1,.2,.3,1.0);
-
-        Rectangle rect = new Rectangle();
-        rect.setFill(c1);
-
-        StyleableProperty fill = (StyleableProperty)rect.fillProperty();
-        StyleOrigin origin = ((StyleableProperty)rect.fillProperty()).getStyleOrigin();
-
-        // set should not change the value if the values are equal and origin is same
-        assertEquals(c1, c2);        
-        fill.applyStyle(origin, c2);
-
-        assertSame(c1,rect.getFill()); // instance should not change.
-
-        // set should change the value if the values are not equal.
-        c2 = new Color(.3,.2,.1,1.0);
-        fill.applyStyle(origin, c2);
-        assertSame(c2,rect.getFill());
-
-        // set should change the value if the origin is not the same
-        fill.applyStyle(StyleOrigin.INLINE, c2);
-        origin = ((StyleableProperty)rect.fillProperty()).getStyleOrigin();
-        assertSame(StyleOrigin.INLINE, origin);
-
-        // set should change the value if one is null and the other is not.
-        rect.setFill(null);
-        fill.applyStyle(origin, c2);
-        assertSame(c2, rect.getFill());
-
-        // set should change the value if one is null and the other is not
-        fill.applyStyle(origin, null);
-        assertNull(rect.getFill());
-
-    }
-
-
-    @Test  @org.junit.Ignore
-    public void testRT_24606() {
-
-        final Stylesheet stylesheet = CSSParser.getInstance().parse(
-                ".root { -fx-base: red; }" +
-                        ".group { -fx-color: -fx-base; }" +
-                        ".text { -fx-fill: -fx-color; }"
-        );
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        final Text text = new Text("HelloWorld");
-        text.getStyleClass().add("text");
-        text.setFill(Color.BLUE);
-
-        final Group group = new Group();
-        group.getStyleClass().add("group");
-        group.getChildren().add(text);
-
-        final Group root = new Group();
-        root.getChildren().add(group);
-
-        Scene scene = new Scene(root);
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-
-        CssMetaData prop = ((StyleableProperty)text.fillProperty()).getCssMetaData();
-        List list = Node.impl_getMatchingStyles(prop, text);
-
-        assertEquals(3, list.size(), 0);
-
-    }
-
-}
--- /dev/null	2015-09-03 15:35:28.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/CssMetaDataTest.java	2015-09-03 15:35:26.577627900 -0700
@@ -0,0 +1,1287 @@
+/*
+ * Copyright (c) 2010, 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.css;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import com.sun.javafx.css.ParsedValueImpl;
+import com.sun.javafx.css.PseudoClassState;
+import com.sun.javafx.css.StyleManager;
+import com.sun.javafx.css.TestNode;
+import com.sun.javafx.css.TestNodeBase;
+import com.sun.javafx.sg.prism.NGNode;
+import javafx.beans.value.WritableValue;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import javafx.css.converter.BooleanConverter;
+import com.sun.javafx.geom.BaseBounds;
+import com.sun.javafx.geom.transform.BaseTransform;
+import com.sun.javafx.jmx.MXNodeAlgorithm;
+import com.sun.javafx.jmx.MXNodeAlgorithmContext;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+public class CssMetaDataTest {
+
+    public CssMetaDataTest() {
+    }
+
+    private static CssMetaData get(List<CssMetaData<? extends Styleable, ?>> list, String prop) {
+        for (CssMetaData styleable : list) {
+            if (prop.equals(styleable.getProperty())) return styleable;
+        }
+        return null;
+    }
+
+    /**
+     * Test of getCssMetaData method of class Styleable.
+     */
+    @Test
+    public void testGetCssMetaData_Styleable() {
+        Styleable styleable = new TestNode();
+        List<CssMetaData<? extends Styleable, ?>> expResult = TestNode.getClassCssMetaData();
+        List result = styleable.getCssMetaData();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetJavafxBeansProperty() {
+        TestNode testNode = new TestNode();
+        WritableValue prop = TestNodeBase.StyleableProperties.TEST.getStyleableProperty(testNode);
+        assert(prop != null);
+        CssMetaData result = ((StyleableProperty)prop).getCssMetaData();
+        assert(result == TestNodeBase.StyleableProperties.TEST);
+    }
+
+    /**
+     * Test of getProperty method, of class CssMetaData.
+     */
+    @Test
+    public void testGetProperty() {
+
+        String expResult = "-fx-test";
+        String result = TestNodeBase.StyleableProperties.TEST.getProperty();
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of getConverter method, of class CssMetaData.
+     */
+    @Test
+    public void testGetConverter() {
+
+        StyleConverter expResult = BooleanConverter.getInstance();
+        StyleConverter result = TestNodeBase.StyleableProperties.TEST.getConverter();
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of getInitialValue method, of class CssMetaData.
+     */
+    @Test
+    public void testGetInitialValue() {
+
+        TestNode testNode = new TestNode();
+        Double expResult = testNode.getXyzzy();
+        Double result = (Double)TestNode.StyleableProperties.XYZZY.getInitialValue(testNode);
+        assertEquals(expResult, result);
+
+    }
+
+    /**
+     * Test of getSubProperties method, of class CssMetaData.
+     */
+    @Test
+    public void testGetSubProperties() {
+
+        CssMetaData<TestNode,Font> fontProp =
+                new FontCssMetaData<TestNode>("-fx-font", Font.getDefault()) {
+
+                    @Override
+                    public boolean isSettable(TestNode n) {
+                        return true;
+                    }
+
+                    @Override
+                    public StyleableProperty<Font> getStyleableProperty(TestNode n) {
+                        return null;
+                    }
+                };
+
+        List<CssMetaData<? extends Styleable, ?>> list = fontProp.getSubProperties();
+        assertNotNull(list);
+
+    }
+
+    /**
+     * Test of isInherits method, of class CssMetaData.
+     */
+    @Test
+    public void testIsInherits() {
+
+        boolean expResult = false;
+        boolean result = TestNode.StyleableProperties.XYZZY.isInherits();
+        assertEquals(expResult, result);
+
+    }
+
+    /**
+     * Test of toString method, of class CssMetaData.
+     */
+    @Test
+    public void testToString() {
+
+        CssMetaData<TestNode,Font> fontProp =
+                new FontCssMetaData<TestNode>("-fx-font", Font.getDefault()) {
+
+                    @Override
+                    public boolean isSettable(TestNode n) {
+                        return true;
+                    }
+
+                    @Override
+                    public StyleableProperty<Font> getStyleableProperty(TestNode n) {
+                        return null;
+                    }
+                };
+
+        String string = fontProp.toString();
+        assertNotNull(string);
+
+    }
+
+    /**
+     * Test of equals method, of class CssMetaData.
+     */
+    @Test
+    public void testEquals() {
+        TestNode testNode = new TestNode();
+        Node node = new Node() {
+
+            @Override
+            protected NGNode impl_createPeer() {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
+            @Override
+            public BaseBounds impl_computeGeomBounds(BaseBounds bb, BaseTransform bt) {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
+            @Override
+            protected boolean impl_computeContains(double d, double d1) {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
+            @Override
+            public Object impl_processMXNode(MXNodeAlgorithm mxna, MXNodeAlgorithmContext mxnac) {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+        };
+
+        CssMetaData testNodeOpacity = get(TestNode.getClassCssMetaData(), "-fx-opacity");
+        CssMetaData nodeOpacity = get(Node.getClassCssMetaData(), "-fx-opacity");
+
+        assertTrue(testNodeOpacity.equals(nodeOpacity));
+    }
+
+    static int ord = 0;
+    static CascadingStyle createCascadingStyle(Selector selector, Declaration declaration) {
+
+        Set<PseudoClass> pseudoClasses = null;
+        if (selector instanceof SimpleSelector) {
+
+            pseudoClasses = ((SimpleSelector)selector).getPseudoClassStates();
+        } else {
+
+            pseudoClasses = new PseudoClassState();
+            for (SimpleSelector sel : ((CompoundSelector)selector).getSelectors()) {
+
+                Set<PseudoClass> selectorPseudoClasses = sel.getPseudoClassStates();
+                pseudoClasses.addAll(selectorPseudoClasses);
+            }
+        }
+
+        return new CascadingStyle(
+                new Style(selector, declaration),
+                pseudoClasses,
+                0,
+                ord++
+        );
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStyles() {
+
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
+        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
+
+        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
+        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxBase, fxColor);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .rect { -fx-fill: -fx-color; }
+        //
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("rect");
+
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rect);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        // .rect:hover { -fx-fill: yellow; }
+        List<String> pseudoclasses = new ArrayList<String>();
+        pseudoclasses.add("hover");
+
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
+
+        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
+        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rectHover);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFillHover);
+
+        Rule rectHoverRule = new Rule(selectors, declarations);
+        rules.add(rectHoverRule);
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(root, fxBase),
+                           new Style(root, fxColor),
+                           new Style(rect, fxFill),
+                           new Style(rectHover, fxFillHover)
+        );
+
+        final Rectangle rectangle = new Rectangle();
+        rectangle.getStyleClass().add("rect");
+
+        final Group group = new Group();
+        group.getChildren().add(rectangle);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail();
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesWithInlineStyleOnParent() {
+
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
+        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
+
+        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
+        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxBase, fxColor);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .rect { -fx-fill: -fx-color; }
+        //
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("rect");
+
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rect);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        // .rect:hover { -fx-fill: yellow; }
+        List<String> pseudoclasses = new ArrayList<String>();
+        pseudoclasses.add("hover");
+
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
+
+        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
+        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rectHover);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFillHover);
+
+        Rule rectHoverRule = new Rule(selectors, declarations);
+        rules.add(rectHoverRule);
+
+        // Declaration now checks origin, so we need to make this expected
+        // value look like it came from an inline
+        final Declaration decl = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
+
+        Stylesheet ss = new Stylesheet() {
+            {
+                setOrigin(StyleOrigin.INLINE);
+                getRules().add(
+                        new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(decl))
+                );
+            }
+        };
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(SimpleSelector.getUniversalSelector(), decl),
+                           new Style(root, fxBase),
+                           new Style(root, fxColor),
+                           new Style(rect, fxFill),
+                           new Style(rectHover, fxFillHover)
+        );
+
+        final Rectangle rectangle = new Rectangle();
+        rectangle.getStyleClass().add("rect");
+
+        final Group group = new Group();
+        group.setStyle("-fx-base: green;");
+        group.getChildren().add(rectangle);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        // inline style should be first
+        assertEquals(expecteds.get(0), actuals.get(0));
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail();
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesWithInlineStyleOnLeaf() {
+
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
+        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
+
+        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
+        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxBase, fxColor);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .rect { -fx-fill: -fx-color; }
+        //
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("rect");
+
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rect);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        // .rect:hover { -fx-fill: yellow; }
+        List<String> pseudoclasses = new ArrayList<String>();
+        pseudoclasses.add("hover");
+
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
+
+        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
+        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rectHover);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFillHover);
+
+        Rule rectHoverRule = new Rule(selectors, declarations);
+        rules.add(rectHoverRule);
+
+        // Declaration now checks origin, so we need to make this expected
+        // value look like it came from an inline
+        final Declaration decl = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
+
+        Stylesheet ss = new Stylesheet() {
+            {
+                setOrigin(StyleOrigin.INLINE);
+                getRules().add(
+                        new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(decl))
+                );
+            }
+        };
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(SimpleSelector.getUniversalSelector(), decl),
+                           new Style(root, fxBase),
+                           new Style(root, fxColor),
+                           new Style(rect, fxFill),
+                           new Style(rectHover, fxFillHover)
+        );
+
+        final Rectangle rectangle = new Rectangle();
+        rectangle.getStyleClass().add("rect");
+        rectangle.setStyle("-fx-base: green;");
+
+        final Group group = new Group();
+        group.getChildren().add(rectangle);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        // inline style should be first
+        assertEquals(expecteds.get(0), actuals.get(0));
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail();
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesWithInlineStyleOnRootAndLeaf() {
+
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
+        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
+
+        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
+        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxBase, fxColor);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .rect { -fx-fill: -fx-color; }
+        //
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("rect");
+
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rect);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        // .rect:hover { -fx-fill: yellow; }
+        List<String> pseudoclasses = new ArrayList<String>();
+        pseudoclasses.add("hover");
+
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
+
+        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
+        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rectHover);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFillHover);
+
+        Rule rectHoverRule = new Rule(selectors, declarations);
+        rules.add(rectHoverRule);
+
+        // Declaration now checks origin, so we need to make this expected
+        // value look like it came from an inline
+        final Declaration gdecl = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
+        final Declaration ydecl = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
+
+        Stylesheet ss = new Stylesheet() {
+            {
+                setOrigin(StyleOrigin.INLINE);
+                Collections.addAll(getRules(),
+                                   new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(gdecl)),
+                                   new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(ydecl))
+                );
+            }
+        };
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(SimpleSelector.getUniversalSelector(), ydecl),
+                           new Style(SimpleSelector.getUniversalSelector(), gdecl),
+                           new Style(root, fxBase),
+                           new Style(root, fxColor),
+                           new Style(rect, fxFill),
+                           new Style(rectHover, fxFillHover)
+        );
+
+        final Rectangle rectangle = new Rectangle();
+        rectangle.getStyleClass().add("rect");
+        rectangle.setStyle("-fx-base: green;");
+
+        final Group group = new Group();
+        group.setStyle("-fx-color: yellow;");
+        group.getChildren().add(rectangle);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        // inline style should be first
+        assertEquals(expecteds.get(0), actuals.get(0));
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail(style.toString());
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesShouldNotReturnAncestorPropertyIfNotInherited() {
+
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
+        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
+
+        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
+        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
+
+        ParsedValueImpl<Color,Color> fxFillShouldNotMatchValue = new ParsedValueImpl<Color,Color>(Color.RED, null);
+        Declaration fxFillShouldNotMatch = new Declaration("-fx-fill", fxFillShouldNotMatchValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxBase, fxColor, fxFillShouldNotMatch);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .rect { -fx-fill: -fx-color; }
+        //
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("rect");
+
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rect);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        // .rect:hover { -fx-fill: yellow; }
+        List<String> pseudoclasses = new ArrayList<String>();
+        pseudoclasses.add("hover");
+
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
+
+        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
+        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rectHover);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFillHover);
+
+        Rule rectHoverRule = new Rule(selectors, declarations);
+        rules.add(rectHoverRule);
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(root, fxBase),
+                           new Style(root, fxColor),
+                           new Style(rect, fxFill),
+                           new Style(rectHover, fxFillHover)
+        );
+
+        final Rectangle rectangle = new Rectangle();
+        rectangle.getStyleClass().add("rect");
+
+        final Group group = new Group();
+        group.getChildren().add(rectangle);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail();
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesShouldNotReturnInlineAncestorPropertyIfNotInherited() {
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("rect");
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue fxBaseValue = new CssParser().parseExpr("-fx-base", "red");
+        Declaration fxBase = new Declaration("-fx-base", fxBaseValue, false);
+
+        ParsedValueImpl<String,String> fxColorValue = new ParsedValueImpl<String,String>(fxBase.getProperty(), null, true);
+        Declaration fxColor = new Declaration("-fx-color", fxColorValue, false);
+
+        ParsedValueImpl<Color,Color> fxFillShouldNotMatchValue = new ParsedValueImpl<Color,Color>(Color.RED, null);
+        Declaration fxFillShouldNotMatch = new Declaration("-fx-fill", fxFillShouldNotMatchValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxBase, fxColor, fxFillShouldNotMatch);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .rect { -fx-fill: -fx-color; }
+        //
+        Selector rect = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "-fx-color");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rect);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        // .rect:hover { -fx-fill: yellow; }
+        List<String> pseudoclasses = new ArrayList<String>();
+        pseudoclasses.add("hover");
+
+        Selector rectHover = new SimpleSelector("*", rectStyleClass, pseudoclasses, null);
+
+        ParsedValueImpl<Color,Color> fxFillHoverValue = new ParsedValueImpl<Color,Color>(Color.YELLOW, null);
+        Declaration fxFillHover = new Declaration("-fx-fill", fxFillHoverValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, rectHover);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFillHover);
+
+        Rule rectHoverRule = new Rule(selectors, declarations);
+        rules.add(rectHoverRule);
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(root, fxBase),
+                           new Style(root, fxColor),
+                           new Style(rect, fxFill),
+                           new Style(rectHover, fxFillHover)
+        );
+
+        final Rectangle rectangle = new Rectangle();
+        rectangle.getStyleClass().add("rect");
+
+        final Group group = new Group();
+        group.getChildren().add(rectangle);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FILL = get(rectangle.getCssMetaData(), "-fx-fill");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FILL, rectangle);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        for (Style style : expecteds) {
+            actuals.remove(style);
+        }
+        assertTrue(actuals.toString(), actuals.isEmpty());
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesReturnsInheritedProperty() {
+
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue<Color,Color> fxFontShouldInheritValue = new CssParser().parseExpr("-fx-font", "12px system");
+        Declaration fxFontShouldInherit = new Declaration("-fx-font", fxFontShouldInheritValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFontShouldInherit);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .text { -fx-fill: -fx-color; }
+        //
+        List<String> textStyleClass = new ArrayList<String>();
+        textStyleClass.add("text");
+
+        Selector textSelector = new SimpleSelector("*", textStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "red");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, textSelector);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(root, fxFontShouldInherit)
+        );
+
+        final Text text = new Text("text");
+        text.getStyleClass().add("text");
+
+        final Group group = new Group();
+        group.getChildren().add(text);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail();
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+    @Test @org.junit.Ignore
+    public void testGetMatchingStylesReturnsSubProperty() {
+
+        final Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final List<Rule> rules = stylesheet.getRules();
+
+        //
+        // .root { -fx-base: red; -fx-color: -fx-base; }
+        //
+        List<String> rootStyleClass = new ArrayList<String>();
+        rootStyleClass.add("root");
+
+        Selector root = new SimpleSelector("*", rootStyleClass, null, null);
+
+        ParsedValue<Color,Color> fxFontShouldInheritValue = new CssParser().parseExpr("-fx-font", "12px system");
+        Declaration fxFontShouldInherit = new Declaration("-fx-font", fxFontShouldInheritValue, false);
+
+        List<Selector> selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, root);
+
+        List<Declaration> declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFontShouldInherit);
+
+        Rule baseRule = new Rule(selectors, declarations);
+        rules.add(baseRule);
+
+        //
+        // .text { -fx-fill: -fx-color; }
+        //
+        List<String> rectStyleClass = new ArrayList<String>();
+        rectStyleClass.add("text");
+
+        Selector textSelector = new SimpleSelector("*", rectStyleClass, null, null);
+
+        ParsedValue fxFillValue = new CssParser().parseExpr("-fx-fill", "red");
+        Declaration fxFill = new Declaration("-fx-fill", fxFillValue, false);
+
+        ParsedValue fxFontFamilyValue = new CssParser().parseExpr("-fx-font-family", "arial");
+        Declaration fxFontFamily = new Declaration("-fx-font-family", fxFontFamilyValue, false);
+
+        selectors = new ArrayList<Selector>();
+        Collections.addAll(selectors, textSelector);
+
+        declarations = new ArrayList<Declaration>();
+        Collections.addAll(declarations, fxFill, fxFontFamily);
+
+        Rule rectRule = new Rule(selectors, declarations);
+        rules.add(rectRule);
+
+        List<Style> expecteds = new ArrayList<Style>();
+        Collections.addAll(expecteds,
+                           new Style(textSelector, fxFontFamily),
+                           new Style(root, fxFontShouldInherit)
+        );
+
+        final Text text  = new Text();
+        text.getStyleClass().add("text");
+
+        final Group group = new Group();
+        group.getChildren().add(text);
+
+        Scene scene = new Scene(group);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        final CssMetaData FONT = get(text.getCssMetaData(), "-fx-font");
+        final List<Style> actuals = Node.impl_getMatchingStyles(FONT, text);
+
+        //        System.err.println("matchingStyles: " + matchingStyles);
+        //        System.err.println("expecteds: " + expecteds);
+        //        System.err.println("actuals: " + actuals);
+
+        assertEquals(expecteds.size(), actuals.size(), 0);
+
+        for (Style style : expecteds) {
+            if (!actuals.remove(style)) fail();
+        }
+        assertTrue(actuals.isEmpty());
+    }
+
+    @Test
+    public void testRT18097() {
+        try {
+            File f = System.getProperties().containsKey("CSS_META_DATA_TEST_DIR") ?
+                    new File(System.getProperties().get("CSS_META_DATA_TEST_DIR").toString()) :
+                    null;
+            if (f == null) {
+                ClassLoader cl = Thread.currentThread().getContextClassLoader();
+                URL base = cl.getResource("javafx/../javafx");
+                f = new File(base.toURI());
+            }
+            //System.err.println(f.getPath());
+            recursiveCheck(f, f.getPath().length() - 7);
+        } catch (Exception ex) {
+            ex.printStackTrace(System.err);
+            fail(ex.getMessage());
+        }
+    }
+
+    private static void checkClass(Class someClass) {
+
+        if (javafx.scene.Node.class.isAssignableFrom(someClass) &&
+                Modifier.isAbstract(someClass.getModifiers()) == false) {
+
+            String what = someClass.getName();
+            try {
+                // should get NoSuchMethodException if ctor is not public
+                //                Constructor ctor = someClass.getConstructor((Class[])null);
+                Method m = someClass.getMethod("getClassCssMetaData", (Class[]) null);
+                //                Node node = (Node)ctor.newInstance((Object[])null);
+                Node node = (Node)someClass.newInstance();
+                List<CssMetaData<? extends Styleable, ?>> list = (List<CssMetaData<? extends Styleable, ?>>)m.invoke(null);
+                if(list == null || list.isEmpty()) return;
+
+                for (CssMetaData styleable : list) {
+
+                    what = someClass.getName() + " " + styleable.getProperty();
+                    WritableValue writable = styleable.getStyleableProperty(node);
+                    assertNotNull(what, writable);
+
+                    Object defaultValue = writable.getValue();
+                    Object initialValue = styleable.getInitialValue((Node) someClass.newInstance());
+
+                    if (defaultValue instanceof Number) {
+                        // 5 and 5.0 are not the same according to equals,
+                        // but they should be...
+                        assert(initialValue instanceof Number);
+                        double d1 = ((Number)defaultValue).doubleValue();
+                        double d2 = ((Number)initialValue).doubleValue();
+                        assertEquals(what, d1, d2, .001);
+
+                    } else if (defaultValue != null && defaultValue.getClass().isArray()) {
+                        assertTrue(what, Arrays.equals((Object[])defaultValue, (Object[])initialValue));
+                    } else {
+                        assertEquals(what, defaultValue, initialValue);
+                    }
+
+                }
+
+            } catch (NoSuchMethodException ex) {
+                System.err.println("NoSuchMethodException: " + what);
+            } catch (IllegalAccessException ex) {
+                System.err.println("IllegalAccessException: " + what);
+            } catch (IllegalArgumentException ex) {
+                System.err.println("IllegalArgumentException: " + what);
+            } catch (InvocationTargetException ex) {
+                System.err.println("InvocationTargetException: " + what);
+            } catch (InstantiationException ex) {
+                System.err.println("InstantiationException: " + what);
+            }
+        }
+    }
+
+    private static void checkDirectory(File directory, final int pathLength) {
+        if (directory.isDirectory()) {
+
+            for (File file : directory.listFiles()) {
+                if (file.isFile() && file.getName().endsWith(".class")) {
+                    final int len = file.getPath().length() - ".class".length();
+                    final String clName =
+                            file.getPath().substring(pathLength+1, len).replace(File.separatorChar,'.');
+                    try {
+                        final Class cl = Class.forName(clName);
+                        if (cl != null) checkClass(cl);
+                    } catch(ClassNotFoundException ex) {
+                        System.err.println(ex.toString() + " " + clName);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void recursiveCheck(File directory, int pathLength) {
+        if (directory.isDirectory()) {
+            //            System.err.println(directory.getPath());
+            checkDirectory(directory, pathLength);
+
+            for (File subFile : directory.listFiles()) {
+                recursiveCheck(subFile, pathLength);
+            }
+        }
+    }
+
+    @Test @org.junit.Ignore("tested CssMetaData#set method, which is deprecated")
+    public void testRT_21185() {
+
+        Color c1 = new Color(.1,.2,.3,1.0);
+        Color c2 = new Color(.1,.2,.3,1.0);
+
+        Rectangle rect = new Rectangle();
+        rect.setFill(c1);
+
+        StyleableProperty fill = (StyleableProperty)rect.fillProperty();
+        StyleOrigin origin = ((StyleableProperty)rect.fillProperty()).getStyleOrigin();
+
+        // set should not change the value if the values are equal and origin is same
+        assertEquals(c1, c2);        
+        fill.applyStyle(origin, c2);
+
+        assertSame(c1,rect.getFill()); // instance should not change.
+
+        // set should change the value if the values are not equal.
+        c2 = new Color(.3,.2,.1,1.0);
+        fill.applyStyle(origin, c2);
+        assertSame(c2,rect.getFill());
+
+        // set should change the value if the origin is not the same
+        fill.applyStyle(StyleOrigin.INLINE, c2);
+        origin = ((StyleableProperty)rect.fillProperty()).getStyleOrigin();
+        assertSame(StyleOrigin.INLINE, origin);
+
+        // set should change the value if one is null and the other is not.
+        rect.setFill(null);
+        fill.applyStyle(origin, c2);
+        assertSame(c2, rect.getFill());
+
+        // set should change the value if one is null and the other is not
+        fill.applyStyle(origin, null);
+        assertNull(rect.getFill());
+
+    }
+
+
+    @Test  @org.junit.Ignore
+    public void testRT_24606() {
+
+        final Stylesheet stylesheet = new CssParser().parse(
+                ".root { -fx-base: red; }" +
+                        ".group { -fx-color: -fx-base; }" +
+                        ".text { -fx-fill: -fx-color; }"
+        );
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        final Text text = new Text("HelloWorld");
+        text.getStyleClass().add("text");
+        text.setFill(Color.BLUE);
+
+        final Group group = new Group();
+        group.getStyleClass().add("group");
+        group.getChildren().add(text);
+
+        final Group root = new Group();
+        root.getChildren().add(group);
+
+        Scene scene = new Scene(root);
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+
+        CssMetaData prop = ((StyleableProperty)text.fillProperty()).getCssMetaData();
+        List list = Node.impl_getMatchingStyles(prop, text);
+
+        assertEquals(3, list.size(), 0);
+
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/parser/CSSParserTest.java	2015-09-03 15:35:35.240123300 -0700
+++ /dev/null	2015-09-03 15:35:36.000000000 -0700
@@ -1,309 +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.css.parser;
-
-import com.sun.javafx.css.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javafx.css.ParsedValue;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.LinearGradient;
-import javafx.scene.paint.Paint;
-import javafx.scene.paint.Stop;
-import javafx.scene.text.Font;
-import javafx.util.Duration;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-
-public class CSSParserTest {
-    
-    @Test
-    public void testRT_16959() {
-
-        CSSParser instance = CSSParser.getInstance();
-        
-        // RT-16959 is an infinite loop on incomplete linear gradient
-        ParsedValue result = instance.parseExpr("-fx-background-color", "linear-gradient(from 0% 0% to 0% 100%, )");
-        assertNull("parseExpr", result);
-
-        // The bad syntax should be skipped. The stylesheet should have one
-        // linear gradient with colors red, white, blue.
-        Stylesheet ss = instance.parse( 
-            "* { "
-            +   "-fx-background-color: linear-gradient(from 0% 0% to 0% 100%, ); "
-            +   "-fx-background-color: linear-gradient(from 0% 0% to 0% 100%, red, white, blue); "
-            + "}" 
-        );
-        
-        assertNotNull(ss);
-        List<Rule> rules = ss.getRules();
-        assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
-        assertTrue(decls.size()==1);
-        Declaration decl = decls.get(0);
-        ParsedValue value = decl.getParsedValue();
-        assertTrue(value != null);
-        
-        Paint[] layers = (Paint[])value.convert(null);
-        assertTrue(layers.length == 1);
-        
-        LinearGradient lg = (LinearGradient)layers[0];
-        List<Stop> stops = lg.getStops();
-        assertTrue(stops.size()==3);
-        assertEquals(Color.RED, stops.get(0).getColor());
-        assertEquals(Color.WHITE, stops.get(1).getColor());
-        assertEquals(Color.BLUE, stops.get(2).getColor());
-        
-    }
-    
-    
-    @Test
-    public void testRT_17770() {
-
-        // RT-17770 is an infinite loop on a dangling comma.
-        // Missing term should be ignored
-        String stylesheetText = 
-            "* {"
-            +   "-fx-background-color: linear-gradient( "
-            +   "to right, "
-            +   "rgba(141, 138, 125, 0.0), "
-            +   "rgba(248, 248, 246, 0.3) 45%, "
-            +   "rgba(248, 248, 246, 0.8) 50%, "
-            +   "rgba(248, 248, 246, 0.3) 55%, "
-            +   "rgba(141, 138, 125, 0.0), "
-            +   "); "
-            + "}";
-                
-        CSSParser instance = CSSParser.getInstance();
-        
-        Stylesheet ss = instance.parse(stylesheetText);
-        
-        assertNotNull(ss);
-        List<Rule> rules = ss.getRules();
-        assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
-        assertTrue(decls.size()==1);
-        Declaration decl = decls.get(0);
-        ParsedValue value = decl.getParsedValue();
-        assertTrue(value != null);
-        
-        Paint[] layers = (Paint[])value.convert(null);
-        assertTrue(layers.length == 1);
-        
-        LinearGradient lg = (LinearGradient)layers[0];
-        List<Stop> stops = lg.getStops();
-        assertTrue(stops.size()==5);
-        assertEquals(Color.rgb(141, 138, 125, 0.0), stops.get(0).getColor());
-        assertEquals(Color.rgb(248, 248, 246, 0.3), stops.get(1).getColor());
-        assertEquals(Color.rgb(248, 248, 246, 0.8), stops.get(2).getColor());
-        assertEquals(Color.rgb(248, 248, 246, 0.3), stops.get(3).getColor());
-        assertEquals(Color.rgb(141, 138, 125, 0.0), stops.get(4).getColor());
-        
-    }    
-    
-    @Test
-    public void testParseSizeWithInvalidDigits() {
-
-        CSSParser instance = CSSParser.getInstance();
-        
-        // RT-16959 is an infinite loop on incomplete linear gradient
-        ParsedValue result = instance.parseExpr("-fx-font-size", "10ptx");
-        assertNull("parseExpr", result);
-
-        // The bad syntax should be skipped.
-        Stylesheet ss = instance.parse(
-            "* {"
-            +  "-fx-font-size: 10ptx; "
-            +  "-fx-font-size: 12px; "
-            + "}"
-        );
-        
-        assertNotNull(ss);
-        List<Rule> rules = ss.getRules();
-        assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
-        assertTrue(decls.size()==1);
-        Declaration decl = decls.get(0);
-        ParsedValue value = decl.getParsedValue();
-        assertTrue(value != null);
-        
-        Double size = (Double)value.convert(Font.font("Amble", 12));
-        assertTrue(Double.compare(size, 12) == 0);
-    }
-    
-
-    @Test
-    public void testRT_17830() {
-
-        CSSParser instance = CSSParser.getInstance();
-        
-        // The empty declaration should be skipped. The stylesheet should have
-        // two declarations.
-        Stylesheet ss = instance.parse(".rt17830 {-fx-fill: red;; -fx-stroke: yellow; }");
-        
-        assertNotNull(ss);
-        List<Rule> rules = ss.getRules();
-        assertEquals(1,rules.size(),0);
-        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
-        assertEquals(2,decls.size(),0);
-        
-        Declaration decl = decls.get(0);
-        ParsedValue value = decl.getParsedValue();
-        assertTrue(value != null);
-        Paint paint = (Paint)value.convert(null);
-        assertEquals(Color.RED, paint);
-        
-        decl = decls.get(1);
-        value = decl.getParsedValue();
-        assertTrue(value != null);
-        paint = (Paint)value.convert(null);
-        assertEquals(Color.YELLOW, paint);
-    }
-    
-    @Test
-    public void testRT_20311() {
-
-        CSSParser instance = CSSParser.getInstance();
-        
-        try {
-            instance.parse(".rt-20311 {  -fx-background-color:red\n-fx-border-color:black; }");
-        } catch (Exception e) {
-            fail(e.toString());
-        }
-        
-    }
-
-    @Test public void testFontFace() {
-
-        // http://fonts.googleapis.com/css?family=Bree+Serif
-        String css = "@font-face {\n" +
-            "font-family: 'Bree Serif';\n" +
-            "font-style: normal;\n" +
-            "font-weight: 400;\n" +
-            "src: local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff');\n"+
-        "}";
-
-        Stylesheet stylesheet = CSSParser.getInstance().parse(css);
-
-        int nFontFaceSrcs = checkFontFace(stylesheet);
-
-        assertEquals(3, nFontFaceSrcs);
-    }
-
-    @Test public void testFontFaceMoreThanOneSrc() {
-
-        // http://fonts.googleapis.com/css?family=Bree+Serif
-        String css = "@font-face {\n" +
-                "font-family: 'Bree Serif';\n" +
-                "font-style: normal;\n" +
-                "font-weight: 400;\n" +
-                "src: local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'),\n"+
-                "     local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff');\n"+
-                "}";
-
-        Stylesheet stylesheet = CSSParser.getInstance().parse(css);
-
-        int nFontFaceSrcs = checkFontFace(stylesheet);
-        assertEquals(6, nFontFaceSrcs);
-    }
-
-    public static int checkFontFace(Stylesheet stylesheet) {
-
-        List<FontFace> fontFaces = stylesheet.getFontFaces();
-        assertNotNull(fontFaces);
-        assertEquals(1, fontFaces.size());
-
-        FontFace fontFace = fontFaces.get(0);
-
-        Map<String,String> descriptors = fontFace.getDescriptors();
-        assertEquals("'Bree Serif'", descriptors.get("font-family"));
-        assertEquals("normal", descriptors.get("font-style"));
-        assertEquals("400", descriptors.get("font-weight"));
-
-        List<FontFace.FontFaceSrc> fontFaceSrcs = fontFace.getSources();
-
-        int nFontFaceSrcs = fontFaceSrcs != null ? fontFaceSrcs.size() : 0;
-
-        for(int n=0; n<nFontFaceSrcs; n++) {
-            FontFace.FontFaceSrc fontFaceSrc = fontFaceSrcs.get(n);
-            FontFace.FontFaceSrcType type = fontFaceSrc.getType();
-            switch(type) {
-                case LOCAL: {
-                    String src = fontFaceSrc.getSrc();
-                    assertTrue("Bree Serif".equals(src) || "BreeSerif-Regular".equals(src));
-                    assertNull(fontFaceSrc.getFormat());
-                    break;
-                }
-                case URL: {
-                    String src = fontFaceSrc.getSrc();
-                    assertEquals(src, "http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff");
-                    assertEquals(fontFaceSrc.getFormat(), "woff");
-                    break;
-                }
-                case REFERENCE:
-                default:
-                        fail();
-            }
-        }
-
-        return nFontFaceSrcs;
-    }
-
-    @Test public void testRT_32522() {
-
-        ParsedValue value = CSSParser.getInstance().parseExpr("foo", "1 2em 3 4;");
-        Object obj = value.convert(Font.font(13));
-        assert obj instanceof Number[];
-        assertArrayEquals(new Number[] {1d, 26d, 3d, 4d}, (Number[])obj);
-
-        value = CSSParser.getInstance().parseExpr("foo", "1;");
-        obj = value.convert(null);
-        assert obj instanceof Number;
-        assertEquals(1d, (Number)obj);
-
-    }
-
-    @Test public void testRT_38483() {
-
-        Duration expected = Duration.millis(42);
-        ParsedValue value = CSSParser.getInstance().parseExpr("foo", "42ms;");
-        Object observed = value.convert(null);
-        assertEquals(expected, observed);
-
-        value = CSSParser.getInstance().parseExpr("foo", "indefinite;");
-        observed = value.convert(null);
-        assertEquals(Duration.INDEFINITE, observed);
-    }
-}
--- /dev/null	2015-09-03 15:35:36.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/CssParserTest.java	2015-09-03 15:35:34.425076700 -0700
@@ -0,0 +1,309 @@
+/*
+ * 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.css;
+
+import com.sun.javafx.css.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javafx.css.ParsedValue;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+import javafx.util.Duration;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+
+public class CssParserTest {
+    
+    @Test
+    public void testRT_16959() {
+
+        CssParser instance = new CssParser();
+        
+        // RT-16959 is an infinite loop on incomplete linear gradient
+        ParsedValue result = instance.parseExpr("-fx-background-color", "linear-gradient(from 0% 0% to 0% 100%, )");
+        assertNull("parseExpr", result);
+
+        // The bad syntax should be skipped. The stylesheet should have one
+        // linear gradient with colors red, white, blue.
+        Stylesheet ss = instance.parse( 
+            "* { "
+            +   "-fx-background-color: linear-gradient(from 0% 0% to 0% 100%, ); "
+            +   "-fx-background-color: linear-gradient(from 0% 0% to 0% 100%, red, white, blue); "
+            + "}" 
+        );
+        
+        assertNotNull(ss);
+        List<Rule> rules = ss.getRules();
+        assertEquals(1,rules.size(),0);
+        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        assertTrue(decls.size()==1);
+        Declaration decl = decls.get(0);
+        ParsedValue value = decl.getParsedValue();
+        assertTrue(value != null);
+        
+        Paint[] layers = (Paint[])value.convert(null);
+        assertTrue(layers.length == 1);
+        
+        LinearGradient lg = (LinearGradient)layers[0];
+        List<Stop> stops = lg.getStops();
+        assertTrue(stops.size()==3);
+        assertEquals(Color.RED, stops.get(0).getColor());
+        assertEquals(Color.WHITE, stops.get(1).getColor());
+        assertEquals(Color.BLUE, stops.get(2).getColor());
+        
+    }
+    
+    
+    @Test
+    public void testRT_17770() {
+
+        // RT-17770 is an infinite loop on a dangling comma.
+        // Missing term should be ignored
+        String stylesheetText = 
+            "* {"
+            +   "-fx-background-color: linear-gradient( "
+            +   "to right, "
+            +   "rgba(141, 138, 125, 0.0), "
+            +   "rgba(248, 248, 246, 0.3) 45%, "
+            +   "rgba(248, 248, 246, 0.8) 50%, "
+            +   "rgba(248, 248, 246, 0.3) 55%, "
+            +   "rgba(141, 138, 125, 0.0), "
+            +   "); "
+            + "}";
+                
+        CssParser instance = new CssParser();
+        
+        Stylesheet ss = instance.parse(stylesheetText);
+        
+        assertNotNull(ss);
+        List<Rule> rules = ss.getRules();
+        assertEquals(1,rules.size(),0);
+        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        assertTrue(decls.size()==1);
+        Declaration decl = decls.get(0);
+        ParsedValue value = decl.getParsedValue();
+        assertTrue(value != null);
+        
+        Paint[] layers = (Paint[])value.convert(null);
+        assertTrue(layers.length == 1);
+        
+        LinearGradient lg = (LinearGradient)layers[0];
+        List<Stop> stops = lg.getStops();
+        assertTrue(stops.size()==5);
+        assertEquals(Color.rgb(141, 138, 125, 0.0), stops.get(0).getColor());
+        assertEquals(Color.rgb(248, 248, 246, 0.3), stops.get(1).getColor());
+        assertEquals(Color.rgb(248, 248, 246, 0.8), stops.get(2).getColor());
+        assertEquals(Color.rgb(248, 248, 246, 0.3), stops.get(3).getColor());
+        assertEquals(Color.rgb(141, 138, 125, 0.0), stops.get(4).getColor());
+        
+    }    
+    
+    @Test
+    public void testParseSizeWithInvalidDigits() {
+
+        CssParser instance = new CssParser();
+        
+        // RT-16959 is an infinite loop on incomplete linear gradient
+        ParsedValue result = instance.parseExpr("-fx-font-size", "10ptx");
+        assertNull("parseExpr", result);
+
+        // The bad syntax should be skipped.
+        Stylesheet ss = instance.parse(
+            "* {"
+            +  "-fx-font-size: 10ptx; "
+            +  "-fx-font-size: 12px; "
+            + "}"
+        );
+        
+        assertNotNull(ss);
+        List<Rule> rules = ss.getRules();
+        assertEquals(1,rules.size(),0);
+        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        assertTrue(decls.size()==1);
+        Declaration decl = decls.get(0);
+        ParsedValue value = decl.getParsedValue();
+        assertTrue(value != null);
+        
+        Double size = (Double)value.convert(Font.font("Amble", 12));
+        assertTrue(Double.compare(size, 12) == 0);
+    }
+    
+
+    @Test
+    public void testRT_17830() {
+
+        CssParser instance = new CssParser();
+        
+        // The empty declaration should be skipped. The stylesheet should have
+        // two declarations.
+        Stylesheet ss = instance.parse(".rt17830 {-fx-fill: red;; -fx-stroke: yellow; }");
+        
+        assertNotNull(ss);
+        List<Rule> rules = ss.getRules();
+        assertEquals(1,rules.size(),0);
+        List<Declaration> decls = ss.getRules().get(0).getUnobservedDeclarationList();
+        assertEquals(2,decls.size(),0);
+        
+        Declaration decl = decls.get(0);
+        ParsedValue value = decl.getParsedValue();
+        assertTrue(value != null);
+        Paint paint = (Paint)value.convert(null);
+        assertEquals(Color.RED, paint);
+        
+        decl = decls.get(1);
+        value = decl.getParsedValue();
+        assertTrue(value != null);
+        paint = (Paint)value.convert(null);
+        assertEquals(Color.YELLOW, paint);
+    }
+    
+    @Test
+    public void testRT_20311() {
+
+        CssParser instance = new CssParser();
+        
+        try {
+            instance.parse(".rt-20311 {  -fx-background-color:red\n-fx-border-color:black; }");
+        } catch (Exception e) {
+            fail(e.toString());
+        }
+        
+    }
+
+    @Test public void testFontFace() {
+
+        // http://fonts.googleapis.com/css?family=Bree+Serif
+        String css = "@font-face {\n" +
+            "font-family: 'Bree Serif';\n" +
+            "font-style: normal;\n" +
+            "font-weight: 400;\n" +
+            "src: local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff');\n"+
+        "}";
+
+        Stylesheet stylesheet = new CssParser().parse(css);
+
+        int nFontFaceSrcs = checkFontFace(stylesheet);
+
+        assertEquals(3, nFontFaceSrcs);
+    }
+
+    @Test public void testFontFaceMoreThanOneSrc() {
+
+        // http://fonts.googleapis.com/css?family=Bree+Serif
+        String css = "@font-face {\n" +
+                "font-family: 'Bree Serif';\n" +
+                "font-style: normal;\n" +
+                "font-weight: 400;\n" +
+                "src: local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff'),\n"+
+                "     local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff');\n"+
+                "}";
+
+        Stylesheet stylesheet = new CssParser().parse(css);
+
+        int nFontFaceSrcs = checkFontFace(stylesheet);
+        assertEquals(6, nFontFaceSrcs);
+    }
+
+    public static int checkFontFace(Stylesheet stylesheet) {
+
+        List<FontFace> fontFaces = stylesheet.getFontFaces();
+        assertNotNull(fontFaces);
+        assertEquals(1, fontFaces.size());
+
+        FontFaceImpl fontFace = (FontFaceImpl)fontFaces.get(0);
+
+        Map<String,String> descriptors = fontFace.getDescriptors();
+        assertEquals("'Bree Serif'", descriptors.get("font-family"));
+        assertEquals("normal", descriptors.get("font-style"));
+        assertEquals("400", descriptors.get("font-weight"));
+
+        List<FontFaceImpl.FontFaceSrc> fontFaceSrcs = fontFace.getSources();
+
+        int nFontFaceSrcs = fontFaceSrcs != null ? fontFaceSrcs.size() : 0;
+
+        for(int n=0; n<nFontFaceSrcs; n++) {
+            FontFaceImpl.FontFaceSrc fontFaceSrc = fontFaceSrcs.get(n);
+            FontFaceImpl.FontFaceSrcType type = fontFaceSrc.getType();
+            switch(type) {
+                case LOCAL: {
+                    String src = fontFaceSrc.getSrc();
+                    assertTrue("Bree Serif".equals(src) || "BreeSerif-Regular".equals(src));
+                    assertNull(fontFaceSrc.getFormat());
+                    break;
+                }
+                case URL: {
+                    String src = fontFaceSrc.getSrc();
+                    assertEquals(src, "http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff");
+                    assertEquals(fontFaceSrc.getFormat(), "woff");
+                    break;
+                }
+                case REFERENCE:
+                default:
+                        fail();
+            }
+        }
+
+        return nFontFaceSrcs;
+    }
+
+    @Test public void testRT_32522() {
+
+        ParsedValue value = new CssParser().parseExpr("foo", "1 2em 3 4;");
+        Object obj = value.convert(Font.font(13));
+        assert obj instanceof Number[];
+        assertArrayEquals(new Number[] {1d, 26d, 3d, 4d}, (Number[])obj);
+
+        value = new CssParser().parseExpr("foo", "1;");
+        obj = value.convert(null);
+        assert obj instanceof Number;
+        assertEquals(1d, (Number)obj);
+
+    }
+
+    @Test public void testRT_38483() {
+
+        Duration expected = Duration.millis(42);
+        ParsedValue value = new CssParser().parseExpr("foo", "42ms;");
+        Object observed = value.convert(null);
+        assertEquals(expected, observed);
+
+        value = new CssParser().parseExpr("foo", "indefinite;");
+        observed = value.convert(null);
+        assertEquals(Duration.INDEFINITE, observed);
+    }
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/DeclarationTest.java	2015-09-03 15:35:43.339586600 -0700
+++ /dev/null	2015-09-03 15:35:44.000000000 -0700
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 2012, 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 com.sun.javafx.css.parser.CSSParser;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import javafx.css.StyleOrigin;
-import javafx.scene.paint.Color;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class DeclarationTest {
-    
-    private static class Data {
-        private final Declaration d1, d2;
-        private final boolean expected;
-        Data(Declaration d1, Declaration d2, boolean expected){
-            this.d1 = d1;
-            this.d2 = d2;
-            this.expected = expected;
-        }
-        
-        @Override public String toString() {
-            return "\"" + d1 + "\" " + (expected ? "==" : "!=") + " \"" + d2 + "\"";
-        }
-    }
-    
-    public DeclarationTest(Data data) {
-        this.data = data;
-    }
-    private final Data data;
-    
-
-    @Parameters
-    public static Collection data() {
-
-        int n = 0;
-        final int GI = n++; // green inline
-        final int YI = n++; // yellow inline
-        final int GA1 = n++; // green author 1 
-        final int YA1 = n++; // yellow author 1 
-        final int GA2 = n++; // green author 2 
-        final int YA2 = n++; // yellow author 2 
-        
-        final Declaration[] DECLS = new Declaration[n];
-        
-        Stylesheet inlineSS = new Stylesheet() {
-            {
-                setOrigin(StyleOrigin.INLINE);
-                
-                DECLS[GI] = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
-                DECLS[YI] = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
-    
-                Collections.addAll(getRules(),
-                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[GI])),
-                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[YI]))
-                );
-            }
-        };
-        
-        Stylesheet authorSS_1 = new Stylesheet() {
-            {
-                setOrigin(StyleOrigin.AUTHOR);
-                
-                DECLS[GA1] = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
-                DECLS[YA1] = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
-    
-                Collections.addAll(getRules(),
-                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[GA1])),
-                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[YA1]))
-                );
-            }
-        };
-        
-        Stylesheet authorSS_2 = new Stylesheet() {
-            {
-                setOrigin(StyleOrigin.AUTHOR);
-                
-                DECLS[GA2] = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
-                DECLS[YA2] = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
-    
-                Collections.addAll(getRules(),
-                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[GA2])),
-                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[YA2]))
-                );
-            }
-        };
-        
-        return Arrays.asList(new Object[] {
-            new Object[] { new Data(DECLS[GA1], DECLS[GA2], true) },
-            new Object[] { new Data(DECLS[GA1], DECLS[YA1], false) },
-            new Object[] { new Data(DECLS[GA1], DECLS[GI],  false) }
-        });
-    }
-    
-    @Test
-    public void testEquals() {
-
-        Declaration instance = data.d1;
-        Declaration obj = data.d2;
-        boolean expected = data.expected;
-        boolean actual = instance.equals(obj);
-        assertTrue(data.toString(), expected == actual);
-        
-    }
-
-}
--- /dev/null	2015-09-03 15:35:44.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/DeclarationTest.java	2015-09-03 15:35:42.562542200 -0700
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2012, 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.css;
+
+import javafx.scene.paint.Color;
+import com.sun.javafx.css.ParsedValueImpl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class DeclarationTest {
+    
+    private static class Data {
+        private final Declaration d1, d2;
+        private final boolean expected;
+        Data(Declaration d1, Declaration d2, boolean expected){
+            this.d1 = d1;
+            this.d2 = d2;
+            this.expected = expected;
+        }
+        
+        @Override public String toString() {
+            return "\"" + d1 + "\" " + (expected ? "==" : "!=") + " \"" + d2 + "\"";
+        }
+    }
+    
+    public DeclarationTest(Data data) {
+        this.data = data;
+    }
+    private final Data data;
+    
+
+    @Parameters
+    public static Collection data() {
+
+        int n = 0;
+        final int GI = n++; // green inline
+        final int YI = n++; // yellow inline
+        final int GA1 = n++; // green author 1 
+        final int YA1 = n++; // yellow author 1 
+        final int GA2 = n++; // green author 2 
+        final int YA2 = n++; // yellow author 2 
+        
+        final Declaration[] DECLS = new Declaration[n];
+        
+        Stylesheet inlineSS = new Stylesheet() {
+            {
+                setOrigin(StyleOrigin.INLINE);
+                
+                DECLS[GI] = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
+                DECLS[YI] = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
+    
+                Collections.addAll(getRules(),
+                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[GI])),
+                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[YI]))
+                );
+            }
+        };
+        
+        Stylesheet authorSS_1 = new Stylesheet() {
+            {
+                setOrigin(StyleOrigin.AUTHOR);
+                
+                DECLS[GA1] = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
+                DECLS[YA1] = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
+    
+                Collections.addAll(getRules(),
+                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[GA1])),
+                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[YA1]))
+                );
+            }
+        };
+        
+        Stylesheet authorSS_2 = new Stylesheet() {
+            {
+                setOrigin(StyleOrigin.AUTHOR);
+                
+                DECLS[GA2] = new Declaration("-fx-base", new ParsedValueImpl<Color,Color>(Color.GREEN, null), false);
+                DECLS[YA2] = new Declaration("-fx-color", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false);
+    
+                Collections.addAll(getRules(),
+                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[GA2])),
+                    new Rule(Arrays.asList(SimpleSelector.getUniversalSelector()), Arrays.asList(DECLS[YA2]))
+                );
+            }
+        };
+        
+        return Arrays.asList(new Object[] {
+            new Object[] { new Data(DECLS[GA1], DECLS[GA2], true) },
+            new Object[] { new Data(DECLS[GA1], DECLS[YA1], false) },
+            new Object[] { new Data(DECLS[GA1], DECLS[GI],  false) }
+        });
+    }
+    
+    @Test
+    public void testEquals() {
+
+        Declaration instance = data.d1;
+        Declaration obj = data.d2;
+        boolean expected = data.expected;
+        boolean actual = instance.equals(obj);
+        assertTrue(data.toString(), expected == actual);
+        
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/FontTypeTest.java	2015-09-03 15:35:51.254039300 -0700
+++ /dev/null	2015-09-03 15:35:52.000000000 -0700
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2010, 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.css;
-
-import com.sun.javafx.css.converters.FontConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.css.parser.CSSParser;
-import javafx.css.ParsedValue;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.text.Font;
-import javafx.scene.text.FontPosture;
-import javafx.scene.text.FontWeight;
-import javafx.scene.text.Text;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-
-public class FontTypeTest {
-
-    public FontTypeTest() {
-    }
-
-    void checkFont(Font expResult, Font result) {
-        assertEquals("family", expResult.getFamily(), result.getFamily());
-        assertEquals("size", expResult.getSize(), result.getSize(), 0.001);
-        // TODO: how to check for weight and posture?
-    }
-    /**
-     * Test of convert method, of class FontType.
-     */
-    @Test
-    public void testConvert_Value_Font() {
-        //System.out.println("convert");
-        Font font = Font.getDefault();
-
-        ParsedValue<String,String> family = new ParsedValueImpl<String,String>(font.getFamily(), null);
-
-        ParsedValue<ParsedValue<?,Size>,Number> size =
-                new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                    new ParsedValueImpl<Size,Size>(new Size(2.0f, SizeUnits.EM), null),
-                    SizeConverter.getInstance()
-                );
-
-        ParsedValue<String,FontPosture> style =
-                new ParsedValueImpl<String,FontPosture>(FontPosture.REGULAR.name(), FontConverter.FontStyleConverter.getInstance());
-
-        ParsedValue<String,FontWeight> weight =
-                new ParsedValueImpl<String,FontWeight>(FontWeight.NORMAL.name(), FontConverter.FontWeightConverter.getInstance());
-        ParsedValue<ParsedValue[],Font> value = new ParsedValueImpl<ParsedValue[],Font>(
-                new ParsedValue[] {family, size, weight, style},
-                FontConverter.getInstance()
-            );
-
-        Font expResult = Font.font(font.getFamily(), font.getSize() * 2);
-        Font result = value.convert(font);
-        checkFont(expResult, result);
-
-        size =
-                new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                    new ParsedValueImpl<Size,Size>(new Size(120, SizeUnits.PERCENT), null),
-                    SizeConverter.getInstance()
-                );
-
-        value = new ParsedValueImpl<ParsedValue[],Font>(
-                new ParsedValue[] {family, size, weight, style},
-                FontConverter.getInstance()
-            );
-
-        expResult = Font.font(font.getFamily(), font.getSize() * 1.2);
-        result = value.convert(font);
-        checkFont(expResult, result);
-
-        size =
-                new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                    new ParsedValueImpl<Size,Size>(new Size(font.getSize(), SizeUnits.PT), null),
-                    SizeConverter.getInstance()
-                );
-
-        value = new ParsedValueImpl<ParsedValue[],Font>(
-                new ParsedValue[] {family, size, weight, style},
-                FontConverter.getInstance()
-            );
-
-        expResult = Font.font(font.getFamily(), font.getSize() * (96.0/72.0));
-        result = value.convert(font);
-        checkFont(expResult, result);
-        
-    }
-
-    @Test public void test_RT_21960_Bold_Italic() {
-        
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "italic bold 24 Amble");
-        Font f = (Font)pv.convert(null);
-        assertEquals("Bold Italic", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(24, f.getSize(),0);
-    }
-    
-    @Test public void test_RT_21960_Bold() {
-        
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "bold 24 Amble");
-        Font f = (Font)pv.convert(null);
-        assertEquals("Bold", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(24, f.getSize(),0);
-    }
-
-    @Test public void test_RT_21960_Italic() {
-        
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "italic 24 Amble");
-        Font f = (Font)pv.convert(null);
-        assertEquals("Italic", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(24, f.getSize(),0);
-    }
-
-    @Test public void test_RT_21960_Neither_Bold_Nor_Italic() {
-        
-        ParsedValue pv = CSSParser.getInstance().parseExpr("-fx-font", "24 Amble");
-        Font f = (Font)pv.convert(null);
-        assertEquals("Regular", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(24, f.getSize(),0);
-    }
-
-    @Test public void test_RT_25355_shorthandLast() {
-
-        Text txt = new Text("test_RT_25355");
-        txt.setStyle("-fx-font-weight: bold; -fx-font: 16 Amble;");
-
-        Scene scene  = new Scene(new Group());
-        ((Group)scene.getRoot()).getChildren().add(txt);
-
-        txt.applyCss();
-
-        Font f = txt.getFont();
-        assertEquals("Regular", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(16, f.getSize(),0);
-    }
-
-    @Test public void test_RT_25355_shorthandFirst() {
-
-        Text txt = new Text("test_RT_25355");
-        txt.setStyle("-fx-font: 16 Amble; -fx-font-weight: bold;");
-
-        Scene scene  = new Scene(new Group());
-        ((Group)scene.getRoot()).getChildren().add(txt);
-
-        txt.applyCss();
-
-        Font f = txt.getFont();
-        assertEquals("Bold", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(16, f.getSize(),0);
-
-    }
-
-    @Test public void test_RT_25355_shorthandFirstInheritedWeight() {
-
-        Text txt = new Text("test_RT_25355");
-        txt.setStyle("-fx-font: 16 Amble;");
-
-        Group g = new Group();
-        g.setStyle("-fx-font-weight: bold");
-
-        Scene scene  = new Scene(g);
-        g.getChildren().add(txt);
-
-        g.applyCss();
-
-        Font f = txt.getFont();
-        assertEquals("Regular", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(16, f.getSize(),0);
-
-    }
-
-    @Test public void test_RT_25355_weightFirstInheritedShorthand() {
-
-        Text txt = new Text("test_RT_25355");
-        txt.setStyle("-fx-font-weight: bold;");
-
-        Group g = new Group();
-        g.setStyle("-fx-font: 16 Amble;");
-
-        Scene scene  = new Scene(g);
-        g.getChildren().add(txt);
-
-        g.applyCss();
-
-        Font f = txt.getFont();
-        assertEquals("Bold", f.getStyle());
-        assertEquals("Amble", f.getFamily());
-        assertEquals(16, f.getSize(),0);
-
-    }
-
-    @Test public void testInheritedFontDoesNotOverrideUserSetFont() {
-
-        Text txt = new Text("testInheritedFontDoesNotOverrideUserSetFont");
-        txt.setFont(Font.font("Amble", 32));
-
-        Group g = new Group();
-        g.setStyle("-fx-font: 16 Amble;");
-
-        Scene scene  = new Scene(g);
-        g.getChildren().add(txt);
-
-        g.applyCss();
-
-        Font f = txt.getFont();
-        assertEquals("Amble", f.getFamily());
-        assertEquals(32, f.getSize(),0);
-
-    }
-
-    @Test public void testRT_32551() {
-
-        Text txt = new Text("testRT_32551");
-        txt.setId("test-rt-32551");
-        txt.setStyle("-fx-font-weight:bold;");
-
-        Group g = new Group();
-
-        Scene scene  = new Scene(g);
-        scene.getStylesheets().add(FontTypeTest.class.getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm());
-        g.getChildren().add(txt);
-
-        g.applyCss();
-
-        Font f = txt.getFont();
-        // should get size and amble from .root, 'italic' from #test-rt-32551, bold from inline.
-        assertEquals("Amble Bold Italic", f.getName());
-        assertEquals(20, f.getSize(),0);
-
-    }
-
-    @Test public void testRT_29773() {
-
-        Text txt = new Text("testRT_29773");
-        txt.setId("test-rt-29773");
-
-        Group g = new Group();
-
-        Scene scene  = new Scene(g);
-        scene.getStylesheets().add(FontTypeTest.class.getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm());
-        g.getChildren().add(txt);
-
-        g.applyCss();
-
-        Font f = txt.getFont();
-        // should get size and amble from .root, 'italic' from #test-rt-32551, bold from inline.
-        assertEquals("Amble Condensed", f.getName());
-        assertEquals(20, f.getSize(),0);
-
-    }
-}
--- /dev/null	2015-09-03 15:35:52.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/FontTypeTest.java	2015-09-03 15:35:50.481995100 -0700
@@ -0,0 +1,283 @@
+/*
+ * Copyright (c) 2010, 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.css;
+
+import com.sun.javafx.css.ParsedValueImpl;
+import javafx.css.converter.FontConverter;
+import javafx.css.converter.SizeConverter;
+
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontPosture;
+import javafx.scene.text.FontWeight;
+import javafx.scene.text.Text;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+
+public class FontTypeTest {
+
+    public FontTypeTest() {
+    }
+
+    void checkFont(Font expResult, Font result) {
+        assertEquals("family", expResult.getFamily(), result.getFamily());
+        assertEquals("size", expResult.getSize(), result.getSize(), 0.001);
+        // TODO: how to check for weight and posture?
+    }
+    /**
+     * Test of convert method, of class FontType.
+     */
+    @Test
+    public void testConvert_Value_Font() {
+        //System.out.println("convert");
+        Font font = Font.getDefault();
+
+        ParsedValue<String,String> family = new ParsedValueImpl<String,String>(font.getFamily(), null);
+
+        ParsedValue<ParsedValue<?,Size>,Number> size =
+                new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                    new ParsedValueImpl<Size,Size>(new Size(2.0f, SizeUnits.EM), null),
+                    SizeConverter.getInstance()
+                );
+
+        ParsedValue<String,FontPosture> style =
+                new ParsedValueImpl<String,FontPosture>(FontPosture.REGULAR.name(), FontConverter.FontStyleConverter.getInstance());
+
+        ParsedValue<String,FontWeight> weight =
+                new ParsedValueImpl<String,FontWeight>(FontWeight.NORMAL.name(), FontConverter.FontWeightConverter.getInstance());
+        ParsedValue<ParsedValue[],Font> value = new ParsedValueImpl<ParsedValue[],Font>(
+                new ParsedValue[] {family, size, weight, style},
+                FontConverter.getInstance()
+            );
+
+        Font expResult = Font.font(font.getFamily(), font.getSize() * 2);
+        Font result = value.convert(font);
+        checkFont(expResult, result);
+
+        size =
+                new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                    new ParsedValueImpl<Size,Size>(new Size(120, SizeUnits.PERCENT), null),
+                    SizeConverter.getInstance()
+                );
+
+        value = new ParsedValueImpl<ParsedValue[],Font>(
+                new ParsedValue[] {family, size, weight, style},
+                FontConverter.getInstance()
+            );
+
+        expResult = Font.font(font.getFamily(), font.getSize() * 1.2);
+        result = value.convert(font);
+        checkFont(expResult, result);
+
+        size =
+                new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                    new ParsedValueImpl<Size,Size>(new Size(font.getSize(), SizeUnits.PT), null),
+                    SizeConverter.getInstance()
+                );
+
+        value = new ParsedValueImpl<ParsedValue[],Font>(
+                new ParsedValue[] {family, size, weight, style},
+                FontConverter.getInstance()
+            );
+
+        expResult = Font.font(font.getFamily(), font.getSize() * (96.0/72.0));
+        result = value.convert(font);
+        checkFont(expResult, result);
+        
+    }
+
+    @Test public void test_RT_21960_Bold_Italic() {
+        
+        ParsedValue pv = new CssParser().parseExpr("-fx-font", "italic bold 24 Amble");
+        Font f = (Font)pv.convert(null);
+        assertEquals("Bold Italic", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(24, f.getSize(),0);
+    }
+    
+    @Test public void test_RT_21960_Bold() {
+        
+        ParsedValue pv = new CssParser().parseExpr("-fx-font", "bold 24 Amble");
+        Font f = (Font)pv.convert(null);
+        assertEquals("Bold", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(24, f.getSize(),0);
+    }
+
+    @Test public void test_RT_21960_Italic() {
+        
+        ParsedValue pv = new CssParser().parseExpr("-fx-font", "italic 24 Amble");
+        Font f = (Font)pv.convert(null);
+        assertEquals("Italic", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(24, f.getSize(),0);
+    }
+
+    @Test public void test_RT_21960_Neither_Bold_Nor_Italic() {
+        
+        ParsedValue pv = new CssParser().parseExpr("-fx-font", "24 Amble");
+        Font f = (Font)pv.convert(null);
+        assertEquals("Regular", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(24, f.getSize(),0);
+    }
+
+    @Test public void test_RT_25355_shorthandLast() {
+
+        Text txt = new Text("test_RT_25355");
+        txt.setStyle("-fx-font-weight: bold; -fx-font: 16 Amble;");
+
+        Scene scene  = new Scene(new Group());
+        ((Group)scene.getRoot()).getChildren().add(txt);
+
+        txt.applyCss();
+
+        Font f = txt.getFont();
+        assertEquals("Regular", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(16, f.getSize(),0);
+    }
+
+    @Test public void test_RT_25355_shorthandFirst() {
+
+        Text txt = new Text("test_RT_25355");
+        txt.setStyle("-fx-font: 16 Amble; -fx-font-weight: bold;");
+
+        Scene scene  = new Scene(new Group());
+        ((Group)scene.getRoot()).getChildren().add(txt);
+
+        txt.applyCss();
+
+        Font f = txt.getFont();
+        assertEquals("Bold", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(16, f.getSize(),0);
+
+    }
+
+    @Test public void test_RT_25355_shorthandFirstInheritedWeight() {
+
+        Text txt = new Text("test_RT_25355");
+        txt.setStyle("-fx-font: 16 Amble;");
+
+        Group g = new Group();
+        g.setStyle("-fx-font-weight: bold");
+
+        Scene scene  = new Scene(g);
+        g.getChildren().add(txt);
+
+        g.applyCss();
+
+        Font f = txt.getFont();
+        assertEquals("Regular", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(16, f.getSize(),0);
+
+    }
+
+    @Test public void test_RT_25355_weightFirstInheritedShorthand() {
+
+        Text txt = new Text("test_RT_25355");
+        txt.setStyle("-fx-font-weight: bold;");
+
+        Group g = new Group();
+        g.setStyle("-fx-font: 16 Amble;");
+
+        Scene scene  = new Scene(g);
+        g.getChildren().add(txt);
+
+        g.applyCss();
+
+        Font f = txt.getFont();
+        assertEquals("Bold", f.getStyle());
+        assertEquals("Amble", f.getFamily());
+        assertEquals(16, f.getSize(),0);
+
+    }
+
+    @Test public void testInheritedFontDoesNotOverrideUserSetFont() {
+
+        Text txt = new Text("testInheritedFontDoesNotOverrideUserSetFont");
+        txt.setFont(Font.font("Amble", 32));
+
+        Group g = new Group();
+        g.setStyle("-fx-font: 16 Amble;");
+
+        Scene scene  = new Scene(g);
+        g.getChildren().add(txt);
+
+        g.applyCss();
+
+        Font f = txt.getFont();
+        assertEquals("Amble", f.getFamily());
+        assertEquals(32, f.getSize(),0);
+
+    }
+
+    @Test public void testRT_32551() {
+
+        Text txt = new Text("testRT_32551");
+        txt.setId("test-rt-32551");
+        txt.setStyle("-fx-font-weight:bold;");
+
+        Group g = new Group();
+
+        Scene scene  = new Scene(g);
+        scene.getStylesheets().add(FontTypeTest.class.getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm());
+        g.getChildren().add(txt);
+
+        g.applyCss();
+
+        Font f = txt.getFont();
+        // should get size and amble from .root, 'italic' from #test-rt-32551, bold from inline.
+        assertEquals("Amble Bold Italic", f.getName());
+        assertEquals(20, f.getSize(),0);
+
+    }
+
+    @Test public void testRT_29773() {
+
+        Text txt = new Text("testRT_29773");
+        txt.setId("test-rt-29773");
+
+        Group g = new Group();
+
+        Scene scene  = new Scene(g);
+        scene.getStylesheets().add(FontTypeTest.class.getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm());
+        g.getChildren().add(txt);
+
+        g.applyCss();
+
+        Font f = txt.getFont();
+        // should get size and amble from .root, 'italic' from #test-rt-32551, bold from inline.
+        assertEquals("Amble Condensed", f.getName());
+        assertEquals(20, f.getSize(),0);
+
+    }
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/HonorDeveloperSettingsTest.java	2015-09-03 15:35:59.084487200 -0700
+++ /dev/null	2015-09-03 15:36:00.000000000 -0700
@@ -1,391 +0,0 @@
-/*
- * Copyright (c) 2011, 2015, 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 static org.junit.Assert.*;
-
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.scene.Cursor;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.FontSmoothingType;
-import javafx.scene.text.Text;
-import javafx.stage.Stage;
-import javafx.stage.Window;
-
-import com.sun.javafx.util.Logging;
-import org.junit.Before;
-import org.junit.Test;
-import sun.util.logging.PlatformLogger;
-
-/**
- * AKA: RT-7401. Tests that the pattern used works by testing opacity
- * specifically. Tests for font and text-fill should be done in the tests
- * for Label and Labeled.
- */
-public class HonorDeveloperSettingsTest {
-
-    private Scene scene;
-    private Rectangle rect;
-    private Text text;
-
-    // Scene must have a Window for CSS to load the stylesheet.
-    // And Window must have a Scene for StyleManager to find the right scene
-    static class TestWindow extends Window {
-        @Override public void setScene(Scene value) {
-            super.setScene(value);
-        }
-    }
-
-    @Before
-    public void setUp() {
-        rect = new Rectangle();
-        rect.setId("rectangle");
-
-        text = new Text();
-        text.setId("text");
-
-        Group group = new Group();
-        group.getChildren().addAll(rect, text);
-
-        scene = new Scene(group);/* {
-            TestWindow window;
-            {
-                window = new TestWindow();
-                window.setScene(HonorDeveloperSettingsTest.this.scene);
-                impl_setWindow(window);
-            }
-        };*/
-        
-        System.setProperty("binary.css", "false");
-        String url = getClass().getResource("HonorDeveloperSettingsTest_UA.css").toExternalForm();
-        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(url);
-        
-        Stage stage = new Stage();
-        stage.setScene(scene);
-        stage.show();
-    }
-
-    @Test
-    public void testOpacityIsSetByCSSByDefault() {
-        rect.applyCss();
-        assertEquals(.76, rect.getOpacity(), 0.01);
-    }
-
-    @Test
-    public void testOpacityWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
-        rect.setOpacity(1.0);
-        rect.applyCss();
-        assertEquals(1.0, rect.getOpacity(), 0.01);
-    }
-
-    @Test
-    public void testOpacityWithInitializedValueIsIgnoredByCSS() {
-        rect.setOpacity(0.535);
-        rect.applyCss();
-        assertEquals(0.535, rect.getOpacity(), 0.01);
-    }
-
-    @Test
-    public void testOpacityWithManuallyChangedValueIsIgnoredByCSS() {
-        rect.applyCss();
-        assertEquals(.76, rect.getOpacity(), 0.01);
-        rect.setOpacity(.873);
-        rect.applyCss();
-        assertEquals(.873, rect.getOpacity(), 0.01);
-    }
-
-    @Test
-    public void testOpacityWithManuallyChangedValueAndInlineStyleIsSetToInlineStyle() {
-        rect.applyCss();
-        assertEquals(.76, rect.getOpacity(), 0.01);
-        rect.setStyle("-fx-opacity: 42%;");
-        rect.setOpacity(.873);
-        rect.applyCss();
-        assertEquals(.42, rect.getOpacity(), 0.01);
-    }
-
-    @Test
-    public void testCursorIsSetByCSSByDefault() {
-        rect.applyCss();
-        assertEquals(Cursor.HAND, rect.getCursor());
-    }
-
-    @Test
-    public void testCursorWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
-        rect.setCursor(null);
-        rect.applyCss();
-        assertEquals(null, rect.getCursor());
-    }
-
-    @Test
-    public void testCursorWithInitializedValueIsIgnoredByCSS() {
-        rect.setCursor(Cursor.WAIT);
-        rect.applyCss();
-        assertEquals(Cursor.WAIT, rect.getCursor());
-    }
-
-    @Test
-    public void testCursorWithManuallyChangedValueIsIgnoredByCSS() {
-        rect.applyCss();
-        assertEquals(Cursor.HAND, rect.getCursor());
-        rect.setCursor(Cursor.WAIT);
-        rect.applyCss();
-        assertEquals(Cursor.WAIT, rect.getCursor());
-    }
-
-//    public void testEffectIsSetByCSSByDefault() {
-//        final Rectangle rect = Rectangle { id: "rectangle" }
-//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
-//        scene.content = rect;
-//        rect.applyCss();
-//        assertNotNull(rect.effect);
-//    }
-//
-//    public void testEffectWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
-//        final Rectangle rect = Rectangle {
-//            id: "rectangle"
-//            effect: null
-//        }
-//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
-//        scene.content = rect;
-//        rect.applyCss();
-//        assertNull(rect.effect);
-//    }
-//
-//    public void testEffectWithInitializedValueIsIgnoredByCSS() {
-//        DropShadow shadow = DropShadow { }
-//        final Rectangle rect = Rectangle {
-//            id: "rectangle"
-//            effect: shadow
-//        }
-//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
-//        scene.content = rect;
-//        rect.applyCss();
-//        assertSame(shadow, rect.effect);
-//    }
-//
-//    public void testEffectWithManuallyChangedValueIsIgnoredByCSS() {
-//        DropShadow shadow = DropShadow { }
-//        final Rectangle rect = Rectangle { id: "rectangle" }
-//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
-//        scene.content = rect;
-//        rect.applyCss();
-//        assertNotSame(shadow, rect.effect);
-//        rect.effect = shadow;
-//        rect.applyCss();
-//        assertSame(shadow, rect.effect);
-//    }
-
-    @Test
-    public void testFontIsSetByCSSByDefault() {
-        text.applyCss();
-        assertNotSame(Font.getDefault(), text.getFont());
-    }
-
-    @Test
-    public void testFontWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
-        text.setFont(Font.getDefault());
-        text.applyCss();
-        assertSame(Font.getDefault(), text.getFont());
-    }
-
-    @Test
-    public void testFontWithInitializedValueIsIgnoredByCSS() {
-        Font f = Font.font(Font.getDefault().getFamily(), 54.0);
-        text.setFont(f);
-        text.applyCss();
-        assertSame(f, text.getFont());
-    }
-
-    @Test
-    public void testFontWithManuallyChangedValueIsIgnoredByCSS() {
-        Font f = Font.font(Font.getDefault().getFamily(), 54.0);
-        text.applyCss();
-        assertNotSame(f, text.getFont());
-        text.setFont(f);
-        text.applyCss();
-        assertSame(f, text.getFont());
-    }
-    
-    @Test
-    public void testUseInheritedFontSizeFromStylesheetForEmSize() {
-        
-        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
-        scene.getStylesheets().add(url);
-        scene.getRoot().applyCss();
-        assertEquals(20, rect.getStrokeWidth(), 0.00001);
-        
-    }
-    
-    @Test
-    public void testInhertWithNoStyleDoesNotOverrideUserSetValue() {
-        Font font = Font.font("Amble", 14);
-        text.setFont(font);
-        
-        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
-        scene.getStylesheets().add(url);
-           
-        scene.getRoot().applyCss();
-        //
-        // Stroke width is set to 1em in the author stylesheet. If 
-        // RT-20145 is not working, then the code will pick up the 20px
-        // font size.
-        //
-        assertEquals(14, text.getStrokeWidth(), 0.00001);
-        
-    }
-    
-    @Test
-    public void testInlineStyleInheritedFromParentApplies() {
-
-        // Must remove the id so we don't match on the ua style.
-        text.setId(null);
-        text.setStyle("-fx-stroke-width: 1em; -fx-stroke: red;");
-        
-        scene.getRoot().setStyle("-fx-font: 18 Amble;");
-       
-        scene.getRoot().applyCss();
-        
-        //
-        // If RT-20513 is not working, then the code will _not_ 
-        // pick up the inline style
-        //        
-        assertEquals(18, text.getStrokeWidth(), 0.00001);
-        
-    }
-    
-    @Test
-    public void testInlineStyleNotInheritedFromParentWhenUserSetsFont() {
-        
-        text.setStyle("-fx-stroke-width: 1em;");
-        
-        Font font = Font.font("Amble", 14);
-        text.setFont(font);
-        
-        scene.getRoot().setStyle("-fx-font: 18 Amble;");
-        
-        scene.getRoot().applyCss();
-                
-        assertEquals(14, text.getStrokeWidth(), 0.00001);
-        
-    }
-
-    
-    @Test public void test_RT_20686_UAStyleDoesNotOverrideSetFontSmoothingType() {
-        
-        text.setId("rt-20686-ua");
-        text.setFontSmoothingType(FontSmoothingType.LCD);
-        
-        scene.getRoot().applyCss();
-         
-        assertEquals(FontSmoothingType.LCD, text.getFontSmoothingType());
-        
-    }
-    
-    @Test public void test_RT_20686_AuthorStyleOverridesSetFontSmoothingType() {
-        
-        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
-        scene.getStylesheets().add(url);
-
-        text.setId("rt-20686-author");
-        text.setFontSmoothingType(FontSmoothingType.GRAY);
-        
-        scene.getRoot().applyCss();
-                
-        assertEquals(FontSmoothingType.LCD, text.getFontSmoothingType());
-        
-    }
-
-    // this test is the prerequisite for the inline font style tests
-    @Test public void test_InlineFontStyleApplies() {
-        
-        // text  has id "text". still, inline style should win out. 
-        text.setStyle("-fx-font-size: 24;");
-
-        scene.getRoot().applyCss();
-
-        double size = text.getFont().getSize();
-        assertEquals(24, size, .0001);
-        
-    }
-    
-    // this test is the prerequisite for the inline font style tests
-    @Test public void test_FontInheritsFromDotRootStyle() {
-        
-        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
-        scene.getStylesheets().add(url);
-
-        // want text to get font style from .root
-        text.setId(null);
-        
-        scene.getRoot().applyCss();
-                
-        double size = text.getFont().getSize();
-        assertEquals(20, size, .0001);
-        
-    }
-    
-    @Test public void test_InlineFontStyleOverridesStylesheetStyles() {
-        
-        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
-        scene.getStylesheets().add(url);
-
-        // want text to get font style from .root
-        // assuming here that test_FontInheritsFromDotRootStyle passed
-        text.setId(null);
-        text.setStyle("-fx-font-size: 24;");
-
-        scene.getRoot().applyCss();
-               
-        double size = text.getFont().getSize();
-        assertEquals(24, size, .0001);
-        
-    }
-    
-    @Test public void test_InlineFontStyleFromParentOverridesStylesheetStyles() {
-        
-        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
-        scene.getStylesheets().add(url);
-        
-        // want text to get font style from .root
-        // assuming here that test_FontInheritsFromDotRootStyle passed
-        text.setId(null);
-
-        Group g = (Group)scene.getRoot();
-        g.setStyle("-fx-font-size: 32;");
-        
-        g.applyCss();
-                
-        double size = text.getFont().getSize();
-        assertEquals(32, size, .0001);
-        
-    }
-    
-}
--- /dev/null	2015-09-03 15:36:00.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/HonorDeveloperSettingsTest.java	2015-09-03 15:35:58.239438800 -0700
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 2011, 2015, 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.css;
+
+import static org.junit.Assert.*;
+
+import com.sun.javafx.css.StyleManager;
+
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.scene.Cursor;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontSmoothingType;
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+import javafx.stage.Window;
+
+import com.sun.javafx.util.Logging;
+import org.junit.Before;
+import org.junit.Test;
+import sun.util.logging.PlatformLogger;
+
+/**
+ * AKA: RT-7401. Tests that the pattern used works by testing opacity
+ * specifically. Tests for font and text-fill should be done in the tests
+ * for Label and Labeled.
+ */
+public class HonorDeveloperSettingsTest {
+
+    private Scene scene;
+    private Rectangle rect;
+    private Text text;
+
+    // Scene must have a Window for CSS to load the stylesheet.
+    // And Window must have a Scene for StyleManager to find the right scene
+    static class TestWindow extends Window {
+        @Override public void setScene(Scene value) {
+            super.setScene(value);
+        }
+    }
+
+    @Before
+    public void setUp() {
+        rect = new Rectangle();
+        rect.setId("rectangle");
+
+        text = new Text();
+        text.setId("text");
+
+        Group group = new Group();
+        group.getChildren().addAll(rect, text);
+
+        scene = new Scene(group);/* {
+            TestWindow window;
+            {
+                window = new TestWindow();
+                window.setScene(HonorDeveloperSettingsTest.this.scene);
+                impl_setWindow(window);
+            }
+        };*/
+        
+        System.setProperty("binary.css", "false");
+        String url = getClass().getResource("HonorDeveloperSettingsTest_UA.css").toExternalForm();
+        StyleManager.getInstance().getInstance().setDefaultUserAgentStylesheet(url);
+        
+        Stage stage = new Stage();
+        stage.setScene(scene);
+        stage.show();
+    }
+
+    @Test
+    public void testOpacityIsSetByCSSByDefault() {
+        rect.applyCss();
+        assertEquals(.76, rect.getOpacity(), 0.01);
+    }
+
+    @Test
+    public void testOpacityWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
+        rect.setOpacity(1.0);
+        rect.applyCss();
+        assertEquals(1.0, rect.getOpacity(), 0.01);
+    }
+
+    @Test
+    public void testOpacityWithInitializedValueIsIgnoredByCSS() {
+        rect.setOpacity(0.535);
+        rect.applyCss();
+        assertEquals(0.535, rect.getOpacity(), 0.01);
+    }
+
+    @Test
+    public void testOpacityWithManuallyChangedValueIsIgnoredByCSS() {
+        rect.applyCss();
+        assertEquals(.76, rect.getOpacity(), 0.01);
+        rect.setOpacity(.873);
+        rect.applyCss();
+        assertEquals(.873, rect.getOpacity(), 0.01);
+    }
+
+    @Test
+    public void testOpacityWithManuallyChangedValueAndInlineStyleIsSetToInlineStyle() {
+        rect.applyCss();
+        assertEquals(.76, rect.getOpacity(), 0.01);
+        rect.setStyle("-fx-opacity: 42%;");
+        rect.setOpacity(.873);
+        rect.applyCss();
+        assertEquals(.42, rect.getOpacity(), 0.01);
+    }
+
+    @Test
+    public void testCursorIsSetByCSSByDefault() {
+        rect.applyCss();
+        assertEquals(Cursor.HAND, rect.getCursor());
+    }
+
+    @Test
+    public void testCursorWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
+        rect.setCursor(null);
+        rect.applyCss();
+        assertEquals(null, rect.getCursor());
+    }
+
+    @Test
+    public void testCursorWithInitializedValueIsIgnoredByCSS() {
+        rect.setCursor(Cursor.WAIT);
+        rect.applyCss();
+        assertEquals(Cursor.WAIT, rect.getCursor());
+    }
+
+    @Test
+    public void testCursorWithManuallyChangedValueIsIgnoredByCSS() {
+        rect.applyCss();
+        assertEquals(Cursor.HAND, rect.getCursor());
+        rect.setCursor(Cursor.WAIT);
+        rect.applyCss();
+        assertEquals(Cursor.WAIT, rect.getCursor());
+    }
+
+//    public void testEffectIsSetByCSSByDefault() {
+//        final Rectangle rect = Rectangle { id: "rectangle" }
+//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
+//        scene.content = rect;
+//        rect.applyCss();
+//        assertNotNull(rect.effect);
+//    }
+//
+//    public void testEffectWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
+//        final Rectangle rect = Rectangle {
+//            id: "rectangle"
+//            effect: null
+//        }
+//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
+//        scene.content = rect;
+//        rect.applyCss();
+//        assertNull(rect.effect);
+//    }
+//
+//    public void testEffectWithInitializedValueIsIgnoredByCSS() {
+//        DropShadow shadow = DropShadow { }
+//        final Rectangle rect = Rectangle {
+//            id: "rectangle"
+//            effect: shadow
+//        }
+//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
+//        scene.content = rect;
+//        rect.applyCss();
+//        assertSame(shadow, rect.effect);
+//    }
+//
+//    public void testEffectWithManuallyChangedValueIsIgnoredByCSS() {
+//        DropShadow shadow = DropShadow { }
+//        final Rectangle rect = Rectangle { id: "rectangle" }
+//        scene.stylesheets = "{__DIR__}HonorDeveloperSettingsTest.css";
+//        scene.content = rect;
+//        rect.applyCss();
+//        assertNotSame(shadow, rect.effect);
+//        rect.effect = shadow;
+//        rect.applyCss();
+//        assertSame(shadow, rect.effect);
+//    }
+
+    @Test
+    public void testFontIsSetByCSSByDefault() {
+        text.applyCss();
+        assertNotSame(Font.getDefault(), text.getFont());
+    }
+
+    @Test
+    public void testFontWithInitializedValueSameAsDefaultValueIsIgnoredByCSS() {
+        text.setFont(Font.getDefault());
+        text.applyCss();
+        assertSame(Font.getDefault(), text.getFont());
+    }
+
+    @Test
+    public void testFontWithInitializedValueIsIgnoredByCSS() {
+        Font f = Font.font(Font.getDefault().getFamily(), 54.0);
+        text.setFont(f);
+        text.applyCss();
+        assertSame(f, text.getFont());
+    }
+
+    @Test
+    public void testFontWithManuallyChangedValueIsIgnoredByCSS() {
+        Font f = Font.font(Font.getDefault().getFamily(), 54.0);
+        text.applyCss();
+        assertNotSame(f, text.getFont());
+        text.setFont(f);
+        text.applyCss();
+        assertSame(f, text.getFont());
+    }
+    
+    @Test
+    public void testUseInheritedFontSizeFromStylesheetForEmSize() {
+        
+        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
+        scene.getStylesheets().add(url);
+        scene.getRoot().applyCss();
+        assertEquals(20, rect.getStrokeWidth(), 0.00001);
+        
+    }
+    
+    @Test
+    public void testInhertWithNoStyleDoesNotOverrideUserSetValue() {
+        Font font = Font.font("Amble", 14);
+        text.setFont(font);
+        
+        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
+        scene.getStylesheets().add(url);
+           
+        scene.getRoot().applyCss();
+        //
+        // Stroke width is set to 1em in the author stylesheet. If 
+        // RT-20145 is not working, then the code will pick up the 20px
+        // font size.
+        //
+        assertEquals(14, text.getStrokeWidth(), 0.00001);
+        
+    }
+    
+    @Test
+    public void testInlineStyleInheritedFromParentApplies() {
+
+        // Must remove the id so we don't match on the ua style.
+        text.setId(null);
+        text.setStyle("-fx-stroke-width: 1em; -fx-stroke: red;");
+        
+        scene.getRoot().setStyle("-fx-font: 18 Amble;");
+       
+        scene.getRoot().applyCss();
+        
+        //
+        // If RT-20513 is not working, then the code will _not_ 
+        // pick up the inline style
+        //        
+        assertEquals(18, text.getStrokeWidth(), 0.00001);
+        
+    }
+    
+    @Test
+    public void testInlineStyleNotInheritedFromParentWhenUserSetsFont() {
+        
+        text.setStyle("-fx-stroke-width: 1em;");
+        
+        Font font = Font.font("Amble", 14);
+        text.setFont(font);
+        
+        scene.getRoot().setStyle("-fx-font: 18 Amble;");
+        
+        scene.getRoot().applyCss();
+                
+        assertEquals(14, text.getStrokeWidth(), 0.00001);
+        
+    }
+
+    
+    @Test public void test_RT_20686_UAStyleDoesNotOverrideSetFontSmoothingType() {
+        
+        text.setId("rt-20686-ua");
+        text.setFontSmoothingType(FontSmoothingType.LCD);
+        
+        scene.getRoot().applyCss();
+         
+        assertEquals(FontSmoothingType.LCD, text.getFontSmoothingType());
+        
+    }
+    
+    @Test public void test_RT_20686_AuthorStyleOverridesSetFontSmoothingType() {
+        
+        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
+        scene.getStylesheets().add(url);
+
+        text.setId("rt-20686-author");
+        text.setFontSmoothingType(FontSmoothingType.GRAY);
+        
+        scene.getRoot().applyCss();
+                
+        assertEquals(FontSmoothingType.LCD, text.getFontSmoothingType());
+        
+    }
+
+    // this test is the prerequisite for the inline font style tests
+    @Test public void test_InlineFontStyleApplies() {
+        
+        // text  has id "text". still, inline style should win out. 
+        text.setStyle("-fx-font-size: 24;");
+
+        scene.getRoot().applyCss();
+
+        double size = text.getFont().getSize();
+        assertEquals(24, size, .0001);
+        
+    }
+    
+    // this test is the prerequisite for the inline font style tests
+    @Test public void test_FontInheritsFromDotRootStyle() {
+        
+        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
+        scene.getStylesheets().add(url);
+
+        // want text to get font style from .root
+        text.setId(null);
+        
+        scene.getRoot().applyCss();
+                
+        double size = text.getFont().getSize();
+        assertEquals(20, size, .0001);
+        
+    }
+    
+    @Test public void test_InlineFontStyleOverridesStylesheetStyles() {
+        
+        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
+        scene.getStylesheets().add(url);
+
+        // want text to get font style from .root
+        // assuming here that test_FontInheritsFromDotRootStyle passed
+        text.setId(null);
+        text.setStyle("-fx-font-size: 24;");
+
+        scene.getRoot().applyCss();
+               
+        double size = text.getFont().getSize();
+        assertEquals(24, size, .0001);
+        
+    }
+    
+    @Test public void test_InlineFontStyleFromParentOverridesStylesheetStyles() {
+        
+        String url = getClass().getResource("HonorDeveloperSettingsTest_AUTHOR.css").toExternalForm();
+        scene.getStylesheets().add(url);
+        
+        // want text to get font style from .root
+        // assuming here that test_FontInheritsFromDotRootStyle passed
+        text.setId(null);
+
+        Group g = (Group)scene.getRoot();
+        g.setStyle("-fx-font-size: 32;");
+        
+        g.applyCss();
+                
+        double size = text.getFont().getSize();
+        assertEquals(32, size, .0001);
+        
+    }
+    
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/InsetsTypeTest.java	2015-09-03 15:36:07.399962800 -0700
+++ /dev/null	2015-09-03 15:36:08.000000000 -0700
@@ -1,125 +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 com.sun.javafx.css;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import javafx.css.ParsedValue;
-import javafx.geometry.Insets;
-import javafx.scene.text.Font;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.css.parser.CSSParser;
-
-
-public class InsetsTypeTest {
-
-    String[] css;
-
-    Insets[][] expResults;
-
-    // values for top, right, bottom, left
-    final float[][][] fvals = new float[][][] {
-        { {1.0f} },
-        { {-1.0f, 0.0f, 1.0f, 2.0f} },
-        { {1.0f}, {2.0f}, {3.0f}, {4.0f} },
-        { {1.0f, 0.0f, 1.0f, 2.0f},
-          {2.0f, 0.0f, 1.0f, 2.0f},
-          {3.0f, 0.0f, 1.0f, 2.0f},
-          {4.0f, 0.0f, 1.0f, 2.0f} },
-        { {1.0f},
-          {2.0f, -1.0f},
-          {3.0f, 0.0f, 1.0f, 2.0f},
-          {4.0f, 0.0f, 1.0f} }
-    };
-
-    @Before
-    public void setup() {
-        css = new String[fvals.length];
-        expResults = new Insets[fvals.length][];
-        for (int i=0; i<fvals.length; i++) {
-            StringBuilder sbuf = new StringBuilder();
-            expResults[i] = new Insets[fvals[i].length];
-            for (int j=0; j<fvals[i].length; j++) {
-                expResults[i][j] = makeInsets(fvals[i][j]);
-
-                for (int k=0; k<fvals[i][j].length; k++) {
-                    sbuf.append(Float.toString(fvals[i][j][k]));
-                    sbuf.append("px");
-                    if (k+1 < fvals[i][j].length) sbuf.append(' ');
-                }
-
-                if (j+1 < fvals[i].length) sbuf.append(", ");
-            }
-            css[i] = sbuf.toString();
-        }
-    }
-
-    public InsetsTypeTest() {
-    }
-
-    final Insets makeInsets(float[] vals) {
-        
-        float top =  (vals.length > 0) ? vals[0] : 0.0f;
-        float right = (vals.length > 1) ? vals[1] : top;
-        float bottom = (vals.length > 2) ? vals[2] : top;
-        float left = (vals.length > 3) ? vals[3] : right;
-        return new Insets(top, right, bottom, left);
-    }
-
-    void checkInsets(String msg, Insets expResult, Insets result) {
-        assertEquals(msg + "top", expResult.getTop(), result.getTop(), 0.01);
-        assertEquals(msg + "right", expResult.getRight(), result.getRight(), 0.01);
-        assertEquals(msg + "bottom", expResult.getBottom(), result.getBottom(), 0.01);
-        assertEquals(msg + "left", expResult.getLeft(), result.getLeft(), 0.01);
-    }
-
-    @Test
-    public void testConvert() {
-
-        for (int i=0; i<css.length; i++) {
-
-            Stylesheet stylesheet =
-                CSSParser.getInstance().parse("* { -fx-border-insets: " + css[i] + "; }");
-
-            ParsedValue value =
-                    TypeTest.getValueFor(stylesheet, "-fx-border-insets");
-
-            Insets[] insets = (Insets[]) value.convert(Font.getDefault());
-
-            //assertEquals(expResults[i].length,insets.length);
-
-            for(int j=0; j<insets.length; j++) {
-                String msg = Integer.toString(i) + "." + Integer.toString(j);
-                checkInsets(msg, expResults[i][j], insets[j]);
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:36:08.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/InsetsTypeTest.java	2015-09-03 15:36:06.622918300 -0700
@@ -0,0 +1,124 @@
+/*
+ * 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.css;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import javafx.geometry.Insets;
+import javafx.scene.text.Font;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import javafx.css.CssParser;
+
+
+public class InsetsTypeTest {
+
+    String[] css;
+
+    Insets[][] expResults;
+
+    // values for top, right, bottom, left
+    final float[][][] fvals = new float[][][] {
+        { {1.0f} },
+        { {-1.0f, 0.0f, 1.0f, 2.0f} },
+        { {1.0f}, {2.0f}, {3.0f}, {4.0f} },
+        { {1.0f, 0.0f, 1.0f, 2.0f},
+          {2.0f, 0.0f, 1.0f, 2.0f},
+          {3.0f, 0.0f, 1.0f, 2.0f},
+          {4.0f, 0.0f, 1.0f, 2.0f} },
+        { {1.0f},
+          {2.0f, -1.0f},
+          {3.0f, 0.0f, 1.0f, 2.0f},
+          {4.0f, 0.0f, 1.0f} }
+    };
+
+    @Before
+    public void setup() {
+        css = new String[fvals.length];
+        expResults = new Insets[fvals.length][];
+        for (int i=0; i<fvals.length; i++) {
+            StringBuilder sbuf = new StringBuilder();
+            expResults[i] = new Insets[fvals[i].length];
+            for (int j=0; j<fvals[i].length; j++) {
+                expResults[i][j] = makeInsets(fvals[i][j]);
+
+                for (int k=0; k<fvals[i][j].length; k++) {
+                    sbuf.append(Float.toString(fvals[i][j][k]));
+                    sbuf.append("px");
+                    if (k+1 < fvals[i][j].length) sbuf.append(' ');
+                }
+
+                if (j+1 < fvals[i].length) sbuf.append(", ");
+            }
+            css[i] = sbuf.toString();
+        }
+    }
+
+    public InsetsTypeTest() {
+    }
+
+    final Insets makeInsets(float[] vals) {
+        
+        float top =  (vals.length > 0) ? vals[0] : 0.0f;
+        float right = (vals.length > 1) ? vals[1] : top;
+        float bottom = (vals.length > 2) ? vals[2] : top;
+        float left = (vals.length > 3) ? vals[3] : right;
+        return new Insets(top, right, bottom, left);
+    }
+
+    void checkInsets(String msg, Insets expResult, Insets result) {
+        assertEquals(msg + "top", expResult.getTop(), result.getTop(), 0.01);
+        assertEquals(msg + "right", expResult.getRight(), result.getRight(), 0.01);
+        assertEquals(msg + "bottom", expResult.getBottom(), result.getBottom(), 0.01);
+        assertEquals(msg + "left", expResult.getLeft(), result.getLeft(), 0.01);
+    }
+
+    @Test
+    public void testConvert() {
+
+        for (int i=0; i<css.length; i++) {
+
+            Stylesheet stylesheet =
+                new CssParser().parse("* { -fx-border-insets: " + css[i] + "; }");
+
+            ParsedValue value =
+                    TypeTest.getValueFor(stylesheet, "-fx-border-insets");
+
+            Insets[] insets = (Insets[]) value.convert(Font.getDefault());
+
+            //assertEquals(expResults[i].length,insets.length);
+
+            for(int j=0; j<insets.length; j++) {
+                String msg = Integer.toString(i) + "." + Integer.toString(j);
+                checkInsets(msg, expResults[i][j], insets[j]);
+            }
+        }
+    }
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/Node_cssStateTransition_Test.java	2015-09-03 15:36:14.837388200 -0700
+++ /dev/null	2015-09-03 15:36:16.000000000 -0700
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2012, 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.css;
-
-
-import com.sun.javafx.css.parser.CSSParser;
-
-import java.io.IOException;
-import javafx.css.CssMetaData;
-import javafx.css.PseudoClass;
-import javafx.css.StyleableProperty;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.Paint;
-import javafx.scene.shape.Rectangle;
-import static org.junit.Assert.*;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class Node_cssStateTransition_Test {
-    
-    public Node_cssStateTransition_Test() {
-    }
-
-    @Before
-    public void setUp() {
-        StyleManager sm = StyleManager.getInstance();
-        sm.userAgentStylesheetContainers.clear();
-        sm.platformUserAgentStylesheetContainers.clear();
-        sm.stylesheetContainerMap.clear();
-        sm.cacheContainerMap.clear();
-        sm.hasDefaultUserAgentStylesheet = false;
-    }
-
-    @Test
-    public void testPropertiesResetOnStyleclassChange() {
-
-        Rectangle rect = new Rectangle(50,50);
-        Paint defaultFill = rect.getFill();
-        Paint defaultStroke = rect.getStroke();
-        Double defaultStrokeWidth = Double.valueOf(rect.getStrokeWidth());
-
-        CssMetaData metaData = ((StyleableProperty)rect.fillProperty()).getCssMetaData();
-        assertEquals(defaultFill, metaData.getInitialValue(rect));
-        metaData = ((StyleableProperty)rect.strokeProperty()).getCssMetaData();
-        assertEquals(defaultStroke, metaData.getInitialValue(rect));
-        metaData = ((StyleableProperty)rect.strokeWidthProperty()).getCssMetaData();
-        assertEquals(defaultStrokeWidth, metaData.getInitialValue(rect));
-
-        Stylesheet stylesheet = null;
-        try {
-            // Note: setDefaultUserAgentStylesheet in StyleManager won't replace the UA stylesheet unless it has a name,
-            //       and that name needs to be different from the current one, if any. This matters when running
-            //       these tests from the same VM since StyleManager is a singleton.
-            stylesheet = CSSParser.getInstance().parse(
-                    "testPropertiesResetOnStyleclassChange",
-                    ".rect { -fx-fill: red; -fx-stroke: yellow; -fx-stroke-width: 3px; }" +
-                            ".rect.green { -fx-fill: green; }" +
-                            ".green { -fx-stroke: green; }"
-
-            );
-        } catch(IOException ioe) {
-            fail();
-        }
-
-        rect.getStyleClass().add("rect");
-
-        Group root = new Group();
-        root.getChildren().add(rect);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Scene scene = new Scene(root);
-
-        root.applyCss();
-
-        assertEquals(Color.RED, rect.getFill());
-        assertEquals(Color.YELLOW, rect.getStroke());
-        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
-
-        rect.getStyleClass().add("green");
-        root.applyCss();
-
-        assertEquals(Color.GREEN, rect.getFill());
-        assertEquals(Color.GREEN, rect.getStroke());
-        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
-
-        rect.getStyleClass().remove("rect");
-        root.applyCss();
-
-        assertEquals(defaultFill, rect.getFill());
-        assertEquals(Color.GREEN, rect.getStroke());
-        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
-
-        rect.getStyleClass().remove("green");
-        root.applyCss();
-
-        assertEquals(defaultFill, rect.getFill());
-        assertEquals(defaultStroke, rect.getStroke());
-        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
-    }
-
-    @Test
-    public void testPropertiesResetOnPsedudoClassStateChange() {
-
-        Rectangle rect = new Rectangle(50,50);
-        Paint defaultFill = rect.getFill();
-        Paint defaultStroke = rect.getStroke();
-        Double defaultStrokeWidth = Double.valueOf(rect.getStrokeWidth());
-
-        CssMetaData metaData = ((StyleableProperty)rect.fillProperty()).getCssMetaData();
-        assertEquals(defaultFill, metaData.getInitialValue(rect));
-        metaData = ((StyleableProperty)rect.strokeProperty()).getCssMetaData();
-        assertEquals(defaultStroke, metaData.getInitialValue(rect));
-        metaData = ((StyleableProperty)rect.strokeWidthProperty()).getCssMetaData();
-        assertEquals(defaultStrokeWidth, metaData.getInitialValue(rect));
-
-        Stylesheet stylesheet = null;
-        try {
-            // Note: setDefaultUserAgentStylesheet in StyleManager won't replace the UA stylesheet unless it has a name,
-            //       and that name needs to be different from the current one, if any. This matters when running
-            //       these tests from the same VM since StyleManager is a singleton.
-            stylesheet = CSSParser.getInstance().parse(
-                "testPropertiesResetOnPsedudoClassStateChange",
-                ".rect:hover { -fx-fill: red; -fx-stroke: yellow; -fx-stroke-width: 3px; }" +
-                ".rect:hover:focused { -fx-fill: green; }" +
-                ".rect:focused { -fx-stroke: green; }"
-
-            );
-        } catch(IOException ioe) {
-            fail();
-        }
-
-        rect.getStyleClass().add("rect");
-
-        Group root = new Group();
-        root.getChildren().add(rect);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-
-        Scene scene = new Scene(root);
-
-        root.applyCss();
-
-        assertEquals(defaultFill, rect.getFill());
-        assertEquals(defaultStroke, rect.getStroke());
-        assertEquals(defaultStrokeWidth, rect.getStrokeWidth(), 1e-6);
-
-        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("hover"), true);
-        root.applyCss();
-
-        assertEquals(Color.RED, rect.getFill());
-        assertEquals(Color.YELLOW, rect.getStroke());
-        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
-
-        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("focused"), true);
-        root.applyCss();
-
-        assertEquals(Color.GREEN, rect.getFill());
-        assertEquals(Color.GREEN, rect.getStroke());
-        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
-
-        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("hover"), false);
-        root.applyCss();
-
-        assertEquals(defaultFill, rect.getFill());
-        assertEquals(Color.GREEN, rect.getStroke());
-        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
-
-        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("focused"), false);
-        root.applyCss();
-
-        assertEquals(defaultFill, rect.getFill());
-        assertEquals(defaultStroke, rect.getStroke());
-        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
-
-    }
-
-}
--- /dev/null	2015-09-03 15:36:16.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/Node_cssStateTransition_Test.java	2015-09-03 15:36:14.070344300 -0700
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2012, 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.css;
+
+
+import com.sun.javafx.css.StyleManager;
+
+import java.io.IOException;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.shape.Rectangle;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class Node_cssStateTransition_Test {
+    
+    public Node_cssStateTransition_Test() {
+    }
+
+    @Before
+    public void setUp() {
+        StyleManager sm = StyleManager.getInstance();
+        sm.userAgentStylesheetContainers.clear();
+        sm.platformUserAgentStylesheetContainers.clear();
+        sm.stylesheetContainerMap.clear();
+        sm.cacheContainerMap.clear();
+        sm.hasDefaultUserAgentStylesheet = false;
+    }
+
+    @Test
+    public void testPropertiesResetOnStyleclassChange() {
+
+        Rectangle rect = new Rectangle(50,50);
+        Paint defaultFill = rect.getFill();
+        Paint defaultStroke = rect.getStroke();
+        Double defaultStrokeWidth = Double.valueOf(rect.getStrokeWidth());
+
+        CssMetaData metaData = ((StyleableProperty)rect.fillProperty()).getCssMetaData();
+        assertEquals(defaultFill, metaData.getInitialValue(rect));
+        metaData = ((StyleableProperty)rect.strokeProperty()).getCssMetaData();
+        assertEquals(defaultStroke, metaData.getInitialValue(rect));
+        metaData = ((StyleableProperty)rect.strokeWidthProperty()).getCssMetaData();
+        assertEquals(defaultStrokeWidth, metaData.getInitialValue(rect));
+
+        Stylesheet stylesheet = null;
+        try {
+            // Note: setDefaultUserAgentStylesheet in StyleManager won't replace the UA stylesheet unless it has a name,
+            //       and that name needs to be different from the current one, if any. This matters when running
+            //       these tests from the same VM since StyleManager is a singleton.
+            stylesheet = new CssParser().parse(
+                    "testPropertiesResetOnStyleclassChange",
+                    ".rect { -fx-fill: red; -fx-stroke: yellow; -fx-stroke-width: 3px; }" +
+                            ".rect.green { -fx-fill: green; }" +
+                            ".green { -fx-stroke: green; }"
+
+            );
+        } catch(IOException ioe) {
+            fail();
+        }
+
+        rect.getStyleClass().add("rect");
+
+        Group root = new Group();
+        root.getChildren().add(rect);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Scene scene = new Scene(root);
+
+        root.applyCss();
+
+        assertEquals(Color.RED, rect.getFill());
+        assertEquals(Color.YELLOW, rect.getStroke());
+        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
+
+        rect.getStyleClass().add("green");
+        root.applyCss();
+
+        assertEquals(Color.GREEN, rect.getFill());
+        assertEquals(Color.GREEN, rect.getStroke());
+        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
+
+        rect.getStyleClass().remove("rect");
+        root.applyCss();
+
+        assertEquals(defaultFill, rect.getFill());
+        assertEquals(Color.GREEN, rect.getStroke());
+        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
+
+        rect.getStyleClass().remove("green");
+        root.applyCss();
+
+        assertEquals(defaultFill, rect.getFill());
+        assertEquals(defaultStroke, rect.getStroke());
+        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
+    }
+
+    @Test
+    public void testPropertiesResetOnPsedudoClassStateChange() {
+
+        Rectangle rect = new Rectangle(50,50);
+        Paint defaultFill = rect.getFill();
+        Paint defaultStroke = rect.getStroke();
+        Double defaultStrokeWidth = Double.valueOf(rect.getStrokeWidth());
+
+        CssMetaData metaData = ((StyleableProperty)rect.fillProperty()).getCssMetaData();
+        assertEquals(defaultFill, metaData.getInitialValue(rect));
+        metaData = ((StyleableProperty)rect.strokeProperty()).getCssMetaData();
+        assertEquals(defaultStroke, metaData.getInitialValue(rect));
+        metaData = ((StyleableProperty)rect.strokeWidthProperty()).getCssMetaData();
+        assertEquals(defaultStrokeWidth, metaData.getInitialValue(rect));
+
+        Stylesheet stylesheet = null;
+        try {
+            // Note: setDefaultUserAgentStylesheet in StyleManager won't replace the UA stylesheet unless it has a name,
+            //       and that name needs to be different from the current one, if any. This matters when running
+            //       these tests from the same VM since StyleManager is a singleton.
+            stylesheet = new CssParser().parse(
+                "testPropertiesResetOnPsedudoClassStateChange",
+                ".rect:hover { -fx-fill: red; -fx-stroke: yellow; -fx-stroke-width: 3px; }" +
+                ".rect:hover:focused { -fx-fill: green; }" +
+                ".rect:focused { -fx-stroke: green; }"
+
+            );
+        } catch(IOException ioe) {
+            fail();
+        }
+
+        rect.getStyleClass().add("rect");
+
+        Group root = new Group();
+        root.getChildren().add(rect);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+
+        Scene scene = new Scene(root);
+
+        root.applyCss();
+
+        assertEquals(defaultFill, rect.getFill());
+        assertEquals(defaultStroke, rect.getStroke());
+        assertEquals(defaultStrokeWidth, rect.getStrokeWidth(), 1e-6);
+
+        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("hover"), true);
+        root.applyCss();
+
+        assertEquals(Color.RED, rect.getFill());
+        assertEquals(Color.YELLOW, rect.getStroke());
+        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
+
+        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("focused"), true);
+        root.applyCss();
+
+        assertEquals(Color.GREEN, rect.getFill());
+        assertEquals(Color.GREEN, rect.getStroke());
+        assertEquals(3d, rect.getStrokeWidth(), 1e-6);
+
+        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("hover"), false);
+        root.applyCss();
+
+        assertEquals(defaultFill, rect.getFill());
+        assertEquals(Color.GREEN, rect.getStroke());
+        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
+
+        rect.pseudoClassStateChanged(PseudoClass.getPseudoClass("focused"), false);
+        root.applyCss();
+
+        assertEquals(defaultFill, rect.getFill());
+        assertEquals(defaultStroke, rect.getStroke());
+        assertEquals(defaultStrokeWidth.doubleValue(), rect.getStrokeWidth(), 1e-6);
+
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/Node_cssStyleMap_Test.java	2015-09-03 15:36:23.089860200 -0700
+++ /dev/null	2015-09-03 15:36:24.000000000 -0700
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 2012, 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.css;
-
-import com.sun.javafx.css.converters.FontConverter;
-import com.sun.javafx.css.converters.SizeConverter;
-import com.sun.javafx.tk.Toolkit;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javafx.beans.property.Property;
-import javafx.collections.FXCollections;
-import javafx.collections.MapChangeListener;
-import javafx.css.CssMetaData;
-import javafx.css.ParsedValue;
-import javafx.css.StyleOrigin;
-import javafx.css.Styleable;
-import javafx.css.StyleableProperty;
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.paint.Color;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.Text;
-import javafx.stage.Stage;
-import static org.junit.Assert.*;
-
-import javafx.util.Pair;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class Node_cssStyleMap_Test {
-    
-    public Node_cssStyleMap_Test() {
-    }
-
-    boolean disabled = false;
-
-    private void checkFoundStyle(Property<?> property, Map<StyleableProperty<?>, List<Style>> map, List<Declaration> decls) {
-
-        List<Style> styles = map.get(property);
-        assert (styles != null && !styles.isEmpty());
-
-        String pname = ((StyleableProperty<?>)property).getCssMetaData().getProperty();
-        Declaration declaration = null;
-        for(Declaration decl : decls) {
-            if (pname.equals(decl.getProperty())) {
-                declaration = decl;
-                break;
-            }
-        }
-        assertNotNull(pname, declaration);
-
-        Style style = null;
-        for(Style s : styles) {
-            if (pname.equals(s.getDeclaration().getProperty())) {
-                style = s;
-                break;
-            }
-        }
-        assertNotNull(pname, style);
-
-        assert(style.getDeclaration() == declaration);
-
-    }
-    
-    @Test
-    public void testStyleMap() {
-
-        final List<Declaration> declsNoState = new ArrayList<Declaration>();
-        Collections.addAll(declsNoState,
-            new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.RED, null), false),
-            new Declaration("-fx-stroke", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false),
-            new Declaration("-fx-stroke-width", new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(3d, SizeUnits.PX), null),
-                SizeConverter.getInstance()), false)
-        );
-
-
-        final List<Selector> selsNoState = new ArrayList<Selector>();
-        Collections.addAll(selsNoState,
-            Selector.createSelector(".rect")
-        );
-
-        Rule rule = new Rule(selsNoState, declsNoState);
-
-        Stylesheet stylesheet = new Stylesheet("testStyleMap");
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        stylesheet.getRules().add(rule);
-
-        final List<Declaration> declsDisabledState = new ArrayList<Declaration>();
-        Collections.addAll(declsDisabledState,
-            new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.GRAY, null), false),
-            new Declaration("-fx-stroke", new ParsedValueImpl<Color,Color>(Color.DARKGRAY, null), false)
-        );
-
-        final List<Selector> selsDisabledState = new ArrayList<Selector>();
-        Collections.addAll(selsDisabledState,
-            Selector.createSelector(".rect:disabled")
-        );
-
-        rule = new Rule(selsDisabledState, declsDisabledState);
-        stylesheet.getRules().add(rule);
-
-        Rectangle rect = new Rectangle(50,50);
-        rect.getStyleClass().add("rect");
-
-        Group root = new Group();
-        root.getChildren().add(rect);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-        Scene scene = new Scene(root);
-
-        rect.applyCss();
-
-        Map<StyleableProperty<?>, List<Style>> map = rect.impl_findStyles(null);
-        assert (map != null && !map.isEmpty());
-
-        checkFoundStyle(rect.fillProperty(), map, declsNoState);
-        checkFoundStyle(rect.strokeProperty(), map, declsNoState);
-        checkFoundStyle(rect.strokeWidthProperty(), map, declsNoState);
-
-        rect.setDisable(true);
-        rect.applyCss();
-
-        map = rect.impl_findStyles(null);
-        assert (map != null && !map.isEmpty());
-
-        checkFoundStyle(rect.fillProperty(), map, declsDisabledState);
-        checkFoundStyle(rect.strokeProperty(), map, declsDisabledState);
-        checkFoundStyle(rect.strokeWidthProperty(), map, declsNoState);
-
-    }
-
-    @Test
-    public void testStyleMapChildren() {
-
-        final List<Declaration> declsNoState = new ArrayList<Declaration>();
-        Collections.addAll(declsNoState,
-                new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.RED, null), false)
-        );
-
-        final List<Selector> selsNoState = new ArrayList<Selector>();
-        Collections.addAll(selsNoState,
-                Selector.createSelector(".rect")
-        );
-
-        Rule rule = new Rule(selsNoState, declsNoState);
-
-        Stylesheet stylesheet = new Stylesheet("testStyleMapChildren");
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        stylesheet.getRules().add(rule);
-
-        Rectangle rect = new Rectangle(50,50);
-        rect.getStyleClass().add("rect");
-
-        Group root = new Group();
-        Group group = new Group();
-        root.getChildren().add(group);
-        group.getChildren().add(rect);
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-        Scene scene = new Scene(root);
-
-        root.applyCss();
-
-        // Even though root and group have no styles, the styles for rect should still be found
-        Map<StyleableProperty<?>, List<Style>> map = root.impl_findStyles(null);
-        assert (map != null && !map.isEmpty());
-
-        checkFoundStyle(rect.fillProperty(), map, declsNoState);
-
-    }
-
-    @Test
-    public void testRT_21212() {
-
-        final List<Declaration> rootDecls = new ArrayList<Declaration>();
-        Collections.addAll(rootDecls, 
-            new Declaration("-fx-font-size", new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(12, SizeUnits.PX), null), 
-                SizeConverter.getInstance()), false)
-        );
-        
-        final List<Selector> rootSels = new ArrayList<Selector>();
-        Collections.addAll(rootSels, 
-            Selector.createSelector(".root")
-        );
-        
-        Rule rootRule = new Rule(rootSels, rootDecls);        
-        
-        Stylesheet stylesheet = new Stylesheet("testRT_21212");
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-        stylesheet.getRules().add(rootRule);
-
-        Group group = new Group();
-        group.getStyleClass().add("root");
-        
-        
-        final ParsedValue[] fontValues = new ParsedValue[] {
-            new ParsedValueImpl<String,String>("system", null),
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.5, SizeUnits.EM), null),
-                SizeConverter.getInstance()
-            ), 
-            null,
-            null
-        };
-        final List<Declaration> textDecls = new ArrayList<Declaration>();
-        Collections.addAll(textDecls, 
-            new Declaration("-fx-font", new ParsedValueImpl<ParsedValue[], Font>(
-                fontValues, FontConverter.getInstance()), false)
-        );
-        
-        final List<Selector> textSels = new ArrayList<Selector>();
-        Collections.addAll(textSels, 
-            Selector.createSelector(".text")
-        );
-        
-        Rule textRule = new Rule(textSels, textDecls);        
-        stylesheet.getRules().add(textRule);
-                
-        Text text = new Text("HelloWorld");
-        text.getStyleClass().add("text");
-        group.getChildren().add(text);
-
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-        Scene scene = new Scene(group);
-
-        text.applyCss();
-
-        Map<StyleableProperty<?>, List<Style>> map = text.impl_findStyles(null);
-        assert (map != null && !map.isEmpty());
-
-        checkFoundStyle(text.fontProperty(), map, textDecls);
-
-    }
-
-    boolean containsProperty(CssMetaData key, Map<String,List<CascadingStyle>> map) {
-
-        if (map.containsKey(key)) return true;
-        List<CssMetaData> subProperties = key.getSubProperties();
-        if (subProperties != null && !subProperties.isEmpty()) {
-            for (CssMetaData subKey: subProperties) {
-                if (map.containsKey(subKey)) return true;
-            }
-        }
-        return false;
-    }
-
-    @Test
-    public void testRT_34799() {
-
-        Stylesheet stylesheet = new Stylesheet("testRT_34799");
-        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
-
-        final List<Declaration> txtDecls = new ArrayList<Declaration>();
-        Collections.addAll(txtDecls,
-                new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.RED, null), false)
-        );
-
-        final List<Selector> textSels = new ArrayList<Selector>();
-        Collections.addAll(textSels,
-                Selector.createSelector(".rt-34799")
-        );
-
-        Rule txtRules = new Rule(textSels, txtDecls);
-        stylesheet.getRules().add(txtRules);
-
-        final List<Style> expectedStyles = new ArrayList<>();
-        for (Rule rule : stylesheet.getRules()) {
-            for (Selector selector : rule.getSelectors()) {
-                for (Declaration declaration : rule.getUnobservedDeclarationList()) {
-                    expectedStyles.add(
-                            new Style(selector, declaration)
-                    );
-                }
-            }
-        }
-
-        Text text = new Text("HelloWorld");
-        text.getStyleClass().add("rt-34799");
-
-        Group group = new Group();
-        group.getStyleClass().add("root");
-
-        group.getChildren().add(text);
-
-        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
-        Scene scene = new Scene(group);
-
-        group.applyCss(); // TODO: force StyleHelper to be created, remove pending RT-34812
-
-        int nExpected = expectedStyles.size();
-        assert(nExpected > 0);
-
-        for(CssMetaData cssMetaData : text.getCssMetaData()) {
-            List<Style> styles = Node.impl_getMatchingStyles(cssMetaData, text);
-            if (styles != null && !styles.isEmpty()) {
-                assertTrue(expectedStyles.containsAll(styles));
-                assertTrue(styles.containsAll(expectedStyles));
-                nExpected -= 1;
-            }
-        }
-
-        assertEquals(nExpected, 0);
-
-    }
-
-}
--- /dev/null	2015-09-03 15:36:24.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/Node_cssStyleMap_Test.java	2015-09-03 15:36:22.313815800 -0700
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2012, 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.css;
+
+import com.sun.javafx.css.ParsedValueImpl;
+import com.sun.javafx.css.StyleManager;
+import javafx.css.converter.FontConverter;
+import javafx.css.converter.SizeConverter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javafx.beans.property.Property;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.Scene;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+
+import static org.junit.Assert.*;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+@Ignore
+public class Node_cssStyleMap_Test {
+    
+    public Node_cssStyleMap_Test() {
+    }
+
+    boolean disabled = false;
+
+    private void checkFoundStyle(Property<?> property, Map<StyleableProperty<?>, List<Style>> map, List<Declaration> decls) {
+
+        List<Style> styles = map.get(property);
+        assert (styles != null && !styles.isEmpty());
+
+        String pname = ((StyleableProperty<?>)property).getCssMetaData().getProperty();
+        Declaration declaration = null;
+        for(Declaration decl : decls) {
+            if (pname.equals(decl.getProperty())) {
+                declaration = decl;
+                break;
+            }
+        }
+        assertNotNull(pname, declaration);
+
+        Style style = null;
+        for(Style s : styles) {
+            if (pname.equals(s.getDeclaration().getProperty())) {
+                style = s;
+                break;
+            }
+        }
+        assertNotNull(pname, style);
+
+        assert(style.getDeclaration() == declaration);
+
+    }
+    
+    @Test
+    public void testStyleMap() {
+
+        final List<Declaration> declsNoState = new ArrayList<Declaration>();
+        Collections.addAll(declsNoState,
+            new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.RED, null), false),
+            new Declaration("-fx-stroke", new ParsedValueImpl<Color,Color>(Color.YELLOW, null), false),
+            new Declaration("-fx-stroke-width", new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(3d, SizeUnits.PX), null),
+                SizeConverter.getInstance()), false)
+        );
+
+
+        final List<Selector> selsNoState = new ArrayList<Selector>();
+        Collections.addAll(selsNoState,
+            Selector.createSelector(".rect")
+        );
+
+        Rule rule = new Rule(selsNoState, declsNoState);
+
+        Stylesheet stylesheet = new Stylesheet("testStyleMap");
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        stylesheet.getRules().add(rule);
+
+        final List<Declaration> declsDisabledState = new ArrayList<Declaration>();
+        Collections.addAll(declsDisabledState,
+            new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.GRAY, null), false),
+            new Declaration("-fx-stroke", new ParsedValueImpl<Color,Color>(Color.DARKGRAY, null), false)
+        );
+
+        final List<Selector> selsDisabledState = new ArrayList<Selector>();
+        Collections.addAll(selsDisabledState,
+            Selector.createSelector(".rect:disabled")
+        );
+
+        rule = new Rule(selsDisabledState, declsDisabledState);
+        stylesheet.getRules().add(rule);
+
+        Rectangle rect = new Rectangle(50,50);
+        rect.getStyleClass().add("rect");
+
+        Group root = new Group();
+        root.getChildren().add(rect);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+        Scene scene = new Scene(root);
+
+        rect.applyCss();
+
+        Map<StyleableProperty<?>, List<Style>> map = rect.impl_findStyles(null);
+        assert (map != null && !map.isEmpty());
+
+        checkFoundStyle(rect.fillProperty(), map, declsNoState);
+        checkFoundStyle(rect.strokeProperty(), map, declsNoState);
+        checkFoundStyle(rect.strokeWidthProperty(), map, declsNoState);
+
+        rect.setDisable(true);
+        rect.applyCss();
+
+        map = rect.impl_findStyles(null);
+        assert (map != null && !map.isEmpty());
+
+        checkFoundStyle(rect.fillProperty(), map, declsDisabledState);
+        checkFoundStyle(rect.strokeProperty(), map, declsDisabledState);
+        checkFoundStyle(rect.strokeWidthProperty(), map, declsNoState);
+
+    }
+
+    @Test
+    public void testStyleMapChildren() {
+
+        final List<Declaration> declsNoState = new ArrayList<Declaration>();
+        Collections.addAll(declsNoState,
+                new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.RED, null), false)
+        );
+
+        final List<Selector> selsNoState = new ArrayList<Selector>();
+        Collections.addAll(selsNoState,
+                Selector.createSelector(".rect")
+        );
+
+        Rule rule = new Rule(selsNoState, declsNoState);
+
+        Stylesheet stylesheet = new Stylesheet("testStyleMapChildren");
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        stylesheet.getRules().add(rule);
+
+        Rectangle rect = new Rectangle(50,50);
+        rect.getStyleClass().add("rect");
+
+        Group root = new Group();
+        Group group = new Group();
+        root.getChildren().add(group);
+        group.getChildren().add(rect);
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+        Scene scene = new Scene(root);
+
+        root.applyCss();
+
+        // Even though root and group have no styles, the styles for rect should still be found
+        Map<StyleableProperty<?>, List<Style>> map = root.impl_findStyles(null);
+        assert (map != null && !map.isEmpty());
+
+        checkFoundStyle(rect.fillProperty(), map, declsNoState);
+
+    }
+
+    @Test
+    public void testRT_21212() {
+
+        final List<Declaration> rootDecls = new ArrayList<Declaration>();
+        Collections.addAll(rootDecls, 
+            new Declaration("-fx-font-size", new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(12, SizeUnits.PX), null), 
+                SizeConverter.getInstance()), false)
+        );
+        
+        final List<Selector> rootSels = new ArrayList<Selector>();
+        Collections.addAll(rootSels, 
+            Selector.createSelector(".root")
+        );
+        
+        Rule rootRule = new Rule(rootSels, rootDecls);        
+        
+        Stylesheet stylesheet = new Stylesheet("testRT_21212");
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+        stylesheet.getRules().add(rootRule);
+
+        Group group = new Group();
+        group.getStyleClass().add("root");
+        
+        
+        final ParsedValue[] fontValues = new ParsedValue[] {
+            new ParsedValueImpl<String,String>("system", null),
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.5, SizeUnits.EM), null),
+                SizeConverter.getInstance()
+            ), 
+            null,
+            null
+        };
+        final List<Declaration> textDecls = new ArrayList<Declaration>();
+        Collections.addAll(textDecls, 
+            new Declaration("-fx-font", new ParsedValueImpl<ParsedValue[], Font>(
+                fontValues, FontConverter.getInstance()), false)
+        );
+        
+        final List<Selector> textSels = new ArrayList<Selector>();
+        Collections.addAll(textSels, 
+            Selector.createSelector(".text")
+        );
+        
+        Rule textRule = new Rule(textSels, textDecls);        
+        stylesheet.getRules().add(textRule);
+                
+        Text text = new Text("HelloWorld");
+        text.getStyleClass().add("text");
+        group.getChildren().add(text);
+
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+        Scene scene = new Scene(group);
+
+        text.applyCss();
+
+        Map<StyleableProperty<?>, List<Style>> map = text.impl_findStyles(null);
+        assert (map != null && !map.isEmpty());
+
+        checkFoundStyle(text.fontProperty(), map, textDecls);
+
+    }
+
+    boolean containsProperty(CssMetaData key, Map<String,List<CascadingStyle>> map) {
+
+        if (map.containsKey(key)) return true;
+        List<CssMetaData> subProperties = key.getSubProperties();
+        if (subProperties != null && !subProperties.isEmpty()) {
+            for (CssMetaData subKey: subProperties) {
+                if (map.containsKey(subKey)) return true;
+            }
+        }
+        return false;
+    }
+
+    @Test
+    public void testRT_34799() {
+
+        Stylesheet stylesheet = new Stylesheet("testRT_34799");
+        stylesheet.setOrigin(StyleOrigin.USER_AGENT);
+
+        final List<Declaration> txtDecls = new ArrayList<Declaration>();
+        Collections.addAll(txtDecls,
+                new Declaration("-fx-fill", new ParsedValueImpl<Color,Color>(Color.RED, null), false)
+        );
+
+        final List<Selector> textSels = new ArrayList<Selector>();
+        Collections.addAll(textSels,
+                Selector.createSelector(".rt-34799")
+        );
+
+        Rule txtRules = new Rule(textSels, txtDecls);
+        stylesheet.getRules().add(txtRules);
+
+        final List<Style> expectedStyles = new ArrayList<>();
+        for (Rule rule : stylesheet.getRules()) {
+            for (Selector selector : rule.getSelectors()) {
+                for (Declaration declaration : rule.getUnobservedDeclarationList()) {
+                    expectedStyles.add(
+                            new Style(selector, declaration)
+                    );
+                }
+            }
+        }
+
+        Text text = new Text("HelloWorld");
+        text.getStyleClass().add("rt-34799");
+
+        Group group = new Group();
+        group.getStyleClass().add("root");
+
+        group.getChildren().add(text);
+
+        StyleManager.getInstance().setDefaultUserAgentStylesheet(stylesheet);
+        Scene scene = new Scene(group);
+
+        group.applyCss(); // TODO: force StyleHelper to be created, remove pending RT-34812
+
+        int nExpected = expectedStyles.size();
+        assert(nExpected > 0);
+
+        for(CssMetaData cssMetaData : text.getCssMetaData()) {
+            List<Style> styles = Node.impl_getMatchingStyles(cssMetaData, text);
+            if (styles != null && !styles.isEmpty()) {
+                assertTrue(expectedStyles.containsAll(styles));
+                assertTrue(styles.containsAll(expectedStyles));
+                nExpected -= 1;
+            }
+        }
+
+        assertEquals(nExpected, 0);
+
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/PaintTypeTest.java	2015-09-03 15:36:31.546343900 -0700
+++ /dev/null	2015-09-03 15:36:32.000000000 -0700
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2010, 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.css;
-
-import javafx.css.ParsedValue;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.CycleMethod;
-import javafx.scene.paint.LinearGradient;
-import javafx.scene.paint.Paint;
-import javafx.scene.paint.RadialGradient;
-import javafx.scene.paint.Stop;
-import javafx.scene.text.Font;
-import com.sun.javafx.css.converters.PaintConverter;
-import com.sun.javafx.css.parser.CSSParser;
-import com.sun.javafx.css.parser.StopConverter;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-
-public class PaintTypeTest {
-
-    public PaintTypeTest() {
-    }
-
-    final Stop[] stops = new Stop[] {
-        new Stop(0.0f, Color.WHITE),
-        new Stop(1.0f, Color.BLACK)
-    };
-
-    final Paint[] paints = new Paint[] {
-        Color.rgb(0, 128, 255),
-        new LinearGradient(0.0f, 0.0f, 1.0f, 1.0f, true, CycleMethod.NO_CYCLE, stops),
-        new RadialGradient(225, 0.28, 1f, 1f, 5.0f, false, CycleMethod.NO_CYCLE, stops)
-    };
-
-    ParsedValue<?,Size> sizeVal(float value) {
-        return new ParsedValueImpl<Size,Size>(new Size(value*100, SizeUnits.PERCENT), null);
-    }
-
-    ParsedValue<ParsedValue[],Stop> stopValue(Stop stop) {
-        ParsedValue<?,Size> offset = sizeVal((float)stop.getOffset());
-        ParsedValue<Color,Color> color = new ParsedValueImpl<Color,Color>(stop.getColor(), null);
-        ParsedValue[] values = new ParsedValue[] { offset, color };
-        return new ParsedValueImpl<ParsedValue[],Stop>(values, StopConverter.getInstance());
-    };
-
-    ParsedValue<ParsedValue[],Paint> linearGradientValues(LinearGradient lg) {
-        ParsedValue[] values = new ParsedValue[7];
-        int v = 0;
-        values[v++] = sizeVal((float) lg.getStartX());
-        values[v++] = sizeVal((float) lg.getStartY());
-        values[v++] = sizeVal((float) lg.getEndX());
-        values[v++] = sizeVal((float) lg.getEndY());
-        values[v++] = new ParsedValueImpl<CycleMethod,CycleMethod>(lg.getCycleMethod(),null);
-        values[v++] = stopValue(stops[0]);
-        values[v++] = stopValue(stops[1]);
-        return new ParsedValueImpl<ParsedValue[],Paint>(values, PaintConverter.LinearGradientConverter.getInstance());
-    }
-
-    ParsedValue<ParsedValue[],Paint> radialGradientValues(RadialGradient rg) {
-        ParsedValue[] values = new ParsedValue[8];
-        int v = 0;
-        values[v++] = new ParsedValueImpl<Size,Size>(new Size(rg.getFocusAngle(), SizeUnits.PX), null);
-        values[v++] = new ParsedValueImpl<Size,Size>(new Size(rg.getFocusDistance(), SizeUnits.PX), null);
-        values[v++] = sizeVal((float) rg.getCenterX());
-        values[v++] = sizeVal((float) rg.getCenterY());
-        values[v++] = new ParsedValueImpl<Size,Size>(new Size(rg.getRadius(), SizeUnits.PX), null);
-        values[v++] = new ParsedValueImpl<CycleMethod,CycleMethod>(rg.getCycleMethod(),null);
-        values[v++] = stopValue(stops[0]);
-        values[v++] = stopValue(stops[1]);
-        return new ParsedValueImpl<ParsedValue[],Paint>(values, PaintConverter.RadialGradientConverter.getInstance());
-    }
-
-    final ParsedValue[] paintValues = new ParsedValue[] {
-        new ParsedValueImpl<Paint,Paint>(paints[0], null),
-        linearGradientValues((LinearGradient)paints[1]),
-        radialGradientValues((RadialGradient)paints[2])
-    };
-
-    /**
-     * Paint is layered (one value per layer).  &lt;paint&gt; [, &lt;paint&gt;]*.
-     * In the convert function, the ParsedValue is a ParsedValue for each layer.
-     * That is, value.getValue() returns a ParsedValue[].
-     */
-    ParsedValue<ParsedValue<?,Paint>[],Paint[]> getValue(int nLayers) {
-        ParsedValue<Paint,Paint>[] layers = new ParsedValue[nLayers];
-        for (int l=0; l<nLayers; l++) {
-            layers[l] = paintValues[l % paintValues.length];
-        }
-        return new ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]>(layers, PaintConverter.SequenceConverter.getInstance());
-    }
-    /**
-     * Test of convert method, of class PaintType.
-     */
-    @Test
-    public void testConvert() {
-        //System.out.println("convert");
-        int nValues = paints.length;
-        ParsedValue<ParsedValue<?,Paint>[],Paint[]> value = getValue(nValues);
-        Font font = null;
-        Paint[] result = value.convert(font);
-        assertEquals(nValues, result.length);
-        for(int r=0; r<result.length; r++) {
-            Paint expResult = paints[r % paints.length];
-            assertEquals(expResult, result[r]);
-        }
-    }
-
-    String[] css;
-
-    Paint[][] expResults;
-
-    // values for top, right, bottom, left
-    final String[][][] svals = new String[][][] {
-        { {"#ff0000"} },
-        { {"#ff0000"}, {"#00ff00"}, {"#0000ff"}, {"#ffffff"} }
-    };
-
-    public void setup() {
-        css = new String[svals.length];
-        expResults = new Paint[svals.length][];
-        for (int i=0; i<svals.length; i++) {
-            StringBuilder sbuf = new StringBuilder();
-            expResults[i] = new Paint[svals[i].length];
-            for (int j=0; j<svals[i].length; j++) {
-                for (int k=0; k<svals[i][j].length; k++) {
-                    expResults[i][j] = Color.web(svals[i][j][k]);
-                    sbuf.append(svals[i][j][k]);
-                    if (k+1 < svals[i][j].length) sbuf.append(' ');
-                }
-
-                if (j+1 < svals[i].length) sbuf.append(", ");
-            }
-            css[i] = sbuf.toString();
-        }
-    }
-
-    @Test
-    public void testPaintTypeWithCSS() {
-        setup();
-
-        for (int i=0; i<css.length; i++) {
-
-            Stylesheet stylesheet =
-                CSSParser.getInstance().parse("* { -fx-border-color: " + css[i] + "; }");
-
-            ParsedValue value = TypeTest.getValueFor(stylesheet, "-fx-border-color");
-
-            Paint[][] paints = (Paint[][])value.convert(Font.getDefault());
-
-            //assertEquals(expResults[i].length,paints.length);
-
-            for(int j=0; j<paints.length; j++) {
-                String msg = Integer.toString(i) + "." + Integer.toString(j);
-                assertEquals(msg, expResults[i][j], paints[j][0]);
-            }
-        }
-
-    }
-
-    @Test
-    public void testParseRadialGradient() {
-
-        // <radial-gradient> = radial-gradient(
-        //        [ focus-angle <angle>, ]?
-        //        [ focus-distance <percentage>, ]?
-        //        [ center <point>, ]?
-        //        radius <length>,
-        //        [ [ repeat | reflect ] ,]?
-        //        <color-stop>[, <color-stop>]+ )
-        ParsedValue value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "radial-gradient(focus-angle 90deg, focus-distance 50%, radius 50, red, green, blue)");
-        RadialGradient result = (RadialGradient)((Paint[])value.convert(null))[0];
-        RadialGradient expected = new RadialGradient(90, .5, 0, 0, 50,
-                false, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0,Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "radial-gradient(focus-angle 1.5708rad, focus-distance 50%, radius 50, red, green, blue)");
-        result = (RadialGradient)((Paint[])value.convert(null))[0];
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "radial-gradient(center 0% 10%, radius 50%, reflect, red, green, blue)");
-        result = (RadialGradient)((Paint[])value.convert(null))[0];
-        expected = new RadialGradient(0, 0, 0, .1, .5,
-                true, CycleMethod.REFLECT,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0,Color.BLUE));
-        assertEquals(expected,result);
-    }
-
-    @Test
-    public void testParseLinearGradient() {
-
-        // <linear-gradient> = linear-gradient(
-        //        [ [from <point> to <point>] | [ to <side-or-corner> ] ] ,]? [ [ repeat | reflect ] ,]?
-        //        <color-stop>[, <color-stop>]+
-        // )
-        //
-        ParsedValue value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to top, red, green, blue)");
-        LinearGradient result = (LinearGradient)((Paint[])value.convert(null))[0];
-        LinearGradient expected = new LinearGradient(0, 1, 0, 0,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to bottom, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(0, 0, 0, 1,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to left, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(1, 0, 0, 0,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to right, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(0, 0, 1, 0,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to bottom left, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(1, 0, 0, 1,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to bottom right, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(0, 0, 1, 1,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to top left, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(1, 1, 0, 0,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(to top right, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(0, 1, 1, 0,
-                true, CycleMethod.NO_CYCLE,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-
-        value = CSSParser.getInstance().parseExpr("-fx-background-color",
-                "linear-gradient(from 10% 10% to 90% 90%, reflect, red, green, blue)");
-        result = (LinearGradient)((Paint[])value.convert(null))[0];
-        expected = new LinearGradient(.1, .1, .9, .9,
-                true, CycleMethod.REFLECT,
-                new Stop(0, Color.RED),
-                new Stop(.5, Color.GREEN),
-                new Stop(1.0, Color.BLUE));
-        assertEquals(expected,result);
-  }
-
-}
--- /dev/null	2015-09-03 15:36:33.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/PaintTypeTest.java	2015-09-03 15:36:30.742297900 -0700
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2010, 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.css;
+
+import javafx.scene.paint.Color;
+import javafx.scene.paint.CycleMethod;
+import javafx.scene.paint.LinearGradient;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.paint.Stop;
+import javafx.scene.text.Font;
+import com.sun.javafx.css.ParsedValueImpl;
+import javafx.css.converter.PaintConverter;
+import javafx.css.converter.StopConverter;
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+
+public class PaintTypeTest {
+
+    public PaintTypeTest() {
+    }
+
+    final Stop[] stops = new Stop[] {
+        new Stop(0.0f, Color.WHITE),
+        new Stop(1.0f, Color.BLACK)
+    };
+
+    final Paint[] paints = new Paint[] {
+        Color.rgb(0, 128, 255),
+        new LinearGradient(0.0f, 0.0f, 1.0f, 1.0f, true, CycleMethod.NO_CYCLE, stops),
+        new RadialGradient(225, 0.28, 1f, 1f, 5.0f, false, CycleMethod.NO_CYCLE, stops)
+    };
+
+    ParsedValue<?,Size> sizeVal(float value) {
+        return new ParsedValueImpl<Size,Size>(new Size(value*100, SizeUnits.PERCENT), null);
+    }
+
+    ParsedValue<ParsedValue[],Stop> stopValue(Stop stop) {
+        ParsedValue<?,Size> offset = sizeVal((float)stop.getOffset());
+        ParsedValue<Color,Color> color = new ParsedValueImpl<Color,Color>(stop.getColor(), null);
+        ParsedValue[] values = new ParsedValue[] { offset, color };
+        return new ParsedValueImpl<ParsedValue[],Stop>(values, StopConverter.getInstance());
+    };
+
+    ParsedValue<ParsedValue[],Paint> linearGradientValues(LinearGradient lg) {
+        ParsedValue[] values = new ParsedValue[7];
+        int v = 0;
+        values[v++] = sizeVal((float) lg.getStartX());
+        values[v++] = sizeVal((float) lg.getStartY());
+        values[v++] = sizeVal((float) lg.getEndX());
+        values[v++] = sizeVal((float) lg.getEndY());
+        values[v++] = new ParsedValueImpl<CycleMethod,CycleMethod>(lg.getCycleMethod(),null);
+        values[v++] = stopValue(stops[0]);
+        values[v++] = stopValue(stops[1]);
+        return new ParsedValueImpl<ParsedValue[],Paint>(values, PaintConverter.LinearGradientConverter.getInstance());
+    }
+
+    ParsedValue<ParsedValue[],Paint> radialGradientValues(RadialGradient rg) {
+        ParsedValue[] values = new ParsedValue[8];
+        int v = 0;
+        values[v++] = new ParsedValueImpl<Size,Size>(new Size(rg.getFocusAngle(), SizeUnits.PX), null);
+        values[v++] = new ParsedValueImpl<Size,Size>(new Size(rg.getFocusDistance(), SizeUnits.PX), null);
+        values[v++] = sizeVal((float) rg.getCenterX());
+        values[v++] = sizeVal((float) rg.getCenterY());
+        values[v++] = new ParsedValueImpl<Size,Size>(new Size(rg.getRadius(), SizeUnits.PX), null);
+        values[v++] = new ParsedValueImpl<CycleMethod,CycleMethod>(rg.getCycleMethod(),null);
+        values[v++] = stopValue(stops[0]);
+        values[v++] = stopValue(stops[1]);
+        return new ParsedValueImpl<ParsedValue[],Paint>(values, PaintConverter.RadialGradientConverter.getInstance());
+    }
+
+    final ParsedValue[] paintValues = new ParsedValue[] {
+        new ParsedValueImpl<Paint,Paint>(paints[0], null),
+        linearGradientValues((LinearGradient)paints[1]),
+        radialGradientValues((RadialGradient)paints[2])
+    };
+
+    /**
+     * Paint is layered (one value per layer).  &lt;paint&gt; [, &lt;paint&gt;]*.
+     * In the convert function, the ParsedValue is a ParsedValue for each layer.
+     * That is, value.getValue() returns a ParsedValue[].
+     */
+    ParsedValue<ParsedValue<?,Paint>[],Paint[]> getValue(int nLayers) {
+        ParsedValue<Paint,Paint>[] layers = new ParsedValue[nLayers];
+        for (int l=0; l<nLayers; l++) {
+            layers[l] = paintValues[l % paintValues.length];
+        }
+        return new ParsedValueImpl<ParsedValue<?,Paint>[],Paint[]>(layers, PaintConverter.SequenceConverter.getInstance());
+    }
+    /**
+     * Test of convert method, of class PaintType.
+     */
+    @Test
+    public void testConvert() {
+        //System.out.println("convert");
+        int nValues = paints.length;
+        ParsedValue<ParsedValue<?,Paint>[],Paint[]> value = getValue(nValues);
+        Font font = null;
+        Paint[] result = value.convert(font);
+        assertEquals(nValues, result.length);
+        for(int r=0; r<result.length; r++) {
+            Paint expResult = paints[r % paints.length];
+            assertEquals(expResult, result[r]);
+        }
+    }
+
+    String[] css;
+
+    Paint[][] expResults;
+
+    // values for top, right, bottom, left
+    final String[][][] svals = new String[][][] {
+        { {"#ff0000"} },
+        { {"#ff0000"}, {"#00ff00"}, {"#0000ff"}, {"#ffffff"} }
+    };
+
+    public void setup() {
+        css = new String[svals.length];
+        expResults = new Paint[svals.length][];
+        for (int i=0; i<svals.length; i++) {
+            StringBuilder sbuf = new StringBuilder();
+            expResults[i] = new Paint[svals[i].length];
+            for (int j=0; j<svals[i].length; j++) {
+                for (int k=0; k<svals[i][j].length; k++) {
+                    expResults[i][j] = Color.web(svals[i][j][k]);
+                    sbuf.append(svals[i][j][k]);
+                    if (k+1 < svals[i][j].length) sbuf.append(' ');
+                }
+
+                if (j+1 < svals[i].length) sbuf.append(", ");
+            }
+            css[i] = sbuf.toString();
+        }
+    }
+
+    @Test
+    public void testPaintTypeWithCSS() {
+        setup();
+
+        for (int i=0; i<css.length; i++) {
+
+            Stylesheet stylesheet =
+                new CssParser().parse("* { -fx-border-color: " + css[i] + "; }");
+
+            ParsedValue value = TypeTest.getValueFor(stylesheet, "-fx-border-color");
+
+            Paint[][] paints = (Paint[][])value.convert(Font.getDefault());
+
+            //assertEquals(expResults[i].length,paints.length);
+
+            for(int j=0; j<paints.length; j++) {
+                String msg = Integer.toString(i) + "." + Integer.toString(j);
+                assertEquals(msg, expResults[i][j], paints[j][0]);
+            }
+        }
+
+    }
+
+    @Test
+    public void testParseRadialGradient() {
+
+        // <radial-gradient> = radial-gradient(
+        //        [ focus-angle <angle>, ]?
+        //        [ focus-distance <percentage>, ]?
+        //        [ center <point>, ]?
+        //        radius <length>,
+        //        [ [ repeat | reflect ] ,]?
+        //        <color-stop>[, <color-stop>]+ )
+        ParsedValue value = new CssParser().parseExpr("-fx-background-color",
+                "radial-gradient(focus-angle 90deg, focus-distance 50%, radius 50, red, green, blue)");
+        RadialGradient result = (RadialGradient)((Paint[])value.convert(null))[0];
+        RadialGradient expected = new RadialGradient(90, .5, 0, 0, 50,
+                false, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0,Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "radial-gradient(focus-angle 1.5708rad, focus-distance 50%, radius 50, red, green, blue)");
+        result = (RadialGradient)((Paint[])value.convert(null))[0];
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "radial-gradient(center 0% 10%, radius 50%, reflect, red, green, blue)");
+        result = (RadialGradient)((Paint[])value.convert(null))[0];
+        expected = new RadialGradient(0, 0, 0, .1, .5,
+                true, CycleMethod.REFLECT,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0,Color.BLUE));
+        assertEquals(expected,result);
+    }
+
+    @Test
+    public void testParseLinearGradient() {
+
+        // <linear-gradient> = linear-gradient(
+        //        [ [from <point> to <point>] | [ to <side-or-corner> ] ] ,]? [ [ repeat | reflect ] ,]?
+        //        <color-stop>[, <color-stop>]+
+        // )
+        //
+        ParsedValue value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to top, red, green, blue)");
+        LinearGradient result = (LinearGradient)((Paint[])value.convert(null))[0];
+        LinearGradient expected = new LinearGradient(0, 1, 0, 0,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to bottom, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(0, 0, 0, 1,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to left, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(1, 0, 0, 0,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to right, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(0, 0, 1, 0,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to bottom left, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(1, 0, 0, 1,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to bottom right, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(0, 0, 1, 1,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to top left, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(1, 1, 0, 0,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(to top right, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(0, 1, 1, 0,
+                true, CycleMethod.NO_CYCLE,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+
+        value = new CssParser().parseExpr("-fx-background-color",
+                "linear-gradient(from 10% 10% to 90% 90%, reflect, red, green, blue)");
+        result = (LinearGradient)((Paint[])value.convert(null))[0];
+        expected = new LinearGradient(.1, .1, .9, .9,
+                true, CycleMethod.REFLECT,
+                new Stop(0, Color.RED),
+                new Stop(.5, Color.GREEN),
+                new Stop(1.0, Color.BLUE));
+        assertEquals(expected,result);
+  }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/ParsedValueTest.java	2015-09-03 15:36:40.147835800 -0700
+++ /dev/null	2015-09-03 15:36:41.000000000 -0700
@@ -1,571 +0,0 @@
-/*
- * Copyright (c) 2010, 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.css;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.css.parser.CSSParser;
-import javafx.scene.text.Font;
-
-import org.junit.Test;
-
-import com.sun.javafx.css.converters.SizeConverter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import javafx.css.ParsedValue;
-
-public class ParsedValueTest {
-
-    public ParsedValueTest() {
-    }
-
-    /**
-     * Test of getValue method, of class ParsedValue.
-     */
-    @Test
-    public void testGetValue() {
-        //System.out.println("getValue");
-        ParsedValue<Size,Size> instance =
-                new ParsedValueImpl<Size,Size>(new Size(100.0, SizeUnits.PERCENT), null);
-        Size expResult = new Size(100.0, SizeUnits.PERCENT);;
-        Size result = instance.getValue();
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of convert method, of class ParsedValue.
-     */
-    @Test
-    public void testConvert() {
-        ///System.out.println("convert");
-        Font font = Font.getDefault();
-        Size size = new Size(1.0, SizeUnits.EM);
-        ParsedValue<ParsedValue<?,Size>,Number> value =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                SizeConverter.getInstance());
-
-        double expResult = font.getSize();
-        double result = value.convert(font).doubleValue();
-        assertEquals(expResult, result, 0.01);
-    }
-
-    @Test
-    public void testEquals() {
-
-        Font font = Font.getDefault();
-        Size size = new Size(1.0, SizeUnits.EM);
-        ParsedValue<ParsedValue<?,Size>,Number> value1 =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                SizeConverter.getInstance());
-
-        ParsedValue<ParsedValue<?,Size>,Number> value2 =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                null);
-
-        // ParsedValue.equals doesn't care about the converter
-        assertTrue(value1.equals(value2));
-
-        value1 =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                SizeConverter.getInstance());
-
-        value2 =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null),
-                SizeConverter.getInstance());
-
-        assertFalse(value1.equals(value2));
-
-        value2 =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.PX), null),
-                SizeConverter.getInstance());
-
-        assertFalse(value1.equals(value2));
-
-        value2 =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(null, null);
-
-        assertFalse(value1.equals(value2));
-
-        ParsedValue<ParsedValue[],Number[]> value3 =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        assertFalse(value1.equals(value3));
-        assertFalse(value3.equals(value1));
-
-        ParsedValue<ParsedValue[],Number[]> value4 =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        assertTrue(value3.equals(value4));
-
-        value4 =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null),
-                        null
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        assertFalse(value3.equals(value4));
-
-        value4 =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null),
-                        new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null)
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        assertFalse(value3.equals(value4));
-
-        value4 =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        null
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        assertFalse(value3.equals(value4));
-
-        value4 =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    null,
-                    SizeConverter.SequenceConverter.getInstance()
-                );
-
-        assertFalse(value3.equals(value4));
-
-        ParsedValue<ParsedValue[][],Number[][]> value5 =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
-                        }
-                    }, null
-                );
-
-        assertFalse(value1.equals(value5));
-        assertFalse(value3.equals(value5));
-        assertFalse(value5.equals(value1));
-        assertFalse(value5.equals(value3));
-
-        ParsedValue<ParsedValue[][],Number[][]> value6 =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
-                        }
-                    }, null
-                );
-
-        assertTrue(value5.equals(value6));
-
-        value6 =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(5.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
-                        }
-                    }, null
-                );
-
-        assertFalse(value5.equals(value6));
-
-        value6 =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            null
-                        }
-                    }, null
-                );
-
-        assertFalse(value5.equals(value6));
-
-        value6 =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        null
-                    }, null
-                );
-
-        assertFalse(value5.equals(value6));
-
-
-    }
-
-    @Test
-    public void test_RT_24614() {
-
-        ParsedValue<String,String> value1 =
-                new ParsedValueImpl<>("FOO", null);
-
-        ParsedValue<String,String> value2 =
-                new ParsedValueImpl<>("FOO", null);
-
-        assertTrue(value1.equals(value2));
-
-        value1 =
-                new ParsedValueImpl<>("FOO", null);
-
-        value2 =
-                new ParsedValueImpl<>("foo", null);
-
-        assertTrue(value1.equals(value2));
-
-        ParsedValueImpl<ParsedValue<?,Size>,Number> value3 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.PX), null),
-                        SizeConverter.getInstance());
-
-        value1 =
-                new ParsedValueImpl<>("FOO", null);
-
-        assertFalse(value1.equals(value3));
-        assertFalse(value3.equals(value1));
-
-        ParsedValue<ParsedValue[],String[]> value4 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[] {
-                                new ParsedValueImpl<String,String>("FOO", null),
-                                new ParsedValueImpl<String,String>("BAR", null)
-                        }, null
-                );
-
-        ParsedValue<ParsedValue[],String[]> value5 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[] {
-                                new ParsedValueImpl<String,String>("foo", null),
-                                new ParsedValueImpl<String,String>("bar", null)
-                        }, null
-                );
-        assertTrue(value4.equals(value5));
-        assertTrue(value5.equals(value4));
-
-        value4 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[] {
-                                new ParsedValueImpl<String,String>("FOO", null),
-                                new ParsedValueImpl<String,String>("BAR", null)
-                        }, null
-                );
-
-        value5 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[] {
-                                new ParsedValueImpl<String,String>("foo", null),
-                                new ParsedValueImpl<String,String>("foo", null)
-                        }, null
-                );
-        assertFalse(value4.equals(value5));
-        assertFalse(value5.equals(value4));
-
-        ParsedValue<ParsedValue[][],String[][]> value6 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[][] {
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("foo", null),
-                                        new ParsedValueImpl<String,String>("bar", null)
-                                },
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("FOO", null),
-                                        new ParsedValueImpl<String,String>("BAR", null)
-                                }
-                        }, null
-                );
-
-        ParsedValue<ParsedValue[][],String[][]> value7 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[][] {
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("FOO", null),
-                                        new ParsedValueImpl<String,String>("BAR", null)
-                                },
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("foo", null),
-                                        new ParsedValueImpl<String,String>("bar", null)
-                                }
-                        }, null
-                );
-
-        assertTrue(value6.equals(value7));
-        assertTrue(value7.equals(value6));
-
-        value6 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[][] {
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("foo", null),
-                                        new ParsedValueImpl<String,String>("bar", null)
-                                },
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("FOO", null),
-                                        new ParsedValueImpl<String,String>("BAR", null)
-                                }
-                        }, null
-                );
-
-        value7 =
-                new ParsedValueImpl<>(
-                        new ParsedValueImpl[][] {
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("FOO", null),
-                                        new ParsedValueImpl<String,String>("BAR", null)
-                                },
-                                new ParsedValueImpl[] {
-                                        new ParsedValueImpl<String,String>("foo", null),
-                                        new ParsedValueImpl<String,String>("foo", null)
-                                }
-                        }, null
-                );
-
-        assertFalse(value6.equals(value7));
-        assertFalse(value7.equals(value6));
-    }
-    
-    private void writeBinary(ParsedValueImpl parsedValue) {
-
-        try {
-            StringStore stringStore = new StringStore();
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DataOutputStream dos = new DataOutputStream(baos);
-            parsedValue.writeBinary(dos, stringStore);
-            dos.close();
-        } catch (IOException ioe) {
-            org.junit.Assert.fail(parsedValue.toString());
-        }
-        
-    }
-    
-    /**
-     * Test of writeBinary method, of class ParsedValueImpl.
-     */
-    @Test
-    public void testWriteReadBinary() throws Exception {
-        Font font = Font.getDefault();
-        Size size = new Size(1.0, SizeUnits.EM);
-        
-        ParsedValueImpl parsedValue =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                SizeConverter.getInstance());
-
-        writeBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        writeBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
-                        }
-                    }, null
-                );
-
-        writeBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            null
-                        }
-                    }, null
-                );
-
-        writeBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        null
-                    }, null
-                );
-
-        writeBinary(parsedValue);
-        
-    }
-
-    private void writeAndReadBinary(ParsedValueImpl<?,?> parsedValue) {
-
-        try {
-            StringStore stringStore = new StringStore();
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DataOutputStream dos = new DataOutputStream(baos);
-            parsedValue.writeBinary(dos, stringStore);
-            dos.close();
-            String[] strings = stringStore.strings.toArray(new String[]{});
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            DataInputStream dis = new DataInputStream(bais);
-            ParsedValue<?,?> pv = ParsedValueImpl.readBinary(Stylesheet.BINARY_CSS_VERSION, dis, strings);
-            org.junit.Assert.assertEquals(parsedValue, pv);
-        } catch (IOException ioe) {
-            System.err.println(ioe);
-            org.junit.Assert.fail(parsedValue.toString());
-        }
-        
-    }    
-    /**
-     * Test of readBinary method, of class ParsedValueImpl.
-     */
-    @Test
-    public void testReadBinary() throws Exception {
-        Font font = Font.getDefault();
-        Size size = new Size(1.0, SizeUnits.EM);
-        
-        ParsedValueImpl parsedValue =
-            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
-                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                SizeConverter.getInstance());
-
-        writeAndReadBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[],Number[]>(
-                    new ParsedValueImpl[] {
-                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                    }, SizeConverter.SequenceConverter.getInstance()
-                );
-
-        writeAndReadBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
-                        }
-                    }, null
-                );
-
-        writeAndReadBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
-                            null
-                        }
-                    }, null
-                );
-
-        writeAndReadBinary(parsedValue);
-        
-        parsedValue =
-                new ParsedValueImpl<ParsedValue[][],Number[][]>(
-                    new ParsedValueImpl[][] {
-                        new ParsedValueImpl[] {
-                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
-                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
-                        },
-                        null
-                    }, null
-                );
-
-        writeAndReadBinary(parsedValue);
-    }
-}
--- /dev/null	2015-09-03 15:36:41.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/ParsedValueTest.java	2015-09-03 15:36:39.437795200 -0700
@@ -0,0 +1,571 @@
+/*
+ * Copyright (c) 2010, 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.css;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import com.sun.javafx.css.ParsedValueImpl;
+import javafx.css.StyleConverter.StringStore;
+import javafx.css.converter.SizeConverter;
+
+import javafx.scene.text.Font;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public class ParsedValueTest {
+
+    public ParsedValueTest() {
+    }
+
+    /**
+     * Test of getValue method, of class ParsedValue.
+     */
+    @Test
+    public void testGetValue() {
+        //System.out.println("getValue");
+        ParsedValue<Size,Size> instance =
+                new ParsedValueImpl<Size,Size>(new Size(100.0, SizeUnits.PERCENT), null);
+        Size expResult = new Size(100.0, SizeUnits.PERCENT);;
+        Size result = instance.getValue();
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of convert method, of class ParsedValue.
+     */
+    @Test
+    public void testConvert() {
+        ///System.out.println("convert");
+        Font font = Font.getDefault();
+        Size size = new Size(1.0, SizeUnits.EM);
+        ParsedValue<ParsedValue<?,Size>,Number> value =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                SizeConverter.getInstance());
+
+        double expResult = font.getSize();
+        double result = value.convert(font).doubleValue();
+        assertEquals(expResult, result, 0.01);
+    }
+
+    @Test
+    public void testEquals() {
+
+        Font font = Font.getDefault();
+        Size size = new Size(1.0, SizeUnits.EM);
+        ParsedValue<ParsedValue<?,Size>,Number> value1 =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                SizeConverter.getInstance());
+
+        ParsedValue<ParsedValue<?,Size>,Number> value2 =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                null);
+
+        // ParsedValue.equals doesn't care about the converter
+        assertTrue(value1.equals(value2));
+
+        value1 =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                SizeConverter.getInstance());
+
+        value2 =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null),
+                SizeConverter.getInstance());
+
+        assertFalse(value1.equals(value2));
+
+        value2 =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.PX), null),
+                SizeConverter.getInstance());
+
+        assertFalse(value1.equals(value2));
+
+        value2 =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(null, null);
+
+        assertFalse(value1.equals(value2));
+
+        ParsedValue<ParsedValue[],Number[]> value3 =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        assertFalse(value1.equals(value3));
+        assertFalse(value3.equals(value1));
+
+        ParsedValue<ParsedValue[],Number[]> value4 =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        assertTrue(value3.equals(value4));
+
+        value4 =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null),
+                        null
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        assertFalse(value3.equals(value4));
+
+        value4 =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null),
+                        new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null)
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        assertFalse(value3.equals(value4));
+
+        value4 =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        null
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        assertFalse(value3.equals(value4));
+
+        value4 =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    null,
+                    SizeConverter.SequenceConverter.getInstance()
+                );
+
+        assertFalse(value3.equals(value4));
+
+        ParsedValue<ParsedValue[][],Number[][]> value5 =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
+                        }
+                    }, null
+                );
+
+        assertFalse(value1.equals(value5));
+        assertFalse(value3.equals(value5));
+        assertFalse(value5.equals(value1));
+        assertFalse(value5.equals(value3));
+
+        ParsedValue<ParsedValue[][],Number[][]> value6 =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
+                        }
+                    }, null
+                );
+
+        assertTrue(value5.equals(value6));
+
+        value6 =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(5.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
+                        }
+                    }, null
+                );
+
+        assertFalse(value5.equals(value6));
+
+        value6 =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            null
+                        }
+                    }, null
+                );
+
+        assertFalse(value5.equals(value6));
+
+        value6 =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        null
+                    }, null
+                );
+
+        assertFalse(value5.equals(value6));
+
+
+    }
+
+    @Test
+    public void test_RT_24614() {
+
+        ParsedValue<String,String> value1 =
+                new ParsedValueImpl<>("FOO", null);
+
+        ParsedValue<String,String> value2 =
+                new ParsedValueImpl<>("FOO", null);
+
+        assertTrue(value1.equals(value2));
+
+        value1 =
+                new ParsedValueImpl<>("FOO", null);
+
+        value2 =
+                new ParsedValueImpl<>("foo", null);
+
+        assertTrue(value1.equals(value2));
+
+        ParsedValueImpl<ParsedValue<?,Size>,Number> value3 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.PX), null),
+                        SizeConverter.getInstance());
+
+        value1 =
+                new ParsedValueImpl<>("FOO", null);
+
+        assertFalse(value1.equals(value3));
+        assertFalse(value3.equals(value1));
+
+        ParsedValue<ParsedValue[],String[]> value4 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[] {
+                                new ParsedValueImpl<String,String>("FOO", null),
+                                new ParsedValueImpl<String,String>("BAR", null)
+                        }, null
+                );
+
+        ParsedValue<ParsedValue[],String[]> value5 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[] {
+                                new ParsedValueImpl<String,String>("foo", null),
+                                new ParsedValueImpl<String,String>("bar", null)
+                        }, null
+                );
+        assertTrue(value4.equals(value5));
+        assertTrue(value5.equals(value4));
+
+        value4 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[] {
+                                new ParsedValueImpl<String,String>("FOO", null),
+                                new ParsedValueImpl<String,String>("BAR", null)
+                        }, null
+                );
+
+        value5 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[] {
+                                new ParsedValueImpl<String,String>("foo", null),
+                                new ParsedValueImpl<String,String>("foo", null)
+                        }, null
+                );
+        assertFalse(value4.equals(value5));
+        assertFalse(value5.equals(value4));
+
+        ParsedValue<ParsedValue[][],String[][]> value6 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[][] {
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("foo", null),
+                                        new ParsedValueImpl<String,String>("bar", null)
+                                },
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("FOO", null),
+                                        new ParsedValueImpl<String,String>("BAR", null)
+                                }
+                        }, null
+                );
+
+        ParsedValue<ParsedValue[][],String[][]> value7 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[][] {
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("FOO", null),
+                                        new ParsedValueImpl<String,String>("BAR", null)
+                                },
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("foo", null),
+                                        new ParsedValueImpl<String,String>("bar", null)
+                                }
+                        }, null
+                );
+
+        assertTrue(value6.equals(value7));
+        assertTrue(value7.equals(value6));
+
+        value6 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[][] {
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("foo", null),
+                                        new ParsedValueImpl<String,String>("bar", null)
+                                },
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("FOO", null),
+                                        new ParsedValueImpl<String,String>("BAR", null)
+                                }
+                        }, null
+                );
+
+        value7 =
+                new ParsedValueImpl<>(
+                        new ParsedValueImpl[][] {
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("FOO", null),
+                                        new ParsedValueImpl<String,String>("BAR", null)
+                                },
+                                new ParsedValueImpl[] {
+                                        new ParsedValueImpl<String,String>("foo", null),
+                                        new ParsedValueImpl<String,String>("foo", null)
+                                }
+                        }, null
+                );
+
+        assertFalse(value6.equals(value7));
+        assertFalse(value7.equals(value6));
+    }
+    
+    private void writeBinary(ParsedValueImpl parsedValue) {
+
+        try {
+            StringStore stringStore = new StringStore();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DataOutputStream dos = new DataOutputStream(baos);
+            parsedValue.writeBinary(dos, stringStore);
+            dos.close();
+        } catch (IOException ioe) {
+            org.junit.Assert.fail(parsedValue.toString());
+        }
+        
+    }
+    
+    /**
+     * Test of writeBinary method, of class ParsedValueImpl.
+     */
+    @Test
+    public void testWriteReadBinary() throws Exception {
+        Font font = Font.getDefault();
+        Size size = new Size(1.0, SizeUnits.EM);
+        
+        ParsedValueImpl parsedValue =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                SizeConverter.getInstance());
+
+        writeBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        writeBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
+                        }
+                    }, null
+                );
+
+        writeBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            null
+                        }
+                    }, null
+                );
+
+        writeBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        null
+                    }, null
+                );
+
+        writeBinary(parsedValue);
+        
+    }
+
+    private void writeAndReadBinary(ParsedValueImpl<?,?> parsedValue) {
+
+        try {
+            StringStore stringStore = new StringStore();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DataOutputStream dos = new DataOutputStream(baos);
+            parsedValue.writeBinary(dos, stringStore);
+            dos.close();
+            String[] strings = stringStore.strings.toArray(new String[]{});
+            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            DataInputStream dis = new DataInputStream(bais);
+            ParsedValue<?,?> pv = ParsedValueImpl.readBinary(Stylesheet.BINARY_CSS_VERSION, dis, strings);
+            org.junit.Assert.assertEquals(parsedValue, pv);
+        } catch (IOException ioe) {
+            System.err.println(ioe);
+            org.junit.Assert.fail(parsedValue.toString());
+        }
+        
+    }    
+    /**
+     * Test of readBinary method, of class ParsedValueImpl.
+     */
+    @Test
+    public void testReadBinary() throws Exception {
+        Font font = Font.getDefault();
+        Size size = new Size(1.0, SizeUnits.EM);
+        
+        ParsedValueImpl parsedValue =
+            new ParsedValueImpl<ParsedValue<?,Size>,Number>(
+                new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                SizeConverter.getInstance());
+
+        writeAndReadBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[],Number[]>(
+                    new ParsedValueImpl[] {
+                        new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                        new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                    }, SizeConverter.SequenceConverter.getInstance()
+                );
+
+        writeAndReadBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(4.0, SizeUnits.EM), null)
+                        }
+                    }, null
+                );
+
+        writeAndReadBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(3.0, SizeUnits.EM), null),
+                            null
+                        }
+                    }, null
+                );
+
+        writeAndReadBinary(parsedValue);
+        
+        parsedValue =
+                new ParsedValueImpl<ParsedValue[][],Number[][]>(
+                    new ParsedValueImpl[][] {
+                        new ParsedValueImpl[] {
+                            new ParsedValueImpl<Size,Size>(new Size(1.0, SizeUnits.EM), null),
+                            new ParsedValueImpl<Size,Size>(new Size(2.0, SizeUnits.EM), null)
+                        },
+                        null
+                    }, null
+                );
+
+        writeAndReadBinary(parsedValue);
+    }
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/RuleTest.java	2015-09-03 15:36:48.256299600 -0700
+++ /dev/null	2015-09-03 15:36:49.000000000 -0700
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2012, 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.StyleOrigin;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javafx.scene.Node;
-import org.junit.AfterClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-
-public class RuleTest {
-    
-    public RuleTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
-    }
-
-    @AfterClass
-    public static void tearDownClass() throws Exception {
-    }
-
-    @Test
-    public void testGetUnobservedSelectorList() {
-        List<Selector> expResult = new ArrayList<Selector>();
-        expResult.add(Selector.createSelector("One.two#three"));
-        expResult.add(Selector.createSelector("Four.five#six"));
-        Rule instance = new Rule(expResult, Collections.EMPTY_LIST);
-        List result = instance.getUnobservedSelectorList();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetUnobservedDeclarationList() {
-        List<Declaration> expResult = new ArrayList<Declaration>();
-        expResult.add(new Declaration("one", new ParsedValueImpl<String,String>("one", null), false));
-        expResult.add(new Declaration("two", new ParsedValueImpl<String,String>("two", null), false));
-        expResult.add(new Declaration("three", new ParsedValueImpl<String,String>("three", null), false));
-        Rule instance = new Rule(Collections.EMPTY_LIST, expResult);
-        List result = instance.getUnobservedDeclarationList();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetSelectors() {
-        List<Selector> expResult = new ArrayList<Selector>();
-        expResult.add(Selector.createSelector("One.two#three"));
-        expResult.add(Selector.createSelector("Four.five#six"));
-        Rule instance = new Rule(expResult, Collections.EMPTY_LIST);
-        List result = instance.getSelectors();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetDeclarations() {
-        List<Declaration> expResult = new ArrayList<Declaration>();
-        expResult.add(new Declaration("one", new ParsedValueImpl<String,String>("one", null), false));
-        expResult.add(new Declaration("two", new ParsedValueImpl<String,String>("two", null), false));
-        expResult.add(new Declaration("three", new ParsedValueImpl<String,String>("three", null), false));
-        Rule instance = new Rule(Collections.EMPTY_LIST, expResult);
-        List result = instance.getDeclarations();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetStylesheet() {
-        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet expResult = new Stylesheet();
-        expResult.getRules().add(instance);
-        Stylesheet result = instance.getStylesheet();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetOriginAfterSettingOriginAfterAddingRuleToStylesheet() {
-        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet stylesheet = new Stylesheet();
-        stylesheet.getRules().add(instance);
-        stylesheet.setOrigin(StyleOrigin.INLINE);
-        StyleOrigin expResult = StyleOrigin.INLINE;
-        StyleOrigin result = instance.getOrigin();
-        assertEquals(expResult, result);
-    }
-
-    @Test
-    public void testGetOriginAfterSettingOriginBeforeAddingRuleToStylesheet() {
-        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet stylesheet = new Stylesheet();
-        stylesheet.setOrigin(StyleOrigin.INLINE);
-        stylesheet.getRules().add(instance);
-        StyleOrigin expResult = StyleOrigin.INLINE;
-        StyleOrigin result = instance.getOrigin();
-        assertEquals(expResult, result);
-    }
-    
-    @Test
-    public void testGetOriginWithoutAddingRuleToStylesheet() {
-        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        StyleOrigin result = instance.getOrigin();
-        assertNull(result);
-    }
-
-    @Test
-    public void testGetOriginAfterRemovingRuleFromStylesheet() {
-        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet stylesheet = new Stylesheet();
-        stylesheet.getRules().add(instance);
-        stylesheet.setOrigin(StyleOrigin.INLINE);
-        stylesheet.getRules().remove(instance);        
-        StyleOrigin result = instance.getOrigin();
-        assertNull(result);
-    }
-
-    @Ignore @Test
-    public void testApplies() {
-        System.out.println("applies");
-        Node node = null;
-        Rule instance = null;
-        long expResult = 0l;
-        long result = instance.applies(node, null);
-        assertEquals(expResult, result);
-        fail("The test case is a prototype.");
-    }
-
-    @Ignore @Test
-    public void testToString() {
-        System.out.println("toString");
-        Rule instance = null;
-        String expResult = "";
-        String result = instance.toString();
-        assertEquals(expResult, result);
-        fail("The test case is a prototype.");
-    }
-
-    @Ignore @Test
-    public void testWriteBinary() throws Exception {
-        System.out.println("writeBinary");
-        DataOutputStream os = null;
-        StringStore stringStore = null;
-        Rule instance = null;
-        instance.writeBinary(os, stringStore);
-        fail("The test case is a prototype.");
-    }
-
-    @Ignore @Test
-    public void testReadBinary() throws Exception {
-        System.out.println("readBinary");
-        DataInputStream is = null;
-        String[] strings = null;
-        Rule expResult = null;
-        Rule result = Rule.readBinary(Stylesheet.BINARY_CSS_VERSION, is, strings);
-        assertEquals(expResult, result);
-        fail("The test case is a prototype.");
-    }
-}
--- /dev/null	2015-09-03 15:36:49.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/RuleTest.java	2015-09-03 15:36:47.481255300 -0700
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2012, 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.css;
+
+import com.sun.javafx.css.ParsedValueImpl;
+import javafx.css.StyleConverter.StringStore;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javafx.scene.Node;
+import org.junit.AfterClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+
+
+public class RuleTest {
+    
+    public RuleTest() {
+    }
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+    }
+
+    @Test
+    public void testGetUnobservedSelectorList() {
+        List<Selector> expResult = new ArrayList<Selector>();
+        expResult.add(Selector.createSelector("One.two#three"));
+        expResult.add(Selector.createSelector("Four.five#six"));
+        Rule instance = new Rule(expResult, Collections.EMPTY_LIST);
+        List result = instance.getUnobservedSelectorList();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetUnobservedDeclarationList() {
+        List<Declaration> expResult = new ArrayList<Declaration>();
+        expResult.add(new Declaration("one", new ParsedValueImpl<String,String>("one", null), false));
+        expResult.add(new Declaration("two", new ParsedValueImpl<String,String>("two", null), false));
+        expResult.add(new Declaration("three", new ParsedValueImpl<String,String>("three", null), false));
+        Rule instance = new Rule(Collections.EMPTY_LIST, expResult);
+        List result = instance.getUnobservedDeclarationList();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetSelectors() {
+        List<Selector> expResult = new ArrayList<Selector>();
+        expResult.add(Selector.createSelector("One.two#three"));
+        expResult.add(Selector.createSelector("Four.five#six"));
+        Rule instance = new Rule(expResult, Collections.EMPTY_LIST);
+        List result = instance.getSelectors();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetDeclarations() {
+        List<Declaration> expResult = new ArrayList<Declaration>();
+        expResult.add(new Declaration("one", new ParsedValueImpl<String,String>("one", null), false));
+        expResult.add(new Declaration("two", new ParsedValueImpl<String,String>("two", null), false));
+        expResult.add(new Declaration("three", new ParsedValueImpl<String,String>("three", null), false));
+        Rule instance = new Rule(Collections.EMPTY_LIST, expResult);
+        List result = instance.getDeclarations();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetStylesheet() {
+        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet expResult = new Stylesheet();
+        expResult.getRules().add(instance);
+        Stylesheet result = instance.getStylesheet();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetOriginAfterSettingOriginAfterAddingRuleToStylesheet() {
+        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet stylesheet = new Stylesheet();
+        stylesheet.getRules().add(instance);
+        stylesheet.setOrigin(StyleOrigin.INLINE);
+        StyleOrigin expResult = StyleOrigin.INLINE;
+        StyleOrigin result = instance.getOrigin();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetOriginAfterSettingOriginBeforeAddingRuleToStylesheet() {
+        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet stylesheet = new Stylesheet();
+        stylesheet.setOrigin(StyleOrigin.INLINE);
+        stylesheet.getRules().add(instance);
+        StyleOrigin expResult = StyleOrigin.INLINE;
+        StyleOrigin result = instance.getOrigin();
+        assertEquals(expResult, result);
+    }
+    
+    @Test
+    public void testGetOriginWithoutAddingRuleToStylesheet() {
+        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        StyleOrigin result = instance.getOrigin();
+        assertNull(result);
+    }
+
+    @Test
+    public void testGetOriginAfterRemovingRuleFromStylesheet() {
+        Rule instance = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet stylesheet = new Stylesheet();
+        stylesheet.getRules().add(instance);
+        stylesheet.setOrigin(StyleOrigin.INLINE);
+        stylesheet.getRules().remove(instance);        
+        StyleOrigin result = instance.getOrigin();
+        assertNull(result);
+    }
+
+    @Ignore @Test
+    public void testApplies() {
+        System.out.println("applies");
+        Node node = null;
+        Rule instance = null;
+        long expResult = 0l;
+        long result = instance.applies(node, null);
+        assertEquals(expResult, result);
+        fail("The test case is a prototype.");
+    }
+
+    @Ignore @Test
+    public void testToString() {
+        System.out.println("toString");
+        Rule instance = null;
+        String expResult = "";
+        String result = instance.toString();
+        assertEquals(expResult, result);
+        fail("The test case is a prototype.");
+    }
+
+    @Ignore @Test
+    public void testWriteBinary() throws Exception {
+        System.out.println("writeBinary");
+        DataOutputStream os = null;
+        StringStore stringStore = null;
+        Rule instance = null;
+        instance.writeBinary(os, stringStore);
+        fail("The test case is a prototype.");
+    }
+
+    @Ignore @Test
+    public void testReadBinary() throws Exception {
+        System.out.println("readBinary");
+        DataInputStream is = null;
+        String[] strings = null;
+        Rule expResult = null;
+        Rule result = Rule.readBinary(Stylesheet.BINARY_CSS_VERSION, is, strings);
+        assertEquals(expResult, result);
+        fail("The test case is a prototype.");
+    }
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/SelectorPartitioningTest.java	2015-09-03 15:36:56.388764800 -0700
+++ /dev/null	2015-09-03 15:36:57.000000000 -0700
@@ -1,243 +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.css;
-
-import com.sun.javafx.css.parser.CSSParser;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import javafx.scene.paint.Color;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class SelectorPartitioningTest {
-    
-    public SelectorPartitioningTest(final Data data) {
-        this.data = data;
-        this.instance = new SelectorPartitioning();
-    }
-    private final Data data;
-    private final SelectorPartitioning instance;
-
-    private static class Data {
-        final Color  color;
-        final String stylesheetText;
-        
-        Data(Color color, String stylesheetText) {
-            this.color = color;
-            this.stylesheetText = stylesheetText;
-        }
-        
-    }
-    
-    private static class SimpleData extends Data {
-        
-        final SimpleSelector selector;
-        final boolean matches;
-        
-        SimpleData(String type, String styleClass, String id, Color color) {
-            this(type, styleClass, id, color, true);
-        }
-        SimpleData(String type, String styleClass, String id, Color color, boolean matches) {
-            super(color, (new StringBuilder()
-                    .append((type != null ? type : "*"))
-                    .append((styleClass != null ? ".".concat(styleClass) : ""))
-                    .append((id != null ? "#".concat(id) : ""))
-                    .append("{-fx-fill: rgb(")
-                    .append(Double.valueOf(color.getRed()*255).intValue()).append(",")
-                    .append(Double.valueOf(color.getGreen()*255).intValue()).append(",")
-                    .append(Double.valueOf(color.getBlue()*255).intValue()).append(");}")
-                ).toString());
-            List<String> styleClasses = 
-                styleClass != null ? Arrays.asList(styleClass.split("\\.")) : null;
-            this.selector = 
-                new SimpleSelector(type, styleClasses, null, id);            
-            this.matches = matches;
-        }
-    }
-    
-    private static class ComplexData extends Data {
-
-        final SimpleData[] data;
-        final SimpleSelector selector;
-        final int matches;
-        
-        ComplexData(SimpleSelector selector, SimpleData... data) {
-            super(Color.TRANSPARENT, combineStylesheets(data));
-            this.data = data;
-            this.selector = selector;
-            int n = 0;
-            for (SimpleData datum : data) {
-                if (datum.matches) n += 1;
-            }
-            this.matches = n;
-        }
-        
-        static String combineStylesheets(Data... data) {
-            StringBuilder buf = new StringBuilder();
-            for (Data datum : data) {
-                buf.append(datum.stylesheetText).append('\n');
-            }
-            return buf.toString();
-        }
-    }
-    
-    
-    @Parameters
-    public static Collection data() {
-
-        int red = 0;
-        int green = 0;
-        int blue = 0;
-        return Arrays.asList(new Object[] {
-            /* selector = * */
-            new Object[] {new SimpleData("*", null, null, Color.rgb(red += 10, 0, 0))},
-            /* selector = A */
-            new Object[] {new SimpleData("A", null, null, Color.rgb(red += 10, 0, 0))},
-            /* selector = * A.b */
-            new Object[] {new SimpleData("A", "b", null, Color.rgb(red += 10, 0, 0))},
-            /* selector = A#c */
-            new Object[] {new SimpleData("A", null, "c", Color.rgb(red += 10, 0, 0))},
-            /* selector = A.b#c */
-            new Object[] {new SimpleData("A", "b", "c", Color.rgb(red += 10, 0, 0))},
-            /* selector = *.b */
-            new Object[] {new SimpleData("*", "b", null, Color.rgb(red += 10, 0, 0))},
-            /* selector = *#c */
-            new Object[] {new SimpleData("*", null, "c", Color.rgb(red += 10, 0, 0))},
-            /* selector = *.b#c */
-            new Object[] {new SimpleData("*", "b", "c", Color.rgb(red += 10, 0, 0))},
-            
-            new Object[] {
-                new ComplexData(
-                    (SimpleSelector)Selector.createSelector("*.b"),
-                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), false),
-                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
-                )},
-            new Object[] {
-                new ComplexData(
-                    (SimpleSelector)Selector.createSelector("*.b.c"),
-                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), true)
-                )},
-            new Object[] {
-                new ComplexData(
-                    (SimpleSelector)Selector.createSelector("A.b"),
-                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("A", "b", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), false),
-                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
-                )},
-            new Object[] {
-                new ComplexData(
-                    (SimpleSelector)Selector.createSelector("A.c"),
-                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), false),
-                    new SimpleData("A", "b", null, Color.rgb(0, green += 10, 0), false),
-                    new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
-                )},
-            new Object[] {
-                new ComplexData(
-                    (SimpleSelector)Selector.createSelector("A.b.c"),
-                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("A", "b", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
-                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), true)
-                )}
-        });
-    }    
-
-    @Test
-    public void testSelectorPartitionAndMatch() {
-
-        Stylesheet stylesheet = 
-                CSSParser.getInstance().parse(data.stylesheetText);
-                
-        for (Rule rule : stylesheet.getRules()) {
-            for (Selector selector : rule.getUnobservedSelectorList()) {
-                instance.partition(selector);
-            }
-        }
-        
-        if (data instanceof SimpleData) {
-            testWithSimpleData((SimpleData)data, stylesheet);            
-        } else {
-            testWithComplexData((ComplexData)data, stylesheet);
-        }
-    }
-    
-    private void testWithSimpleData(SimpleData simpleData, Stylesheet stylesheet) {
-                
-        SimpleSelector simple = simpleData.selector;
-        
-        List<Selector> matched = instance.match(simple.getId(), simple.getName(), simple.getStyleClassSet());
-        
-        assertEquals(1,matched.size());
-        Selector selector = matched.get(0);
-
-        Rule rule = selector.getRule();
-
-        assertEquals(1,rule.getUnobservedDeclarationList().size());
-        Declaration decl = rule.getUnobservedDeclarationList().get(0);
-        
-        assertEquals("-fx-fill", decl.property);
-        
-        Color color = (Color)decl.parsedValue.convert(null);
-        
-        assertEquals(simpleData.selector.toString(), data.color.getRed(), color.getRed(), 0.00001);
-        assertEquals(simpleData.selector.toString(), data.color.getGreen(), color.getGreen(), 0.00001);
-        assertEquals(simpleData.selector.toString(), data.color.getBlue(), color.getBlue(), 0.00001);
-                
-    }
-    
-    private void testWithComplexData(ComplexData complexData, Stylesheet stylesheet) {
-                
-        SimpleSelector simple = complexData.selector;
-        
-        List<Selector> matched = instance.match(simple.getId(), simple.getName(), simple.getStyleClassSet());
-        assertEquals(complexData.matches, matched.size());
-        
-        for(Selector s1 : matched) {
-            for (SimpleData datum : complexData.data) {
-                Selector s2 = datum.selector;
-                if (s1.equals(s2)) {
-                    assertTrue(s1.toString() + " != " + s2.toString(), datum.matches);
-                }
-            }
-        }
-
-    }
-    
-}
--- /dev/null	2015-09-03 15:36:57.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/SelectorPartitioningTest.java	2015-09-03 15:36:55.717726400 -0700
@@ -0,0 +1,244 @@
+/*
+ * 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.css;
+
+import com.sun.javafx.css.SelectorPartitioning;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import javafx.scene.paint.Color;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class SelectorPartitioningTest {
+    
+    public SelectorPartitioningTest(final Data data) {
+        this.data = data;
+        this.instance = new SelectorPartitioning();
+    }
+    private final Data data;
+    private final SelectorPartitioning instance;
+
+    private static class Data {
+        final Color  color;
+        final String stylesheetText;
+        
+        Data(Color color, String stylesheetText) {
+            this.color = color;
+            this.stylesheetText = stylesheetText;
+        }
+        
+    }
+    
+    private static class SimpleData extends Data {
+        
+        final SimpleSelector selector;
+        final boolean matches;
+        
+        SimpleData(String type, String styleClass, String id, Color color) {
+            this(type, styleClass, id, color, true);
+        }
+        SimpleData(String type, String styleClass, String id, Color color, boolean matches) {
+            super(color, (new StringBuilder()
+                    .append((type != null ? type : "*"))
+                    .append((styleClass != null ? ".".concat(styleClass) : ""))
+                    .append((id != null ? "#".concat(id) : ""))
+                    .append("{-fx-fill: rgb(")
+                    .append(Double.valueOf(color.getRed()*255).intValue()).append(",")
+                    .append(Double.valueOf(color.getGreen()*255).intValue()).append(",")
+                    .append(Double.valueOf(color.getBlue()*255).intValue()).append(");}")
+                ).toString());
+            List<String> styleClasses = 
+                styleClass != null ? Arrays.asList(styleClass.split("\\.")) : null;
+            this.selector = 
+                new SimpleSelector(type, styleClasses, null, id);            
+            this.matches = matches;
+        }
+    }
+    
+    private static class ComplexData extends Data {
+
+        final SimpleData[] data;
+        final SimpleSelector selector;
+        final int matches;
+        
+        ComplexData(SimpleSelector selector, SimpleData... data) {
+            super(Color.TRANSPARENT, combineStylesheets(data));
+            this.data = data;
+            this.selector = selector;
+            int n = 0;
+            for (SimpleData datum : data) {
+                if (datum.matches) n += 1;
+            }
+            this.matches = n;
+        }
+        
+        static String combineStylesheets(Data... data) {
+            StringBuilder buf = new StringBuilder();
+            for (Data datum : data) {
+                buf.append(datum.stylesheetText).append('\n');
+            }
+            return buf.toString();
+        }
+    }
+    
+    
+    @Parameters
+    public static Collection data() {
+
+        int red = 0;
+        int green = 0;
+        int blue = 0;
+        return Arrays.asList(new Object[] {
+            /* selector = * */
+            new Object[] {new SimpleData("*", null, null, Color.rgb(red += 10, 0, 0))},
+            /* selector = A */
+            new Object[] {new SimpleData("A", null, null, Color.rgb(red += 10, 0, 0))},
+            /* selector = * A.b */
+            new Object[] {new SimpleData("A", "b", null, Color.rgb(red += 10, 0, 0))},
+            /* selector = A#c */
+            new Object[] {new SimpleData("A", null, "c", Color.rgb(red += 10, 0, 0))},
+            /* selector = A.b#c */
+            new Object[] {new SimpleData("A", "b", "c", Color.rgb(red += 10, 0, 0))},
+            /* selector = *.b */
+            new Object[] {new SimpleData("*", "b", null, Color.rgb(red += 10, 0, 0))},
+            /* selector = *#c */
+            new Object[] {new SimpleData("*", null, "c", Color.rgb(red += 10, 0, 0))},
+            /* selector = *.b#c */
+            new Object[] {new SimpleData("*", "b", "c", Color.rgb(red += 10, 0, 0))},
+            
+            new Object[] {
+                new ComplexData(
+                    (SimpleSelector)Selector.createSelector("*.b"),
+                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), false),
+                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
+                )},
+            new Object[] {
+                new ComplexData(
+                    (SimpleSelector)Selector.createSelector("*.b.c"),
+                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), true)
+                )},
+            new Object[] {
+                new ComplexData(
+                    (SimpleSelector)Selector.createSelector("A.b"),
+                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("A", "b", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), false),
+                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
+                )},
+            new Object[] {
+                new ComplexData(
+                    (SimpleSelector)Selector.createSelector("A.c"),
+                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), false),
+                    new SimpleData("A", "b", null, Color.rgb(0, green += 10, 0), false),
+                    new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), false)
+                )},
+            new Object[] {
+                new ComplexData(
+                    (SimpleSelector)Selector.createSelector("A.b.c"),
+                    new SimpleData("*", "b", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("A", "b", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", null, null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "c", null, Color.rgb(0, green += 10, 0), true),
+                    new SimpleData("*", "b.c", null, Color.rgb(0, green += 10, 0), true)
+                )}
+        });
+    }    
+
+    @Test
+    public void testSelectorPartitionAndMatch() {
+
+        Stylesheet stylesheet = 
+                new CssParser().parse(data.stylesheetText);
+                
+        for (Rule rule : stylesheet.getRules()) {
+            for (Selector selector : rule.getUnobservedSelectorList()) {
+                instance.partition(selector);
+            }
+        }
+        
+        if (data instanceof SimpleData) {
+            testWithSimpleData((SimpleData)data, stylesheet);            
+        } else {
+            testWithComplexData((ComplexData)data, stylesheet);
+        }
+    }
+    
+    private void testWithSimpleData(SimpleData simpleData, Stylesheet stylesheet) {
+                
+        SimpleSelector simple = simpleData.selector;
+        
+        List<Selector> matched = instance.match(simple.getId(), simple.getName(), simple.getStyleClassSet());
+        
+        assertEquals(1,matched.size());
+        Selector selector = matched.get(0);
+
+        Rule rule = selector.getRule();
+
+        assertEquals(1,rule.getUnobservedDeclarationList().size());
+        Declaration decl = rule.getUnobservedDeclarationList().get(0);
+        
+        assertEquals("-fx-fill", decl.property);
+        
+        Color color = (Color)decl.parsedValue.convert(null);
+        
+        assertEquals(simpleData.selector.toString(), data.color.getRed(), color.getRed(), 0.00001);
+        assertEquals(simpleData.selector.toString(), data.color.getGreen(), color.getGreen(), 0.00001);
+        assertEquals(simpleData.selector.toString(), data.color.getBlue(), color.getBlue(), 0.00001);
+                
+    }
+    
+    private void testWithComplexData(ComplexData complexData, Stylesheet stylesheet) {
+                
+        SimpleSelector simple = complexData.selector;
+        
+        List<Selector> matched = instance.match(simple.getId(), simple.getName(), simple.getStyleClassSet());
+        assertEquals(complexData.matches, matched.size());
+        
+        for(Selector s1 : matched) {
+            for (SimpleData datum : complexData.data) {
+                Selector s2 = datum.selector;
+                if (s1.equals(s2)) {
+                    assertTrue(s1.toString() + " != " + s2.toString(), datum.matches);
+                }
+            }
+        }
+
+    }
+    
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/SizeTest.java	2015-09-03 15:37:04.999257300 -0700
+++ /dev/null	2015-09-03 15:37:05.000000000 -0700
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2010, 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.css;
-
-import static org.junit.Assert.assertEquals;
-import javafx.scene.text.Font;
-
-import org.junit.Test;
-
-
-public class SizeTest {
-
-    public SizeTest() {
-    }
-
-    static final private double DOTS_PER_INCH = 96.0;
-    static final private double POINTS_PER_INCH = 72.0;
-
-    /**
-     * Test of points method, of class Size.
-     */
-    @Test
-    public void testPoints() {
-        final Font font = Font.font("Amble", 16);
-        final double pixelSize = font.getSize();
-        final double pointSize = pixelSize * (POINTS_PER_INCH / DOTS_PER_INCH);
-
-        Size instance = new Size(12.0, SizeUnits.PX);
-        double expResult = 12.0  * (POINTS_PER_INCH/DOTS_PER_INCH);
-        double result = instance.points(font);
-        assertEquals("px", expResult, result, 0.01);
-
-        instance = new Size(12.0, SizeUnits.PT);
-        expResult = 12.0; // PT is absolute
-        result = instance.points(font);
-        assertEquals("pt", expResult, result, 0.01);
-
-        instance = new Size(50.0, SizeUnits.PERCENT);
-        expResult = 0.5 * pointSize;
-        result = instance.points(pointSize, font);
-        assertEquals("%", expResult, result, 0.01);
-
-        instance = new Size(2, SizeUnits.EM);
-        expResult = 2 * pointSize;
-        result = instance.points(font);
-        assertEquals("em", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.EX);
-        expResult = 0.5 * pointSize;
-        result = instance.points(font);
-        assertEquals("ex", expResult, result, 0.01);
-
-
-        instance = new Size(1.0, SizeUnits.CM);
-        expResult = POINTS_PER_INCH/2.54; // CM is absolute (pts per inch/cm per inch)
-        result = instance.points(font);
-        assertEquals("cm", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.MM);
-        expResult = POINTS_PER_INCH/25.4; // MM is absolute (pts per inch/mm per inch)
-        result = instance.points(font);
-        assertEquals("mm", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.IN);
-        expResult = POINTS_PER_INCH; // IN is absolute (pts per inch)
-        result = instance.points(font);
-        assertEquals("in", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.PC);
-        expResult = 12.0; // PC is absolute (pts per pica)
-        result = instance.points(font);
-        assertEquals("pc", expResult, result, 0.01);
-
-    }
-
-    /**
-     * Test of pixels method, of class Size.
-     */
-    @Test
-    public void testPixels() {
-        final Font font = Font.font("Amble", 16);
-        final double pixelSize = font.getSize();
-        final double pointSize = pixelSize * (POINTS_PER_INCH / DOTS_PER_INCH);
-
-        Size instance = new Size(12.0, SizeUnits.PX);
-        double expResult = 12.0;
-        double result = instance.pixels(font);
-        assertEquals("px", expResult, result, 0.01);
-
-        instance = new Size(12.0, SizeUnits.PT);
-        expResult = 12.0 * (DOTS_PER_INCH / POINTS_PER_INCH);
-        result = instance.pixels(font);
-        assertEquals("pt", expResult, result, 0.01);
-
-        instance = new Size(50.0, SizeUnits.PERCENT);
-        expResult = .5 * pixelSize;
-        result = instance.pixels(pixelSize, font);
-        assertEquals("%", expResult, result, 0.01);
-
-        instance = new Size(2, SizeUnits.EM);
-        expResult = 2 * pixelSize;
-        result = instance.pixels(font);
-        assertEquals("em", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.EX);
-        expResult = .5 * pixelSize;
-        result = instance.pixels(font);
-        assertEquals("ex", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.CM);
-        // 1 cm / cm per inch
-        expResult = (1/2.54f) * DOTS_PER_INCH;
-        result = instance.pixels(font);
-        assertEquals("cm", expResult, result, 0.01);
-
-        instance = new Size(1.0, SizeUnits.MM);
-        // 1mm / mm per inch
-        expResult = (1/25.4f) * DOTS_PER_INCH;
-        result = instance.pixels(font);
-        assertEquals("mm", expResult, result, 0.01f);
-
-        instance = new Size(1.0, SizeUnits.IN);
-        expResult = DOTS_PER_INCH;
-        result = instance.pixels(font);
-        assertEquals("in", expResult, result, 0.01f);
-
-        instance = new Size(1.0, SizeUnits.PC);
-        // 1pc * 12 pt per pc yields points, then convert points to pixels
-        expResult = (1*12.0) * (DOTS_PER_INCH / POINTS_PER_INCH);
-        result = instance.pixels(1.0, font);
-        assertEquals("pc", expResult, result, 0.01f);
-
-    }
-
-
-    /**
-     * Test of sizes with angle units.
-     */
-    @Test
-    public void testAngles() {
-
-        // 360 degrees = 2pi radians
-        // 90 degrees as radians
-        double expResult = 90;
-
-        Size instance = new Size(0.5*Math.PI, SizeUnits.RAD);
-        double result = instance.pixels();
-        assertEquals("1/2pi rad to deg", expResult, result, 0.01);
-
-        instance = new Size(100, SizeUnits.GRAD);
-        result = instance.pixels();
-        assertEquals("100grad to deg", expResult, result, 0.01);
-
-        instance = new Size(.25, SizeUnits.TURN);
-        result = instance.pixels();
-        assertEquals(".25turn to deg", expResult, result, 0.01);
-    }
-
-    /**
-     * Test of sizes with time units.
-     */
-    @Test
-    public void testTime() {
-
-        double expResult = 90;
-
-        Size instance = new Size(90, SizeUnits.S);
-        double result = instance.pixels();
-        assertEquals("90s", expResult, result, 0.01);
-
-        instance = new Size(90, SizeUnits.MS);
-        result = instance.pixels();
-        assertEquals("90ms", expResult, result, 0.01);
-
-    }
-
-
-    /**
-     * Test of equals method, of class Size.
-     */
-    @Test
-    public void testEquals() {
-        Object o = new Size(2.0, SizeUnits.PX);
-        Size instance = new Size(1.0, SizeUnits.PX);
-        boolean expResult = false;
-        boolean result = instance.equals(o);
-        assertEquals(expResult, result);
-
-        o = new Size(2.0, SizeUnits.PX);
-        instance = new Size(2.0, SizeUnits.PX);
-        expResult = true;
-        result = instance.equals(o);
-        assertEquals(expResult, result);
-
-        o = new Size(2.0, SizeUnits.PT);
-        instance = new Size(2.0, SizeUnits.EM);
-        expResult = false;
-        result = instance.equals(o);
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of getValue method, of class Size.
-     */
-    @Test
-    public void testGetValue() {
-        Size instance = new Size(0.0, SizeUnits.PX);
-        double expResult = 0.0;
-        double result = instance.getValue();
-        assertEquals(expResult, result, 0.0);
-    }
-
-    /**
-     * Test of getUnits method, of class Size.
-     */
-    @Test
-    public void testGetUnits() {
-        Size instance = new Size(0.0, SizeUnits.PX);
-        SizeUnits expResult = SizeUnits.PX;
-        SizeUnits result = instance.getUnits();
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of isAbsolute method, of class Size.
-     */
-    @Test
-    public void testIsAbsolute() {
-        Size instance = new Size(0.0, SizeUnits.EM);
-        boolean expResult = false;
-        boolean result = instance.isAbsolute();
-        assertEquals(expResult, result);
-
-        instance = new Size(0.0, SizeUnits.PX);
-        expResult = true;
-        result = instance.isAbsolute();
-        assertEquals(expResult, result);
-
-    }
-
-}
--- /dev/null	2015-09-03 15:37:06.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/SizeTest.java	2015-09-03 15:37:04.135207800 -0700
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2010, 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.css;
+
+import static org.junit.Assert.assertEquals;
+import javafx.scene.text.Font;
+
+import org.junit.Test;
+
+
+public class SizeTest {
+
+    public SizeTest() {
+    }
+
+    static final private double DOTS_PER_INCH = 96.0;
+    static final private double POINTS_PER_INCH = 72.0;
+
+    /**
+     * Test of points method, of class Size.
+     */
+    @Test
+    public void testPoints() {
+        final Font font = Font.font("Amble", 16);
+        final double pixelSize = font.getSize();
+        final double pointSize = pixelSize * (POINTS_PER_INCH / DOTS_PER_INCH);
+
+        Size instance = new Size(12.0, SizeUnits.PX);
+        double expResult = 12.0  * (POINTS_PER_INCH/DOTS_PER_INCH);
+        double result = instance.points(font);
+        assertEquals("px", expResult, result, 0.01);
+
+        instance = new Size(12.0, SizeUnits.PT);
+        expResult = 12.0; // PT is absolute
+        result = instance.points(font);
+        assertEquals("pt", expResult, result, 0.01);
+
+        instance = new Size(50.0, SizeUnits.PERCENT);
+        expResult = 0.5 * pointSize;
+        result = instance.points(pointSize, font);
+        assertEquals("%", expResult, result, 0.01);
+
+        instance = new Size(2, SizeUnits.EM);
+        expResult = 2 * pointSize;
+        result = instance.points(font);
+        assertEquals("em", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.EX);
+        expResult = 0.5 * pointSize;
+        result = instance.points(font);
+        assertEquals("ex", expResult, result, 0.01);
+
+
+        instance = new Size(1.0, SizeUnits.CM);
+        expResult = POINTS_PER_INCH/2.54; // CM is absolute (pts per inch/cm per inch)
+        result = instance.points(font);
+        assertEquals("cm", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.MM);
+        expResult = POINTS_PER_INCH/25.4; // MM is absolute (pts per inch/mm per inch)
+        result = instance.points(font);
+        assertEquals("mm", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.IN);
+        expResult = POINTS_PER_INCH; // IN is absolute (pts per inch)
+        result = instance.points(font);
+        assertEquals("in", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.PC);
+        expResult = 12.0; // PC is absolute (pts per pica)
+        result = instance.points(font);
+        assertEquals("pc", expResult, result, 0.01);
+
+    }
+
+    /**
+     * Test of pixels method, of class Size.
+     */
+    @Test
+    public void testPixels() {
+        final Font font = Font.font("Amble", 16);
+        final double pixelSize = font.getSize();
+        final double pointSize = pixelSize * (POINTS_PER_INCH / DOTS_PER_INCH);
+
+        Size instance = new Size(12.0, SizeUnits.PX);
+        double expResult = 12.0;
+        double result = instance.pixels(font);
+        assertEquals("px", expResult, result, 0.01);
+
+        instance = new Size(12.0, SizeUnits.PT);
+        expResult = 12.0 * (DOTS_PER_INCH / POINTS_PER_INCH);
+        result = instance.pixels(font);
+        assertEquals("pt", expResult, result, 0.01);
+
+        instance = new Size(50.0, SizeUnits.PERCENT);
+        expResult = .5 * pixelSize;
+        result = instance.pixels(pixelSize, font);
+        assertEquals("%", expResult, result, 0.01);
+
+        instance = new Size(2, SizeUnits.EM);
+        expResult = 2 * pixelSize;
+        result = instance.pixels(font);
+        assertEquals("em", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.EX);
+        expResult = .5 * pixelSize;
+        result = instance.pixels(font);
+        assertEquals("ex", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.CM);
+        // 1 cm / cm per inch
+        expResult = (1/2.54f) * DOTS_PER_INCH;
+        result = instance.pixels(font);
+        assertEquals("cm", expResult, result, 0.01);
+
+        instance = new Size(1.0, SizeUnits.MM);
+        // 1mm / mm per inch
+        expResult = (1/25.4f) * DOTS_PER_INCH;
+        result = instance.pixels(font);
+        assertEquals("mm", expResult, result, 0.01f);
+
+        instance = new Size(1.0, SizeUnits.IN);
+        expResult = DOTS_PER_INCH;
+        result = instance.pixels(font);
+        assertEquals("in", expResult, result, 0.01f);
+
+        instance = new Size(1.0, SizeUnits.PC);
+        // 1pc * 12 pt per pc yields points, then convert points to pixels
+        expResult = (1*12.0) * (DOTS_PER_INCH / POINTS_PER_INCH);
+        result = instance.pixels(1.0, font);
+        assertEquals("pc", expResult, result, 0.01f);
+
+    }
+
+
+    /**
+     * Test of sizes with angle units.
+     */
+    @Test
+    public void testAngles() {
+
+        // 360 degrees = 2pi radians
+        // 90 degrees as radians
+        double expResult = 90;
+
+        Size instance = new Size(0.5*Math.PI, SizeUnits.RAD);
+        double result = instance.pixels();
+        assertEquals("1/2pi rad to deg", expResult, result, 0.01);
+
+        instance = new Size(100, SizeUnits.GRAD);
+        result = instance.pixels();
+        assertEquals("100grad to deg", expResult, result, 0.01);
+
+        instance = new Size(.25, SizeUnits.TURN);
+        result = instance.pixels();
+        assertEquals(".25turn to deg", expResult, result, 0.01);
+    }
+
+    /**
+     * Test of sizes with time units.
+     */
+    @Test
+    public void testTime() {
+
+        double expResult = 90;
+
+        Size instance = new Size(90, SizeUnits.S);
+        double result = instance.pixels();
+        assertEquals("90s", expResult, result, 0.01);
+
+        instance = new Size(90, SizeUnits.MS);
+        result = instance.pixels();
+        assertEquals("90ms", expResult, result, 0.01);
+
+    }
+
+
+    /**
+     * Test of equals method, of class Size.
+     */
+    @Test
+    public void testEquals() {
+        Object o = new Size(2.0, SizeUnits.PX);
+        Size instance = new Size(1.0, SizeUnits.PX);
+        boolean expResult = false;
+        boolean result = instance.equals(o);
+        assertEquals(expResult, result);
+
+        o = new Size(2.0, SizeUnits.PX);
+        instance = new Size(2.0, SizeUnits.PX);
+        expResult = true;
+        result = instance.equals(o);
+        assertEquals(expResult, result);
+
+        o = new Size(2.0, SizeUnits.PT);
+        instance = new Size(2.0, SizeUnits.EM);
+        expResult = false;
+        result = instance.equals(o);
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of getValue method, of class Size.
+     */
+    @Test
+    public void testGetValue() {
+        Size instance = new Size(0.0, SizeUnits.PX);
+        double expResult = 0.0;
+        double result = instance.getValue();
+        assertEquals(expResult, result, 0.0);
+    }
+
+    /**
+     * Test of getUnits method, of class Size.
+     */
+    @Test
+    public void testGetUnits() {
+        Size instance = new Size(0.0, SizeUnits.PX);
+        SizeUnits expResult = SizeUnits.PX;
+        SizeUnits result = instance.getUnits();
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of isAbsolute method, of class Size.
+     */
+    @Test
+    public void testIsAbsolute() {
+        Size instance = new Size(0.0, SizeUnits.EM);
+        boolean expResult = false;
+        boolean result = instance.isAbsolute();
+        assertEquals(expResult, result);
+
+        instance = new Size(0.0, SizeUnits.PX);
+        expResult = true;
+        result = instance.isAbsolute();
+        assertEquals(expResult, result);
+
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/StyleTest.java	2015-09-03 15:37:13.322733300 -0700
+++ /dev/null	2015-09-03 15:37:14.000000000 -0700
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2012, 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 com.sun.javafx.css.parser.CSSParser;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class StyleTest {
-    
-    private static class Data {
-        private final String s1, s2;
-        private final boolean expected;
-        Data(String s1, String s2, boolean expected){
-            this.s1 = s1;
-            this.s2 = s2;
-            this.expected = expected;
-        }
-        
-        @Override public String toString() {
-            return "\"" + s1 + "\" " + (expected ? "==" : "!=") + " \"" + s2 + "\"";
-        }
-    }
-    
-    public StyleTest(Data data) {
-        this.data = data;
-    }
-    private final Data data;
-    
-    private static Style createStyle(String stylesheetText) {
-        
-        Stylesheet stylesheet = CSSParser.getInstance().parse(stylesheetText);
-        Rule rule = stylesheet.getRules().get(0);
-        Selector sel = rule.getUnobservedSelectorList().get(0);
-        Declaration decl = rule.getUnobservedDeclarationList().get(0);
-        return new Style(sel, decl);
-    }
-
-    @Parameters
-    public static Collection data() {
-        
-        return Arrays.asList(new Object[] {
-            new Object[] { new Data("*.style { -fx-fill: red; }", 
-                                    "*.style { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style { -fx-fill: red; }", 
-                                    "*.bad   { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style:p { -fx-fill: red; }", 
-                                    "*.style:p { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style:p { -fx-fill: red; }", 
-                                    "*.style:q { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style:p { -fx-fill: red; }", 
-                                    "*.bad:p   { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style#c { -fx-fill: red; }", 
-                                    "*.style#c { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style#c { -fx-fill: red; }", 
-                                    "*.style#d { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style#c:p { -fx-fill: red; }", 
-                                    "*.style#c:p { -fx-fill: red; }", true) },
-            new Object[] { new Data("*.style#c:p { -fx-fill: red; }", 
-                                    "*.style#c:q { -fx-fill: red; }", false) },
-            new Object[] { new Data("*.style { -fx-fill: red; }", 
-                                    "*.style { -fx-fill: green; }", false) },
-            new Object[] { new Data("*.style { -fx-border-color: red; }", 
-                                    "*.style { -fx-fill: red; }", false) },
-        });
-    }
-    
-    @Test
-    public void testEquals() {
-
-        Style instance = createStyle(data.s1);
-        Style obj = createStyle(data.s2);
-        boolean expected = data.expected;
-        boolean actual = instance.equals(obj);
-        assertTrue(data.toString(), expected == actual);
-        
-    }
-
-}
--- /dev/null	2015-09-03 15:37:14.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/StyleTest.java	2015-09-03 15:37:12.471684700 -0700
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2012, 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.css;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class StyleTest {
+    
+    private static class Data {
+        private final String s1, s2;
+        private final boolean expected;
+        Data(String s1, String s2, boolean expected){
+            this.s1 = s1;
+            this.s2 = s2;
+            this.expected = expected;
+        }
+        
+        @Override public String toString() {
+            return "\"" + s1 + "\" " + (expected ? "==" : "!=") + " \"" + s2 + "\"";
+        }
+    }
+    
+    public StyleTest(Data data) {
+        this.data = data;
+    }
+    private final Data data;
+    
+    private static Style createStyle(String stylesheetText) {
+        
+        Stylesheet stylesheet = new CssParser().parse(stylesheetText);
+        Rule rule = stylesheet.getRules().get(0);
+        Selector sel = rule.getUnobservedSelectorList().get(0);
+        Declaration decl = rule.getUnobservedDeclarationList().get(0);
+        return new Style(sel, decl);
+    }
+
+    @Parameters
+    public static Collection data() {
+        
+        return Arrays.asList(new Object[] {
+            new Object[] { new Data("*.style { -fx-fill: red; }", 
+                                    "*.style { -fx-fill: red; }", true) },
+            new Object[] { new Data("*.style { -fx-fill: red; }", 
+                                    "*.bad   { -fx-fill: red; }", false) },
+            new Object[] { new Data("*.style:p { -fx-fill: red; }", 
+                                    "*.style:p { -fx-fill: red; }", true) },
+            new Object[] { new Data("*.style:p { -fx-fill: red; }", 
+                                    "*.style:q { -fx-fill: red; }", false) },
+            new Object[] { new Data("*.style:p { -fx-fill: red; }", 
+                                    "*.bad:p   { -fx-fill: red; }", false) },
+            new Object[] { new Data("*.style#c { -fx-fill: red; }", 
+                                    "*.style#c { -fx-fill: red; }", true) },
+            new Object[] { new Data("*.style#c { -fx-fill: red; }", 
+                                    "*.style#d { -fx-fill: red; }", false) },
+            new Object[] { new Data("*.style#c:p { -fx-fill: red; }", 
+                                    "*.style#c:p { -fx-fill: red; }", true) },
+            new Object[] { new Data("*.style#c:p { -fx-fill: red; }", 
+                                    "*.style#c:q { -fx-fill: red; }", false) },
+            new Object[] { new Data("*.style { -fx-fill: red; }", 
+                                    "*.style { -fx-fill: green; }", false) },
+            new Object[] { new Data("*.style { -fx-border-color: red; }", 
+                                    "*.style { -fx-fill: red; }", false) },
+        });
+    }
+    
+    @Test
+    public void testEquals() {
+
+        Style instance = createStyle(data.s1);
+        Style obj = createStyle(data.s2);
+        boolean expected = data.expected;
+        boolean actual = instance.equals(obj);
+        assertTrue(data.toString(), expected == actual);
+        
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/StylesheetTest.java	2015-09-03 15:37:21.320190800 -0700
+++ /dev/null	2015-09-03 15:37:22.000000000 -0700
@@ -1,632 +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.css;
-
-import com.sun.javafx.css.converters.EnumConverter;
-import com.sun.javafx.css.converters.StringConverter;
-import com.sun.javafx.css.parser.CSSParser;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.css.StyleOrigin;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javafx.css.StyleableProperty;
-import javafx.geometry.NodeOrientation;
-import javafx.geometry.Orientation;
-import javafx.geometry.Pos;
-import javafx.geometry.VPos;
-import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.layout.StackPane;
-import javafx.scene.paint.Color;
-import javafx.scene.paint.LinearGradient;
-import javafx.scene.paint.Paint;
-import javafx.scene.paint.RadialGradient;
-import javafx.scene.shape.Rectangle;
-import javafx.scene.text.Font;
-import javafx.scene.text.FontSmoothingType;
-import javafx.scene.text.TextAlignment;
-import javafx.stage.Stage;
-import org.junit.*;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-
-
-public class StylesheetTest {
-
-    String testURL = null;
-    
-    public StylesheetTest() {
-        testURL = getClass().getResource("HonorDeveloperSettingsTest_UA.css").toExternalForm();
-    }
-
-    /**
-     * Test of getUrl method, of class Stylesheet.
-     */
-    @Test
-    public void testGetUrl() {
-        Stylesheet instance = new Stylesheet();
-        URL expResult = null;
-        String result = instance.getUrl();
-        assertEquals(expResult, result);
-        
-        instance = new Stylesheet(testURL);
-        result = instance.getUrl();
-        assertEquals(testURL, result);
-    }
-
-    /**
-     * Test of getSource method, of class Stylesheet.
-     */
-    @Test
-    public void testGetStylesheetSourceGetterAndSetter() {
-        Stylesheet instance = new Stylesheet();
-        StyleOrigin expResult = StyleOrigin.AUTHOR;
-        StyleOrigin result = instance.getOrigin();
-        assertEquals(expResult, result);
-        
-        instance.setOrigin(StyleOrigin.INLINE);
-        expResult = StyleOrigin.INLINE;
-        result = instance.getOrigin();
-        assertEquals(expResult, result);
-
-        instance.setOrigin(StyleOrigin.USER);
-        expResult = StyleOrigin.USER;
-        result = instance.getOrigin();
-        assertEquals(expResult, result);
-
-        instance.setOrigin(StyleOrigin.USER_AGENT);
-        expResult = StyleOrigin.USER_AGENT;
-        result = instance.getOrigin();
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of addRule method, of class Stylesheet.
-     */
-    @Test
-    public void testStylesheetAddAndGetRule() {
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet instance = new Stylesheet();
-        instance.getRules().add(rule);
-        instance.getRules().add(rule);
-        instance.getRules().add(rule);
-        instance.getRules().add(rule);
-        instance.getRules().add(rule);
-        List<Rule> rules = instance.getRules();
-        assert(rules.size() == 5);
-        for(Rule r : rules) assertEquals(r, rule);
-    }
-    
-    @Test
-    public void testAddingRuleSetsStylesheetOnRule() {
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet instance = new Stylesheet();
-        instance.getRules().add(rule);
-        assert(rule.getStylesheet() == instance);        
-    }
-
-    @Test
-    public void testRemovingRuleSetsStylesheetNullOnRule() {
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        Stylesheet instance = new Stylesheet();
-        instance.getRules().add(rule);
-        instance.getRules().remove(rule);
-        assertNull(rule.getStylesheet());
-    }
-    
-    /**
-     * Test of equals method, of class Stylesheet.
-     */
-    @Test
-    public void testStylesheetEquals() {
-        Object obj = new Stylesheet();
-        Stylesheet instance = new Stylesheet();
-        boolean expResult = true;
-        boolean result = instance.equals(obj);
-        assertEquals(expResult, result);
-
-        obj = new Stylesheet(testURL);
-        instance = new Stylesheet(testURL);
-        expResult = true;
-        result = instance.equals(obj);
-        assertEquals(expResult, result);
-
-        obj = new Stylesheet();
-        instance = new Stylesheet(testURL);
-        expResult = false;
-        result = instance.equals(obj);
-        assertEquals(expResult, result);
-        
-        obj = instance = new Stylesheet(testURL);
-        expResult = true;
-        result = instance.equals(obj);
-        assertEquals(expResult, result);
-        
-    }
-
-    /**
-     * Test of toString method, of class Stylesheet.
-     */
-    @Test
-    public void testStylesheetToString() {
-        Stylesheet instance = new Stylesheet();
-        String expResult = "/*  */";
-        String result = instance.toString();
-        assertEquals(expResult, result);
-
-        instance = new Stylesheet(testURL);
-        expResult = "/* " + testURL + " */";
-        result = instance.toString();
-        assertEquals(expResult, result);
-
-        instance = new Stylesheet(testURL);
-        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
-        instance.getRules().add(rule);
-        expResult = "/* " + testURL + " */\n{\n}\n";
-        result = instance.toString();
-        assertEquals(expResult, result);
-    }
-
-    /**
-     * Test of writeBinary method, of class Stylesheet.
-    @Test
-    public void testWriteAndReadBinary() throws Exception {
-        DataOutputStream os = null;
-        StringStore stringStore = null;
-        Stylesheet instance = new Stylesheet(testURL);
-        instance.writeBinary(os, stringStore);
-    }
-     */
-
-    /**
-     * Test of loadBinary method, of class Stylesheet.
-    @Test
-    public void testLoadBinary() {
-        System.out.println("loadBinary");
-        URL url = null;
-        Stylesheet expResult = null;
-        Stylesheet result = Stylesheet.loadBinary(url);
-        assertEquals(expResult, result);
-        // TODO review the generated test code and remove the default call to fail.
-        fail("The test case is a prototype.");
-    }
-     */
-    
-    @Test public void test_RT_18126() {
-        // CSS cannot write binary -fx-background-repeat: repeat, no-repeat;
-        String data = "#rt18126 {"
-                + "-fx-background-repeat: repeat, no-repeat;"
-                + "-fx-border-image-repeat: repeat, no-repeat;"
-                + "}";
-
-        try {
-            Stylesheet stylesheet = CSSParser.getInstance().parse(data);
-
-            StringStore stringStore = new StringStore();
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DataOutputStream dos = new DataOutputStream(baos);
-            stylesheet.writeBinary(dos, stringStore);
-            dos.flush();
-            dos.close();
-
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            DataInputStream dis = new DataInputStream(bais);
-
-            Stylesheet restored = new Stylesheet();
-            restored.readBinary(Stylesheet.BINARY_CSS_VERSION, dis, stringStore.strings.toArray(new String[stringStore.strings.size()]));
-
-            List<Rule> cssRules = stylesheet.getRules();
-            List<Rule> bssRules = restored.getRules();
-
-            // Rule does not have an equals method
-            assert(cssRules.size() == bssRules.size());
-            for (int n=0; n<cssRules.size(); n++) {
-                Rule expected = cssRules.get(n);
-                Rule actual = bssRules.get(n);
-                assertEquals(Integer.toString(n), expected.getUnobservedDeclarationList(), actual.getUnobservedDeclarationList());
-            }
-
-        } catch (IOException ioe) {
-            fail(ioe.toString());
-        }
-
-    }
-
-    @Test
-    public void testRT_23140() {
-
-        try {
-            Group root = new Group();
-            root.getChildren().add(new Rectangle(50,50));
-            Scene scene = new Scene(root, 500, 500);
-            root.getStylesheets().add("bogus.css");
-            Stage stage = new Stage();
-            stage.setScene(scene);
-            stage.show();
-        } catch (NullPointerException e) {
-            // RT-23140 is supposed to fix the NPE. Did it?
-            fail("Test purpose failed: " + e.toString());
-        } catch (Exception e) {
-            // Something other than an NPE should still raise a red flag,
-            // but the exception is not what RT-23140 fixed.
-
-            fail("Exception not expected: " + e.toString());
-        }
-
-    }
-
-    @Test public void testRT_31316() {
-
-        try {
-
-            Rectangle rect = new Rectangle(50,50);
-            rect.setStyle("-fx-base: red; -fx-fill: -fx-base;");
-            rect.setFill(Color.GREEN);
-
-            Group root = new Group();
-            root.getChildren().add(rect);
-            Scene scene = new Scene(root, 500, 500);
-
-            root.applyCss();
-
-            // Shows inline style works.
-            assertEquals(Color.RED, rect.getFill());
-
-            // reset fill
-            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
-
-            // loop in style!
-            rect.setStyle("-fx-base: -fx-fill; -fx-fill: -fx-base;");
-            root.applyCss();
-
-            // Shows value was left alone
-            assertNull(rect.getFill());
-
-
-        } catch (Exception e) {
-            // The code generates an IllegalArgumentException that should never reach here
-            fail("Exception not expected: " + e.toString());
-        }
-
-    }
-
-    @Test public void testRT_31316_with_complex_value() {
-
-        try {
-
-            Rectangle rect = new Rectangle(50,50);
-            rect.setStyle("-fx-base: red; -fx-color: -fx-base; -fx-fill: radial-gradient(radius 100%, red, -fx-color);");
-            rect.setFill(Color.GREEN);
-
-            Group root = new Group();
-            root.getChildren().add(rect);
-            Scene scene = new Scene(root, 500, 500);
-
-            root.applyCss();
-
-            // Shows inline style works.
-            assertTrue(rect.getFill() instanceof RadialGradient);
-
-            // reset fill
-            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
-
-            // loop in style!
-            rect.setStyle("-fx-base: -fx-color; -fx-color: -fx-base; -fx-fill: radial-gradient(radius 100%, red, -fx-color);");
-
-            root.applyCss();
-
-            // Shows value was left alone
-            assertNull(rect.getFill());
-
-        } catch (Exception e) {
-            // The code generates an IllegalArgumentException that should never reach here
-            fail("Exception not expected: " + e.toString());
-        }
-    }
-
-
-    @Test public void testRT_31316_with_complex_scenegraph() {
-
-        try {
-
-            Rectangle rect = new Rectangle(50,50);
-            rect.setStyle("-fx-fill: radial-gradient(radius 100%, red, -fx-color);");
-            rect.setFill(Color.GREEN);
-
-            StackPane pane = new StackPane();
-            pane.setStyle("-fx-color: -fx-base;");
-            pane.getChildren().add(rect);
-
-            Group root = new Group();
-            // loop in style!
-            root.setStyle("-fx-base: red;");
-            root.getChildren().add(pane);
-            Scene scene = new Scene(root, 500, 500);
-
-            root.applyCss();
-
-            // Shows inline style works.
-            assertTrue(rect.getFill() instanceof RadialGradient);
-
-            // reset fill
-            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
-
-            // loop in style
-            root.setStyle("-fx-base: -fx-color;");
-
-            root.applyCss();
-
-            // Shows value was left alone
-            assertNull(rect.getFill());
-
-        } catch (Exception e) {
-            // The code generates an IllegalArgumentException that should never reach here
-            fail("Exception not expected: " + e.toString());
-        }
-
-    }
-
-    @Test public void testRT_32229() {
-
-        try {
-
-            Rectangle rect = new Rectangle(50,50);
-            rect.setStyle("-fx-base: red; -fx-fill: radial-gradient(radius 100%, derive(-fx-base, -25%), derive(-fx-base, 25%));");
-            rect.setFill(Color.GREEN);
-
-            Group root = new Group();
-            root.getChildren().add(rect);
-            Scene scene = new Scene(root, 500, 500);
-
-            root.applyCss();
-
-            // Shows inline style works.
-            assertTrue(rect.getFill() instanceof RadialGradient);
-
-            // reset fill
-            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
-
-            // loop in style!
-            root.setStyle("-fx-base: -fx-fill;");
-            rect.setStyle("-fx-fill: radial-gradient(radius 100%, derive(-fx-base, -25%), derive(-fx-base, 25%));");
-
-
-            root.applyCss();
-
-            // Shows value was left alone
-            assertNull(rect.getFill());
-
-        } catch (Exception e) {
-            // The code generates an IllegalArgumentException that should never reach here
-            fail("Exception not expected: " + e.toString());
-        }
-    }
-
-    @Test
-    public void testRT_30953_parse() {
-
-        try {
-            // Make sure RT-30953.css can be parsed, serialized and deserialized with the current code,
-            // no matter the bss version
-            URL url = StylesheetTest.class.getResource("RT-30953.css");
-            if (url == null) {
-                fail("Can't find RT-30953.css");
-            }
-
-            Stylesheet ss = CSSParser.getInstance().parse(url);
-            int nFontFaceSrcs = checkFontFace(ss);
-            assertEquals(3, nFontFaceSrcs);
-            checkConvert(ss);
-
-        } catch (Exception e) {
-            fail(e.toString());
-        }
-
-    }
-
-    @Test public void testRT_30953_deserialize_from_v4() {
-        // RT-30953-v4.bss was generated with version 4
-        Stylesheet ss = deserialize("RT-30953-v4.bss");
-        checkConvert(ss);
-    }
-
-    @Test
-    public void testRT_30953_deserialize_from_2_2_45() {
-
-        // RT-30953-2.2.4bss was generated with javafx version 2.2.45 from 7u??
-        Stylesheet ss = deserialize("RT-30953-2.2.45.bss");
-        checkConvert(ss);
-    }
-
-    @Test
-    public void testRT_30953_deserialize_from_2_2_4() {
-
-        // RT-30953-2.2.4bss was generated with javafx version 2.2.4 from 7u10
-        Stylesheet ss = deserialize("RT-30953-2.2.4.bss");
-        checkConvert(ss);
-    }
-
-    @Test
-    public void testRT_30953_deserialize_from_2_2_21() {
-
-        // RT-30953-2.2.21.bss was generated with javafx version 2.2.21 from 7u21
-        Stylesheet ss = deserialize("RT-30953-2.2.21.bss");
-        checkConvert(ss);
-
-    }
-
-    private Stylesheet deserialize(String bssFile) {
-        Stylesheet ss = null;
-        try {
-            URL url = StylesheetTest.class.getResource(bssFile);
-            if (url == null) {
-                fail(bssFile);
-            }
-            ss = Stylesheet.loadBinary(url);
-        } catch (IOException ioe) {
-            fail(ioe.toString());
-        } catch (Exception e) {
-            fail(e.toString());
-        }
-        return ss;
-    }
-
-    private void checkConvert(Stylesheet ss) {
-        Declaration decl = null;
-        StyleConverter converter = null;
-        try {
-            for (Rule r : ss.getRules()) {
-                for (Declaration d : r.getDeclarations()) {
-                    decl = d;
-                    ParsedValue pv = decl.getParsedValue();
-                    converter = pv.getConverter();
-                    if (converter == null) {
-
-                        if ("inherit".equals(pv.getValue())) continue;
-
-                        String prop = d.getProperty().toLowerCase(Locale.ROOT);
-                        if ("-fx-shape".equals(prop)) {
-                            StringConverter.getInstance().convert(pv, null);
-                        } else if ("-fx-font-smoothing-type".equals(prop)) {
-                            (new EnumConverter<FontSmoothingType>(FontSmoothingType.class)).convert(pv, null);
-                        } else if ("-fx-text-alignment".equals(prop)) {
-                            (new EnumConverter<TextAlignment>(TextAlignment.class)).convert(pv, null);
-                        } else if ("-fx-alignment".equals(prop)) {
-                            (new EnumConverter<Pos>(Pos.class)).convert(pv, null);
-                        } else if ("-fx-text-origin".equals(prop)) {
-                            (new EnumConverter<VPos>(VPos.class)).convert(pv, null);
-                        } else if ("-fx-text-overrun".equals(prop)) {
-                            Class cl = null;
-                            try {
-                                cl = Class.forName("javafx.scene.control.OverrunStyle");
-                            } catch (Exception ignored) {
-                                // just means we're running ant test from javafx-ui-common
-                            }
-                            if (cl != null) {
-                                (new EnumConverter(cl)).convert(pv, null);
-                            }
-                        } else if ("-fx-orientation".equals(prop)) {
-                            (new EnumConverter<Orientation>(Orientation.class)).convert(pv, null);
-                        } else if ("-fx-content-display".equals(prop)) {
-                            Class cl = null;
-                            try {
-                                cl = Class.forName("javafx.scene.control.CpntentDisplay");
-                            } catch (Exception ignored) {
-                                // just means we're running ant test from javafx-ui-common
-                            }
-                            if (cl != null) {
-                                (new EnumConverter(cl)).convert(pv, null);
-                            }
-                        } else if ("-fx-hbar-policy".equals(prop)) {
-                            Class cl = null;
-                            try {
-                                cl = Class.forName("javafx.scene.control.ScrollPane.ScrollBarPolicy");
-                            } catch (Exception ignored) {
-                                // just means we're running ant test from javafx-ui-common
-                            }
-                            if (cl != null) {
-                                (new EnumConverter(cl)).convert(pv, null);
-                            }
-                        } else {
-                            System.out.println("No converter for " + d.toString() + ". Skipped conversion.");
-                        }
-                        continue;
-                    }
-                    Object value = converter.convert(pv, Font.getDefault());
-                }
-            }
-        } catch (Exception e) {
-            if (decl == null) fail(e.toString());
-            else if (converter != null) fail(decl.getProperty() + ", " + converter + ", " + e.toString());
-            else fail(decl.getProperty() + ", " + e.toString());
-        }
-
-    }
-
-    private int checkFontFace(Stylesheet stylesheet) {
-        return com.sun.javafx.css.parser.CSSParserTest.checkFontFace(stylesheet);
-    }
-
-   @Test
-   public void testRT_37122() {
-       try {
-           URL url = StylesheetTest.class.getResource("RT-37122.css");
-           File source = new File(url.toURI());
-           File target = File.createTempFile("RT_37122_", "bss");
-           Stylesheet.convertToBinary(source, target);
-           Stylesheet.convertToBinary(source, target);
-       } catch (URISyntaxException | IOException e) {
-           fail(e.toString());
-       }
-   }
-
-    @Test
-    public void testRT_37301() {
-        try {
-            File source = File.createTempFile("RT_37301_", "css");
-            FileWriter writer = new FileWriter(source);
-            writer.write("A:dir(rtl) {} B:dir(ltr) {} C {}");
-            writer.flush();
-            writer.close();
-            File target = File.createTempFile("RT_37301_", "bss");
-            Stylesheet.convertToBinary(source, target);
-            Stylesheet stylesheet = Stylesheet.loadBinary(target.toURL());
-            int good = 0;
-            for (Rule rule : stylesheet.getRules()) {
-                for (Selector sel : rule.getSelectors()) {
-                    SimpleSelector simpleSelector = (SimpleSelector)sel;
-                    if ("A".equals(simpleSelector.getName())) {
-                        assertEquals(NodeOrientation.RIGHT_TO_LEFT, simpleSelector.getNodeOrientation());
-                    } else if ("B".equals(simpleSelector.getName())) {
-                        assertEquals(NodeOrientation.LEFT_TO_RIGHT, simpleSelector.getNodeOrientation());
-                    } else if ("C".equals(simpleSelector.getName())) {
-                        assertEquals(NodeOrientation.INHERIT, simpleSelector.getNodeOrientation());
-                    } else {
-                        fail(simpleSelector.toString());
-                    }
-                }
-            }
-        } catch (IOException e) {
-            fail(e.toString());
-        }
-    }
-
-}
--- /dev/null	2015-09-03 15:37:22.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/StylesheetTest.java	2015-09-03 15:37:20.555147000 -0700
@@ -0,0 +1,625 @@
+/*
+ * 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.css;
+
+import javafx.css.StyleConverter.StringStore;
+import javafx.css.converter.EnumConverter;
+import javafx.css.converter.StringConverter;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import javafx.geometry.NodeOrientation;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.geometry.VPos;
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
+import javafx.scene.paint.RadialGradient;
+import javafx.scene.shape.Rectangle;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontSmoothingType;
+import javafx.scene.text.TextAlignment;
+import javafx.stage.Stage;
+import org.junit.*;
+import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
+
+public class StylesheetTest {
+
+    String testURL = null;
+    
+    public StylesheetTest() {
+        testURL = getClass().getResource("HonorDeveloperSettingsTest_UA.css").toExternalForm();
+    }
+
+    /**
+     * Test of getUrl method, of class Stylesheet.
+     */
+    @Test
+    public void testGetUrl() {
+        Stylesheet instance = new Stylesheet();
+        URL expResult = null;
+        String result = instance.getUrl();
+        assertEquals(expResult, result);
+        
+        instance = new Stylesheet(testURL);
+        result = instance.getUrl();
+        assertEquals(testURL, result);
+    }
+
+    /**
+     * Test of getSource method, of class Stylesheet.
+     */
+    @Test
+    public void testGetStylesheetSourceGetterAndSetter() {
+        Stylesheet instance = new Stylesheet();
+        StyleOrigin expResult = StyleOrigin.AUTHOR;
+        StyleOrigin result = instance.getOrigin();
+        assertEquals(expResult, result);
+        
+        instance.setOrigin(StyleOrigin.INLINE);
+        expResult = StyleOrigin.INLINE;
+        result = instance.getOrigin();
+        assertEquals(expResult, result);
+
+        instance.setOrigin(StyleOrigin.USER);
+        expResult = StyleOrigin.USER;
+        result = instance.getOrigin();
+        assertEquals(expResult, result);
+
+        instance.setOrigin(StyleOrigin.USER_AGENT);
+        expResult = StyleOrigin.USER_AGENT;
+        result = instance.getOrigin();
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of addRule method, of class Stylesheet.
+     */
+    @Test
+    public void testStylesheetAddAndGetRule() {
+        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet instance = new Stylesheet();
+        instance.getRules().add(rule);
+        instance.getRules().add(rule);
+        instance.getRules().add(rule);
+        instance.getRules().add(rule);
+        instance.getRules().add(rule);
+        List<Rule> rules = instance.getRules();
+        assert(rules.size() == 5);
+        for(Rule r : rules) assertEquals(r, rule);
+    }
+    
+    @Test
+    public void testAddingRuleSetsStylesheetOnRule() {
+        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet instance = new Stylesheet();
+        instance.getRules().add(rule);
+        assert(rule.getStylesheet() == instance);        
+    }
+
+    @Test
+    public void testRemovingRuleSetsStylesheetNullOnRule() {
+        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        Stylesheet instance = new Stylesheet();
+        instance.getRules().add(rule);
+        instance.getRules().remove(rule);
+        assertNull(rule.getStylesheet());
+    }
+    
+    /**
+     * Test of equals method, of class Stylesheet.
+     */
+    @Test
+    public void testStylesheetEquals() {
+        Object obj = new Stylesheet();
+        Stylesheet instance = new Stylesheet();
+        boolean expResult = true;
+        boolean result = instance.equals(obj);
+        assertEquals(expResult, result);
+
+        obj = new Stylesheet(testURL);
+        instance = new Stylesheet(testURL);
+        expResult = true;
+        result = instance.equals(obj);
+        assertEquals(expResult, result);
+
+        obj = new Stylesheet();
+        instance = new Stylesheet(testURL);
+        expResult = false;
+        result = instance.equals(obj);
+        assertEquals(expResult, result);
+        
+        obj = instance = new Stylesheet(testURL);
+        expResult = true;
+        result = instance.equals(obj);
+        assertEquals(expResult, result);
+        
+    }
+
+    /**
+     * Test of toString method, of class Stylesheet.
+     */
+    @Test
+    public void testStylesheetToString() {
+        Stylesheet instance = new Stylesheet();
+        String expResult = "/*  */";
+        String result = instance.toString();
+        assertEquals(expResult, result);
+
+        instance = new Stylesheet(testURL);
+        expResult = "/* " + testURL + " */";
+        result = instance.toString();
+        assertEquals(expResult, result);
+
+        instance = new Stylesheet(testURL);
+        Rule rule = new Rule(Collections.EMPTY_LIST, Collections.EMPTY_LIST);
+        instance.getRules().add(rule);
+        expResult = "/* " + testURL + " */\n{\n}\n";
+        result = instance.toString();
+        assertEquals(expResult, result);
+    }
+
+    /**
+     * Test of writeBinary method, of class Stylesheet.
+    @Test
+    public void testWriteAndReadBinary() throws Exception {
+        DataOutputStream os = null;
+        StringStore stringStore = null;
+        Stylesheet instance = new Stylesheet(testURL);
+        instance.writeBinary(os, stringStore);
+    }
+     */
+
+    /**
+     * Test of loadBinary method, of class Stylesheet.
+    @Test
+    public void testLoadBinary() {
+        System.out.println("loadBinary");
+        URL url = null;
+        Stylesheet expResult = null;
+        Stylesheet result = Stylesheet.loadBinary(url);
+        assertEquals(expResult, result);
+        // TODO review the generated test code and remove the default call to fail.
+        fail("The test case is a prototype.");
+    }
+     */
+    
+    @Test public void test_RT_18126() {
+        // CSS cannot write binary -fx-background-repeat: repeat, no-repeat;
+        String data = "#rt18126 {"
+                + "-fx-background-repeat: repeat, no-repeat;"
+                + "-fx-border-image-repeat: repeat, no-repeat;"
+                + "}";
+
+        try {
+            Stylesheet stylesheet = new CssParser().parse(data);
+
+            StringStore stringStore = new StringStore();
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            DataOutputStream dos = new DataOutputStream(baos);
+            stylesheet.writeBinary(dos, stringStore);
+            dos.flush();
+            dos.close();
+
+            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+            DataInputStream dis = new DataInputStream(bais);
+
+            Stylesheet restored = new Stylesheet();
+            restored.readBinary(Stylesheet.BINARY_CSS_VERSION, dis, stringStore.strings.toArray(new String[stringStore.strings.size()]));
+
+            List<Rule> cssRules = stylesheet.getRules();
+            List<Rule> bssRules = restored.getRules();
+
+            // Rule does not have an equals method
+            assert(cssRules.size() == bssRules.size());
+            for (int n=0; n<cssRules.size(); n++) {
+                Rule expected = cssRules.get(n);
+                Rule actual = bssRules.get(n);
+                assertEquals(Integer.toString(n), expected.getUnobservedDeclarationList(), actual.getUnobservedDeclarationList());
+            }
+
+        } catch (IOException ioe) {
+            fail(ioe.toString());
+        }
+
+    }
+
+    @Test
+    public void testRT_23140() {
+
+        try {
+            Group root = new Group();
+            root.getChildren().add(new Rectangle(50,50));
+            Scene scene = new Scene(root, 500, 500);
+            root.getStylesheets().add("bogus.css");
+            Stage stage = new Stage();
+            stage.setScene(scene);
+            stage.show();
+        } catch (NullPointerException e) {
+            // RT-23140 is supposed to fix the NPE. Did it?
+            fail("Test purpose failed: " + e.toString());
+        } catch (Exception e) {
+            // Something other than an NPE should still raise a red flag,
+            // but the exception is not what RT-23140 fixed.
+
+            fail("Exception not expected: " + e.toString());
+        }
+
+    }
+
+    @Test public void testRT_31316() {
+
+        try {
+
+            Rectangle rect = new Rectangle(50,50);
+            rect.setStyle("-fx-base: red; -fx-fill: -fx-base;");
+            rect.setFill(Color.GREEN);
+
+            Group root = new Group();
+            root.getChildren().add(rect);
+            Scene scene = new Scene(root, 500, 500);
+
+            root.applyCss();
+
+            // Shows inline style works.
+            assertEquals(Color.RED, rect.getFill());
+
+            // reset fill
+            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
+
+            // loop in style!
+            rect.setStyle("-fx-base: -fx-fill; -fx-fill: -fx-base;");
+            root.applyCss();
+
+            // Shows value was left alone
+            assertNull(rect.getFill());
+
+
+        } catch (Exception e) {
+            // The code generates an IllegalArgumentException that should never reach here
+            fail("Exception not expected: " + e.toString());
+        }
+
+    }
+
+    @Test public void testRT_31316_with_complex_value() {
+
+        try {
+
+            Rectangle rect = new Rectangle(50,50);
+            rect.setStyle("-fx-base: red; -fx-color: -fx-base; -fx-fill: radial-gradient(radius 100%, red, -fx-color);");
+            rect.setFill(Color.GREEN);
+
+            Group root = new Group();
+            root.getChildren().add(rect);
+            Scene scene = new Scene(root, 500, 500);
+
+            root.applyCss();
+
+            // Shows inline style works.
+            assertTrue(rect.getFill() instanceof RadialGradient);
+
+            // reset fill
+            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
+
+            // loop in style!
+            rect.setStyle("-fx-base: -fx-color; -fx-color: -fx-base; -fx-fill: radial-gradient(radius 100%, red, -fx-color);");
+
+            root.applyCss();
+
+            // Shows value was left alone
+            assertNull(rect.getFill());
+
+        } catch (Exception e) {
+            // The code generates an IllegalArgumentException that should never reach here
+            fail("Exception not expected: " + e.toString());
+        }
+    }
+
+
+    @Test public void testRT_31316_with_complex_scenegraph() {
+
+        try {
+
+            Rectangle rect = new Rectangle(50,50);
+            rect.setStyle("-fx-fill: radial-gradient(radius 100%, red, -fx-color);");
+            rect.setFill(Color.GREEN);
+
+            StackPane pane = new StackPane();
+            pane.setStyle("-fx-color: -fx-base;");
+            pane.getChildren().add(rect);
+
+            Group root = new Group();
+            // loop in style!
+            root.setStyle("-fx-base: red;");
+            root.getChildren().add(pane);
+            Scene scene = new Scene(root, 500, 500);
+
+            root.applyCss();
+
+            // Shows inline style works.
+            assertTrue(rect.getFill() instanceof RadialGradient);
+
+            // reset fill
+            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
+
+            // loop in style
+            root.setStyle("-fx-base: -fx-color;");
+
+            root.applyCss();
+
+            // Shows value was left alone
+            assertNull(rect.getFill());
+
+        } catch (Exception e) {
+            // The code generates an IllegalArgumentException that should never reach here
+            fail("Exception not expected: " + e.toString());
+        }
+
+    }
+
+    @Test public void testRT_32229() {
+
+        try {
+
+            Rectangle rect = new Rectangle(50,50);
+            rect.setStyle("-fx-base: red; -fx-fill: radial-gradient(radius 100%, derive(-fx-base, -25%), derive(-fx-base, 25%));");
+            rect.setFill(Color.GREEN);
+
+            Group root = new Group();
+            root.getChildren().add(rect);
+            Scene scene = new Scene(root, 500, 500);
+
+            root.applyCss();
+
+            // Shows inline style works.
+            assertTrue(rect.getFill() instanceof RadialGradient);
+
+            // reset fill
+            ((StyleableProperty<Paint>)rect.fillProperty()).applyStyle(null, null);
+
+            // loop in style!
+            root.setStyle("-fx-base: -fx-fill;");
+            rect.setStyle("-fx-fill: radial-gradient(radius 100%, derive(-fx-base, -25%), derive(-fx-base, 25%));");
+
+
+            root.applyCss();
+
+            // Shows value was left alone
+            assertNull(rect.getFill());
+
+        } catch (Exception e) {
+            // The code generates an IllegalArgumentException that should never reach here
+            fail("Exception not expected: " + e.toString());
+        }
+    }
+
+    @Test
+    public void testRT_30953_parse() {
+
+        try {
+            // Make sure RT-30953.css can be parsed, serialized and deserialized with the current code,
+            // no matter the bss version
+            URL url = StylesheetTest.class.getResource("RT-30953.css");
+            if (url == null) {
+                fail("Can't find RT-30953.css");
+            }
+
+            Stylesheet ss = new CssParser().parse(url);
+            int nFontFaceSrcs = checkFontFace(ss);
+            assertEquals(3, nFontFaceSrcs);
+            checkConvert(ss);
+
+        } catch (Exception e) {
+            fail(e.toString());
+        }
+
+    }
+
+    @Test public void testRT_30953_deserialize_from_v4() {
+        // RT-30953-v4.bss was generated with version 4
+        Stylesheet ss = deserialize("RT-30953-v4.bss");
+        checkConvert(ss);
+    }
+
+    @Test
+    public void testRT_30953_deserialize_from_2_2_45() {
+
+        // RT-30953-2.2.4bss was generated with javafx version 2.2.45 from 7u??
+        Stylesheet ss = deserialize("RT-30953-2.2.45.bss");
+        checkConvert(ss);
+    }
+
+    @Test
+    public void testRT_30953_deserialize_from_2_2_4() {
+
+        // RT-30953-2.2.4bss was generated with javafx version 2.2.4 from 7u10
+        Stylesheet ss = deserialize("RT-30953-2.2.4.bss");
+        checkConvert(ss);
+    }
+
+    @Test
+    public void testRT_30953_deserialize_from_2_2_21() {
+
+        // RT-30953-2.2.21.bss was generated with javafx version 2.2.21 from 7u21
+        Stylesheet ss = deserialize("RT-30953-2.2.21.bss");
+        checkConvert(ss);
+
+    }
+
+    private Stylesheet deserialize(String bssFile) {
+        Stylesheet ss = null;
+        try {
+            URL url = StylesheetTest.class.getResource(bssFile);
+            if (url == null) {
+                fail(bssFile);
+            }
+            ss = Stylesheet.loadBinary(url);
+        } catch (IOException ioe) {
+            fail(ioe.toString());
+        } catch (Exception e) {
+            fail(e.toString());
+        }
+        return ss;
+    }
+
+    private void checkConvert(Stylesheet ss) {
+        Declaration decl = null;
+        StyleConverter converter = null;
+        try {
+            for (Rule r : ss.getRules()) {
+                for (Declaration d : r.getDeclarations()) {
+                    decl = d;
+                    ParsedValue pv = decl.getParsedValue();
+                    converter = pv.getConverter();
+                    if (converter == null) {
+
+                        if ("inherit".equals(pv.getValue())) continue;
+
+                        String prop = d.getProperty().toLowerCase(Locale.ROOT);
+                        if ("-fx-shape".equals(prop)) {
+                            StringConverter.getInstance().convert(pv, null);
+                        } else if ("-fx-font-smoothing-type".equals(prop)) {
+                            (new EnumConverter<FontSmoothingType>(FontSmoothingType.class)).convert(pv, null);
+                        } else if ("-fx-text-alignment".equals(prop)) {
+                            (new EnumConverter<TextAlignment>(TextAlignment.class)).convert(pv, null);
+                        } else if ("-fx-alignment".equals(prop)) {
+                            (new EnumConverter<Pos>(Pos.class)).convert(pv, null);
+                        } else if ("-fx-text-origin".equals(prop)) {
+                            (new EnumConverter<VPos>(VPos.class)).convert(pv, null);
+                        } else if ("-fx-text-overrun".equals(prop)) {
+                            Class cl = null;
+                            try {
+                                cl = Class.forName("javafx.scene.control.OverrunStyle");
+                            } catch (Exception ignored) {
+                                // just means we're running ant test from javafx-ui-common
+                            }
+                            if (cl != null) {
+                                (new EnumConverter(cl)).convert(pv, null);
+                            }
+                        } else if ("-fx-orientation".equals(prop)) {
+                            (new EnumConverter<Orientation>(Orientation.class)).convert(pv, null);
+                        } else if ("-fx-content-display".equals(prop)) {
+                            Class cl = null;
+                            try {
+                                cl = Class.forName("javafx.scene.control.CpntentDisplay");
+                            } catch (Exception ignored) {
+                                // just means we're running ant test from javafx-ui-common
+                            }
+                            if (cl != null) {
+                                (new EnumConverter(cl)).convert(pv, null);
+                            }
+                        } else if ("-fx-hbar-policy".equals(prop)) {
+                            Class cl = null;
+                            try {
+                                cl = Class.forName("javafx.scene.control.ScrollPane.ScrollBarPolicy");
+                            } catch (Exception ignored) {
+                                // just means we're running ant test from javafx-ui-common
+                            }
+                            if (cl != null) {
+                                (new EnumConverter(cl)).convert(pv, null);
+                            }
+                        } else {
+                            System.out.println("No converter for " + d.toString() + ". Skipped conversion.");
+                        }
+                        continue;
+                    }
+                    Object value = converter.convert(pv, Font.getDefault());
+                }
+            }
+        } catch (Exception e) {
+            if (decl == null) fail(e.toString());
+            else if (converter != null) fail(decl.getProperty() + ", " + converter + ", " + e.toString());
+            else fail(decl.getProperty() + ", " + e.toString());
+        }
+
+    }
+
+    private int checkFontFace(Stylesheet stylesheet) {
+        return javafx.css.CssParserTest.checkFontFace(stylesheet);
+    }
+
+   @Test
+   public void testRT_37122() {
+       try {
+           URL url = StylesheetTest.class.getResource("RT-37122.css");
+           File source = new File(url.toURI());
+           File target = File.createTempFile("RT_37122_", "bss");
+           Stylesheet.convertToBinary(source, target);
+           Stylesheet.convertToBinary(source, target);
+       } catch (URISyntaxException | IOException e) {
+           fail(e.toString());
+       }
+   }
+
+    @Test
+    public void testRT_37301() {
+        try {
+            File source = File.createTempFile("RT_37301_", "css");
+            FileWriter writer = new FileWriter(source);
+            writer.write("A:dir(rtl) {} B:dir(ltr) {} C {}");
+            writer.flush();
+            writer.close();
+            File target = File.createTempFile("RT_37301_", "bss");
+            Stylesheet.convertToBinary(source, target);
+            Stylesheet stylesheet = Stylesheet.loadBinary(target.toURL());
+            int good = 0;
+            for (Rule rule : stylesheet.getRules()) {
+                for (Selector sel : rule.getSelectors()) {
+                    SimpleSelector simpleSelector = (SimpleSelector)sel;
+                    if ("A".equals(simpleSelector.getName())) {
+                        assertEquals(NodeOrientation.RIGHT_TO_LEFT, simpleSelector.getNodeOrientation());
+                    } else if ("B".equals(simpleSelector.getName())) {
+                        assertEquals(NodeOrientation.LEFT_TO_RIGHT, simpleSelector.getNodeOrientation());
+                    } else if ("C".equals(simpleSelector.getName())) {
+                        assertEquals(NodeOrientation.INHERIT, simpleSelector.getNodeOrientation());
+                    } else {
+                        fail(simpleSelector.toString());
+                    }
+                }
+            }
+        } catch (IOException e) {
+            fail(e.toString());
+        }
+    }
+
+}
--- old/modules/graphics/src/test/java/com/sun/javafx/css/TypeTest.java	2015-09-03 15:37:29.419654000 -0700
+++ /dev/null	2015-09-03 15:37:30.000000000 -0700
@@ -1,312 +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 com.sun.javafx.css;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import javafx.css.CssMetaData;
-import javafx.css.ParsedValue;
-import org.junit.Test;
-
-
-public class TypeTest {
-
-    // Key key = TypeTest.getKeyByName("-fx-cursor", Node.impl_CSS_KEYS);
-    public static CssMetaData getCssMetaDataByName(String name, CssMetaData[] keys) {
-        CssMetaData keyForName = null;
-        for (CssMetaData k : keys) {
-            if (k.getProperty().equals(name)) {
-                keyForName = k;
-                break;
-            }
-        }
-        assertNotNull(keyForName);
-        return keyForName;
-    }
-
-    // ParsedValue value = TypeTest.getValueFor(stylesheet, "-fx-cursor")
-    public static ParsedValue getValueFor(Stylesheet stylesheet, String property ) {
-        for (Rule rule : stylesheet.getRules()) {
-            for (Declaration decl : rule.getUnobservedDeclarationList()) {
-                if (property.equals(decl.getProperty())) {
-                    return decl.getParsedValue();
-                }
-            }
-        }
-        fail("getValueFor " + property);
-        return null;
-    }
-
-    public TypeTest() {
-    }
-
-    @Test
-    public void testType() {
-        // All the tests have been stubbed out for now (since
-        // the other tests implicitly or explicitly test Type).
-        // But a unit test has to have a runnable method.
-    }
-
-    /**
-     * Test of ENUM method, of class Type.
-     */
-//    @Test
-//    public void testENUM() {
-//        System.out.println("ENUM");
-//        Class type = null;
-//        Type expResult = null;
-//        Type result = Type.ENUM(type);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of convert method, of class Type.
-     */
-//    @Test
-//    public void testConvert_Value_Font() {
-//        System.out.println("convert");
-//        ParsedValue<Font> value = null;
-//        Font font = null;
-//        Type instance = new Type();
-//        Object expResult = null;
-//        Object result = instance.convert(value, font);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of convert method, of class Type.
-     */
-//    @Test
-//    public void testConvert_KeyArr() {
-//        System.out.println("convert");
-//        Key[] keys = null;
-//        Type instance = new Type();
-//        Object expResult = null;
-//        Object result = instance.convert(keys);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of writeCssSerializable method, of class Type.
-     */
-//    @Test
-//    public void testWriteCssSerializable() throws Exception {
-//        System.out.println("writeCssSerializable");
-//        DataOutputStream stream = null;
-//        StringStore ss = null;
-//        CssSerializable cs = null;
-//        Type instance = new Type();
-//        instance.writeCssSerializable(stream, ss, cs);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readCssSerializable method, of class Type.
-     */
-//    @Test
-//    public void testReadCssSerializable() throws Exception {
-//        System.out.println("readCssSerializable");
-//        DataInputStream stream = null;
-//        String[] strings = null;
-//        Type instance = new Type();
-//        Object expResult = null;
-//        Object result = instance.readCssSerializable(stream, strings);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of writePaint method, of class Type.
-     */
-//    @Test
-//    public void testWritePaint() throws Exception {
-//        System.out.println("writePaint");
-//        DataOutputStream stream = null;
-//        Paint paint = null;
-//        Type.writePaint(stream, paint);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readPaint method, of class Type.
-     */
-//    @Test
-//    public void testReadPaint() throws Exception {
-//        System.out.println("readPaint");
-//        DataInputStream stream = null;
-//        Paint expResult = null;
-//        Paint result = Type.readPaint(stream);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of writeColor method, of class Type.
-     */
-//    @Test
-//    public void testWriteColor() throws Exception {
-//        System.out.println("writeColor");
-//        DataOutputStream stream = null;
-//        Color color = null;
-//        Type.writeColor(stream, color);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readColor method, of class Type.
-     */
-//    @Test
-//    public void testReadColor() throws Exception {
-//        System.out.println("readColor");
-//        DataInputStream stream = null;
-//        Color expResult = null;
-//        Color result = Type.readColor(stream);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of writeLinearGradient method, of class Type.
-     */
-//    @Test
-//    public void testWriteLinearGradient() throws Exception {
-//        System.out.println("writeLinearGradient");
-//        DataOutputStream stream = null;
-//        LinearGradient lg = null;
-//        Type.writeLinearGradient(stream, lg);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readLinearGradient method, of class Type.
-     */
-//    @Test
-//    public void testReadLinearGradient() throws Exception {
-//        System.out.println("readLinearGradient");
-//        DataInputStream stream = null;
-//        LinearGradient expResult = null;
-//        LinearGradient result = Type.readLinearGradient(stream);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of writeRadialGradient method, of class Type.
-     */
-//    @Test
-//    public void testWriteRadialGradient() throws Exception {
-//        System.out.println("writeRadialGradient");
-//        DataOutputStream stream = null;
-//        RadialGradient rg = null;
-//        Type.writeRadialGradient(stream, rg);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readRadialGradient method, of class Type.
-     */
-//    @Test
-//    public void testReadRadialGradient() throws Exception {
-//        System.out.println("readRadialGradient");
-//        DataInputStream stream = null;
-//        RadialGradient expResult = null;
-//        RadialGradient result = Type.readRadialGradient(stream);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readCycleMethod method, of class Type.
-     */
-//    @Test
-//    public void testReadCycleMethod() throws Exception {
-//        System.out.println("readCycleMethod");
-//        DataInputStream stream = null;
-//        CycleMethod expResult = null;
-//        CycleMethod result = Type.readCycleMethod(stream);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of writeStop method, of class Type.
-     */
-//    @Test
-//    public void testWriteStop() throws Exception {
-//        System.out.println("writeStop");
-//        DataOutputStream stream = null;
-//        Stop stop = null;
-//        Type.writeStop(stream, stop);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of readStop method, of class Type.
-     */
-//    @Test
-//    public void testReadStop() throws Exception {
-//        System.out.println("readStop");
-//        DataInputStream stream = null;
-//        Stop expResult = null;
-//        Stop result = Type.readStop(stream);
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-    /**
-     * Test of isMightHaveLookups method, of class Type.
-     */
-//    @Test
-//    public void testIsMightHaveLookups() {
-//        System.out.println("isMightHaveLookups");
-//        Type instance = new Type();
-//        boolean expResult = false;
-//        boolean result = instance.isMightHaveLookups();
-//        assertEquals(expResult, result);
-//        // TODO review the generated test code and remove the default call to fail.
-//        fail("The test case is a prototype.");
-//    }
-
-}
--- /dev/null	2015-09-03 15:37:30.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/TypeTest.java	2015-09-03 15:37:28.595606900 -0700
@@ -0,0 +1,311 @@
+/*
+ * 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.css;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
+
+public class TypeTest {
+
+    // Key key = TypeTest.getKeyByName("-fx-cursor", Node.impl_CSS_KEYS);
+    public static CssMetaData getCssMetaDataByName(String name, CssMetaData[] keys) {
+        CssMetaData keyForName = null;
+        for (CssMetaData k : keys) {
+            if (k.getProperty().equals(name)) {
+                keyForName = k;
+                break;
+            }
+        }
+        assertNotNull(keyForName);
+        return keyForName;
+    }
+
+    // ParsedValue value = TypeTest.getValueFor(stylesheet, "-fx-cursor")
+    public static ParsedValue getValueFor(Stylesheet stylesheet, String property ) {
+        for (Rule rule : stylesheet.getRules()) {
+            // for (Declaration decl : rule.getUnobservedDeclarationList()) {
+            for (Declaration decl : rule.getDeclarations()) {
+                if (property.equals(decl.getProperty())) {
+                    return decl.getParsedValue();
+                }
+            }
+        }
+        fail("getValueFor " + property);
+        return null;
+    }
+
+    public TypeTest() {
+    }
+
+    @Test
+    public void testType() {
+        // All the tests have been stubbed out for now (since
+        // the other tests implicitly or explicitly test Type).
+        // But a unit test has to have a runnable method.
+    }
+
+    /**
+     * Test of ENUM method, of class Type.
+     */
+//    @Test
+//    public void testENUM() {
+//        System.out.println("ENUM");
+//        Class type = null;
+//        Type expResult = null;
+//        Type result = Type.ENUM(type);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of convert method, of class Type.
+     */
+//    @Test
+//    public void testConvert_Value_Font() {
+//        System.out.println("convert");
+//        ParsedValue<Font> value = null;
+//        Font font = null;
+//        Type instance = new Type();
+//        Object expResult = null;
+//        Object result = instance.convert(value, font);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of convert method, of class Type.
+     */
+//    @Test
+//    public void testConvert_KeyArr() {
+//        System.out.println("convert");
+//        Key[] keys = null;
+//        Type instance = new Type();
+//        Object expResult = null;
+//        Object result = instance.convert(keys);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of writeCssSerializable method, of class Type.
+     */
+//    @Test
+//    public void testWriteCssSerializable() throws Exception {
+//        System.out.println("writeCssSerializable");
+//        DataOutputStream stream = null;
+//        StringStore ss = null;
+//        CssSerializable cs = null;
+//        Type instance = new Type();
+//        instance.writeCssSerializable(stream, ss, cs);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readCssSerializable method, of class Type.
+     */
+//    @Test
+//    public void testReadCssSerializable() throws Exception {
+//        System.out.println("readCssSerializable");
+//        DataInputStream stream = null;
+//        String[] strings = null;
+//        Type instance = new Type();
+//        Object expResult = null;
+//        Object result = instance.readCssSerializable(stream, strings);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of writePaint method, of class Type.
+     */
+//    @Test
+//    public void testWritePaint() throws Exception {
+//        System.out.println("writePaint");
+//        DataOutputStream stream = null;
+//        Paint paint = null;
+//        Type.writePaint(stream, paint);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readPaint method, of class Type.
+     */
+//    @Test
+//    public void testReadPaint() throws Exception {
+//        System.out.println("readPaint");
+//        DataInputStream stream = null;
+//        Paint expResult = null;
+//        Paint result = Type.readPaint(stream);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of writeColor method, of class Type.
+     */
+//    @Test
+//    public void testWriteColor() throws Exception {
+//        System.out.println("writeColor");
+//        DataOutputStream stream = null;
+//        Color color = null;
+//        Type.writeColor(stream, color);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readColor method, of class Type.
+     */
+//    @Test
+//    public void testReadColor() throws Exception {
+//        System.out.println("readColor");
+//        DataInputStream stream = null;
+//        Color expResult = null;
+//        Color result = Type.readColor(stream);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of writeLinearGradient method, of class Type.
+     */
+//    @Test
+//    public void testWriteLinearGradient() throws Exception {
+//        System.out.println("writeLinearGradient");
+//        DataOutputStream stream = null;
+//        LinearGradient lg = null;
+//        Type.writeLinearGradient(stream, lg);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readLinearGradient method, of class Type.
+     */
+//    @Test
+//    public void testReadLinearGradient() throws Exception {
+//        System.out.println("readLinearGradient");
+//        DataInputStream stream = null;
+//        LinearGradient expResult = null;
+//        LinearGradient result = Type.readLinearGradient(stream);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of writeRadialGradient method, of class Type.
+     */
+//    @Test
+//    public void testWriteRadialGradient() throws Exception {
+//        System.out.println("writeRadialGradient");
+//        DataOutputStream stream = null;
+//        RadialGradient rg = null;
+//        Type.writeRadialGradient(stream, rg);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readRadialGradient method, of class Type.
+     */
+//    @Test
+//    public void testReadRadialGradient() throws Exception {
+//        System.out.println("readRadialGradient");
+//        DataInputStream stream = null;
+//        RadialGradient expResult = null;
+//        RadialGradient result = Type.readRadialGradient(stream);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readCycleMethod method, of class Type.
+     */
+//    @Test
+//    public void testReadCycleMethod() throws Exception {
+//        System.out.println("readCycleMethod");
+//        DataInputStream stream = null;
+//        CycleMethod expResult = null;
+//        CycleMethod result = Type.readCycleMethod(stream);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of writeStop method, of class Type.
+     */
+//    @Test
+//    public void testWriteStop() throws Exception {
+//        System.out.println("writeStop");
+//        DataOutputStream stream = null;
+//        Stop stop = null;
+//        Type.writeStop(stream, stop);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of readStop method, of class Type.
+     */
+//    @Test
+//    public void testReadStop() throws Exception {
+//        System.out.println("readStop");
+//        DataInputStream stream = null;
+//        Stop expResult = null;
+//        Stop result = Type.readStop(stream);
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+    /**
+     * Test of isMightHaveLookups method, of class Type.
+     */
+//    @Test
+//    public void testIsMightHaveLookups() {
+//        System.out.println("isMightHaveLookups");
+//        Type instance = new Type();
+//        boolean expResult = false;
+//        boolean result = instance.isMightHaveLookups();
+//        assertEquals(expResult, result);
+//        // TODO review the generated test code and remove the default call to fail.
+//        fail("The test case is a prototype.");
+//    }
+
+}
--- old/modules/graphics/src/test/resources/com/sun/javafx/css/HonorDeveloperSettingsTest_AUTHOR.css	2015-09-03 15:37:37.491115700 -0700
+++ /dev/null	2015-09-03 15:37:38.000000000 -0700
@@ -1,16 +0,0 @@
-
-.root { -fx-font: 20 Amble; }
-
-/* 
- * setting stroke width to 1em will cause CSS to lookup the
- * inherited font. 
- */
-#text { -fx-stroke: red; -fx-stroke-width: 1em; }
-#rectangle { -fx-stroke: red; -fx-stroke-width: 1em; }
-
-#rt-20686-author { -fx-font-smoothing-type: lcd; }
-
-/* FontTypeTest testRT_32551 */
-#test-rt-32551 { -fx-font-style: italic; }
-
-#test-rt-29773 { -fx-font-family: 'Amble Cn'; }
\ No newline at end of file
--- /dev/null	2015-09-03 15:37:38.000000000 -0700
+++ new/modules/graphics/src/test/resources/javafx/css/HonorDeveloperSettingsTest_AUTHOR.css	2015-09-03 15:37:36.695070200 -0700
@@ -0,0 +1,16 @@
+
+.root { -fx-font: 20 Amble; }
+
+/* 
+ * setting stroke width to 1em will cause CSS to lookup the
+ * inherited font. 
+ */
+#text { -fx-stroke: red; -fx-stroke-width: 1em; }
+#rectangle { -fx-stroke: red; -fx-stroke-width: 1em; }
+
+#rt-20686-author { -fx-font-smoothing-type: lcd; }
+
+/* FontTypeTest testRT_32551 */
+#test-rt-32551 { -fx-font-style: italic; }
+
+#test-rt-29773 { -fx-font-family: 'Amble Cn'; }
\ No newline at end of file
--- old/modules/graphics/src/test/resources/com/sun/javafx/css/HonorDeveloperSettingsTest_UA.css	2015-09-03 15:37:42.437398600 -0700
+++ /dev/null	2015-09-03 15:37:43.000000000 -0700
@@ -1,15 +0,0 @@
-/*
- * We specify from CSS that this rectangle should have an opacity value of
- * .76
- */
-#rectangle {
-    -fx-opacity: .76;
-    -fx-cursor: HAND;
-    -fx-effect: dropshadow( two-pass-box , rgba(0,0,0,0.4) , 15, 0.0 , 0 , 6 );
-}
-
-#text {
-    -fx-font: 32 "Amble Cn";
-}
-
-#rt-20686-ua { -fx-font-smoothing-type: gray; }
\ No newline at end of file
--- /dev/null	2015-09-03 15:37:43.000000000 -0700
+++ new/modules/graphics/src/test/resources/javafx/css/HonorDeveloperSettingsTest_UA.css	2015-09-03 15:37:41.585349900 -0700
@@ -0,0 +1,15 @@
+/*
+ * We specify from CSS that this rectangle should have an opacity value of
+ * .76
+ */
+#rectangle {
+    -fx-opacity: .76;
+    -fx-cursor: HAND;
+    -fx-effect: dropshadow( two-pass-box , rgba(0,0,0,0.4) , 15, 0.0 , 0 , 6 );
+}
+
+#text {
+    -fx-font: 32 "Amble Cn";
+}
+
+#rt-20686-ua { -fx-font-smoothing-type: gray; }
\ No newline at end of file
Files old/modules/graphics/src/test/resources/com/sun/javafx/css/RT-30953-2.2.21.bss and /dev/null differ
Files /dev/null and new/modules/graphics/src/test/resources/javafx/css/RT-30953-2.2.21.bss differ
Files old/modules/graphics/src/test/resources/com/sun/javafx/css/RT-30953-2.2.4.bss and /dev/null differ
Files /dev/null and new/modules/graphics/src/test/resources/javafx/css/RT-30953-2.2.4.bss differ
Files old/modules/graphics/src/test/resources/com/sun/javafx/css/RT-30953-2.2.45.bss and /dev/null differ
Files /dev/null and new/modules/graphics/src/test/resources/javafx/css/RT-30953-2.2.45.bss differ
Files old/modules/graphics/src/test/resources/com/sun/javafx/css/RT-30953-v4.bss and /dev/null differ
Files /dev/null and new/modules/graphics/src/test/resources/javafx/css/RT-30953-v4.bss differ
--- old/modules/graphics/src/test/resources/com/sun/javafx/css/RT-30953.css	2015-09-03 15:38:07.486831400 -0700
+++ /dev/null	2015-09-03 15:38:08.000000000 -0700
@@ -1,234 +0,0 @@
-/* http://fonts.googleapis.com/css?family=Bree+Serif */
-@font-face {
-    font-family: 'Bree Serif';
-    font-style: normal;
-    font-weight: 400;
-    src: local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff');
-}
-
-.root {
-    -fx-background-color: red;
-    -fx-background-color: red, yellow;
-    -fx-background-image: url("duke.png");
-    -fx-background-image: url("duke.png"), url("duke.png");
-    -fx-background-insets: 1px;
-    -fx-background-insets: 1px, 2px;
-    -fx-background-position: left;
-    -fx-background-position: right;
-    -fx-background-position: 10px;
-    -fx-background-position: 10px 20px;
-    -fx-background-position: left 20px;
-    -fx-background-position: 10px 20px, 20px 10px;
-    -fx-background-position: left 20px, right 20px;
-    -fx-background-radius: 1;
-    -fx-background-radius: 1 2;
-    -fx-background-radius: 1 2 3;
-    -fx-background-radius: 1 2 3 4;
-    -fx-background-radius: 1, 1;
-    -fx-background-radius: 1 2 3 4, 1 2 3 4;
-    -fx-background-insets: 1;
-    -fx-background-insets: 1 2;
-    -fx-background-insets: 1 2 3;
-    -fx-background-insets: 1 2 3 4;
-    -fx-background-insets: 1, 1;
-    -fx-background-insets: 1 2 3 4, 1 2 3 4;    
-    -fx-background-repeat: repeat-x;
-    -fx-background-repeat: repeat-y;
-    -fx-background-repeat: repeat;
-    -fx-background-repeat: space;
-    -fx-background-repeat: round;
-    -fx-background-repeat: stretch;
-    -fx-background-repeat: no-repeat;
-    -fx-background-repeat: repeat no-repeat;
-    -fx-background-repeat: repeat-x, repeat-y;
-    -fx-background-repeat: repeat no-repeat, round space;    
-    -fx-background-size: 100px;
-    -fx-background-size: 100px 100px;
-    -fx-background-size: auto;
-    -fx-background-size: cover;
-    -fx-background-size: contain;
-    -fx-background-size: stretch;
-    -fx-background-size: stretch, contain;        
-    -fx-border-color: red;
-    -fx-border-color: red yellow;
-    -fx-border-color: red yellow green;
-    -fx-border-color: red yellow green blue;
-    -fx-border-color: red, red;
-    -fx-border-color: red yellow green blue, red yellow green blue; 
-    -fx-border-radius: 1;
-    -fx-border-radius: 1 2;
-    -fx-border-radius: 1 2 3;
-    -fx-border-radius: 1 2 3 4;
-    -fx-border-radius: 1, 1;
-    -fx-border-radius: 1 2 3 4, 1 2 3 4;
-    -fx-border-insets: 1;
-    -fx-border-insets: 1 2;
-    -fx-border-insets: 1 2 3;
-    -fx-border-insets: 1 2 3 4;
-    -fx-border-insets: 1, 1;
-    -fx-border-insets: 1 2 3 4, 1 2 3 4;        
-   -fx-border-style: solid;
-    -fx-border-style: solid phase 10;
-    -fx-border-style: dotted;
-    -fx-border-style: dashed;
-    -fx-border-style: segments(1, 2, 3);
-    -fx-border-style: solid centered;
-    -fx-border-style: solid phase 10 centered;
-    -fx-border-style: solid inside;
-    -fx-border-style: solid outside;
-    -fx-border-style: solid line-join miter 10;
-    -fx-border-style: solid line-join bevel;
-    -fx-border-style: solid line-join round;
-    -fx-border-style: solid centered line-join miter 10;
-    -fx-border-style: solid centered line-join bevel;
-    -fx-border-style: solid phase 10 centered line-join miter 10;
-    -fx-border-style: solid phase 10 centered line-join bevel;
-    -fx-border-style: solid line-cap square;
-    -fx-border-style: solid line-cap butt;
-    -fx-border-style: solid line-cap round;
-    -fx-border-style: solid centered line-cap square;
-    -fx-border-style: solid centered line-cap butt;
-    -fx-border-style: solid phase 10 centered line-cap square;
-    -fx-border-style: solid phase 10 centered line-cap butt;
-    -fx-border-style: solid line-join miter 10 line-cap square;
-    -fx-border-style: solid line-join bevel line-cap square;
-    -fx-border-style: solid phase 10 line-join bevel line-cap square;
-    -fx-border-style: solid phase 10 line-join bevel line-cap square, dashed phase 10 line-join bevel line-cap square;
-    -fx-border-width: 1;
-    -fx-border-width: 1 2;
-    -fx-border-width: 1 2 3;
-    -fx-border-width: 1 2 3 4;
-    -fx-border-width: 1, 1;
-    -fx-border-width: 1 2 3 4, 1 2 3 4;        
-    -fx-border-image-insets: 1;
-    -fx-border-image-insets: 1 2;
-    -fx-border-image-insets: 1 2 3;
-    -fx-border-image-insets: 1 2 3 4;
-    -fx-border-image-insets: 1, 1;
-    -fx-border-image-insets: 1 2 3 4, 1 2 3 4;        
-    -fx-border-image-repeat: repeat-x;
-    -fx-border-image-repeat: repeat-y;
-    -fx-border-image-repeat: repeat;
-    -fx-border-image-repeat: space;
-    -fx-border-image-repeat: round;
-    -fx-border-image-repeat: stretch;
-    -fx-border-image-repeat: no-repeat;
-    -fx-border-image-repeat: repeat no-repeat;
-    -fx-border-image-repeat: repeat-x, repeat-y;
-    -fx-border-image-repeat: repeat no-repeat, round space;     
-    -fx-border-image-slice: 10%;
-    -fx-border-image-slice: 10% fill;
-    -fx-border-image-slice: 10% 10%;
-    -fx-border-image-slice: 10% 10% 10%;
-    -fx-border-image-slice: 10% 10% 10% fill;
-    -fx-border-image-slice: 10% 10% 10% 10%;
-    -fx-border-image-slice: 10% 10% 10% 10% fill;
-    -fx-border-image-slice: 10%, 10%;
-    -fx-border-image-slice: 10% fill, 10% fill;
-    -fx-border-image-slice: 10% 10% 10% 10% fill, 10% 10% 10% 10% fill;        
-    -fx-border-image-source: url("duke.png");
-    -fx-border-image-source: url("duke.png"), url("duke.png");
-    -fx-border-image-width: 1;
-    -fx-border-image-width: 1 2;
-    -fx-border-image-width: 1 2 3;
-    -fx-border-image-width: 1 2 3 4;
-    -fx-border-image-width: 1, 1;
-    -fx-border-image-width: 1 2 3 4, 1 2 3 4;        
-    -fx-padding: 1;
-    -fx-padding: 1 2;
-    -fx-padding: 1 2 3;
-    -fx-padding: 1 2 3 4;
-    -fx-padding: 1, 1;
-    -fx-padding: 1 2 3 4, 1 2 3 4;        
-    -fx-label-padding: 1;
-    -fx-label-padding: 1 2;
-    -fx-label-padding: 1 2 3;
-    -fx-label-padding: 1 2 3 4;
-    -fx-label-padding: 1, 1;
-    -fx-label-padding: 1 2 3 4, 1 2 3 4;        
-    -fx-shape: "M150 0 L75 200 L225 200 Z";
-    -fx-font-size: 18pt;
-    -fx-font-size: 1.5em;
-    -fx-font-size: 150%;
-    -fx-font-size: xx-small;
-    -fx-font-size: x-small;
-    -fx-font-size: small;
-    -fx-font-size: medium;
-    -fx-font-size: large;
-    -fx-font-size: x-large;
-    -fx-font-size: xx-large;
-    -fx-font-size: smaller;
-    -fx-font-size: larger;
-    -fx-font-style: italic;
-    -fx-font-weight: normal;
-    -fx-font-weight: bold;
-    -fx-font-weight: bolder;
-    -fx-font-weight: lighter;
-    -fx-font-weight: inherit;
-/*    -fx-font-weight: 100;
-    -fx-font-weight: 200;
-    -fx-font-weight: 300;
-    -fx-font-weight: 400;
-    -fx-font-weight: 500;
-    -fx-font-weight: 600;
-    -fx-font-weight: 700;
-    -fx-font-weight: 800;
-    -fx-font-weight: 900;*/
-    -fx-font: 16 "Comic Sans MS";
-    -fx-font: 16 Arial;
-    -fx-font: bold 16 Arial;
-    -fx-font: italic 16 Arial;
-    -fx-font: bold italic 16 Arial;
-    -fx-font: italic bold 16 Arial;
-    -fx-stroke-dash-array: 10 20 30 40;
-    -fx-stroke-line-join: miter 45;
-    -fx-stroke-line-join: bevel;
-    -fx-stroke-line-join: round;
-    -fx-stroke-line-cap: round;
-    -fx-stroke-line-cap: square;
-    -fx-stroke-line-cap: butt;
-    -fx-stroke-type: centered;
-    -fx-stroke-type: inside;
-    -fx-stroke-type: outside;
-    -fx-font-smoothing-type: gray;
-    -fx-font-smoothing-type: lcd;
-    -fx-text-alignment: left;
-    -fx-text-alignment: center;
-    -fx-text-alignment: right;
-    -fx-text-alignment: justify;
-    -fx-text-origin: top;
-    -fx-text-origin: baseline;
-    -fx-text-origin: bottom;
-    -fx-orientation: horizontal;
-    -fx-orientation: vertical;
-    -fx-alignment: top-left;
-    -fx-alignment: top-center;
-    -fx-alignment: top-right;
-    -fx-alignment: center-left;
-    -fx-alignment: center;
-    -fx-alignment: center-right;
-    -fx-alignment: bottom-left;
-    -fx-alignment: bottom-center;
-    -fx-alignment: bottom-right;
-    -fx-alignment: baseline-left;
-    -fx-alignment: baseline-center;
-    -fx-alignment: baseline-right;
-    -fx-text-overrun: center-ellipsis;
-    -fx-text-overrun: center-word-ellipsis;
-    -fx-text-overrun: clip;
-    -fx-text-overrun: ellipsis;
-    -fx-text-overrun: leading-ellipsis;
-    -fx-text-overrun: leading-word-ellipsis;
-    -fx-text-overrun: word-ellipsis;
-    -fx-content-display: top;
-    -fx-content-display: right;
-    -fx-content-display: bottom;
-    -fx-content-display: left;
-    -fx-content-display: center;
-    -fx-content-display: graphic-only;
-    -fx-content-display: text-only;
-    -fx-hbar-policy: never;
-    -fx-hbar-policy: always;
-    -fx-hbar-policy: as-needed;
-}
-    
--- /dev/null	2015-09-03 15:38:09.000000000 -0700
+++ new/modules/graphics/src/test/resources/javafx/css/RT-30953.css	2015-09-03 15:38:06.775790700 -0700
@@ -0,0 +1,234 @@
+/* http://fonts.googleapis.com/css?family=Bree+Serif */
+@font-face {
+    font-family: 'Bree Serif';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Bree Serif'), local('BreeSerif-Regular'), url(http://themes.googleusercontent.com/static/fonts/breeserif/v2/LQ7WLTaITDg4OSRuOZCps73hpw3pgy2gAi-Ip7WPMi0.woff) format('woff');
+}
+
+.root {
+    -fx-background-color: red;
+    -fx-background-color: red, yellow;
+    -fx-background-image: url("duke.png");
+    -fx-background-image: url("duke.png"), url("duke.png");
+    -fx-background-insets: 1px;
+    -fx-background-insets: 1px, 2px;
+    -fx-background-position: left;
+    -fx-background-position: right;
+    -fx-background-position: 10px;
+    -fx-background-position: 10px 20px;
+    -fx-background-position: left 20px;
+    -fx-background-position: 10px 20px, 20px 10px;
+    -fx-background-position: left 20px, right 20px;
+    -fx-background-radius: 1;
+    -fx-background-radius: 1 2;
+    -fx-background-radius: 1 2 3;
+    -fx-background-radius: 1 2 3 4;
+    -fx-background-radius: 1, 1;
+    -fx-background-radius: 1 2 3 4, 1 2 3 4;
+    -fx-background-insets: 1;
+    -fx-background-insets: 1 2;
+    -fx-background-insets: 1 2 3;
+    -fx-background-insets: 1 2 3 4;
+    -fx-background-insets: 1, 1;
+    -fx-background-insets: 1 2 3 4, 1 2 3 4;    
+    -fx-background-repeat: repeat-x;
+    -fx-background-repeat: repeat-y;
+    -fx-background-repeat: repeat;
+    -fx-background-repeat: space;
+    -fx-background-repeat: round;
+    -fx-background-repeat: stretch;
+    -fx-background-repeat: no-repeat;
+    -fx-background-repeat: repeat no-repeat;
+    -fx-background-repeat: repeat-x, repeat-y;
+    -fx-background-repeat: repeat no-repeat, round space;    
+    -fx-background-size: 100px;
+    -fx-background-size: 100px 100px;
+    -fx-background-size: auto;
+    -fx-background-size: cover;
+    -fx-background-size: contain;
+    -fx-background-size: stretch;
+    -fx-background-size: stretch, contain;        
+    -fx-border-color: red;
+    -fx-border-color: red yellow;
+    -fx-border-color: red yellow green;
+    -fx-border-color: red yellow green blue;
+    -fx-border-color: red, red;
+    -fx-border-color: red yellow green blue, red yellow green blue; 
+    -fx-border-radius: 1;
+    -fx-border-radius: 1 2;
+    -fx-border-radius: 1 2 3;
+    -fx-border-radius: 1 2 3 4;
+    -fx-border-radius: 1, 1;
+    -fx-border-radius: 1 2 3 4, 1 2 3 4;
+    -fx-border-insets: 1;
+    -fx-border-insets: 1 2;
+    -fx-border-insets: 1 2 3;
+    -fx-border-insets: 1 2 3 4;
+    -fx-border-insets: 1, 1;
+    -fx-border-insets: 1 2 3 4, 1 2 3 4;        
+   -fx-border-style: solid;
+    -fx-border-style: solid phase 10;
+    -fx-border-style: dotted;
+    -fx-border-style: dashed;
+    -fx-border-style: segments(1, 2, 3);
+    -fx-border-style: solid centered;
+    -fx-border-style: solid phase 10 centered;
+    -fx-border-style: solid inside;
+    -fx-border-style: solid outside;
+    -fx-border-style: solid line-join miter 10;
+    -fx-border-style: solid line-join bevel;
+    -fx-border-style: solid line-join round;
+    -fx-border-style: solid centered line-join miter 10;
+    -fx-border-style: solid centered line-join bevel;
+    -fx-border-style: solid phase 10 centered line-join miter 10;
+    -fx-border-style: solid phase 10 centered line-join bevel;
+    -fx-border-style: solid line-cap square;
+    -fx-border-style: solid line-cap butt;
+    -fx-border-style: solid line-cap round;
+    -fx-border-style: solid centered line-cap square;
+    -fx-border-style: solid centered line-cap butt;
+    -fx-border-style: solid phase 10 centered line-cap square;
+    -fx-border-style: solid phase 10 centered line-cap butt;
+    -fx-border-style: solid line-join miter 10 line-cap square;
+    -fx-border-style: solid line-join bevel line-cap square;
+    -fx-border-style: solid phase 10 line-join bevel line-cap square;
+    -fx-border-style: solid phase 10 line-join bevel line-cap square, dashed phase 10 line-join bevel line-cap square;
+    -fx-border-width: 1;
+    -fx-border-width: 1 2;
+    -fx-border-width: 1 2 3;
+    -fx-border-width: 1 2 3 4;
+    -fx-border-width: 1, 1;
+    -fx-border-width: 1 2 3 4, 1 2 3 4;        
+    -fx-border-image-insets: 1;
+    -fx-border-image-insets: 1 2;
+    -fx-border-image-insets: 1 2 3;
+    -fx-border-image-insets: 1 2 3 4;
+    -fx-border-image-insets: 1, 1;
+    -fx-border-image-insets: 1 2 3 4, 1 2 3 4;        
+    -fx-border-image-repeat: repeat-x;
+    -fx-border-image-repeat: repeat-y;
+    -fx-border-image-repeat: repeat;
+    -fx-border-image-repeat: space;
+    -fx-border-image-repeat: round;
+    -fx-border-image-repeat: stretch;
+    -fx-border-image-repeat: no-repeat;
+    -fx-border-image-repeat: repeat no-repeat;
+    -fx-border-image-repeat: repeat-x, repeat-y;
+    -fx-border-image-repeat: repeat no-repeat, round space;     
+    -fx-border-image-slice: 10%;
+    -fx-border-image-slice: 10% fill;
+    -fx-border-image-slice: 10% 10%;
+    -fx-border-image-slice: 10% 10% 10%;
+    -fx-border-image-slice: 10% 10% 10% fill;
+    -fx-border-image-slice: 10% 10% 10% 10%;
+    -fx-border-image-slice: 10% 10% 10% 10% fill;
+    -fx-border-image-slice: 10%, 10%;
+    -fx-border-image-slice: 10% fill, 10% fill;
+    -fx-border-image-slice: 10% 10% 10% 10% fill, 10% 10% 10% 10% fill;        
+    -fx-border-image-source: url("duke.png");
+    -fx-border-image-source: url("duke.png"), url("duke.png");
+    -fx-border-image-width: 1;
+    -fx-border-image-width: 1 2;
+    -fx-border-image-width: 1 2 3;
+    -fx-border-image-width: 1 2 3 4;
+    -fx-border-image-width: 1, 1;
+    -fx-border-image-width: 1 2 3 4, 1 2 3 4;        
+    -fx-padding: 1;
+    -fx-padding: 1 2;
+    -fx-padding: 1 2 3;
+    -fx-padding: 1 2 3 4;
+    -fx-padding: 1, 1;
+    -fx-padding: 1 2 3 4, 1 2 3 4;        
+    -fx-label-padding: 1;
+    -fx-label-padding: 1 2;
+    -fx-label-padding: 1 2 3;
+    -fx-label-padding: 1 2 3 4;
+    -fx-label-padding: 1, 1;
+    -fx-label-padding: 1 2 3 4, 1 2 3 4;        
+    -fx-shape: "M150 0 L75 200 L225 200 Z";
+    -fx-font-size: 18pt;
+    -fx-font-size: 1.5em;
+    -fx-font-size: 150%;
+    -fx-font-size: xx-small;
+    -fx-font-size: x-small;
+    -fx-font-size: small;
+    -fx-font-size: medium;
+    -fx-font-size: large;
+    -fx-font-size: x-large;
+    -fx-font-size: xx-large;
+    -fx-font-size: smaller;
+    -fx-font-size: larger;
+    -fx-font-style: italic;
+    -fx-font-weight: normal;
+    -fx-font-weight: bold;
+    -fx-font-weight: bolder;
+    -fx-font-weight: lighter;
+    -fx-font-weight: inherit;
+/*    -fx-font-weight: 100;
+    -fx-font-weight: 200;
+    -fx-font-weight: 300;
+    -fx-font-weight: 400;
+    -fx-font-weight: 500;
+    -fx-font-weight: 600;
+    -fx-font-weight: 700;
+    -fx-font-weight: 800;
+    -fx-font-weight: 900;*/
+    -fx-font: 16 "Comic Sans MS";
+    -fx-font: 16 Arial;
+    -fx-font: bold 16 Arial;
+    -fx-font: italic 16 Arial;
+    -fx-font: bold italic 16 Arial;
+    -fx-font: italic bold 16 Arial;
+    -fx-stroke-dash-array: 10 20 30 40;
+    -fx-stroke-line-join: miter 45;
+    -fx-stroke-line-join: bevel;
+    -fx-stroke-line-join: round;
+    -fx-stroke-line-cap: round;
+    -fx-stroke-line-cap: square;
+    -fx-stroke-line-cap: butt;
+    -fx-stroke-type: centered;
+    -fx-stroke-type: inside;
+    -fx-stroke-type: outside;
+    -fx-font-smoothing-type: gray;
+    -fx-font-smoothing-type: lcd;
+    -fx-text-alignment: left;
+    -fx-text-alignment: center;
+    -fx-text-alignment: right;
+    -fx-text-alignment: justify;
+    -fx-text-origin: top;
+    -fx-text-origin: baseline;
+    -fx-text-origin: bottom;
+    -fx-orientation: horizontal;
+    -fx-orientation: vertical;
+    -fx-alignment: top-left;
+    -fx-alignment: top-center;
+    -fx-alignment: top-right;
+    -fx-alignment: center-left;
+    -fx-alignment: center;
+    -fx-alignment: center-right;
+    -fx-alignment: bottom-left;
+    -fx-alignment: bottom-center;
+    -fx-alignment: bottom-right;
+    -fx-alignment: baseline-left;
+    -fx-alignment: baseline-center;
+    -fx-alignment: baseline-right;
+    -fx-text-overrun: center-ellipsis;
+    -fx-text-overrun: center-word-ellipsis;
+    -fx-text-overrun: clip;
+    -fx-text-overrun: ellipsis;
+    -fx-text-overrun: leading-ellipsis;
+    -fx-text-overrun: leading-word-ellipsis;
+    -fx-text-overrun: word-ellipsis;
+    -fx-content-display: top;
+    -fx-content-display: right;
+    -fx-content-display: bottom;
+    -fx-content-display: left;
+    -fx-content-display: center;
+    -fx-content-display: graphic-only;
+    -fx-content-display: text-only;
+    -fx-hbar-policy: never;
+    -fx-hbar-policy: always;
+    -fx-hbar-policy: as-needed;
+}
+    
--- old/modules/graphics/src/test/resources/com/sun/javafx/css/RT-37122.css	2015-09-03 15:38:12.739131800 -0700
+++ /dev/null	2015-09-03 15:38:13.000000000 -0700
@@ -1 +0,0 @@
-.rect { -fx-fill: red; }
--- /dev/null	2015-09-03 15:38:14.000000000 -0700
+++ new/modules/graphics/src/test/resources/javafx/css/RT-37122.css	2015-09-03 15:38:11.915084600 -0700
@@ -0,0 +1 @@
+.rect { -fx-fill: red; }
--- old/modules/graphics/src/test/resources/com/sun/javafx/css/converters/some.txt	2015-09-03 15:38:17.736417600 -0700
+++ /dev/null	2015-09-03 15:38:18.000000000 -0700
@@ -1,25 +0,0 @@
-<!--
-  ~ Copyright (c) 2012, 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.
-  -->
-
-This is some file I'm trying to find! See URLConverterTest
--- /dev/null	2015-09-03 15:38:18.000000000 -0700
+++ new/modules/graphics/src/test/resources/javafx/css/converter/some.txt	2015-09-03 15:38:17.023376800 -0700
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2012, 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.
+  -->
+
+This is some file I'm trying to find! See URLConverterTest
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMBuilderFactory.java	2015-09-03 15:38:21.561636400 -0700
+++ /dev/null	2015-09-03 15:38:22.000000000 -0700
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package com.oracle.javafx.scenebuilder.kit.fxom;
-
-import javafx.fxml.JavaFXBuilderFactory;
-import javafx.scene.image.Image;
-import javafx.util.Builder;
-import javafx.util.BuilderFactory;
-
-import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
-
-/**
- *
- */
-class FXOMBuilderFactory implements BuilderFactory {
-
-    final JavaFXBuilderFactory delegate;
-    
-    public FXOMBuilderFactory(ClassLoader classLoader) {
-        assert classLoader != null;
-        
-        this.delegate = Deprecation.newJavaFXBuilderFactory(classLoader);
-    }
-    
-    /*
-     * BuilderFactory
-     */
-    
-    @Override
-    public Builder<?> getBuilder(Class<?> type) {
-        final Builder<?> result;
-        
-        if (Image.class == type) {
-           result = new FXOMImageBuilder();
-        } else {
-           result = delegate.getBuilder(type);
-        }
-        
-        return result;
-    }
-    
-}
--- old/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMImageBuilder.java	2015-09-03 15:38:25.733875000 -0700
+++ /dev/null	2015-09-03 15:38:26.000000000 -0700
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates.
- * All rights reserved. Use is subject to license terms.
- *
- * This file is available and licensed under the following license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the distribution.
- *  - Neither the name of Oracle Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.oracle.javafx.scenebuilder.kit.fxom;
-
-import com.oracle.javafx.scenebuilder.kit.util.URLUtils;
-import com.sun.javafx.fxml.builder.JavaFXImageBuilder;
-import java.io.File;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-/**
- *
- */
-class FXOMImageBuilder extends JavaFXImageBuilder {
-    
-    /*
-     * JavaFXImageBuilder
-     */
-    
-    @Override
-    public Object put(String key, Object value) {
-        Object fixedValue;
-        
-        if ("url".equals(key)) { //NOI18N
-            if (value == null) {
-                fixedValue = getMissingImageURL().toExternalForm();
-            } else {
-                try {
-                    // Check that value is a valid URI
-                    final File imageFile = URLUtils.getFile(value.toString());
-                    if (imageFile == null) { // Not a file URI
-                        fixedValue = getMissingImageURL().toExternalForm();
-                    } else if (imageFile.canRead()) {
-                        fixedValue = value;
-                    } else {
-                        fixedValue = getMissingImageURL().toExternalForm();
-                    }
-                } catch(URISyntaxException x) {
-                    fixedValue = getMissingImageURL().toExternalForm();
-                }
-            }
-        } else {
-            fixedValue = value;
-        }
-        
-        return super.put(key, fixedValue);
-    }
-        
-    
-    /*
-     * Private
-     */
-    
-    private static URL missingImageURL;
-    
-    private static URL getMissingImageURL() {
-        if (missingImageURL == null) {
-            missingImageURL = FXOMImageBuilder.class.getResource("missing-image.png"); //NOI18N
-            if (missingImageURL == null) {
-                throw new RuntimeException("Cannot find missing-image.png"); //NOI18N
-            }
-        }
-        return missingImageURL;
-    }
-}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/MultiplePropertyChangeListenerHandler.java	2015-09-03 15:38:30.104125000 -0700
+++ /dev/null	2015-09-03 15:38:31.000000000 -0700
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2012, 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.scene.control;
-
-import java.util.HashMap;
-import java.util.Map;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WeakChangeListener;
-import javafx.util.Callback;
-
-public final class MultiplePropertyChangeListenerHandler {
-    
-    private final Callback<String, Void> propertyChangedHandler;
-    
-    public MultiplePropertyChangeListenerHandler(Callback<String, Void> propertyChangedHandler) {
-        this.propertyChangedHandler = propertyChangedHandler;
-    }
-    
-    /**
-     * This is part of the workaround introduced during delomboking. We probably will
-     * want to adjust the way listeners are added rather than continuing to use this
-     * map (although it doesn't really do much harm).
-     */
-    private Map<ObservableValue<?>,String> propertyReferenceMap =
-            new HashMap<ObservableValue<?>,String>();
-    
-    private final ChangeListener<Object> propertyChangedListener = new ChangeListener<Object>() {
-        @Override public void changed(ObservableValue<?> property, 
-                @SuppressWarnings("unused") Object oldValue, 
-                @SuppressWarnings("unused") Object newValue) {
-            propertyChangedHandler.call(propertyReferenceMap.get(property));
-        }
-    };
-    
-    private final WeakChangeListener<Object> weakPropertyChangedListener = 
-            new WeakChangeListener<Object>(propertyChangedListener);
-    
-    /**
-     * Subclasses can invoke this method to register that we want to listen to
-     * property change events for the given property.
-     *
-     * @param property
-     * @param reference
-     */
-    public final void registerChangeListener(ObservableValue<?> property, String reference) {
-        if (!propertyReferenceMap.containsKey(property)) {
-            propertyReferenceMap.put(property, reference);
-            property.addListener(weakPropertyChangedListener);
-        }
-    }
-    
-    public final void unregisterChangeListener(ObservableValue<?> property) {
-        if (propertyReferenceMap.containsKey(property)) {
-            propertyReferenceMap.remove(property);
-            property.removeListener(weakPropertyChangedListener);
-        }
-    }
-
-    public void dispose() {
-        // unhook listeners
-        for (ObservableValue<?> value : propertyReferenceMap.keySet()) {
-            value.removeListener(weakPropertyChangedListener);
-        }
-        propertyReferenceMap.clear();
-    }
-}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/OptionalBoolean.java	2015-09-03 15:38:34.231361100 -0700
+++ /dev/null	2015-09-03 15:38:35.000000000 -0700
@@ -1,42 +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 com.sun.javafx.scene.control.behavior;
-
-/**
- * A tri-state boolean used with KeyBinding.
- */
-public enum OptionalBoolean {
-    TRUE,
-    FALSE,
-    ANY;
-
-    public boolean equals(boolean b) {
-        if (this == ANY) return true;
-        if (b && this == TRUE) return true;
-        if (!b && this == FALSE) return true;
-        return false;
-    }
-}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/OrientedKeyBinding.java	2015-09-03 15:38:38.630612700 -0700
+++ /dev/null	2015-09-03 15:38:39.000000000 -0700
@@ -1,79 +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 com.sun.javafx.scene.control.behavior;
-
-import static com.sun.javafx.scene.control.behavior.OptionalBoolean.ANY;
-import static com.sun.javafx.scene.control.behavior.OptionalBoolean.FALSE;
-import static com.sun.javafx.scene.control.behavior.OptionalBoolean.TRUE;
-import javafx.event.EventType;
-import javafx.scene.control.Control;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-
-/**
- * Just like regular key binding but the specificity is adjusted depending
- * on the orientation of the control.
- */
-public abstract class OrientedKeyBinding extends KeyBinding {
-    private OptionalBoolean vertical = FALSE;
-
-    public OrientedKeyBinding(KeyCode code, String action) {
-        super(code, action);
-    }
-
-    public OrientedKeyBinding(KeyCode code, EventType<KeyEvent> type, String action) {
-        super(code, type, action);
-    }
-
-    public OrientedKeyBinding vertical() {
-        vertical = TRUE;
-        return this;
-    }
-
-    protected abstract boolean getVertical(Control control);
-
-    @Override public int getSpecificity(Control control, KeyEvent event) {
-        // If the control's vertical property does not match the binding's
-        // vertical property then this binding does not apply
-        final boolean verticalControl = getVertical(control);
-        if (!vertical.equals(verticalControl)) return 0;
-        // Delegate to super to compute the specificity
-        final int s = super.getSpecificity(control, event);
-        // If the super implementation says it is not a match, then it is not a
-        // match and we should return 0
-        if (s == 0) return 0;
-        // Otherwise it was a match so return s + 1
-        return (vertical != ANY) ? s + 1 : s;
-    }
-
-    @Override public String toString() {
-        return "OrientedKeyBinding [code=" + getCode() + ", shift=" + getShift() +
-                ", ctrl=" + getCtrl() + ", alt=" + getAlt() + ", meta=" + getMeta() +
-                ", type=" + getType() + ", vertical=" + vertical +
-                ", action=" + getAction() + "]";
-    }
-}
-
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TextInputControlBindings.java	2015-09-03 15:38:42.817852200 -0700
+++ /dev/null	2015-09-03 15:38:44.000000000 -0700
@@ -1,167 +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.behavior;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.application.ConditionalFeature;
-import com.sun.javafx.PlatformUtil;
-import com.sun.javafx.application.PlatformImpl;
-
-import static javafx.scene.input.KeyCode.*;
-import static javafx.scene.input.KeyEvent.*;
-
-/**
- */
-public class TextInputControlBindings {
-    protected static final List<KeyBinding> BINDINGS = new ArrayList<KeyBinding>();
-    static {
-        // caret movement
-        BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,       "Right"));
-        BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,    "Right"));
-        BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,        "Left"));
-        BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,     "Left"));
-        BINDINGS.add(new KeyBinding(UP, KEY_PRESSED,          "Home"));
-        BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED,       "Home"));
-        BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,        "Home"));
-        BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED,        "End"));
-        BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED,     "End"));
-        BINDINGS.add(new KeyBinding(END, KEY_PRESSED,         "End"));
-        BINDINGS.add(new KeyBinding(ENTER, KEY_PRESSED,       "Fire"));
-        // deletion
-        BINDINGS.add(new KeyBinding(BACK_SPACE, KEY_PRESSED,  "DeletePreviousChar"));
-        BINDINGS.add(new KeyBinding(DELETE, KEY_PRESSED,      "DeleteNextChar"));
-        // cut/copy/paste
-        BINDINGS.add(new KeyBinding(CUT, KEY_PRESSED,         "Cut"));
-        BINDINGS.add(new KeyBinding(DELETE, KEY_PRESSED,      "Cut").shift());
-        BINDINGS.add(new KeyBinding(COPY, KEY_PRESSED,        "Copy"));
-        BINDINGS.add(new KeyBinding(PASTE, KEY_PRESSED,       "Paste"));
-        BINDINGS.add(new KeyBinding(INSERT, KEY_PRESSED,      "Paste").shift());// does this belong on mac?
-        // selection
-        BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,       "SelectRight").shift());
-        BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,    "SelectRight").shift());
-        BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,        "SelectLeft").shift());
-        BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,     "SelectLeft").shift());
-        BINDINGS.add(new KeyBinding(UP, KEY_PRESSED,          "SelectHome").shift());
-        BINDINGS.add(new KeyBinding(KP_UP, KEY_PRESSED,       "SelectHome").shift());
-        BINDINGS.add(new KeyBinding(DOWN, KEY_PRESSED,        "SelectEnd").shift());
-        BINDINGS.add(new KeyBinding(KP_DOWN, KEY_PRESSED,     "SelectEnd").shift());
-
-        BINDINGS.add(new KeyBinding(BACK_SPACE, KEY_PRESSED,  "DeletePreviousChar").shift());
-        BINDINGS.add(new KeyBinding(DELETE, KEY_PRESSED,      "DeleteNextChar").shift());
-
-        // platform specific settings
-        if (PlatformUtil.isMac()) {
-            BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,       "SelectHomeExtend").shift());
-            BINDINGS.add(new KeyBinding(END, KEY_PRESSED,        "SelectEndExtend").shift());
-
-            BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,       "Home").shortcut());
-            BINDINGS.add(new KeyBinding(END, KEY_PRESSED,        "End").shortcut());
-            BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,       "Home").shortcut());
-            BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,    "Home").shortcut());
-            BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,      "End").shortcut());
-            BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "End").shortcut());
-            BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,       "LeftWord").alt());
-            BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,    "LeftWord").alt());
-            BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,      "RightWord").alt());
-            BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "RightWord").alt());
-            BINDINGS.add(new KeyBinding(DELETE, KEY_PRESSED,     "DeleteNextWord").alt());
-            BINDINGS.add(new KeyBinding(BACK_SPACE, KEY_PRESSED, "DeletePreviousWord").alt());
-            BINDINGS.add(new KeyBinding(BACK_SPACE, KEY_PRESSED, "DeleteFromLineStart").shortcut());
-            BINDINGS.add(new KeyBinding(X, KEY_PRESSED,          "Cut").shortcut());
-            BINDINGS.add(new KeyBinding(C, KEY_PRESSED,          "Copy").shortcut());
-            BINDINGS.add(new KeyBinding(INSERT, KEY_PRESSED,     "Copy").shortcut());
-            BINDINGS.add(new KeyBinding(V, KEY_PRESSED,          "Paste").shortcut());
-            BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,       "SelectHome").shift().shortcut());
-            BINDINGS.add(new KeyBinding(END, KEY_PRESSED,        "SelectEnd").shift().shortcut());
-            BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,       "SelectHomeExtend").shift().shortcut());
-            BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,    "SelectHomeExtend").shift().shortcut());
-            BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,      "SelectEndExtend").shift().shortcut());
-            BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "SelectEndExtend").shift().shortcut());
-            BINDINGS.add(new KeyBinding(A, KEY_PRESSED,          "SelectAll").shortcut());
-            BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,       "SelectLeftWord").shift().alt());
-            BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,    "SelectLeftWord").shift().alt());
-            BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,      "SelectRightWord").shift().alt());
-            BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "SelectRightWord").shift().alt());
-            BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Undo").shortcut());
-            BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Redo").shift().shortcut());
-        } else {
-            BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,       "SelectHome").shift());
-            BINDINGS.add(new KeyBinding(END, KEY_PRESSED,        "SelectEnd").shift());
-
-            BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,       "Home").ctrl());
-            BINDINGS.add(new KeyBinding(END, KEY_PRESSED,        "End").ctrl());
-            BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,       "LeftWord").ctrl());
-            BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,    "LeftWord").ctrl());
-            BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,      "RightWord").ctrl());
-            BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "RightWord").ctrl());
-            BINDINGS.add(new KeyBinding(H, KEY_PRESSED,          "DeletePreviousChar").ctrl());
-            BINDINGS.add(new KeyBinding(DELETE, KEY_PRESSED,     "DeleteNextWord").ctrl());
-            BINDINGS.add(new KeyBinding(BACK_SPACE, KEY_PRESSED, "DeletePreviousWord").ctrl());
-            BINDINGS.add(new KeyBinding(X, KEY_PRESSED,          "Cut").ctrl());
-            BINDINGS.add(new KeyBinding(C, KEY_PRESSED,          "Copy").ctrl());
-            BINDINGS.add(new KeyBinding(INSERT, KEY_PRESSED,     "Copy").ctrl());
-            BINDINGS.add(new KeyBinding(V, KEY_PRESSED,          "Paste").ctrl());
-            BINDINGS.add(new KeyBinding(HOME, KEY_PRESSED,       "SelectHome").ctrl().shift());
-            BINDINGS.add(new KeyBinding(END, KEY_PRESSED,        "SelectEnd").ctrl().shift());
-            BINDINGS.add(new KeyBinding(LEFT, KEY_PRESSED,       "SelectLeftWord").ctrl().shift());
-            BINDINGS.add(new KeyBinding(KP_LEFT, KEY_PRESSED,    "SelectLeftWord").ctrl().shift());
-            BINDINGS.add(new KeyBinding(RIGHT, KEY_PRESSED,      "SelectRightWord").ctrl().shift());
-            BINDINGS.add(new KeyBinding(KP_RIGHT, KEY_PRESSED,   "SelectRightWord").ctrl().shift());
-            BINDINGS.add(new KeyBinding(A, KEY_PRESSED,          "SelectAll").ctrl());
-            BINDINGS.add(new KeyBinding(BACK_SLASH, KEY_PRESSED, "Unselect").ctrl());
-            if (PlatformUtil.isLinux()) {
-                BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Undo").ctrl());
-                BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Redo").ctrl().shift());
-            } else {  // Windows
-                BINDINGS.add(new KeyBinding(Z, KEY_PRESSED,          "Undo").ctrl());
-                BINDINGS.add(new KeyBinding(Y, KEY_PRESSED,          "Redo").ctrl());
-            }
-        }
-        // Any other key press first goes to normal text input
-        // Note this is KEY_TYPED because otherwise the character is not available in the event.
-        BINDINGS.add(new KeyBinding(null, KEY_TYPED, "InputCharacter")
-                .alt(OptionalBoolean.ANY)
-                .shift(OptionalBoolean.ANY)
-                .ctrl(OptionalBoolean.ANY)
-                .meta(OptionalBoolean.ANY));
-        // Traversal Bindings
-        BINDINGS.add(new KeyBinding(TAB, "TraverseNext"));
-        BINDINGS.add(new KeyBinding(TAB, "TraversePrevious").shift());
-        BINDINGS.add(new KeyBinding(TAB, "TraverseNext").ctrl());
-        BINDINGS.add(new KeyBinding(TAB, "TraversePrevious").shift().ctrl());
-
-        // The following keys are forwarded to the parent container
-        BINDINGS.add(new KeyBinding(ESCAPE, "Cancel"));
-        BINDINGS.add(new KeyBinding(F10, "ToParent"));
-        // TODO XXX DEBUGGING ONLY
-//        BINDINGS.add(new KeyBinding(F4, "TraverseDebug").alt().ctrl().shift());
-        /*DEBUG*/if (PlatformImpl.isSupported(ConditionalFeature.VIRTUAL_KEYBOARD)) {
-            BINDINGS.add(new KeyBinding(DIGIT9, "UseVK").ctrl().shift());
-        }
-    }
-}
--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/BehaviorSkinBase.java	2015-09-03 15:38:47.388113600 -0700
+++ /dev/null	2015-09-03 15:38:48.000000000 -0700
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2012, 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.application.ConditionalFeature;
-import javafx.application.Platform;
-import javafx.beans.value.ObservableValue;
-import javafx.event.EventHandler;
-import javafx.event.EventType;
-import javafx.scene.control.Control;
-import javafx.scene.control.SkinBase;
-import javafx.scene.input.ContextMenuEvent;
-import javafx.scene.input.MouseEvent;
-import com.sun.javafx.scene.control.MultiplePropertyChangeListenerHandler;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-
-/**
- *
- */
-public abstract class BehaviorSkinBase<C extends Control, BB extends BehaviorBase<C>> extends SkinBase<C> {
-    /**
-     * A static final reference to whether the platform we are on supports touch.
-     */
-    protected final static boolean IS_TOUCH_SUPPORTED = Platform.isSupported(ConditionalFeature.INPUT_TOUCH);
-
-    /***************************************************************************
-     *                                                                         *
-     * Private fields                                                          *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * The {@link BehaviorBase} that encapsulates the interaction with the
-     * {@link Control} from this {@code Skin}. The {@code Skin} does not modify
-     * the {@code Control} directly, but rather redirects events into the
-     * {@code BehaviorBase} which then handles the events by modifying internal state
-     * and public state in the {@code Control}. Generally, specific
-     * {@code Skin} implementations will require specific {@code BehaviorBase}
-     * implementations. For example, a ButtonSkin might require a ButtonBehavior.
-     */
-    private BB behavior;
-    
-    /**
-     * This is part of the workaround introduced during delomboking. We probably will
-     * want to adjust the way listeners are added rather than continuing to use this
-     * map (although it doesn't really do much harm).
-     */
-    private MultiplePropertyChangeListenerHandler changeListenerHandler;
-    
-    
-    
-    /***************************************************************************
-     *                                                                         *
-     * Event Handlers / Listeners                                              *
-     *                                                                         *
-     **************************************************************************/
-    
-    
-    /**
-     * Forwards mouse events received by a MouseListener to the behavior.
-     * Note that we use this pattern to remove some of the anonymous inner
-     * classes which we'd otherwise have to create. When lambda expressions
-     * are supported, we could do it that way instead (or use MethodHandles).
-     */
-    private final EventHandler<MouseEvent> mouseHandler =
-            new EventHandler<MouseEvent>() {
-        @Override public void handle(MouseEvent e) {
-            final EventType<?> type = e.getEventType();
-
-            if (type == MouseEvent.MOUSE_ENTERED) behavior.mouseEntered(e);
-            else if (type == MouseEvent.MOUSE_EXITED) behavior.mouseExited(e);
-            else if (type == MouseEvent.MOUSE_PRESSED) behavior.mousePressed(e);
-            else if (type == MouseEvent.MOUSE_RELEASED) behavior.mouseReleased(e);
-            else if (type == MouseEvent.MOUSE_DRAGGED) behavior.mouseDragged(e);
-            else { // no op
-                throw new AssertionError("Unsupported event type received");
-            }
-        }
-    };
-
-    private final EventHandler<ContextMenuEvent> contextMenuHandler =
-            new EventHandler<ContextMenuEvent>() {
-                @Override public void handle(ContextMenuEvent event) {
-                    behavior.contextMenuRequested(event);
-                }
-            };
-    
-    /***************************************************************************
-     *                                                                         *
-     * Constructor                                                             *
-     *                                                                         *
-     **************************************************************************/
-
-    /**
-     * Constructor for all BehaviorSkinBase instances.
-     * 
-     * @param control The control for which this Skin should attach to.
-     * @param behavior The behavior for which this Skin should defer to.
-     */
-    protected BehaviorSkinBase(final C control, final BB behavior) {
-        super(control);
-        
-        if (behavior == null) {
-            throw new IllegalArgumentException("Cannot pass null for behavior");
-        }
-
-        // Update the control and behavior
-        this.behavior = behavior;
-        
-        // We will auto-add listeners for wiring up Region mouse events to
-        // be sent to the behavior
-        control.addEventHandler(MouseEvent.MOUSE_ENTERED, mouseHandler);
-        control.addEventHandler(MouseEvent.MOUSE_EXITED, mouseHandler);
-        control.addEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
-        control.addEventHandler(MouseEvent.MOUSE_RELEASED, mouseHandler);
-        control.addEventHandler(MouseEvent.MOUSE_DRAGGED, mouseHandler);
-
-        control.addEventHandler(ContextMenuEvent.CONTEXT_MENU_REQUESTED, contextMenuHandler);
-    }
-    
-    
-
-    /***************************************************************************
-     *                                                                         *
-     * Public API (from Skin)                                                  *
-     *                                                                         *
-     **************************************************************************/    
-
-    /** {@inheritDoc} */
-    public final BB getBehavior() {
-        return behavior;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void dispose() { 
-        // unhook listeners
-        if (changeListenerHandler != null) {
-            changeListenerHandler.dispose();
-        }
-        
-        C control = getSkinnable();
-        if (control != null) {
-            control.removeEventHandler(MouseEvent.MOUSE_ENTERED, mouseHandler);
-            control.removeEventHandler(MouseEvent.MOUSE_EXITED, mouseHandler);
-            control.removeEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
-            control.removeEventHandler(MouseEvent.MOUSE_RELEASED, mouseHandler);
-            control.removeEventHandler(MouseEvent.MOUSE_DRAGGED, mouseHandler);
-        }
-
-        if (behavior != null) {
-            behavior.dispose();
-            behavior = null;
-        }
-
-        super.dispose();
-    }
-    
-    /***************************************************************************
-     *                                                                         *
-     * Public API                                                              *
-     *                                                                         *
-     **************************************************************************/
-    
-    /**
-     * Subclasses can invoke this method to register that we want to listen to
-     * property change events for the given property.
-     *
-     * @param property
-     * @param reference
-     */
-    protected final void registerChangeListener(ObservableValue<?> property, String reference) {
-        if (changeListenerHandler == null) {
-            changeListenerHandler = new MultiplePropertyChangeListenerHandler(p -> {
-                handleControlPropertyChanged(p);
-                return null;
-            });
-        }
-        changeListenerHandler.registerChangeListener(property, reference);
-    }
-    
-    /**
-     * Skin subclasses will override this method to handle changes in corresponding
-     * control's properties.
-     */
-    protected void handleControlPropertyChanged(String propertyReference) {
-        // no-op
-    }
-
-}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/behavior/BehaviorBaseTest.java	2015-09-03 15:38:52.100383100 -0700
+++ /dev/null	2015-09-03 15:38:53.000000000 -0700
@@ -1,310 +0,0 @@
-/*
- * Copyright (c) 2013, 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.behavior;
-
-import javafx.scene.control.Button;
-import javafx.scene.control.Skin;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.MouseEvent;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
-import com.sun.javafx.scene.control.infrastructure.KeyModifier;
-import com.sun.javafx.scene.control.infrastructure.MouseEventFirer;
-import com.sun.javafx.scene.control.skin.BehaviorSkinBase;
-import org.junit.Before;
-import org.junit.After;
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * Unit tests for BehaviorBase
- */
-public class BehaviorBaseTest {
-    private ControlMock button;
-    private Skin<Button> skin;
-    private BehaviorBaseMock behavior;
-    private ArrayList<KeyBinding> bindings;
-    private KeyEventFirer keyboard;
-    private MouseEventFirer mouse;
-
-    @Before
-    public void setup() {
-        button = new ControlMock();
-        bindings = new ArrayList<>();
-        bindings.addAll(BehaviorBase.TRAVERSAL_BINDINGS);
-        behavior = new BehaviorBaseMock(button, bindings);
-        skin = new BehaviorSkinBase(button, behavior) {};
-        button.setSkin(skin);
-        keyboard = new KeyEventFirer(button);
-        mouse = new MouseEventFirer(button);
-    }
-
-    @After
-    public void after() {
-        mouse.dispose();
-    }
-
-    /**
-     * We don't accept null for the control of a behavior
-     */
-    @Test(expected = NullPointerException.class)
-    public void creatingBehaviorWithNullControlThrowsNPE() {
-        new BehaviorBase<Button>(null, Collections.EMPTY_LIST);
-    }
-
-    /**
-     * We do accept null for the key bindings of a behavior, treating it as empty
-     */
-    @Test
-    public void creatingBehaviorWithNullKeyBindingsResultsInEmptyKeyBindings() {
-        BehaviorBaseMock b = new BehaviorBaseMock(button, null);
-        skin = new BehaviorSkinBase(button, b) {};
-        button.setSkin(skin);
-        keyboard.doKeyPress(KeyCode.TAB);
-        assertFalse(b.someActionCalled());
-    }
-
-    /**
-     * This is a hard-and-fast rule, you must always have the control set to the
-     * expected value after the constructor was called
-     */
-    @Test
-    public void controlMustBeSet() {
-        assertEquals(button, behavior.getControl());
-    }
-
-    /**
-     * This is a little fishy. Right now we store the control in a final field, so we
-     * know that we want this to continue returning "button" after dispose, but really
-     * it seems better to clear the control after dispose, although this mean we can
-     * no longer store the control in a final field.
-     */
-    @Test
-    public void controlMustNotBeClearedOnDispose() {
-        button.setSkin(null);
-        assertEquals(button, behavior.getControl());
-    }
-
-    /**
-     * Modifying the list passed to BehaviorBase should have no effect on what
-     * key bindings are used.
-     */
-    @Test
-    public void changingKeyBindingsDynamicallyMustHaveNoEffect() {
-        bindings.set(0, new KeyBinding(KeyCode.TAB, "action2"));
-        keyboard.doKeyPress(KeyCode.TAB);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_NEXT));
-        assertFalse(behavior.actionCalled("action2"));
-    }
-
-    /**
-     * Test that if the default traversal bindings are installed, that the "tab" event is
-     * handled correctly
-     */
-    @Test
-    public void tabCalls_TraverseNext() {
-        keyboard.doKeyPress(KeyCode.TAB);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_NEXT));
-    }
-
-    /**
-     * Test that if the default traversal bindings are installed, that the "shift+tab" event is
-     * handled correctly
-     */
-    @Test
-    public void shiftTabCalls_TraversePrevious() {
-        keyboard.doKeyPress(KeyCode.TAB, KeyModifier.SHIFT);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_PREVIOUS));
-    }
-
-    /**
-     * Test that if the default traversal bindings are installed, that the "up" event is
-     * handled correctly
-     */
-    @Test
-    public void upCalls_TraverseUp() {
-        keyboard.doKeyPress(KeyCode.UP);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_UP));
-    }
-
-    /**
-     * Test that if the default traversal bindings are installed, that the "down" event is
-     * handled correctly
-     */
-    @Test
-    public void downCalls_TraverseDown() {
-        keyboard.doKeyPress(KeyCode.DOWN);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_DOWN));
-    }
-
-    /**
-     * Test that if the default traversal bindings are installed, that the "left" event is
-     * handled correctly
-     */
-    @Test
-    public void leftCalls_TraverseLeft() {
-        keyboard.doKeyPress(KeyCode.LEFT);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_LEFT));
-    }
-
-    /**
-     * Test that if the default traversal bindings are installed, that the "right" event is
-     * handled correctly
-     */
-    @Test
-    public void rightCalls_TraverseRight() {
-        keyboard.doKeyPress(KeyCode.RIGHT);
-        assertTrue(behavior.actionCalled(BehaviorBase.TRAVERSE_RIGHT));
-    }
-
-    /**
-     * Make sure that key listeners are removed after the behavior is disposed, which should
-     * always happen when the skin is disposed, which should always happen when the skin is
-     * removed from a Control.
-     */
-    @Test
-    public void keyListenerShouldBeRemovedAfterBehaviorIsDisposed() {
-        // Send a key event
-        keyboard.doKeyPress(KeyCode.TAB);
-        assertTrue(behavior.someActionCalled());
-        behavior.reset();
-
-        // Remove the skin, which should result in dispose being called, and then send another event
-        button.setSkin(null);
-        keyboard.doKeyPress(KeyCode.TAB);
-        assertFalse(behavior.someActionCalled());
-    }
-
-    /**
-     * Test to make sure that the focusChanged() method is called when focus is gained.
-     */
-    @Test
-    public void focusListenerShouldBeCalledWhenFocusGained() {
-        assertFalse(behavior.focusCalled);
-        button.focus();
-        assertTrue(behavior.focusCalled);
-    }
-
-    /**
-     * Test to make sure that the focusChanged() method is called when focus is lost
-     */
-    @Test
-    public void focusListenerShouldBeCalledWhenFocusLost() {
-        assertFalse(behavior.focusCalled);
-        button.focus();
-        behavior.reset();
-        button.blur();
-        assertTrue(behavior.focusCalled);
-    }
-
-    /**
-     * Make sure that the behavior is no longer called on focus changes after disposal
-     */
-    @Test
-    public void focusListenerShouldBeRemovedAfterBehaviorIsDisposed() {
-        button.setSkin(null);
-        button.focus();
-        assertFalse(behavior.focusCalled);
-    }
-
-    /**
-     * mousePressed method should be called when the behavior is wired up properly
-     */
-    @Test
-    public void mousePressedCalledWhenMousePressedOverControl() {
-        assertFalse(behavior.mousePressCalled);
-        mouse.fireMousePressed();
-        assertTrue(behavior.mousePressCalled);
-    }
-
-    /**
-     * The mouse handlers should never be called when the skin / behavior has been
-     * disposed of.
-     */
-    @Test
-    public void mouseListenerShouldBeRemovedAfterBehaviorIsDisposed() {
-        button.setSkin(null);
-        mouse.fireMousePressed();
-        assertFalse(behavior.mousePressCalled);
-    }
-
-
-    // Test the matchActionForEvent
-    //      Make sure paired events are consumed / allowed together
-    //
-
-    private static final class ControlMock extends Button {
-        public void focus() {
-            setFocused(true);
-        }
-        public void blur() {
-            setFocused(false);
-        }
-    }
-
-    private static final class BehaviorBaseMock extends BehaviorBase<Button> {
-        private Set<String> actionsCalled = new HashSet<>();
-        private boolean focusCalled;
-        private boolean mousePressCalled;
-
-        public BehaviorBaseMock(Button control, List<KeyBinding> keyBindings) {
-            super(control, keyBindings);
-        }
-
-        @Override protected void callAction(String name) {
-            actionsCalled.add(name);
-        }
-
-        public boolean someActionCalled() {
-            return !actionsCalled.isEmpty();
-        }
-
-        public boolean actionCalled(String name) {
-            return actionsCalled.contains(name);
-        }
-
-        @Override protected void focusChanged() {
-            focusCalled = true;
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-            mousePressCalled = true;
-        }
-
-        public void reset() {
-            actionsCalled.clear();
-            focusCalled = false;
-            mousePressCalled = false;
-        }
-    }
-}
--- old/modules/controls/src/test/java/com/sun/javafx/scene/control/skin/BehaviorSkinBaseTest.java	2015-09-03 15:38:56.576639100 -0700
+++ /dev/null	2015-09-03 15:38:57.000000000 -0700
@@ -1,80 +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.scene.control.skin;
-
-import javafx.scene.control.Control;
-import javafx.scene.control.ControlStub;
-import java.util.Collections;
-import com.sun.javafx.scene.control.behavior.BehaviorBase;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-
-public class BehaviorSkinBaseTest {
-    private ControlStub c;
-    private BehaviorBaseStub<ControlStub> b;
-    private BehaviorSkinBaseStub<ControlStub, BehaviorBaseStub<ControlStub>> s;
-
-    @Before public void setup() {
-        c = new ControlStub();
-        b = new BehaviorBaseStub<>(c);
-        s = new BehaviorSkinBaseStub<>(c, b);
-    }
-    
-    @Test public void skinNotAssignedToControlShouldStillHaveReferenceToControl() {
-        assertSame(c, s.getSkinnable());
-    }
-
-    @Test public void skinAddedToControlShouldReferToControl() {
-        c.setSkin(s);
-        assertSame(c, s.getSkinnable());
-    }
-    
-    @Test public void skinRemovedFromControlShouldHaveNullReferenceToControl() {
-        c.setSkin(s);
-        c.setSkin(null);
-        assertNull(s.getSkinnable());
-    }
-
-    @Test public void skinRemovedFromControlShouldHaveNullReferenceToBehavior() {
-        c.setSkin(s);
-        c.setSkin(null);
-        assertNull(s.getBehavior());
-    }
-
-    public static final class BehaviorSkinBaseStub<C extends Control, B extends BehaviorBase<C>> extends BehaviorSkinBase<C,B> {
-        public BehaviorSkinBaseStub(C control, B behavior) {
-            super(control, behavior);
-        }
-    }
-    
-    public static final class BehaviorBaseStub<C extends Control> extends BehaviorBase<C> {
-        public BehaviorBaseStub(C control) {
-            super(control, Collections.EMPTY_LIST);
-        }        
-    }
-}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/CssError.java	2015-09-03 15:39:01.226905100 -0700
+++ /dev/null	2015-09-03 15:39:02.000000000 -0700
@@ -1,191 +0,0 @@
-/*
- * Copyright (c) 2012, 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.css;
-
-import javafx.css.CssMetaData;
-import javafx.css.Styleable;
-import javafx.scene.Scene;
-
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-
-/**
- * Encapsulate information about the source and nature of errors encountered
- * while parsing CSS or applying styles to Nodes. 
- */
-public class CssError {
- 
-    // RT-20643 - hold a ref so CssError doesn't leak Scene.
-    private static Reference<Scene> SCENE_REF;
-            
-    /** 
-     * Set the static scene variable. This scene will be set on all CssErrors
-     * generated after the call is made. The argument may be null. Null should
-     * be passed when the code exits a method from which CssErrors may be 
-     * created. This is intended internal use and should not be called from
-     * outside the css code.
-     */
-    public static void setCurrentScene(Scene scene) {
-        
-        // Treat as a no-op if noone cares about CssErrors
-        if (StyleManager.getErrors() == null) return;
-        
-        if (scene != null) {
-            // don't make new ref for same scene
-            final Scene oldScene = SCENE_REF != null ? SCENE_REF.get() : null;
-            if (oldScene != scene) {
-                SCENE_REF = new WeakReference<Scene>(scene);
-            }
-        } else {
-            SCENE_REF = null;
-        }
-    }
-    
-    /** @return The error message from the CSS code. */
-    public final String getMessage() {
-        return message;
-    }
-
-    public CssError(String message) {
-        this.message = message;
-        // RT-20643        
-        this.sceneRef = SCENE_REF;
-    }
-    
-    /** 
-     * @return The Scene in which this error occurred, if known, or null.
-     */
-    public Scene getScene() {
-        return sceneRef != null ? sceneRef.get() : null;
-    }
-    
-    // RT-20643 - track the scene that this error belongs to       
-    // Note that CssError has the potential to leak Scene so the Scene
-    // variable is held as a Reference.
-    private final Reference<Scene> sceneRef;
-    protected final String message;
-
-    @Override
-    public String toString() {
-        return "CSS Error: " + message;
-    }
-
-    /** Encapsulate errors arising from parsing of stylesheet files */
-    public final static class StylesheetParsingError extends CssError { 
-        
-        public StylesheetParsingError(String url, String message) {
-            super(message);
-            this.url = url;
-        }
-        
-        public String getURL() {
-            return url;
-        }
-        
-        private final String url;
-
-        @Override
-        public String toString() {
-            final String path = url != null ? url : "?";
-            // TBD: i18n
-            return "CSS Error parsing " + path + ": " + message;
-        }
-        
-    }
-    
-    /** Encapsulate errors arising from parsing of Node's style property */
-    public final static class InlineStyleParsingError extends CssError { 
-        
-        public InlineStyleParsingError(Styleable styleable, String message) {
-            super(message);
-            this.styleable = styleable;
-        }
-        
-        public Styleable getStyleable() {
-            return styleable;
-        }
-        
-        private final Styleable styleable;
-        
-        @Override
-        public String toString() {
-            final String inlineStyle = styleable.getStyle();
-            final String source = styleable.toString();
-            // TBD: i18n
-            return "CSS Error parsing in-line style \'" + inlineStyle + 
-                    "\' from " + source + ": " + message;
-        }
-    } 
-    
-    /** 
-     * Encapsulate errors arising from parsing when the style is not 
-     * an in-line style nor is the style from a stylesheet. Primarily to
-     * support unit testing.
-     */
-    public final static class StringParsingError extends CssError { 
-        
-        public StringParsingError(String style, String message) {
-            super(message);
-            this.style = style;
-        }
-        
-        public String getStyle() {
-            return style;
-        }
-        
-        private final String style;
-        
-        @Override
-        public String toString() {
-            // TBD: i18n
-            return "CSS Error parsing \'" + style + ": " + message;
-        }
-    } 
-    
-    /** Encapsulates errors arising from applying a style to a Node. */
-    public final static class PropertySetError extends CssError { 
-        
-        public PropertySetError(CssMetaData styleableProperty, 
-                Styleable styleable, String message) {
-            super(message);
-            this.styleableProperty = styleableProperty;
-            this.styleable = styleable;
-        }
-        
-        public Styleable getStyleable() {
-            return styleable;
-        }
-        
-        public CssMetaData getProperty() {
-            return styleableProperty;
-        }
-        
-        private final CssMetaData styleableProperty;
-        private final Styleable styleable;
-        
-    }
-}     
-
--- old/modules/graphics/src/main/java/com/sun/javafx/css/StringStore.java	2015-09-03 15:39:05.599155200 -0700
+++ /dev/null	2015-09-03 15:39:06.000000000 -0700
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2009, 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.css;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * StringStore
- *
- */
-public class StringStore {
-    private final Map<String,Integer> stringMap = new HashMap<String,Integer>();
-    public final List<String> strings = new ArrayList<String>();
-
-    public int addString(String s) {
-
-        Integer index = stringMap.get(s);
-        if (index == null) {
-            index = strings.size();
-            strings.add(s);
-            stringMap.put(s,index);
-        }
-        return index;
-    }
-
-    public void writeBinary(DataOutputStream os) throws IOException {
-        os.writeShort(strings.size());
-        if (stringMap.containsKey(null)) {
-            Integer index = stringMap.get(null);
-            os.writeShort(index);
-        } else {
-            os.writeShort(-1);
-        }
-        for (int n=0; n<strings.size(); n++) {
-            String s = strings.get(n);
-            if (s == null) continue;
-            os.writeUTF(s);
-        }
-    }
-
-    // TODO: this isn't parallel with writeBinary
-    static String[] readBinary(DataInputStream is) throws IOException {
-        int nStrings = is.readShort();
-        int nullIndex = is.readShort();
-        String[] strings = new String[nStrings];
-        java.util.Arrays.fill(strings, null);
-        for (int n=0; n<nStrings; n++) {
-            if (n == nullIndex) continue;
-            strings[n] = is.readUTF();
-        }
-        return strings;
-    }
-}
--- old/modules/graphics/src/main/java/com/sun/javafx/css/StyleConverterImpl.java	2015-09-03 15:39:10.368428000 -0700
+++ /dev/null	2015-09-03 15:39:11.000000000 -0700
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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 com.sun.javafx.scene.layout.region.CornerRadiiConverter;
-import com.sun.javafx.util.Logging;
-import javafx.css.CssMetaData;
-import javafx.css.ParsedValue;
-import javafx.css.StyleConverter;
-import javafx.css.Styleable;
-import sun.util.logging.PlatformLogger;
-import sun.util.logging.PlatformLogger.Level;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-/**
- * Converter converts ParsedValueImpl&lt;F,T&gt; from type F to type T.
- * F is the type of the parsed value, T is the converted type of
- * the ParsedValueImpl. For example, a converter from String to Color would
- * be declared
- * <p>&nbsp;&nbsp;&nbsp;&nbsp;
- * <code>public Color convert(ParsedValueImpl&lt;String,Color&gt; value, Font font)</code>
- * </p>
- */
-public class StyleConverterImpl<F, T> extends StyleConverter<F, T> {
-
-    /**
-     * Convert from the constituent values to the target property type.
-     * Implemented by Types that have Keys with subKeys.
-     */
-    public T convert(Map<CssMetaData<? extends Styleable, ?>,Object> convertedValues) {
-        return null;
-    }
-
-    protected StyleConverterImpl() {
-        super();
-    }
-
-    public void writeBinary(DataOutputStream os, StringStore sstore)
-            throws IOException {
-
-        String cname = getClass().getName();
-        int index = sstore.addString(cname);
-        os.writeShort(index);
-    }
-
-    private static Map<ParsedValue, Object> cache;
-
-    static void clearCache() { if (cache != null) cache.clear(); }
-
-    protected T getCachedValue(ParsedValue key) {
-        if (cache != null) {
-            return (T)cache.get(key);
-        }
-        return null;
-    }
-
-    protected void cacheValue(ParsedValue key, Object value) {
-        if (cache == null) cache = new WeakHashMap<>();
-        cache.put(key, value);
-    }
-
-    // map of StyleConverter class name to StyleConverter
-    private static Map<String,StyleConverter<?, ?>> tmap;
-
-    @SuppressWarnings("rawtypes")
-    public static StyleConverter<?,?> readBinary(DataInputStream is, String[] strings)
-            throws IOException {
-
-        int index = is.readShort();
-        String cname = strings[index];
-
-        if (cname == null || cname.isEmpty()) return null;
-
-        if (cname.startsWith("com.sun.javafx.css.converters.EnumConverter")) {
-            return (StyleConverter)com.sun.javafx.css.converters.EnumConverter.readBinary(is, strings);
-        }
-
-        // Make a new entry in tmap, if necessary
-        if (tmap == null || !tmap.containsKey(cname)) {
-            StyleConverter<?,?> converter = getInstance(cname);
-            if (converter == null) {
-                final PlatformLogger logger = Logging.getCSSLogger();
-                if (logger.isLoggable(Level.SEVERE)) {
-                    logger.severe("could not deserialize " + cname);
-                }
-            }
-            if (converter == null) {
-                System.err.println("could not deserialize " + cname);
-            }
-            if (tmap == null) tmap = new HashMap<String,StyleConverter<?,?>>();
-            tmap.put(cname, converter);
-            return converter;
-        }
-        return tmap.get(cname);
-    }
-
-    // package for unit test purposes
-    static StyleConverter<?,?> getInstance(final String converterClass) {
-
-        StyleConverter<?,?> styleConverter = null;
-
-        switch(converterClass) {
-        case "com.sun.javafx.css.converters.BooleanConverter" :
-            styleConverter = com.sun.javafx.css.converters.BooleanConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.ColorConverter" :
-            styleConverter = com.sun.javafx.css.converters.ColorConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.CursorConverter" :
-            styleConverter = com.sun.javafx.css.converters.CursorConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.EffectConverter" :
-            styleConverter = com.sun.javafx.css.converters.EffectConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.EffectConverter$DropShadowConverter" :
-            styleConverter = com.sun.javafx.css.converters.EffectConverter.DropShadowConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.EffectConverter$InnerShadowConverter" :
-            styleConverter = com.sun.javafx.css.converters.EffectConverter.InnerShadowConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.FontConverter" :
-            styleConverter = com.sun.javafx.css.converters.FontConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.FontConverter$FontStyleConverter" :
-        case "com.sun.javafx.css.converters.FontConverter$StyleConverter" :
-            styleConverter = com.sun.javafx.css.converters.FontConverter.FontStyleConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.FontConverter$FontWeightConverter" :
-        case "com.sun.javafx.css.converters.FontConverter$WeightConverter" :
-            styleConverter = com.sun.javafx.css.converters.FontConverter.FontWeightConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.FontConverter$FontSizeConverter" :
-        case "com.sun.javafx.css.converters.FontConverter$SizeConverter" :
-            styleConverter = com.sun.javafx.css.converters.FontConverter.FontSizeConverter.getInstance();
-            break;
-
-        case "com.sun.javafx.css.converters.InsetsConverter" :
-            styleConverter = com.sun.javafx.css.converters.InsetsConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.InsetsConverter$SequenceConverter" :
-            styleConverter = com.sun.javafx.css.converters.InsetsConverter.SequenceConverter.getInstance();
-            break;
-
-        case "com.sun.javafx.css.converters.PaintConverter" :
-            styleConverter = com.sun.javafx.css.converters.PaintConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.PaintConverter$SequenceConverter" :
-            styleConverter = com.sun.javafx.css.converters.PaintConverter.SequenceConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.PaintConverter$LinearGradientConverter" :
-            styleConverter = com.sun.javafx.css.converters.PaintConverter.LinearGradientConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.PaintConverter$RadialGradientConverter" :
-            styleConverter = com.sun.javafx.css.converters.PaintConverter.RadialGradientConverter.getInstance();
-            break;
-
-        case "com.sun.javafx.css.converters.SizeConverter" :
-            styleConverter = com.sun.javafx.css.converters.SizeConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.SizeConverter$SequenceConverter" :
-            styleConverter = com.sun.javafx.css.converters.SizeConverter.SequenceConverter.getInstance();
-            break;
-
-        case "com.sun.javafx.css.converters.StringConverter" :
-            styleConverter = com.sun.javafx.css.converters.StringConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.StringConverter$SequenceConverter" :
-            styleConverter = com.sun.javafx.css.converters.StringConverter.SequenceConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.URLConverter" :
-            styleConverter = com.sun.javafx.css.converters.URLConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.converters.URLConverter$SequenceConverter" :
-            styleConverter = com.sun.javafx.css.converters.URLConverter.SequenceConverter.getInstance();
-            break;
-
-        // Region stuff  - including 2.x class names
-        case "com.sun.javafx.scene.layout.region.BackgroundPositionConverter" :
-        case "com.sun.javafx.scene.layout.region.BackgroundImage$BackgroundPositionConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BackgroundPositionConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.BackgroundSizeConverter" :
-        case "com.sun.javafx.scene.layout.region.BackgroundImage$BackgroundSizeConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BackgroundSizeConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.BorderImageSliceConverter" :
-        case "com.sun.javafx.scene.layout.region.BorderImage$SliceConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BorderImageSliceConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.BorderImageWidthConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BorderImageWidthConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.BorderImageWidthsSequenceConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BorderImageWidthsSequenceConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.BorderStrokeStyleSequenceConverter" :
-        case "com.sun.javafx.scene.layout.region.StrokeBorder$BorderStyleSequenceConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BorderStrokeStyleSequenceConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.BorderStyleConverter" :
-        case "com.sun.javafx.scene.layout.region.StrokeBorder$BorderStyleConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.BorderStyleConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter" :
-        case "com.sun.javafx.scene.layout.region.BackgroundImage$LayeredBackgroundPositionConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.LayeredBackgroundPositionConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter" :
-        case "com.sun.javafx.scene.layout.region.BackgroundImage$LayeredBackgroundSizeConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.LayeredBackgroundSizeConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.LayeredBorderPaintConverter" :
-        case "com.sun.javafx.scene.layout.region.StrokeBorder$LayeredBorderPaintConverter" :
-           styleConverter = com.sun.javafx.scene.layout.region.LayeredBorderPaintConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.LayeredBorderStyleConverter" :
-        case "com.sun.javafx.scene.layout.region.StrokeBorder$LayeredBorderStyleConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.LayeredBorderStyleConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.RepeatStructConverter" :
-        case "com.sun.javafx.scene.layout.region.BackgroundImage$BackgroundRepeatConverter" :
-        case "com.sun.javafx.scene.layout.region.BorderImage$RepeatConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.RepeatStructConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.SliceSequenceConverter" :
-        case "com.sun.javafx.scene.layout.region.BorderImage$SliceSequenceConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.SliceSequenceConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.StrokeBorderPaintConverter" :
-        case "com.sun.javafx.scene.layout.region.StrokeBorder$BorderPaintConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.StrokeBorderPaintConverter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.Margins$Converter" :
-            styleConverter = com.sun.javafx.scene.layout.region.Margins.Converter.getInstance();
-            break;
-        case "com.sun.javafx.scene.layout.region.Margins$SequenceConverter" :
-            styleConverter = com.sun.javafx.scene.layout.region.Margins.SequenceConverter.getInstance();
-            break;
-        case "javafx.scene.layout.CornerRadiiConverter" :  // Fix for RT-39665
-        case "com.sun.javafx.scene.layout.region.CornerRadiiConverter" :
-            styleConverter = CornerRadiiConverter.getInstance();
-            break;
-
-        // parser stuff
-        case "com.sun.javafx.css.parser.DeriveColorConverter" :
-            styleConverter = com.sun.javafx.css.parser.DeriveColorConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.parser.DeriveSizeConverter" :
-            styleConverter = com.sun.javafx.css.parser.DeriveSizeConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.parser.LadderConverter" :
-            styleConverter = com.sun.javafx.css.parser.LadderConverter.getInstance();
-            break;
-        case "com.sun.javafx.css.parser.StopConverter" :
-            styleConverter = com.sun.javafx.css.parser.StopConverter.getInstance();
-            break;
-
-            default :
-            final PlatformLogger logger = Logging.getCSSLogger();
-            if (logger.isLoggable(Level.SEVERE)) {
-                logger.severe("StyleConverterImpl : converter Class is null for : "+converterClass);
-            }
-            break;
-        }
-
-        return styleConverter;
-    }
-}