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