modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TreeTableCellBehavior.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

*** 23,33 ****
   * questions.
   */
  
  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;
  import javafx.scene.control.TreeItem;
  import javafx.scene.control.TreeTableCell;
--- 23,32 ----
*** 57,72 ****
       *                                                                         *
       **************************************************************************/          
  
      /** @{@inheritDoc} */
      @Override protected TreeTableView<S> getCellContainer() {
!         return getControl().getTreeTableView();
      }
  
      /** @{@inheritDoc} */
      @Override protected TreeTableColumn<S,T> getTableColumn() {
!         return getControl().getTableColumn();
      }
  
      /** @{@inheritDoc} */
      @Override protected int getItemCount() {
          return getCellContainer().getExpandedItemCount();
--- 56,71 ----
       *                                                                         *
       **************************************************************************/          
  
      /** @{@inheritDoc} */
      @Override protected TreeTableView<S> getCellContainer() {
!         return getNode().getTreeTableView();
      }
  
      /** @{@inheritDoc} */
      @Override protected TreeTableColumn<S,T> getTableColumn() {
!         return getNode().getTableColumn();
      }
  
      /** @{@inheritDoc} */
      @Override protected int getItemCount() {
          return getCellContainer().getExpandedItemCount();
*** 87,97 ****
          return getCellContainer().getFocusModel().getFocusedCell();
      }
  
      /** @{@inheritDoc} */
      @Override protected boolean isTableRowSelected() {
!         return getControl().getTreeTableRow().isSelected();
      }
  
      /** @{@inheritDoc} */
      @Override protected int getVisibleLeafIndex(TableColumnBase tc) {
          return getCellContainer().getVisibleLeafIndex((TreeTableColumn)tc);
--- 86,96 ----
          return getCellContainer().getFocusModel().getFocusedCell();
      }
  
      /** @{@inheritDoc} */
      @Override protected boolean isTableRowSelected() {
!         return getNode().getTreeTableRow().isSelected();
      }
  
      /** @{@inheritDoc} */
      @Override protected int getVisibleLeafIndex(TableColumnBase tc) {
          return getCellContainer().getVisibleLeafIndex((TreeTableColumn)tc);
*** 110,128 ****
              getCellContainer().edit(cell.getIndex(), cell.getTableColumn());
          }
      }
  
      @Override protected boolean handleDisclosureNode(double x, double y) {
!         final TreeItem<S> treeItem = getControl().getTreeTableRow().getTreeItem();
  
!         final TreeTableView<S> treeTableView = getControl().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();
              if (disclosureNode != null) {
                  double startX = 0;
                  for (TreeTableColumn<S,?> tc : treeTableView.getVisibleLeafColumns()) {
                      if (tc == treeColumn) break;
                      startX += tc.getWidth();
--- 109,127 ----
              getCellContainer().edit(cell.getIndex(), cell.getTableColumn());
          }
      }
  
      @Override protected boolean handleDisclosureNode(double x, double y) {
!         final TreeItem<S> treeItem = getNode().getTreeTableRow().getTreeItem();
  
!         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 = getNode().getTreeTableRow().getDisclosureNode();
              if (disclosureNode != null) {
                  double startX = 0;
                  for (TreeTableColumn<S,?> tc : treeTableView.getVisibleLeafColumns()) {
                      if (tc == treeColumn) break;
                      startX += tc.getWidth();
*** 140,159 ****
      }
      
      @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();
          if (button == MouseButton.PRIMARY) {
              if (clickCount == 1 && isAlreadySelected) {
!                 edit(getControl());
              } else if (clickCount == 1) {
                  // cancel editing
                  edit(null);
              } else if (clickCount == 2 && treeItem.isLeaf()) {
                  // attempt to edit
!                 edit(getControl());
              } else if (clickCount % 2 == 0) {
                  // try to expand/collapse branch tree item
                  treeItem.setExpanded(! treeItem.isExpanded());
              }
          }
--- 139,158 ----
      }
      
      @Override
      protected void handleClicks(MouseButton button, int clickCount, boolean isAlreadySelected) {
          // handle editing, which only occurs with the primary mouse button
!         TreeItem<S> treeItem = getNode().getTreeTableRow().getTreeItem();
          if (button == MouseButton.PRIMARY) {
              if (clickCount == 1 && isAlreadySelected) {
!                 edit(getNode());
              } else if (clickCount == 1) {
                  // cancel editing
                  edit(null);
              } else if (clickCount == 2 && treeItem.isLeaf()) {
                  // attempt to edit
!                 edit(getNode());
              } else if (clickCount % 2 == 0) {
                  // try to expand/collapse branch tree item
                  treeItem.setExpanded(! treeItem.isExpanded());
              }
          }