--- 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);
     }