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

*** 23,32 ****
--- 23,33 ----
   * questions.
   */
  
  package com.sun.javafx.scene.control.behavior;
  
+ import com.sun.javafx.scene.NodeHelper;
  import javafx.scene.Node;
  import javafx.scene.control.PopupControl;
  
  import javafx.scene.Scene;
  import javafx.scene.input.KeyEvent;
*** 102,132 ****
                      Object obj = event.getTarget();
  
                      switch (((KeyEvent)event).getCode()) {
                        case TAB :
                            if (((KeyEvent)event).isShiftDown()) {
!                               ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.PREVIOUS);
                            }
                            else {
!                               ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.NEXT);
                            }
                            event.consume();
                            break;
                        case UP :
!                           ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.UP);
                            event.consume();
                            break;
                        case DOWN :
!                           ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.DOWN);
                            event.consume();
                            break;
                        case LEFT :
!                           ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.LEFT);
                            event.consume();
                            break;
                        case RIGHT :
!                           ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.RIGHT);
                            event.consume();
                            break;
                        case ENTER :
                            setExternalFocus(false);
                            event.consume();
--- 103,133 ----
                      Object obj = event.getTarget();
  
                      switch (((KeyEvent)event).getCode()) {
                        case TAB :
                            if (((KeyEvent)event).isShiftDown()) {
!                               NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
                            }
                            else {
!                               NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
                            }
                            event.consume();
                            break;
                        case UP :
!                           NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
                            event.consume();
                            break;
                        case DOWN :
!                           NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
                            event.consume();
                            break;
                        case LEFT :
!                           NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
                            event.consume();
                            break;
                        case RIGHT :
!                           NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
                            event.consume();
                            break;
                        case ENTER :
                            setExternalFocus(false);
                            event.consume();
*** 162,191 ****
                        case UP :
                        case DOWN :
                            break;
                        case LEFT :
                            if (obj instanceof Node) {
!                               ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.LEFT);
                                event.consume();
                            }
                            else if (obj instanceof Scene) {
                                Node node = ((Scene)obj).getFocusOwner();
                                if (node != null) {
!                                   node.impl_traverse(com.sun.javafx.scene.traversal.Direction.LEFT);
                                    event.consume();
                                }
                            }
                            break;
                        case RIGHT :
                            if (obj instanceof Node) {
!                               ((Node)obj).impl_traverse(com.sun.javafx.scene.traversal.Direction.RIGHT);
                                event.consume();
                            }
                            else if (obj instanceof Scene) {
                                Node node = ((Scene)obj).getFocusOwner();
                                if (node != null) {
!                                   node.impl_traverse(com.sun.javafx.scene.traversal.Direction.RIGHT);
                                    event.consume();
                                }
                            }
                            break;
  
--- 163,192 ----
                        case UP :
                        case DOWN :
                            break;
                        case LEFT :
                            if (obj instanceof Node) {
!                               NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
                                event.consume();
                            }
                            else if (obj instanceof Scene) {
                                Node node = ((Scene)obj).getFocusOwner();
                                if (node != null) {
!                                   NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.LEFT);
                                    event.consume();
                                }
                            }
                            break;
                        case RIGHT :
                            if (obj instanceof Node) {
!                               NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
                                event.consume();
                            }
                            else if (obj instanceof Scene) {
                                Node node = ((Scene)obj).getFocusOwner();
                                if (node != null) {
!                                   NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.RIGHT);
                                    event.consume();
                                }
                            }
                            break;