From b8fd2a5e1f7bbd86fa32f48c14378eef2f83ec19 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Wed, 21 Apr 2021 20:06:51 +0200
Subject: [PATCH 01/21] Added :focus-visible CSS pseudoclass

---
 .../scene/control/DatePickerContent.java      |   3 +-
 .../control/behavior/ButtonBehavior.java      |   2 +-
 .../behavior/FocusTraversalInputMap.java      |  17 +-
 .../control/behavior/SliderBehavior.java      |   5 +-
 .../behavior/TwoLevelFocusBehavior.java       |  13 +-
 .../behavior/TwoLevelFocusComboBehavior.java  |  13 +-
 .../behavior/TwoLevelFocusListBehavior.java   |  13 +-
 .../behavior/TwoLevelFocusPopupBehavior.java  |  21 +--
 .../scene/KeyboardShortcutsHandler.java       |   3 +-
 .../java/com/sun/javafx/scene/NodeHelper.java |  12 +-
 .../traversal/TopMostTraversalEngine.java     |  19 +-
 .../scene/traversal/TraversalMethod.java      |  41 +++++
 .../src/main/java/javafx/scene/Node.java      | 170 ++++++++++++------
 .../src/main/java/javafx/scene/Scene.java     |  36 ++--
 .../src/main/java/javafx/scene/SubScene.java  |   5 +-
 .../traversal/TopMostTraversalEngineTest.java |  35 ++--
 .../javafx/scene/traversal/TraversalTest.java |   7 +-
 .../traversal/TraverseInvisibleTest.java      |   3 +-
 .../sun/javafx/webkit/WebPageClientImpl.java  |   3 +-
 19 files changed, 278 insertions(+), 143 deletions(-)
 create mode 100644 modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java

diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
index 761887a16de..83c432ed0af 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
@@ -66,6 +66,7 @@
 
 import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 
 import static com.sun.javafx.PlatformUtil.*;
 import com.sun.javafx.scene.NodeHelper;
@@ -170,7 +171,7 @@ public DatePickerContent(final DatePicker datePicker) {
                 if (newFocusOwner == gridPane) {
                     if (oldFocusOwner instanceof DateCell) {
                         // Backwards traversal, skip gridPane.
-                        NodeHelper.traverse(gridPane, Direction.PREVIOUS);
+                        NodeHelper.traverse(gridPane, Direction.PREVIOUS, TraversalMethod.DEFAULT);
                     } else {
                         // Forwards traversal, pass focus to day cell.
                         if (lastFocusedDayCell != null) {
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
index e485c83e539..d5777a13a03 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
@@ -179,7 +179,7 @@ protected void keyReleased(KeyEvent e) {
      */
     protected void mousePressed(MouseEvent e) {
         // if the button is not already focused, then request the focus
-        if (! getNode().isFocused() && getNode().isFocusTraversable()) {
+        if (getNode().isFocusTraversable()) {
             getNode().requestFocus();
         }
 
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
index d18821f4ba6..d1df5c65a46 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
@@ -26,6 +26,7 @@
 
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.event.EventTarget;
 import javafx.scene.Node;
 import com.sun.javafx.scene.control.inputmap.InputMap;
@@ -90,12 +91,12 @@ public static <N extends Node> InputMap<N> createInputMap(N node) {
      * @param node The node to traverse on
      * @param dir The direction to traverse
      */
-    public static void traverse(final Node node, final Direction dir) {
+    public static void traverse(final Node node, final Direction dir, TraversalMethod method) {
         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.");
         }
-        NodeHelper.traverse(node, dir);
+        NodeHelper.traverse(node, dir, method);
     }
 
     /**
@@ -103,7 +104,7 @@ public static void traverse(final Node node, final Direction dir) {
      * 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);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
     }
 
     /**
@@ -111,7 +112,7 @@ public static final void traverseUp(KeyEvent e) {
      * 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);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
     }
 
     /**
@@ -119,7 +120,7 @@ public static final void traverseDown(KeyEvent e) {
      * 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);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
     }
 
     /**
@@ -127,7 +128,7 @@ public static final void traverseLeft(KeyEvent e) {
      * 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);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
     }
 
     /**
@@ -135,7 +136,7 @@ public static final void traverseRight(KeyEvent e) {
      * 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);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
     }
 
     /**
@@ -143,7 +144,7 @@ public static final void traverseNext(KeyEvent e) {
      * 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);
+        traverse(getNode(e), com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
     }
 
     private static Node getNode(KeyEvent e) {
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
index 3d0ea3087fc..d2a9040634a 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
@@ -109,8 +109,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 = getNode();
-        // If not already focused, request focus
-        if (!slider.isFocused()) slider.requestFocus();
+        slider.requestFocus();
         if (slider.getOrientation().equals(Orientation.HORIZONTAL)) {
             slider.adjustValue(position * (slider.getMax() - slider.getMin()) + slider.getMin());
         } else {
@@ -125,7 +124,7 @@ public void trackPress(MouseEvent e, double position) {
     public void thumbPressed(MouseEvent e, double position) {
         // If not already focused, request focus
         final Slider slider = getNode();
-        if (!slider.isFocused())  slider.requestFocus();
+        slider.requestFocus();
         slider.setValueChanging(true);
     }
 
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
index 89fa52b46f7..e1007d9250c 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.css.PseudoClass;
 import javafx.scene.Node;
 import javafx.scene.control.Control;
@@ -104,27 +105,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
index fa489275156..c012789f168 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Node;
 
 import javafx.scene.Scene;
@@ -84,27 +85,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
index 50c106a6dce..d842d45d643 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
@@ -27,6 +27,7 @@
 
 import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.control.Properties;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 
@@ -86,27 +87,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
index 8b1b599036b..772a6dd1640 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
@@ -26,6 +26,7 @@
 package com.sun.javafx.scene.control.behavior;
 
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Node;
 import javafx.scene.control.PopupControl;
 
@@ -105,27 +106,27 @@ public void dispose() {
                     switch (((KeyEvent)event).getCode()) {
                       case TAB :
                           if (((KeyEvent)event).isShiftDown()) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.PREVIOUS, TraversalMethod.KEY);
                           }
                           else {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.NEXT, TraversalMethod.KEY);
                           }
                           event.consume();
                           break;
                       case UP :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.UP, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case DOWN :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.DOWN, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case LEFT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case RIGHT :
-                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                          NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                           event.consume();
                           break;
                       case ENTER :
@@ -165,26 +166,26 @@ public void dispose() {
                           break;
                       case LEFT :
                           if (obj instanceof Node) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                               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);
+                                  NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.LEFT, TraversalMethod.KEY);
                                   event.consume();
                               }
                           }
                           break;
                       case RIGHT :
                           if (obj instanceof Node) {
-                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT);
+                              NodeHelper.traverse((Node) obj, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                               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);
+                                  NodeHelper.traverse(node, com.sun.javafx.scene.traversal.Direction.RIGHT, TraversalMethod.KEY);
                                   event.consume();
                               }
                           }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
index edaf393862c..9ab9a7cd92f 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
 import javafx.event.Event;
@@ -99,7 +100,7 @@ public ObservableMap<KeyCombination, Runnable> getAccelerators() {
     }
 
     private void traverse(Event event, Node node, Direction dir) {
-        if (NodeHelper.traverse(node, dir)) {
+        if (NodeHelper.traverse(node, dir, TraversalMethod.KEY)) {
             event.consume();
         }
     }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
index dec9c54e3ec..617c98304b1 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
@@ -31,6 +31,7 @@
 import com.sun.javafx.geom.transform.BaseTransform;
 import com.sun.javafx.scene.input.PickResultChooser;
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.sg.prism.NGNode;
 import com.sun.javafx.util.Utils;
 import java.util.List;
@@ -233,8 +234,8 @@ public static BooleanProperty showMnemonicsProperty(Node node) {
         return nodeAccessor.showMnemonicsProperty(node);
     }
 
-    public static boolean traverse(Node node, Direction direction) {
-        return nodeAccessor.traverse(node, direction);
+    public static boolean traverse(Node node, Direction direction, TraversalMethod method) {
+        return nodeAccessor.traverse(node, direction, method);
     }
 
     public static double getPivotX(Node node) {
@@ -307,6 +308,10 @@ public static Map<StyleableProperty<?>,List<Style>> findStyles(Node node, Map<St
         return nodeAccessor.findStyles(node, styleMap);
     }
 
+    public static void requestFocusVisible(Node node) {
+        nodeAccessor.requestFocusVisible(node);
+    }
+
     public static void setNodeAccessor(final NodeAccessor newAccessor) {
         if (nodeAccessor != null) {
             throw new IllegalStateException();
@@ -346,7 +351,7 @@ boolean doComputeIntersects(Node node, PickRay pickRay,
         void setShowMnemonics(Node node, boolean value);
         boolean isShowMnemonics(Node node);
         BooleanProperty showMnemonicsProperty(Node node);
-        boolean traverse(Node node, Direction direction);
+        boolean traverse(Node node, Direction direction, TraversalMethod method);
         double getPivotX(Node node);
         double getPivotY(Node node);
         double getPivotZ(Node node);
@@ -366,6 +371,7 @@ boolean doComputeIntersects(Node node, PickRay pickRay,
         List<Style> getMatchingStyles(CssMetaData cssMetaData, Styleable styleable);
         Map<StyleableProperty<?>,List<Style>> findStyles(Node node,
                 Map<StyleableProperty<?>,List<Style>> styleMap);
+        void requestFocusVisible(Node node);
     }
 
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
index 431d41f53b1..205f3d49c9b 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
@@ -25,6 +25,7 @@
 
 package com.sun.javafx.scene.traversal;
 
+import com.sun.javafx.scene.NodeHelper;
 import com.sun.javafx.scene.ParentHelper;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -64,9 +65,10 @@ protected TopMostTraversalEngine() {
      *
      * @param node The starting node to traverse from
      * @param dir the traversal direction
+     * @param method the traversal method
      * @return the new focus owner or null if none found (in that case old focus owner is still valid)
      */
-    public final Node trav(Node node, Direction dir) {
+    public final Node trav(Node node, Direction dir, TraversalMethod method) {
         Node newNode = null;
         Parent p = node.getParent();
         Node traverseNode = node;
@@ -101,13 +103,18 @@ public final Node trav(Node node, Direction dir) {
             }
         }
         if (newNode != null) {
-            focusAndNotify(newNode);
+            focusAndNotify(newNode, method);
         }
         return newNode;
     }
 
-    private void focusAndNotify(Node newNode) {
-        newNode.requestFocus();
+    private void focusAndNotify(Node newNode, TraversalMethod method) {
+        if (method == TraversalMethod.KEY) {
+            NodeHelper.requestFocusVisible(newNode);
+        } else {
+            newNode.requestFocus();
+        }
+
         notifyTreeTraversedTo(newNode);
     }
 
@@ -129,7 +136,7 @@ private void notifyTreeTraversedTo(Node newNode) {
      */
     public final Node traverseToFirst() {
         Node n = selectFirst();
-        if (n != null) focusAndNotify(n);
+        if (n != null) focusAndNotify(n, TraversalMethod.DEFAULT);
         return n;
     }
 
@@ -139,7 +146,7 @@ public final Node traverseToFirst() {
      */
     public final Node traverseToLast() {
         Node n = selectLast();
-        if (n != null) focusAndNotify(n);
+        if (n != null) focusAndNotify(n, TraversalMethod.DEFAULT);
         return n;
     }
 }
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
new file mode 100644
index 00000000000..d660d2b93f0
--- /dev/null
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact 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.traversal;
+
+/**
+ * Specifies the traversal method.
+ */
+public enum TraversalMethod {
+    /**
+     * Traversal was initiated programmatically or by clicking.
+     */
+    DEFAULT,
+
+    /**
+     * Traversal was initiated by pressing a key on the keyboard.
+     */
+    KEY
+}
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 9ee37dd5786..cc3bed90916 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -27,6 +27,7 @@
 
 
 import com.sun.javafx.geometry.BoundsUtils;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -522,8 +523,8 @@ public BooleanProperty showMnemonicsProperty(Node node) {
             }
 
             @Override
-            public boolean traverse(Node node, Direction direction) {
-                return node.traverse(direction);
+            public boolean traverse(Node node, Direction direction, TraversalMethod method) {
+                return node.traverse(direction, method);
             }
 
             @Override
@@ -619,6 +620,11 @@ public Map<StyleableProperty<?>, List<Style>> findStyles(Node node,
                     Map<StyleableProperty<?>, List<Style>> styleMap) {
                 return node.findStyles(styleMap);
             }
+
+            @Override
+            public void requestFocusVisible(Node node) {
+                node.requestFocusVisible();
+            }
         });
     }
 
@@ -8107,55 +8113,44 @@ public final ObjectProperty<InputMethodRequests> inputMethodRequestsProperty() {
      * like an atomic operation - when the old node is notified to loose focus,
      * the new node is already focused.
      */
-    final class FocusedProperty extends ReadOnlyBooleanPropertyBase {
+    abstract class FocusPropertyBase extends ReadOnlyBooleanPropertyBase {
         private boolean value;
-        private boolean valid = true;
-        private boolean needsChangeEvent = false;
-
-        public void store(final boolean value) {
-            if (value != this.value) {
-                this.value = value;
-                markInvalid();
-            }
-        }
-
-        public void notifyListeners() {
-            if (needsChangeEvent) {
-                fireValueChangedEvent();
-                needsChangeEvent = false;
-            }
-        }
+        private boolean changed;
 
-        private void markInvalid() {
-            if (valid) {
-                valid = false;
-
-                pseudoClassStateChanged(FOCUSED_PSEUDOCLASS_STATE, get());
-                PlatformLogger logger = Logging.getFocusLogger();
-                if (logger.isLoggable(Level.FINE)) {
-                    logger.fine(this + " focused=" + get());
-                }
-
-                needsChangeEvent = true;
+        protected abstract PseudoClass getPseudoClass();
 
-                notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUSED);
-            }
+        @Override
+        public Object getBean() {
+            return Node.this;
         }
 
         @Override
         public boolean get() {
-            valid = true;
             return value;
         }
 
-        @Override
-        public Object getBean() {
-            return Node.this;
+        public void set(boolean value) {
+            if (this.value != value) {
+                this.value = value;
+                this.changed = true;
+            }
         }
 
-        @Override
-        public String getName() {
-            return "focused";
+        protected boolean notifyListeners() {
+            if (!changed) {
+                return false;
+            }
+
+            changed = false;
+            pseudoClassStateChanged(getPseudoClass(), value);
+
+            PlatformLogger logger = Logging.getFocusLogger();
+            if (logger.isLoggable(Level.FINE)) {
+                logger.fine(this + " " + getName() + "=" + get());
+            }
+
+            fireValueChangedEvent();
+            return true;
         }
     }
 
@@ -8168,31 +8163,79 @@ public String getName() {
      * @see #requestFocus()
      * @defaultValue false
      */
-    private FocusedProperty focused;
+    private FocusPropertyBase focused;
+
+    /**
+     * Indicates whether this {@code Node} currently has a visible focus
+     * indicator. This usually happens when a node acquired input focus
+     * via keyboard navigation.
+     */
+    private FocusPropertyBase focusVisible;
 
     protected final void setFocused(boolean value) {
-        FocusedProperty fp = focusedPropertyImpl();
-        if (fp.value != value) {
-            fp.store(value);
-            fp.notifyListeners();
-        }
+        setFocused(value, false);
     }
 
-    public final boolean isFocused() {
-        return focused == null ? false : focused.get();
+    final void setFocused(boolean focused, boolean focusVisible) {
+        FocusPropertyBase focusedProperty = (FocusPropertyBase)focusedProperty();
+        FocusPropertyBase focusVisibleProperty = (FocusPropertyBase)focusVisibleProperty();
+        focusedProperty.set(focused);
+        focusVisibleProperty.set(focused && focusVisible);
+        focusedProperty.notifyListeners();
+        focusVisibleProperty.notifyListeners();
     }
 
-    public final ReadOnlyBooleanProperty focusedProperty() {
-        return focusedPropertyImpl();
+    public final boolean isFocused() {
+        return focused != null && focused.get();
     }
 
-    private FocusedProperty focusedPropertyImpl() {
+    public final ReadOnlyBooleanProperty focusedProperty() {
         if (focused == null) {
-            focused = new FocusedProperty();
+            focused = new FocusPropertyBase() {
+                @Override
+                protected PseudoClass getPseudoClass() {
+                    return FOCUSED_PSEUDOCLASS_STATE;
+                }
+
+                @Override
+                public String getName() {
+                    return "focused";
+                }
+
+                @Override
+                protected boolean notifyListeners() {
+                    if (super.notifyListeners()) {
+                        notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUSED);
+                        return true;
+                    }
+                    return false;
+                }
+            };
         }
         return focused;
     }
 
+    public final boolean isFocusVisible() {
+        return focusVisible != null && focusVisible.get();
+    }
+
+    public final ReadOnlyBooleanProperty focusVisibleProperty() {
+        if (focusVisible == null) {
+            focusVisible = new FocusPropertyBase() {
+                @Override
+                protected PseudoClass getPseudoClass() {
+                    return FOCUS_VISIBLE_PSEUDOCLASS_STATE;
+                }
+
+                @Override
+                public String getName() {
+                    return "focusVisible";
+                }
+            };
+        }
+        return focusVisible;
+    }
+
     /**
      * Specifies whether this {@code Node} should be a part of focus traversal
      * cycle. When this property is {@code true} focus can be moved to this
@@ -8282,7 +8325,25 @@ private void focusSetDirty(Scene s) {
      */
     public void requestFocus() {
         if (getScene() != null) {
-            getScene().requestFocus(this);
+            if (getScene().getFocusOwner() == this) {
+                pseudoClassStateChanged(FOCUS_VISIBLE_PSEUDOCLASS_STATE, false);
+            } else {
+                getScene().requestFocus(this, false);
+            }
+        }
+    }
+
+    /**
+     * Requests focus as if by calling {@link Node#requestFocus()}, and additionally
+     * sets the :focus-visible pseudoclass for the current node.
+     */
+    private void requestFocusVisible() {
+        if (getScene() != null) {
+            if (getScene().getFocusOwner() == this) {
+                pseudoClassStateChanged(FOCUS_VISIBLE_PSEUDOCLASS_STATE, true);
+            } else {
+                getScene().requestFocus(this, true);
+            }
         }
     }
 
@@ -8292,11 +8353,11 @@ public void requestFocus() {
      * However, the node must be part of a scene, otherwise this request
      * is ignored.
      */
-    final boolean traverse(Direction dir) {
+    final boolean traverse(Direction dir, TraversalMethod method) {
         if (getScene() == null) {
             return false;
         }
-        return getScene().traverse(this, dir);
+        return getScene().traverse(this, dir, method);
     }
 
     ////////////////////////////
@@ -9587,6 +9648,7 @@ private void doProcessCSS() {
     private static final PseudoClass PRESSED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("pressed");
     private static final PseudoClass DISABLED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("disabled");
     private static final PseudoClass FOCUSED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focused");
+    private static final PseudoClass FOCUS_VISIBLE_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focus-visible");
     private static final PseudoClass SHOW_MNEMONICS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("show-mnemonics");
 
     private static abstract class LazyTransformProperty
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 30e81b8b927..6e8c5feebe2 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -27,6 +27,7 @@
 
 import com.sun.glass.ui.Application;
 import com.sun.glass.ui.Accessible;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.util.Logging;
 import com.sun.javafx.util.Utils;
 import com.sun.javafx.application.PlatformImpl;
@@ -2090,11 +2091,11 @@ final boolean isFocusDirty() {
     /**
      * Traverses focus from the given node in the given direction.
      */
-    boolean traverse(Node node, Direction dir) {
+    boolean traverse(Node node, Direction dir, TraversalMethod method) {
         if (node.getSubScene() != null) {
-            return node.getSubScene().traverse(node, dir);
+            return node.getSubScene().traverse(node, dir, method);
         }
-        return traversalEngine.trav(node, dir) != null;
+        return traversalEngine.trav(node, dir, method) != null;
     }
 
     /**
@@ -2113,7 +2114,7 @@ private void focusInitial() {
      * function assumes that it is still a member of the same scene.
      */
     private void focusIneligible(Node node) {
-        traverse(node, Direction.NEXT);
+        traverse(node, Direction.NEXT, TraversalMethod.DEFAULT);
     }
 
     public void processKeyEvent(KeyEvent e) {
@@ -2126,8 +2127,8 @@ public void processKeyEvent(KeyEvent e) {
         getKeyHandler().process(e);
     }
 
-    void requestFocus(Node node) {
-        getKeyHandler().requestFocus(node);
+    void requestFocus(Node node, boolean focusVisible) {
+        getKeyHandler().requestFocus(node, focusVisible);
     }
 
     private Node oldFocusOwner;
@@ -2143,11 +2144,13 @@ void requestFocus(Node node) {
         @Override
         protected void invalidated() {
             if (oldFocusOwner != null) {
-                ((Node.FocusedProperty) oldFocusOwner.focusedProperty()).store(false);
+                ((Node.FocusPropertyBase)oldFocusOwner.focusedProperty()).set(false);
+                ((Node.FocusPropertyBase)oldFocusOwner.focusVisibleProperty()).set(false);
             }
             Node value = get();
             if (value != null) {
-                ((Node.FocusedProperty) value.focusedProperty()).store(keyHandler.windowFocused);
+                ((Node.FocusPropertyBase)value.focusedProperty()).set(keyHandler.windowFocused);
+                ((Node.FocusPropertyBase)value.focusVisibleProperty()).set(keyHandler.focusVisible);
                 if (value != oldFocusOwner) {
                     value.getScene().enableInputMethodEvents(
                             value.getInputMethodRequests() != null
@@ -2160,10 +2163,12 @@ protected void invalidated() {
             Node localOldOwner = oldFocusOwner;
             oldFocusOwner = value;
             if (localOldOwner != null) {
-                ((Node.FocusedProperty) localOldOwner.focusedProperty()).notifyListeners();
+                ((Node.FocusPropertyBase)localOldOwner.focusedProperty()).notifyListeners();
+                ((Node.FocusPropertyBase)localOldOwner.focusVisibleProperty()).notifyListeners();
             }
             if (value != null) {
-                ((Node.FocusedProperty) value.focusedProperty()).notifyListeners();
+                ((Node.FocusPropertyBase)value.focusedProperty()).notifyListeners();
+                ((Node.FocusPropertyBase)value.focusVisibleProperty()).notifyListeners();
             }
             PlatformLogger logger = Logging.getFocusLogger();
             if (logger.isLoggable(Level.FINE)) {
@@ -2437,10 +2442,10 @@ private void focusCleanup() {
                 if (oldOwner == null) {
                     Scene.this.focusInitial();
                 } else if (oldOwner.getScene() != Scene.this) {
-                    Scene.this.requestFocus(null);
+                    Scene.this.requestFocus(null, false);
                     Scene.this.focusInitial();
                 } else if (!oldOwner.isCanReceiveFocus()) {
-                    Scene.this.requestFocus(null);
+                    Scene.this.requestFocus(null, false);
                     Scene.this.focusIneligible(oldOwner);
                 }
                 Scene.this.setFocusDirty(false);
@@ -4013,6 +4018,8 @@ private PickResult pickNode(PickRay pickRay) {
      ******************************************************************************/
 
     class KeyHandler {
+        boolean focusVisible;
+
         private void setFocusOwner(final Node value) {
             // Cancel IM composition if there is one in progress.
             // This needs to be done before the focus owner is switched as it
@@ -4034,7 +4041,7 @@ private void setFocusOwner(final Node value) {
         protected void setWindowFocused(boolean value) {
             windowFocused = value;
             if (getFocusOwner() != null) {
-                getFocusOwner().setFocused(windowFocused);
+                getFocusOwner().setFocused(windowFocused, focusVisible);
             }
             if (windowFocused) {
                 if (accessible != null) {
@@ -4069,10 +4076,11 @@ private void process(KeyEvent e) {
             Event.fireEvent(eventTarget, e);
         }
 
-        private void requestFocus(Node node) {
+        private void requestFocus(Node node, boolean focusVisible) {
             if (getFocusOwner() == node || (node != null && !node.isCanReceiveFocus())) {
                 return;
             }
+            this.focusVisible = focusVisible;
             setFocusOwner(node);
         }
     }
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java b/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
index 330e227a112..692a7a260b6 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
@@ -29,6 +29,7 @@
 import com.sun.javafx.scene.traversal.Direction;
 import com.sun.javafx.scene.traversal.SubSceneTraversalEngine;
 import com.sun.javafx.scene.traversal.TopMostTraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
@@ -756,8 +757,8 @@ void layoutPass() {
 
     private TopMostTraversalEngine traversalEngine = new SubSceneTraversalEngine(this);
 
-    boolean traverse(Node node, Direction dir) {
-        return traversalEngine.trav(node, dir) != null;
+    boolean traverse(Node node, Direction dir, TraversalMethod method) {
+        return traversalEngine.trav(node, dir, method) != null;
     }
 
     private enum SubSceneDirtyBits {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
index 5c3d6bef43d..8d6a579237b 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
@@ -34,6 +34,7 @@
 import com.sun.javafx.scene.traversal.TopMostTraversalEngine;
 import com.sun.javafx.scene.traversal.TopMostTraversalEngineShim;
 import com.sun.javafx.scene.traversal.TraversalContext;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -259,7 +260,7 @@ public void selectNext() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -271,7 +272,7 @@ public void selectNextFromParent() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(ng1, engine.trav(n1, Direction.NEXT));
+        assertEquals(ng1, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -282,7 +283,7 @@ public void selectNextFromParent_2() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -293,7 +294,7 @@ public void selectNextInParentSibling() {
         ParentShim.getChildren(root).addAll(createFocusableNode(), new Group(new Group(n1, createFocusableDisabledNode(), createFocusableDisabledNode()),
                 new Group(createFocusableDisabledNode())), new Group(n2));
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -304,7 +305,7 @@ public void selectNextFocusableParent() {
 
         ParentShim.getChildren(root).addAll(new Group(createFocusableNode(), n1, createFocusableDisabledNode(), g));
 
-        assertEquals(g, engine.trav(n1, Direction.NEXT));
+        assertEquals(g, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -334,7 +335,7 @@ public Node selectLast(TraversalContext context) {
 
         ParentShim.getChildren(root).add(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
 
@@ -367,7 +368,7 @@ public Node selectLast(TraversalContext context) {
         final Node n3 = createFocusableNode();
         ParentShim.getChildren(root).addAll(g, n3);
 
-        assertEquals(n3, engine.trav(n1, Direction.NEXT));
+        assertEquals(n3, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -379,7 +380,7 @@ public void selectNextInLine() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT_IN_LINE));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT_IN_LINE, TraversalMethod.DEFAULT));
     }
 
 
@@ -391,7 +392,7 @@ public void selectPrevious() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -403,7 +404,7 @@ public void selectPreviousFromParent() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -414,7 +415,7 @@ public void selectPreviousFromParent_2() {
 
         ParentShim.getChildren(root).addAll(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -426,7 +427,7 @@ public void selectPreviousInParentSibling() {
                 new Group(new Group(createFocusableDisabledNode(), n1, createFocusableDisabledNode())),
                  createFocusableNode());
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -438,7 +439,7 @@ public void selectPreviousFocusableParentsNode() {
 
         ParentShim.getChildren(root).addAll(new Group(createFocusableNode(), g, n1, createFocusableDisabledNode()));
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -450,7 +451,7 @@ public void selectPreviousFocusableParent() {
 
         ParentShim.getChildren(root).addAll(new Group(createFocusableNode(), n1, g, createFocusableDisabledNode()));
 
-        assertEquals(g, engine.trav(n2, Direction.PREVIOUS));
+        assertEquals(g, engine.trav(n2, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     @Test
@@ -460,7 +461,7 @@ public void selectNextToLast() {
 
         ParentShim.getChildren(root).addAll(new Group(n2), new Group(createFocusableNode(), n1));
 
-        assertEquals(n2, engine.trav(n1, Direction.NEXT));
+        assertEquals(n2, engine.trav(n1, Direction.NEXT, TraversalMethod.DEFAULT));
     }
 
 
@@ -471,7 +472,7 @@ public void selectPreviousToFirst() {
 
         ParentShim.getChildren(root).addAll(new Group(n1, createFocusableNode()), new Group(n2));
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
 
@@ -502,7 +503,7 @@ public Node selectLast(TraversalContext context) {
 
         ParentShim.getChildren(root).add(g);
 
-        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS));
+        assertEquals(n2, engine.trav(n1, Direction.PREVIOUS, TraversalMethod.DEFAULT));
     }
 
     private Node createFocusableNode() {
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
index 892f4ef0ac5..60be4a1f58a 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
@@ -31,6 +31,7 @@
 import com.sun.javafx.scene.traversal.SceneTraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import static org.junit.Assert.assertEquals;
@@ -181,7 +182,7 @@ public void tearDown() {
     @Test
     public void untransformedTraversalTest() {
         keypadNodes[fromNumber - 1].requestFocus();
-        traversalEngine.trav(keypadNodes[fromNumber - 1], direction);
+        traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         assertTrue(keypadNodes[toNumber - 1].isFocused());
     }
 
@@ -189,7 +190,7 @@ public void untransformedTraversalTest() {
     public void transformedTraversalTest() {
         scene.getRoot().setRotate(90);
         keypadNodes[fromNumber - 1].requestFocus();
-        traversalEngine.trav(keypadNodes[fromNumber - 1], direction);
+        traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         assertTrue(keypadNodes[toNumberTransformed - 1].isFocused());
     }
 
@@ -199,7 +200,7 @@ public void traverseListenerTest() {
                 new TraverseListenerImpl();
         traversalEngine.addTraverseListener(traverseListener);
         keypadNodes[fromNumber - 1].requestFocus();
-        traversalEngine.trav(keypadNodes[fromNumber - 1], direction);
+        traversalEngine.trav(keypadNodes[fromNumber - 1], direction, TraversalMethod.DEFAULT);
         if (fromNumber != toNumber) {
             assertEquals(1, traverseListener.getCallCounter());
             assertSame(keypadNodes[toNumber - 1],
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
index 6dd6aeeabdb..59142ad3d8f 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
@@ -31,6 +31,7 @@
 import com.sun.javafx.scene.traversal.SceneTraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
 import com.sun.javafx.scene.traversal.TraversalEngine;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import com.sun.javafx.scene.traversal.TraverseListener;
 import static org.junit.Assert.assertEquals;
@@ -124,7 +125,7 @@ public void tearDown() {
     public void traverseOverInvisible() {
         keypadNodes[fromNumber].requestFocus();
         keypadNodes[invisibleNumber].setVisible(false);
-        traversalEngine.trav(keypadNodes[fromNumber], direction);
+        traversalEngine.trav(keypadNodes[fromNumber], direction, TraversalMethod.DEFAULT);
 
         assertTrue(keypadNodes[toNumber].isFocused());
 
diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
index 2793ad709cc..3fd30829527 100644
--- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
+++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
@@ -31,6 +31,7 @@
 import java.security.PrivilegedAction;
 
 import com.sun.javafx.scene.traversal.Direction;
+import com.sun.javafx.scene.traversal.TraversalMethod;
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Cursor;
@@ -114,7 +115,7 @@ public WebPageClientImpl(Accessor accessor) {
     }
 
     @Override public void transferFocus(boolean forward) {
-        NodeHelper.traverse(accessor.getView(), forward ? Direction.NEXT : Direction.PREVIOUS);
+        NodeHelper.traverse(accessor.getView(), forward ? Direction.NEXT : Direction.PREVIOUS, TraversalMethod.DEFAULT);
     }
 
     @Override public WCRectangle getScreenBounds(boolean available) {

From 92f6f7ad62892e54097809d8b6879e2ac56c51bb Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Thu, 22 Apr 2021 03:45:42 +0200
Subject: [PATCH 02/21] Add some tests

---
 .../src/main/java/javafx/scene/Node.java      | 12 +--
 .../src/main/java/javafx/scene/Scene.java     | 13 ++-
 .../java/test/javafx/scene/FocusTest.java     | 82 +++++++++++++++++++
 3 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index cc3bed90916..0d06313bbc3 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8325,11 +8325,7 @@ private void focusSetDirty(Scene s) {
      */
     public void requestFocus() {
         if (getScene() != null) {
-            if (getScene().getFocusOwner() == this) {
-                pseudoClassStateChanged(FOCUS_VISIBLE_PSEUDOCLASS_STATE, false);
-            } else {
-                getScene().requestFocus(this, false);
-            }
+            getScene().requestFocus(this, false);
         }
     }
 
@@ -8339,11 +8335,7 @@ public void requestFocus() {
      */
     private void requestFocusVisible() {
         if (getScene() != null) {
-            if (getScene().getFocusOwner() == this) {
-                pseudoClassStateChanged(FOCUS_VISIBLE_PSEUDOCLASS_STATE, true);
-            } else {
-                getScene().requestFocus(this, true);
-            }
+            getScene().requestFocus(this, true);
         }
     }
 
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 6e8c5feebe2..a005af19a11 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -4077,11 +4077,16 @@ private void process(KeyEvent e) {
         }
 
         private void requestFocus(Node node, boolean focusVisible) {
-            if (getFocusOwner() == node || (node != null && !node.isCanReceiveFocus())) {
-                return;
+            if (node == null) {
+                setFocusOwner(null);
+            } else if (node.isCanReceiveFocus()) {
+                if (node != getFocusOwner()) {
+                    this.focusVisible = focusVisible;
+                    setFocusOwner(node);
+                } else {
+                    ((Node.FocusPropertyBase)node.focusVisibleProperty()).set(focusVisible);
+                }
             }
-            this.focusVisible = focusVisible;
-            setFocusOwner(node);
         }
     }
     /***************************************************************************
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index 81d96de3a91..d93d1012d82 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -27,6 +27,10 @@
 
 
 import com.sun.javafx.scene.SceneHelper;
+import javafx.event.Event;
+import javafx.event.EventType;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import test.com.sun.javafx.pgstub.StubScene;
 import test.com.sun.javafx.pgstub.StubToolkit;
 import com.sun.javafx.tk.Toolkit;
@@ -124,6 +128,10 @@ private void assertNullFocus(Scene s) {
         assertNull(s.getFocusOwner());
     }
 
+    private KeyEvent createKeyEvent(EventType<KeyEvent> type) {
+        return new KeyEvent(type, null, null, KeyCode.TAB, false, false, false, false);
+    }
+
     /**
      * Test setting of initial focus.
      */
@@ -732,6 +740,80 @@ public void testSwitchScenes(){
         assertTrue(actionTaken);
     }
 
+    /**
+     * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
+     */
+    @Test public void defaultFocusTraversalDoesNotSetFocusVisible() {
+        Node node = n();
+        scene.setRoot(new Group(node));
+
+        assertNotFocused(scene, node);
+        assertFalse(node.isFocusVisible());
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertFalse(node.isFocusVisible());
+    }
+
+    /**
+     * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
+     */
+    @Test public void keyFocusTraversalSetsFocusVisible() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+
+        assertNotFocused(scene, node);
+        assertFalse(node.isFocusVisible());
+
+        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_PRESSED));
+        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_RELEASED));
+
+        assertIsFocused(scene, node);
+        assertTrue(node.isFocusVisible());
+    }
+
+    /**
+     * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
+     * visible focus is removed from the node.
+     */
+    @Test public void focusVisibleIsRemovedByDefaultRequestFocus() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_PRESSED));
+        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_RELEASED));
+
+        assertIsFocused(scene, node);
+        assertTrue(node.isFocusVisible());
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertFalse(node.isFocusVisible());
+    }
+
+    /**
+     * When a node loses focus, it also loses visible focus.
+     */
+    @Test public void visibleFocusIsRemovedWhenFocusIsRemoved() {
+        Node node1 = n();
+        Node node2 = n();
+        Group g = new Group(node1, node2);
+        scene.setRoot(g);
+        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_PRESSED));
+        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_RELEASED));
+
+        assertIsFocused(scene, node1);
+        assertTrue(node1.isFocusVisible());
+
+        node2.requestFocus();
+
+        assertNotFocused(scene, node1);
+        assertFalse(node1.isFocusVisible());
+    }
+
     // TODO: tests for moving nodes between scenes
     // and active and inactive stages
 }

From b1e905d00a5cc25996e19fa02d3f6dd42b711b33 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Thu, 22 Apr 2021 03:55:29 +0200
Subject: [PATCH 03/21] Changed javadoc, changed test

---
 .../src/main/java/javafx/scene/Node.java      |  2 +-
 .../java/test/javafx/scene/FocusTest.java     | 24 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 0d06313bbc3..7f3d4c9b45e 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8331,7 +8331,7 @@ public void requestFocus() {
 
     /**
      * Requests focus as if by calling {@link Node#requestFocus()}, and additionally
-     * sets the :focus-visible pseudoclass for the current node.
+     * sets the {@code Node#isFocusVisible} flag.
      */
     private void requestFocusVisible() {
         if (getScene() != null) {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index d93d1012d82..1d2b1162122 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -28,7 +28,6 @@
 
 import com.sun.javafx.scene.SceneHelper;
 import javafx.event.Event;
-import javafx.event.EventType;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import test.com.sun.javafx.pgstub.StubScene;
@@ -43,10 +42,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
+
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.ParentShim;
@@ -128,10 +124,6 @@ private void assertNullFocus(Scene s) {
         assertNull(s.getFocusOwner());
     }
 
-    private KeyEvent createKeyEvent(EventType<KeyEvent> type) {
-        return new KeyEvent(type, null, null, KeyCode.TAB, false, false, false, false);
-    }
-
     /**
      * Test setting of initial focus.
      */
@@ -740,6 +732,11 @@ public void testSwitchScenes(){
         assertTrue(actionTaken);
     }
 
+    private void fireTabKeyEvent(Node node) {
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_PRESSED, null, null, KeyCode.TAB, false, false, false, false));
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_RELEASED, null, null, KeyCode.TAB, false, false, false, false));
+    }
+
     /**
      * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
      */
@@ -767,8 +764,7 @@ public void testSwitchScenes(){
         assertNotFocused(scene, node);
         assertFalse(node.isFocusVisible());
 
-        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_PRESSED));
-        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_RELEASED));
+        fireTabKeyEvent(g);
 
         assertIsFocused(scene, node);
         assertTrue(node.isFocusVisible());
@@ -782,8 +778,7 @@ public void testSwitchScenes(){
         Node node = n();
         Group g = new Group(node);
         scene.setRoot(g);
-        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_PRESSED));
-        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_RELEASED));
+        fireTabKeyEvent(g);
 
         assertIsFocused(scene, node);
         assertTrue(node.isFocusVisible());
@@ -802,8 +797,7 @@ public void testSwitchScenes(){
         Node node2 = n();
         Group g = new Group(node1, node2);
         scene.setRoot(g);
-        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_PRESSED));
-        Event.fireEvent(g, createKeyEvent(KeyEvent.KEY_RELEASED));
+        fireTabKeyEvent(g);
 
         assertIsFocused(scene, node1);
         assertTrue(node1.isFocusVisible());

From cc78d2db3ad75ca33a3d6d5100de3ad86cebda1b Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Thu, 22 Apr 2021 21:43:20 +0200
Subject: [PATCH 04/21] Test for pseudo-class state

---
 .../src/main/java/javafx/scene/Scene.java     |  8 +++++-
 .../java/test/javafx/scene/FocusTest.java     | 28 +++++++++++++------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index a005af19a11..6deb974098b 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -4036,6 +4036,12 @@ private void setFocusOwner(final Node value) {
             focusOwner.set(value);
         }
 
+        private void setFocusVisible(Node node, boolean focusVisible) {
+            Node.FocusPropertyBase property = (Node.FocusPropertyBase)node.focusVisibleProperty();
+            property.set(focusVisible);
+            property.notifyListeners();
+        }
+
         private boolean windowFocused;
         protected boolean isWindowFocused() { return windowFocused; }
         protected void setWindowFocused(boolean value) {
@@ -4084,7 +4090,7 @@ private void requestFocus(Node node, boolean focusVisible) {
                     this.focusVisible = focusVisible;
                     setFocusOwner(node);
                 } else {
-                    ((Node.FocusPropertyBase)node.focusVisibleProperty()).set(focusVisible);
+                    setFocusVisible(node, focusVisible);
                 }
             }
         }
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index 1d2b1162122..320c3e5c874 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -113,17 +113,29 @@ Node n() {
     private void assertIsFocused(Scene s, Node n) {
         assertEquals(n, s.getFocusOwner());
         assertTrue(n.isFocused());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
     }
 
     private void assertNotFocused(Scene s, Node n) {
         assertTrue(n != s.getFocusOwner());
         assertFalse(n.isFocused());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
     }
 
     private void assertNullFocus(Scene s) {
         assertNull(s.getFocusOwner());
     }
 
+    private void assertIsFocusVisible(Node n) {
+        assertTrue(n.isFocusVisible());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertNotFocusVisible(Node n) {
+        assertFalse(n.isFocusVisible());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
     /**
      * Test setting of initial focus.
      */
@@ -745,12 +757,12 @@ private void fireTabKeyEvent(Node node) {
         scene.setRoot(new Group(node));
 
         assertNotFocused(scene, node);
-        assertFalse(node.isFocusVisible());
+        assertNotFocusVisible(node);
 
         node.requestFocus();
 
         assertIsFocused(scene, node);
-        assertFalse(node.isFocusVisible());
+        assertNotFocusVisible(node);
     }
 
     /**
@@ -762,12 +774,12 @@ private void fireTabKeyEvent(Node node) {
         scene.setRoot(g);
 
         assertNotFocused(scene, node);
-        assertFalse(node.isFocusVisible());
+        assertNotFocusVisible(node);
 
         fireTabKeyEvent(g);
 
         assertIsFocused(scene, node);
-        assertTrue(node.isFocusVisible());
+        assertIsFocusVisible(node);
     }
 
     /**
@@ -781,12 +793,12 @@ private void fireTabKeyEvent(Node node) {
         fireTabKeyEvent(g);
 
         assertIsFocused(scene, node);
-        assertTrue(node.isFocusVisible());
+        assertIsFocusVisible(node);
 
         node.requestFocus();
 
         assertIsFocused(scene, node);
-        assertFalse(node.isFocusVisible());
+        assertNotFocusVisible(node);
     }
 
     /**
@@ -800,12 +812,12 @@ private void fireTabKeyEvent(Node node) {
         fireTabKeyEvent(g);
 
         assertIsFocused(scene, node1);
-        assertTrue(node1.isFocusVisible());
+        assertIsFocusVisible(node1);
 
         node2.requestFocus();
 
         assertNotFocused(scene, node1);
-        assertFalse(node1.isFocusVisible());
+        assertNotFocusVisible(node1);
     }
 
     // TODO: tests for moving nodes between scenes

From e4d51f7fcbf7b2f5f6b2dfd4e1b672dcb82082ec Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Sun, 6 Jun 2021 18:00:22 +0200
Subject: [PATCH 05/21] changed javadoc

---
 .../src/main/java/javafx/scene/Node.java              | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 7f3d4c9b45e..dec07c68d33 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8166,9 +8166,9 @@ protected boolean notifyListeners() {
     private FocusPropertyBase focused;
 
     /**
-     * Indicates whether this {@code Node} currently has a visible focus
-     * indicator. This usually happens when a node acquired input focus
-     * via keyboard navigation.
+     * Indicates whether this {@code Node} should visibly indicate focus.
+     * This flag is set when a node acquired input focus via keyboard navigation,
+     * and it is cleared when {@link #requestFocus()} is called.
      */
     private FocusPropertyBase focusVisible;
 
@@ -8322,6 +8322,7 @@ private void focusSetDirty(Scene s) {
      * node. The focus owner will not actually have the input focus, however,
      * unless the scene belongs to a {@code Stage} that is both visible
      * and active.
+     * <p>This method will clear the {@link #focusVisible} flag.
      */
     public void requestFocus() {
         if (getScene() != null) {
@@ -8330,8 +8331,8 @@ public void requestFocus() {
     }
 
     /**
-     * Requests focus as if by calling {@link Node#requestFocus()}, and additionally
-     * sets the {@code Node#isFocusVisible} flag.
+     * Requests focus as if by calling {@link #requestFocus()}, and additionally
+     * sets the {@link #focusVisible} flag.
      */
     private void requestFocusVisible() {
         if (getScene() != null) {

From 792b1aea613a1d07c875ed7139011737e52abc89 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 7 Jun 2021 21:18:00 +0200
Subject: [PATCH 06/21] added focusWithin

---
 .../docs/javafx/scene/doc-files/cssref.html   |  8 ++
 .../src/main/java/javafx/scene/Node.java      | 75 ++++++++++++++++--
 .../src/main/java/javafx/scene/Scene.java     | 15 ++--
 .../java/test/javafx/scene/FocusTest.java     | 76 ++++++++++++++++++-
 4 files changed, 153 insertions(+), 21 deletions(-)

diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
index c64dc03cd39..c5dc98d6df0 100644
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
@@ -1771,6 +1771,14 @@ <h4>Pseudo-classes</h4>
           <td>applies when the <strong>focused</strong> variable is true</td>
         </tr>
         <tr>
+        <th class="propertyname" scope="row">focus-visible</th>
+          <td>applies when the <strong>focusVisible</strong> variable is true</td>
+        </tr>
+        <tr>
+        <th class="propertyname" scope="row">focus-within</th>
+          <td>applies when the <strong>focusWithin</strong> variable is true</td>
+        </tr>
+        <tr>
         <th class="propertyname" scope="row">hover</th>
           <td>applies when the <strong>hover</strong> variable is true</td>
         </tr>
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index dec07c68d33..4bf231fdd4d 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8172,17 +8172,41 @@ protected boolean notifyListeners() {
      */
     private FocusPropertyBase focusVisible;
 
+    /**
+     * Indicates whether this {@code Node} or any of its children currently
+     * has the input focus.
+     */
+    private FocusPropertyBase focusWithin;
+
     protected final void setFocused(boolean value) {
-        setFocused(value, false);
+        setFocusQuietly(value, false);
+        notifyFocus();
+    }
+
+    /**
+     * Sets the value of the {@link #focused} and {@link #focusVisible} properties
+     * without firing change events. The value of {@link #focusWithin} is set
+     * by the implementation of {@link #focused}.
+     */
+    final void setFocusQuietly(boolean focused, boolean focusVisible) {
+        ((FocusPropertyBase)focusedProperty()).set(focused);
+        ((FocusPropertyBase)focusVisibleProperty()).set(focused && focusVisible);
     }
 
-    final void setFocused(boolean focused, boolean focusVisible) {
-        FocusPropertyBase focusedProperty = (FocusPropertyBase)focusedProperty();
-        FocusPropertyBase focusVisibleProperty = (FocusPropertyBase)focusVisibleProperty();
-        focusedProperty.set(focused);
-        focusVisibleProperty.set(focused && focusVisible);
-        focusedProperty.notifyListeners();
-        focusVisibleProperty.notifyListeners();
+    /**
+     * Fires change notifications if the value of {@link #focused}, {@link #focusVisible}
+     * or {@link #focusWithin} has changed. Change notifications for {@link #focusWithin}
+     * are fired on the current node and on all of its parents, if necessary.
+     */
+    final void notifyFocus() {
+        ((FocusPropertyBase)focusedProperty()).notifyListeners();
+        ((FocusPropertyBase)focusVisibleProperty()).notifyListeners();
+
+        Node node = this;
+        do {
+            ((FocusPropertyBase)node.focusWithinProperty()).notifyListeners();
+            node = node.getParent();
+        } while (node != null);
     }
 
     public final boolean isFocused() {
@@ -8210,6 +8234,19 @@ protected boolean notifyListeners() {
                     }
                     return false;
                 }
+
+                @Override
+                public void set(boolean value) {
+                    if (get() != value) {
+                        super.set(value);
+
+                        Node node = Node.this;
+                        do {
+                            ((FocusPropertyBase)node.focusWithinProperty()).set(value);
+                            node = node.getParent();
+                        } while (node != null);
+                    }
+                }
             };
         }
         return focused;
@@ -8236,6 +8273,27 @@ public String getName() {
         return focusVisible;
     }
 
+    public final boolean isFocusWithin() {
+        return focusWithin != null && focusWithin.get();
+    }
+
+    public final ReadOnlyBooleanProperty focusWithinProperty() {
+        if (focusWithin == null) {
+            focusWithin = new FocusPropertyBase() {
+                @Override
+                protected PseudoClass getPseudoClass() {
+                    return FOCUS_WITHIN_PSEUDOCLASS_STATE;
+                }
+
+                @Override
+                public String getName() {
+                    return "focusWithin";
+                }
+            };
+        }
+        return focusWithin;
+    }
+
     /**
      * Specifies whether this {@code Node} should be a part of focus traversal
      * cycle. When this property is {@code true} focus can be moved to this
@@ -9642,6 +9700,7 @@ private void doProcessCSS() {
     private static final PseudoClass DISABLED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("disabled");
     private static final PseudoClass FOCUSED_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focused");
     private static final PseudoClass FOCUS_VISIBLE_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focus-visible");
+    private static final PseudoClass FOCUS_WITHIN_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("focus-within");
     private static final PseudoClass SHOW_MNEMONICS_PSEUDOCLASS_STATE = PseudoClass.getPseudoClass("show-mnemonics");
 
     private static abstract class LazyTransformProperty
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 6deb974098b..91fc8eed03e 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -2144,13 +2144,11 @@ void requestFocus(Node node, boolean focusVisible) {
         @Override
         protected void invalidated() {
             if (oldFocusOwner != null) {
-                ((Node.FocusPropertyBase)oldFocusOwner.focusedProperty()).set(false);
-                ((Node.FocusPropertyBase)oldFocusOwner.focusVisibleProperty()).set(false);
+                oldFocusOwner.setFocusQuietly(false, false);
             }
             Node value = get();
             if (value != null) {
-                ((Node.FocusPropertyBase)value.focusedProperty()).set(keyHandler.windowFocused);
-                ((Node.FocusPropertyBase)value.focusVisibleProperty()).set(keyHandler.focusVisible);
+                value.setFocusQuietly(keyHandler.windowFocused, keyHandler.focusVisible);
                 if (value != oldFocusOwner) {
                     value.getScene().enableInputMethodEvents(
                             value.getInputMethodRequests() != null
@@ -2163,12 +2161,10 @@ protected void invalidated() {
             Node localOldOwner = oldFocusOwner;
             oldFocusOwner = value;
             if (localOldOwner != null) {
-                ((Node.FocusPropertyBase)localOldOwner.focusedProperty()).notifyListeners();
-                ((Node.FocusPropertyBase)localOldOwner.focusVisibleProperty()).notifyListeners();
+                localOldOwner.notifyFocus();
             }
             if (value != null) {
-                ((Node.FocusPropertyBase)value.focusedProperty()).notifyListeners();
-                ((Node.FocusPropertyBase)value.focusVisibleProperty()).notifyListeners();
+                value.notifyFocus();
             }
             PlatformLogger logger = Logging.getFocusLogger();
             if (logger.isLoggable(Level.FINE)) {
@@ -4047,7 +4043,8 @@ private void setFocusVisible(Node node, boolean focusVisible) {
         protected void setWindowFocused(boolean value) {
             windowFocused = value;
             if (getFocusOwner() != null) {
-                getFocusOwner().setFocused(windowFocused, focusVisible);
+                getFocusOwner().setFocusQuietly(windowFocused, focusVisible);
+                getFocusOwner().notifyFocus();
             }
             if (windowFocused) {
                 if (accessible != null) {
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index 320c3e5c874..5fc7a15b6ff 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -136,6 +136,32 @@ private void assertNotFocusVisible(Node n) {
         assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
     }
 
+    private void assertIsFocusWithin(Node n) {
+        assertTrue(n.isFocusWithin());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertNotFocusWithin(Node n) {
+        assertFalse(n.isFocusWithin());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertIsFocusWithinParents(Node n) {
+        do {
+            assertTrue(n.isFocusWithin());
+            assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
+    private void assertNotFocusWithinParents(Node n) {
+        do {
+            assertFalse(n.isFocusWithin());
+            assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
     /**
      * Test setting of initial focus.
      */
@@ -752,7 +778,7 @@ private void fireTabKeyEvent(Node node) {
     /**
      * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
      */
-    @Test public void defaultFocusTraversalDoesNotSetFocusVisible() {
+    @Test public void testDefaultFocusTraversalDoesNotSetFocusVisible() {
         Node node = n();
         scene.setRoot(new Group(node));
 
@@ -768,7 +794,7 @@ private void fireTabKeyEvent(Node node) {
     /**
      * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
      */
-    @Test public void keyFocusTraversalSetsFocusVisible() {
+    @Test public void testKeyFocusTraversalSetsFocusVisible() {
         Node node = n();
         Group g = new Group(node);
         scene.setRoot(g);
@@ -786,7 +812,7 @@ private void fireTabKeyEvent(Node node) {
      * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
      * visible focus is removed from the node.
      */
-    @Test public void focusVisibleIsRemovedByDefaultRequestFocus() {
+    @Test public void testFocusVisibleIsRemovedByDefaultRequestFocus() {
         Node node = n();
         Group g = new Group(node);
         scene.setRoot(g);
@@ -804,7 +830,7 @@ private void fireTabKeyEvent(Node node) {
     /**
      * When a node loses focus, it also loses visible focus.
      */
-    @Test public void visibleFocusIsRemovedWhenFocusIsRemoved() {
+    @Test public void testVisibleFocusIsRemovedWhenFocusIsRemoved() {
         Node node1 = n();
         Node node2 = n();
         Group g = new Group(node1, node2);
@@ -820,6 +846,48 @@ private void fireTabKeyEvent(Node node) {
         assertNotFocusVisible(node1);
     }
 
+    /**
+     * When a node acquires focus, the focusWithin property is set on the node
+     * and all of its parents.
+     */
+    @Test public void testFocusWithinIsTrueOnAllParents() {
+        Node node1 = n();
+        Group g = new Group(new Group(new Group(node1)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+    }
+
+    /**
+     * When a node loses focus, the focusWithin property of its parents is cleared.
+     */
+    @Test public void testFocusWithinIsRemovedFromParentsAfterChangingFocusOwner() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+        assertNotFocusWithinParents(node2);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+        assertNotFocusWithin(node2);
+        assertNotFocusWithin(node2.getParent());
+        assertNotFocusWithin(node2.getParent().getParent());
+
+        node2.requestFocus();
+
+        assertIsFocusWithinParents(node2);
+        assertNotFocusWithin(node1);
+        assertNotFocusWithin(node1.getParent());
+        assertNotFocusWithin(node1.getParent().getParent());
+    }
+
     // TODO: tests for moving nodes between scenes
     // and active and inactive stages
 }

From 40a8d9c79c42699f9acea023d82d8d53e86e8aeb Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 7 Jun 2021 21:21:49 +0200
Subject: [PATCH 07/21] minor naming change

---
 .../javafx.graphics/src/main/java/javafx/scene/Node.java    | 4 ++--
 .../javafx.graphics/src/main/java/javafx/scene/Scene.java   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 4bf231fdd4d..4a2c54d0146 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8180,7 +8180,7 @@ protected boolean notifyListeners() {
 
     protected final void setFocused(boolean value) {
         setFocusQuietly(value, false);
-        notifyFocus();
+        notifyFocusListeners();
     }
 
     /**
@@ -8198,7 +8198,7 @@ final void setFocusQuietly(boolean focused, boolean focusVisible) {
      * or {@link #focusWithin} has changed. Change notifications for {@link #focusWithin}
      * are fired on the current node and on all of its parents, if necessary.
      */
-    final void notifyFocus() {
+    final void notifyFocusListeners() {
         ((FocusPropertyBase)focusedProperty()).notifyListeners();
         ((FocusPropertyBase)focusVisibleProperty()).notifyListeners();
 
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 91fc8eed03e..ffcdc1521c2 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -2161,10 +2161,10 @@ protected void invalidated() {
             Node localOldOwner = oldFocusOwner;
             oldFocusOwner = value;
             if (localOldOwner != null) {
-                localOldOwner.notifyFocus();
+                localOldOwner.notifyFocusListeners();
             }
             if (value != null) {
-                value.notifyFocus();
+                value.notifyFocusListeners();
             }
             PlatformLogger logger = Logging.getFocusLogger();
             if (logger.isLoggable(Level.FINE)) {
@@ -4044,7 +4044,7 @@ protected void setWindowFocused(boolean value) {
             windowFocused = value;
             if (getFocusOwner() != null) {
                 getFocusOwner().setFocusQuietly(windowFocused, focusVisible);
-                getFocusOwner().notifyFocus();
+                getFocusOwner().notifyFocusListeners();
             }
             if (windowFocused) {
                 if (accessible != null) {

From 1f0813f37d043e9c9fc5062e58b05c207c8e3919 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 7 Jun 2021 21:46:29 +0200
Subject: [PATCH 08/21] Only fire focus change notification if value is
 actually different

---
 .../src/main/java/javafx/scene/Node.java              | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 4a2c54d0146..08c865b8ec9 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8115,7 +8115,7 @@ public final ObjectProperty<InputMethodRequests> inputMethodRequestsProperty() {
      */
     abstract class FocusPropertyBase extends ReadOnlyBooleanPropertyBase {
         private boolean value;
-        private boolean changed;
+        private boolean lastNotifiedValue;
 
         protected abstract PseudoClass getPseudoClass();
 
@@ -8130,18 +8130,15 @@ public boolean get() {
         }
 
         public void set(boolean value) {
-            if (this.value != value) {
-                this.value = value;
-                this.changed = true;
-            }
+            this.value = value;
         }
 
         protected boolean notifyListeners() {
-            if (!changed) {
+            if (lastNotifiedValue == value) {
                 return false;
             }
 
-            changed = false;
+            lastNotifiedValue = value;
             pseudoClassStateChanged(getPseudoClass(), value);
 
             PlatformLogger logger = Logging.getFocusLogger();

From beb57b5d358ee6af2b179fcb63c867bc6783361b Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 7 Jun 2021 21:59:46 +0200
Subject: [PATCH 09/21] added test

---
 .../java/test/javafx/scene/FocusTest.java     | 1811 +++++++++--------
 1 file changed, 918 insertions(+), 893 deletions(-)

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index 5fc7a15b6ff..a7fce045b94 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -1,893 +1,918 @@
-/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package test.javafx.scene;
-
-
-import com.sun.javafx.scene.SceneHelper;
-import javafx.event.Event;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import test.com.sun.javafx.pgstub.StubScene;
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.ParentShim;
-import javafx.scene.Scene;
-import javafx.scene.SceneShim;
-
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class FocusTest {
-
-    private Stage stage;
-    private Scene scene;
-    private List<Node> nodes;
-    private int nodeIndex;
-    private StubToolkit toolkit;
-    private boolean actionTaken;
-
-    @Before
-    public void setUp() {
-        stage = new Stage();
-        scene = new Scene(new Group(), 500, 500);
-        stage.setScene(scene);
-        stage.show();
-        stage.requestFocus();
-        nodes = new ArrayList();
-        nodeIndex = 0;
-
-        toolkit = (StubToolkit) Toolkit.getToolkit();
-    }
-
-    @After
-    public void tearDown() {
-        stage.hide();
-        stage = null;
-        scene = null;
-    }
-
-    void fireTestPulse() {
-        // TODO: an actual pulse doesn't work in the stub environment.
-        // Just clean up focus instead.
-        SceneShim.focusCleanup(scene);
-    }
-
-    boolean T = true;
-    boolean F = false;
-
-    Node n(boolean trav, boolean vis, boolean enable) {
-        Rectangle node = new Rectangle();
-        node.setId("Rect-" + nodeIndex);
-        node.setFocusTraversable(trav);
-        node.setVisible(vis);
-        node.setDisable(!enable);
-        nodes.add(node);
-        nodeIndex++;
-
-        return node;
-    }
-
-    Node n() {
-        return n(T, T, T);
-    }
-
-    private void assertIsFocused(Scene s, Node n) {
-        assertEquals(n, s.getFocusOwner());
-        assertTrue(n.isFocused());
-        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
-    }
-
-    private void assertNotFocused(Scene s, Node n) {
-        assertTrue(n != s.getFocusOwner());
-        assertFalse(n.isFocused());
-        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
-    }
-
-    private void assertNullFocus(Scene s) {
-        assertNull(s.getFocusOwner());
-    }
-
-    private void assertIsFocusVisible(Node n) {
-        assertTrue(n.isFocusVisible());
-        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
-    }
-
-    private void assertNotFocusVisible(Node n) {
-        assertFalse(n.isFocusVisible());
-        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
-    }
-
-    private void assertIsFocusWithin(Node n) {
-        assertTrue(n.isFocusWithin());
-        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-    }
-
-    private void assertNotFocusWithin(Node n) {
-        assertFalse(n.isFocusWithin());
-        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-    }
-
-    private void assertIsFocusWithinParents(Node n) {
-        do {
-            assertTrue(n.isFocusWithin());
-            assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-            n = n.getParent();
-        } while (n != null);
-    }
-
-    private void assertNotFocusWithinParents(Node n) {
-        do {
-            assertFalse(n.isFocusWithin());
-            assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-            n = n.getParent();
-        } while (n != null);
-    }
-
-    /**
-     * Test setting of initial focus.
-     */
-    @Test
-    public void testInitial() {
-        assertNullFocus(scene);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * Test requestFocus() on eligible and ineligible nodes.
-     */
-    @Test
-    public void testRequest() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(
-                n(T, T, T), // 0 - focusable
-                n(F, T, T), // 1 - focusable
-                n(T, T, F), // 2 - not focusable
-                n(F, T, F), // 3 - not focusable
-                n(T, F, T), // 4 - not focusable
-                n(F, F, T), // 5 - not focusable
-                n(T, F, F), // 6 - not focusable
-                n(F, F, F) // 7 - not focusable
-                );
-        n(); // 8 - not focusable, because not in scene
-
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).requestFocus();
-        assertIsFocused(scene, nodes.get(1));
-        nodes.get(2).requestFocus();
-        assertNotFocused(scene, nodes.get(2));
-        nodes.get(3).requestFocus();
-        assertNotFocused(scene, nodes.get(3));
-        nodes.get(4).requestFocus();
-        assertNotFocused(scene, nodes.get(4));
-        nodes.get(5).requestFocus();
-        assertNotFocused(scene, nodes.get(5));
-        nodes.get(6).requestFocus();
-        assertNotFocused(scene, nodes.get(6));
-        nodes.get(7).requestFocus();
-        assertNotFocused(scene, nodes.get(7));
-        nodes.get(8).requestFocus();
-        assertNotFocused(scene, nodes.get(8));
-    }
-
-    /**
-     * Test removing the focus owner without another eligible node in the scene.
-     */
-    @Test
-    public void testRemove1() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test removing the focus owner with another eligible node in the scene.
-     */
-    @Test
-    public void testRemove2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test removing the focus owner without another eligible node in the scene.
-     */
-    @Test
-    public void testRemove_ClearsFocusOnRemovedNode1() {
-        Node n = n();
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n);
-        n.requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(n);
-        fireTestPulse();
-        assertNotFocused(scene, n);
-    }
-
-    /**
-     * Test removing the focus owner with another eligible node in the scene.
-     */
-    @Test
-    public void testRemove_ClearsFocusOnRemovedNode2() {
-        Node n = n();
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n, n());
-        n.requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(n);
-        fireTestPulse();
-        assertNotFocused(scene, n);
-        assertIsFocused(scene, ParentShim.getChildren(scene.getRoot()).get(0));
-    }
-
-    /**
-     * Test removing the focus owner without another eligible node in the scene.
-     */
-    @Test
-    public void testRemoveChildOfGroup_ClearsFocusOnRemovedNode1() {
-        Node n = n();
-        Group g = new Group(n);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(g);
-        n.requestFocus();
-        ParentShim.getChildren(g).remove(n);
-        fireTestPulse();
-        assertNotFocused(scene, n);
-    }
-
-    /**
-     * Test making the focus owner invisible without another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testInvisible1() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(0).setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the focus owner invisible with another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testInvisible2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(0).setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test making the focus owner disabled without another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testDisable1() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        nodes.get(0).setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the focus owner disabled with another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testDisable2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        nodes.get(0).setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * When focus null, test adding an eligible, traversable node.
-     */
-    @Test
-    public void testAddEligible() {
-        fireTestPulse(); // make sure focus is clean
-        assertNullFocus(scene);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus null, test making a node traversable.
-     */
-    @Test
-    public void testBecomeTraversable() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(F, T, T), n(F, T, T));
-        fireTestPulse();
-        assertNullFocus(scene);
-        toolkit.clearPulseRequested();
-        assertFalse(toolkit.isPulseRequested());
-        nodes.get(0).setFocusTraversable(true);
-        assertTrue(toolkit.isPulseRequested());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus null, test making a node visible.
-     */
-    @Test
-    public void testBecomeVisible() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n(T, F, T));
-        fireTestPulse();
-        assertNullFocus(scene);
-        nodes.get(0).setVisible(true);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus null, test making a node enabled.
-     */
-    @Test
-    public void testBecomeEnabled() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n(T, T, F));
-        fireTestPulse();
-        assertNullFocus(scene);
-        nodes.get(0).setDisable(false);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test adding an eligible, traversable node.
-     */
-    @Test
-    public void testAddEligible2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test making a node traversable.
-     */
-    @Test
-    public void testBecomeTraversable2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(F, T, T));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).setFocusTraversable(true);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test making a node visible.
-     */
-    @Test
-    public void testBecomeVisible2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, F, T));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).setVisible(true);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test making a node enabled.
-     */
-    @Test
-    public void testBecomeEnabled2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, T, F));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).setDisable(false);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * Test moving the focus within a scene.
-     */
-    @Test
-    public void testMoveWithinScene() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * Test moving the focus into an invisible group, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMoveIntoInvisible() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test moving the focus into an invisible group, with another
-     * eligible node in the scene.
-     */
-    @Test
-    public void testMoveIntoInvisible2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test moving the focus into a disabled group, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMoveIntoDisabled() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setDisable(true);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test moving the focus into a disabled group, with another
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMoveIntoDisabled2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setDisable(true);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test making the parent of focused node disabled, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentDisabled() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the parent of focused node disabled, with another
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentDisabled2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test making the parent of focused node invisible, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentInvisible() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the parent of focused node invisible, with another
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentInvisible2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Focus should not move if stacking order changes.
-     */
-    @Test
-    public void testToFront() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        assertNotFocused(scene, nodes.get(1));
-        nodes.get(0).toFront();
-        assertIsFocused(scene, nodes.get(0));
-        assertNotFocused(scene, nodes.get(1));
-        nodes.get(0).toBack();
-        assertIsFocused(scene, nodes.get(0));
-        assertNotFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test moving focused node into scene which is not in active stage.
-     */
-    @Test
-    public void testMoveIntoInactiveScene() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        Scene scene2 = new Scene(new Group());
-        ParentShim.getChildren(scene2.getRoot()).add(nodes.get(0));
-        fireTestPulse();
-        assertNullFocus(scene);
-        assertNullFocus(scene2);
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertNullFocus(scene);
-        assertEquals(nodes.get(0), scene2.getFocusOwner());
-        assertFalse(nodes.get(0).isFocused());
-        stage.setScene(scene2);
-        fireTestPulse();
-        assertNullFocus(scene);
-        assertIsFocused(scene2, nodes.get(0));
-    }
-
-    /**
-     * Test making stage invisible.
-     */
-    @Test
-    public void testInvisibleStage() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        stage.show();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        stage.hide();
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertEquals(nodes.get(0), scene.getFocusOwner());
-        assertFalse(nodes.get(0).isFocused());
-    }
-
-    /**
-     * Test switching two scenes in one stage. Focus owner in scenes should
-     * remain the same while focused node should change.
-     */
-    @Test
-    public void testSwitchScenes(){
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        Scene scene2 = new Scene(new Group());
-        ParentShim.getChildren(scene2.getRoot()).add(n());
-        nodes.get(1).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        assertFalse(nodes.get(1).isFocused());
-        assertEquals(nodes.get(1), scene2.getFocusOwner());
-        stage.setScene(scene2);
-        fireTestPulse();
-        assertFalse(nodes.get(0).isFocused());
-        assertEquals(nodes.get(0), scene.getFocusOwner());
-        assertIsFocused(scene2, nodes.get(1));
-    }
-
-    @Test public void nestedFocusRequestsShouldResultInOneFocusedNode() {
-        final Node n1 = n();
-        final Node n2 = n();
-        scene.setRoot(new Group(n1, n2));
-
-        n1.focusedProperty().addListener((ov, lostFocus, getFocus) -> {
-            if (lostFocus) {
-                n1.requestFocus();
-            }
-        });
-
-        n2.focusedProperty().addListener(o -> {
-            // n2 can be invalidated, but should not have focus
-            assertTrue(n1.isFocused());
-            assertFalse(n2.isFocused());
-        });
-
-        n2.focusedProperty().addListener((ov, lostFocus, getFocus) -> fail("n2 should never get focus"));
-
-        stage.show();
-        n1.requestFocus();
-        assertTrue(n1.isFocused());
-        assertFalse(n2.isFocused());
-
-        n2.requestFocus();
-        assertTrue(n1.isFocused());
-        assertFalse(n2.isFocused());
-    }
-
-    @Test public void shouldCancelInputMethodWhenLoosingFocus() {
-        final Node n1 = n();
-        final Node n2 = n();
-        scene.setRoot(new Group(n1, n2));
-
-        stage.show();
-
-        Toolkit.getToolkit().firePulse();
-
-        n1.requestFocus();
-        assertSame(n1, scene.getFocusOwner());
-        actionTaken = false;
-
-        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
-                () -> {
-                    assertSame(n1, scene.getFocusOwner());
-                    actionTaken = true;
-                }
-        );
-
-        n2.requestFocus();
-
-        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
-                null);
-
-        assertSame(n2, scene.getFocusOwner());
-        assertTrue(actionTaken);
-    }
-
-    private void fireTabKeyEvent(Node node) {
-        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_PRESSED, null, null, KeyCode.TAB, false, false, false, false));
-        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_RELEASED, null, null, KeyCode.TAB, false, false, false, false));
-    }
-
-    /**
-     * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
-     */
-    @Test public void testDefaultFocusTraversalDoesNotSetFocusVisible() {
-        Node node = n();
-        scene.setRoot(new Group(node));
-
-        assertNotFocused(scene, node);
-        assertNotFocusVisible(node);
-
-        node.requestFocus();
-
-        assertIsFocused(scene, node);
-        assertNotFocusVisible(node);
-    }
-
-    /**
-     * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
-     */
-    @Test public void testKeyFocusTraversalSetsFocusVisible() {
-        Node node = n();
-        Group g = new Group(node);
-        scene.setRoot(g);
-
-        assertNotFocused(scene, node);
-        assertNotFocusVisible(node);
-
-        fireTabKeyEvent(g);
-
-        assertIsFocused(scene, node);
-        assertIsFocusVisible(node);
-    }
-
-    /**
-     * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
-     * visible focus is removed from the node.
-     */
-    @Test public void testFocusVisibleIsRemovedByDefaultRequestFocus() {
-        Node node = n();
-        Group g = new Group(node);
-        scene.setRoot(g);
-        fireTabKeyEvent(g);
-
-        assertIsFocused(scene, node);
-        assertIsFocusVisible(node);
-
-        node.requestFocus();
-
-        assertIsFocused(scene, node);
-        assertNotFocusVisible(node);
-    }
-
-    /**
-     * When a node loses focus, it also loses visible focus.
-     */
-    @Test public void testVisibleFocusIsRemovedWhenFocusIsRemoved() {
-        Node node1 = n();
-        Node node2 = n();
-        Group g = new Group(node1, node2);
-        scene.setRoot(g);
-        fireTabKeyEvent(g);
-
-        assertIsFocused(scene, node1);
-        assertIsFocusVisible(node1);
-
-        node2.requestFocus();
-
-        assertNotFocused(scene, node1);
-        assertNotFocusVisible(node1);
-    }
-
-    /**
-     * When a node acquires focus, the focusWithin property is set on the node
-     * and all of its parents.
-     */
-    @Test public void testFocusWithinIsTrueOnAllParents() {
-        Node node1 = n();
-        Group g = new Group(new Group(new Group(node1)));
-        scene.setRoot(g);
-
-        assertNotFocusWithinParents(node1);
-
-        node1.requestFocus();
-
-        assertIsFocusWithinParents(node1);
-    }
-
-    /**
-     * When a node loses focus, the focusWithin property of its parents is cleared.
-     */
-    @Test public void testFocusWithinIsRemovedFromParentsAfterChangingFocusOwner() {
-        Node node1 = n(), node2 = n();
-        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
-        scene.setRoot(g);
-
-        assertNotFocusWithinParents(node1);
-        assertNotFocusWithinParents(node2);
-
-        node1.requestFocus();
-
-        assertIsFocusWithinParents(node1);
-        assertNotFocusWithin(node2);
-        assertNotFocusWithin(node2.getParent());
-        assertNotFocusWithin(node2.getParent().getParent());
-
-        node2.requestFocus();
-
-        assertIsFocusWithinParents(node2);
-        assertNotFocusWithin(node1);
-        assertNotFocusWithin(node1.getParent());
-        assertNotFocusWithin(node1.getParent().getParent());
-    }
-
-    // TODO: tests for moving nodes between scenes
-    // and active and inactive stages
-}
+/*
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.javafx.scene;
+
+
+import com.sun.javafx.scene.SceneHelper;
+import javafx.event.Event;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import test.com.sun.javafx.pgstub.StubScene;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import com.sun.javafx.tk.Toolkit;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.ParentShim;
+import javafx.scene.Scene;
+import javafx.scene.SceneShim;
+
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Stage;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FocusTest {
+
+    private Stage stage;
+    private Scene scene;
+    private List<Node> nodes;
+    private int nodeIndex;
+    private StubToolkit toolkit;
+    private boolean actionTaken;
+
+    @Before
+    public void setUp() {
+        stage = new Stage();
+        scene = new Scene(new Group(), 500, 500);
+        stage.setScene(scene);
+        stage.show();
+        stage.requestFocus();
+        nodes = new ArrayList();
+        nodeIndex = 0;
+
+        toolkit = (StubToolkit) Toolkit.getToolkit();
+    }
+
+    @After
+    public void tearDown() {
+        stage.hide();
+        stage = null;
+        scene = null;
+    }
+
+    void fireTestPulse() {
+        // TODO: an actual pulse doesn't work in the stub environment.
+        // Just clean up focus instead.
+        SceneShim.focusCleanup(scene);
+    }
+
+    boolean T = true;
+    boolean F = false;
+
+    Node n(boolean trav, boolean vis, boolean enable) {
+        Rectangle node = new Rectangle();
+        node.setId("Rect-" + nodeIndex);
+        node.setFocusTraversable(trav);
+        node.setVisible(vis);
+        node.setDisable(!enable);
+        nodes.add(node);
+        nodeIndex++;
+
+        return node;
+    }
+
+    Node n() {
+        return n(T, T, T);
+    }
+
+    private void assertIsFocused(Scene s, Node n) {
+        assertEquals(n, s.getFocusOwner());
+        assertTrue(n.isFocused());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
+    }
+
+    private void assertNotFocused(Scene s, Node n) {
+        assertTrue(n != s.getFocusOwner());
+        assertFalse(n.isFocused());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
+    }
+
+    private void assertNullFocus(Scene s) {
+        assertNull(s.getFocusOwner());
+    }
+
+    private void assertIsFocusVisible(Node n) {
+        assertTrue(n.isFocusVisible());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertNotFocusVisible(Node n) {
+        assertFalse(n.isFocusVisible());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertIsFocusWithin(Node n) {
+        assertTrue(n.isFocusWithin());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertNotFocusWithin(Node n) {
+        assertFalse(n.isFocusWithin());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertIsFocusWithinParents(Node n) {
+        do {
+            assertTrue(n.isFocusWithin());
+            assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
+    private void assertNotFocusWithinParents(Node n) {
+        do {
+            assertFalse(n.isFocusWithin());
+            assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
+    /**
+     * Test setting of initial focus.
+     */
+    @Test
+    public void testInitial() {
+        assertNullFocus(scene);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * Test requestFocus() on eligible and ineligible nodes.
+     */
+    @Test
+    public void testRequest() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(
+                n(T, T, T), // 0 - focusable
+                n(F, T, T), // 1 - focusable
+                n(T, T, F), // 2 - not focusable
+                n(F, T, F), // 3 - not focusable
+                n(T, F, T), // 4 - not focusable
+                n(F, F, T), // 5 - not focusable
+                n(T, F, F), // 6 - not focusable
+                n(F, F, F) // 7 - not focusable
+                );
+        n(); // 8 - not focusable, because not in scene
+
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).requestFocus();
+        assertIsFocused(scene, nodes.get(1));
+        nodes.get(2).requestFocus();
+        assertNotFocused(scene, nodes.get(2));
+        nodes.get(3).requestFocus();
+        assertNotFocused(scene, nodes.get(3));
+        nodes.get(4).requestFocus();
+        assertNotFocused(scene, nodes.get(4));
+        nodes.get(5).requestFocus();
+        assertNotFocused(scene, nodes.get(5));
+        nodes.get(6).requestFocus();
+        assertNotFocused(scene, nodes.get(6));
+        nodes.get(7).requestFocus();
+        assertNotFocused(scene, nodes.get(7));
+        nodes.get(8).requestFocus();
+        assertNotFocused(scene, nodes.get(8));
+    }
+
+    /**
+     * Test removing the focus owner without another eligible node in the scene.
+     */
+    @Test
+    public void testRemove1() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test removing the focus owner with another eligible node in the scene.
+     */
+    @Test
+    public void testRemove2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test removing the focus owner without another eligible node in the scene.
+     */
+    @Test
+    public void testRemove_ClearsFocusOnRemovedNode1() {
+        Node n = n();
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n);
+        n.requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(n);
+        fireTestPulse();
+        assertNotFocused(scene, n);
+    }
+
+    /**
+     * Test removing the focus owner with another eligible node in the scene.
+     */
+    @Test
+    public void testRemove_ClearsFocusOnRemovedNode2() {
+        Node n = n();
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n, n());
+        n.requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(n);
+        fireTestPulse();
+        assertNotFocused(scene, n);
+        assertIsFocused(scene, ParentShim.getChildren(scene.getRoot()).get(0));
+    }
+
+    /**
+     * Test removing the focus owner without another eligible node in the scene.
+     */
+    @Test
+    public void testRemoveChildOfGroup_ClearsFocusOnRemovedNode1() {
+        Node n = n();
+        Group g = new Group(n);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(g);
+        n.requestFocus();
+        ParentShim.getChildren(g).remove(n);
+        fireTestPulse();
+        assertNotFocused(scene, n);
+    }
+
+    /**
+     * Test making the focus owner invisible without another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testInvisible1() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(0).setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the focus owner invisible with another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testInvisible2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(0).setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test making the focus owner disabled without another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testDisable1() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        nodes.get(0).setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the focus owner disabled with another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testDisable2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        nodes.get(0).setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * When focus null, test adding an eligible, traversable node.
+     */
+    @Test
+    public void testAddEligible() {
+        fireTestPulse(); // make sure focus is clean
+        assertNullFocus(scene);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus null, test making a node traversable.
+     */
+    @Test
+    public void testBecomeTraversable() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(F, T, T), n(F, T, T));
+        fireTestPulse();
+        assertNullFocus(scene);
+        toolkit.clearPulseRequested();
+        assertFalse(toolkit.isPulseRequested());
+        nodes.get(0).setFocusTraversable(true);
+        assertTrue(toolkit.isPulseRequested());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus null, test making a node visible.
+     */
+    @Test
+    public void testBecomeVisible() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n(T, F, T));
+        fireTestPulse();
+        assertNullFocus(scene);
+        nodes.get(0).setVisible(true);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus null, test making a node enabled.
+     */
+    @Test
+    public void testBecomeEnabled() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n(T, T, F));
+        fireTestPulse();
+        assertNullFocus(scene);
+        nodes.get(0).setDisable(false);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test adding an eligible, traversable node.
+     */
+    @Test
+    public void testAddEligible2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test making a node traversable.
+     */
+    @Test
+    public void testBecomeTraversable2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(F, T, T));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).setFocusTraversable(true);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test making a node visible.
+     */
+    @Test
+    public void testBecomeVisible2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, F, T));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).setVisible(true);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test making a node enabled.
+     */
+    @Test
+    public void testBecomeEnabled2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, T, F));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).setDisable(false);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * Test moving the focus within a scene.
+     */
+    @Test
+    public void testMoveWithinScene() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * Test moving the focus into an invisible group, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMoveIntoInvisible() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test moving the focus into an invisible group, with another
+     * eligible node in the scene.
+     */
+    @Test
+    public void testMoveIntoInvisible2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test moving the focus into a disabled group, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMoveIntoDisabled() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setDisable(true);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test moving the focus into a disabled group, with another
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMoveIntoDisabled2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setDisable(true);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test making the parent of focused node disabled, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentDisabled() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the parent of focused node disabled, with another
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentDisabled2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test making the parent of focused node invisible, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentInvisible() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the parent of focused node invisible, with another
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentInvisible2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Focus should not move if stacking order changes.
+     */
+    @Test
+    public void testToFront() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        assertNotFocused(scene, nodes.get(1));
+        nodes.get(0).toFront();
+        assertIsFocused(scene, nodes.get(0));
+        assertNotFocused(scene, nodes.get(1));
+        nodes.get(0).toBack();
+        assertIsFocused(scene, nodes.get(0));
+        assertNotFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test moving focused node into scene which is not in active stage.
+     */
+    @Test
+    public void testMoveIntoInactiveScene() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        Scene scene2 = new Scene(new Group());
+        ParentShim.getChildren(scene2.getRoot()).add(nodes.get(0));
+        fireTestPulse();
+        assertNullFocus(scene);
+        assertNullFocus(scene2);
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertNullFocus(scene);
+        assertEquals(nodes.get(0), scene2.getFocusOwner());
+        assertFalse(nodes.get(0).isFocused());
+        stage.setScene(scene2);
+        fireTestPulse();
+        assertNullFocus(scene);
+        assertIsFocused(scene2, nodes.get(0));
+    }
+
+    /**
+     * Test making stage invisible.
+     */
+    @Test
+    public void testInvisibleStage() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        stage.show();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        stage.hide();
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertEquals(nodes.get(0), scene.getFocusOwner());
+        assertFalse(nodes.get(0).isFocused());
+    }
+
+    /**
+     * Test switching two scenes in one stage. Focus owner in scenes should
+     * remain the same while focused node should change.
+     */
+    @Test
+    public void testSwitchScenes(){
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        Scene scene2 = new Scene(new Group());
+        ParentShim.getChildren(scene2.getRoot()).add(n());
+        nodes.get(1).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        assertFalse(nodes.get(1).isFocused());
+        assertEquals(nodes.get(1), scene2.getFocusOwner());
+        stage.setScene(scene2);
+        fireTestPulse();
+        assertFalse(nodes.get(0).isFocused());
+        assertEquals(nodes.get(0), scene.getFocusOwner());
+        assertIsFocused(scene2, nodes.get(1));
+    }
+
+    @Test public void nestedFocusRequestsShouldResultInOneFocusedNode() {
+        final Node n1 = n();
+        final Node n2 = n();
+        scene.setRoot(new Group(n1, n2));
+
+        n1.focusedProperty().addListener((ov, lostFocus, getFocus) -> {
+            if (lostFocus) {
+                n1.requestFocus();
+            }
+        });
+
+        n2.focusedProperty().addListener(o -> {
+            // n2 can be invalidated, but should not have focus
+            assertTrue(n1.isFocused());
+            assertFalse(n2.isFocused());
+        });
+
+        n2.focusedProperty().addListener((ov, lostFocus, getFocus) -> fail("n2 should never get focus"));
+
+        stage.show();
+        n1.requestFocus();
+        assertTrue(n1.isFocused());
+        assertFalse(n2.isFocused());
+
+        n2.requestFocus();
+        assertTrue(n1.isFocused());
+        assertFalse(n2.isFocused());
+    }
+
+    @Test public void shouldCancelInputMethodWhenLoosingFocus() {
+        final Node n1 = n();
+        final Node n2 = n();
+        scene.setRoot(new Group(n1, n2));
+
+        stage.show();
+
+        Toolkit.getToolkit().firePulse();
+
+        n1.requestFocus();
+        assertSame(n1, scene.getFocusOwner());
+        actionTaken = false;
+
+        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
+                () -> {
+                    assertSame(n1, scene.getFocusOwner());
+                    actionTaken = true;
+                }
+        );
+
+        n2.requestFocus();
+
+        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
+                null);
+
+        assertSame(n2, scene.getFocusOwner());
+        assertTrue(actionTaken);
+    }
+
+    private void fireTabKeyEvent(Node node) {
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_PRESSED, null, null, KeyCode.TAB, false, false, false, false));
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_RELEASED, null, null, KeyCode.TAB, false, false, false, false));
+    }
+
+    /**
+     * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
+     */
+    @Test public void testDefaultFocusTraversalDoesNotSetFocusVisible() {
+        Node node = n();
+        scene.setRoot(new Group(node));
+
+        assertNotFocused(scene, node);
+        assertNotFocusVisible(node);
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertNotFocusVisible(node);
+    }
+
+    /**
+     * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
+     */
+    @Test public void testKeyFocusTraversalSetsFocusVisible() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+
+        assertNotFocused(scene, node);
+        assertNotFocusVisible(node);
+
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node);
+        assertIsFocusVisible(node);
+    }
+
+    /**
+     * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
+     * visible focus is removed from the node.
+     */
+    @Test public void testFocusVisibleIsRemovedByDefaultRequestFocus() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node);
+        assertIsFocusVisible(node);
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertNotFocusVisible(node);
+    }
+
+    /**
+     * When a node loses focus, it also loses visible focus.
+     */
+    @Test public void testVisibleFocusIsRemovedWhenFocusIsRemoved() {
+        Node node1 = n();
+        Node node2 = n();
+        Group g = new Group(node1, node2);
+        scene.setRoot(g);
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node1);
+        assertIsFocusVisible(node1);
+
+        node2.requestFocus();
+
+        assertNotFocused(scene, node1);
+        assertNotFocusVisible(node1);
+    }
+
+    /**
+     * When a node acquires focus, the focusWithin property is set on the node
+     * and all of its parents.
+     */
+    @Test public void testFocusWithinIsTrueOnAllParents() {
+        Node node1 = n();
+        Group g = new Group(new Group(new Group(node1)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+    }
+
+    /**
+     * When a node loses focus, the focusWithin property of its parents is cleared.
+     */
+    @Test public void testFocusWithinIsRemovedFromParentsAfterChangingFocusOwner() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+        assertNotFocusWithinParents(node2);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+        assertNotFocusWithin(node2);
+        assertNotFocusWithin(node2.getParent());
+        assertNotFocusWithin(node2.getParent().getParent());
+
+        node2.requestFocus();
+
+        assertIsFocusWithinParents(node2);
+        assertNotFocusWithin(node1);
+        assertNotFocusWithin(node1.getParent());
+        assertNotFocusWithin(node1.getParent().getParent());
+    }
+
+    /**
+     * When a node loses focus, all of its parents also lose focusWithin.
+     * However, if focus transitions to a new node, and the new node is also a child of the
+     * parent that just lost focusWithin, the parent will re-gain focusWithin.
+     *
+     * Since focus traversal is specified to be an atomic operation, the fact that
+     * the parent technically lost and re-gained focusWithin must not be observable.
+     */
+    @Test public void testFocusWithinListenerIsNotInvokedIfPropertyDidNotEffectivelyChange() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        List<Boolean> focusWithinValues = new ArrayList<>();
+        g.focusWithinProperty().addListener((observable, oldValue, newValue) -> focusWithinValues.add(newValue));
+
+        node1.requestFocus();
+        assertEquals(1, focusWithinValues.size());
+        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
+
+        node2.requestFocus();
+        assertEquals(1, focusWithinValues.size());
+        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
+    }
+
+    // TODO: tests for moving nodes between scenes
+    // and active and inactive stages
+}

From 8bb468a0e0877bac193c478fad9b3c0d0535bb7d Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 7 Jun 2021 22:10:52 +0200
Subject: [PATCH 10/21] revert changes to line endings

---
 .../java/test/javafx/scene/FocusTest.java     | 1836 ++++++++---------
 1 file changed, 918 insertions(+), 918 deletions(-)

diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index a7fce045b94..b2c3441dbcc 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -1,918 +1,918 @@
-/*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package test.javafx.scene;
-
-
-import com.sun.javafx.scene.SceneHelper;
-import javafx.event.Event;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyEvent;
-import test.com.sun.javafx.pgstub.StubScene;
-import test.com.sun.javafx.pgstub.StubToolkit;
-import com.sun.javafx.tk.Toolkit;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javafx.scene.Group;
-import javafx.scene.Node;
-import javafx.scene.ParentShim;
-import javafx.scene.Scene;
-import javafx.scene.SceneShim;
-
-import javafx.scene.shape.Rectangle;
-import javafx.stage.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class FocusTest {
-
-    private Stage stage;
-    private Scene scene;
-    private List<Node> nodes;
-    private int nodeIndex;
-    private StubToolkit toolkit;
-    private boolean actionTaken;
-
-    @Before
-    public void setUp() {
-        stage = new Stage();
-        scene = new Scene(new Group(), 500, 500);
-        stage.setScene(scene);
-        stage.show();
-        stage.requestFocus();
-        nodes = new ArrayList();
-        nodeIndex = 0;
-
-        toolkit = (StubToolkit) Toolkit.getToolkit();
-    }
-
-    @After
-    public void tearDown() {
-        stage.hide();
-        stage = null;
-        scene = null;
-    }
-
-    void fireTestPulse() {
-        // TODO: an actual pulse doesn't work in the stub environment.
-        // Just clean up focus instead.
-        SceneShim.focusCleanup(scene);
-    }
-
-    boolean T = true;
-    boolean F = false;
-
-    Node n(boolean trav, boolean vis, boolean enable) {
-        Rectangle node = new Rectangle();
-        node.setId("Rect-" + nodeIndex);
-        node.setFocusTraversable(trav);
-        node.setVisible(vis);
-        node.setDisable(!enable);
-        nodes.add(node);
-        nodeIndex++;
-
-        return node;
-    }
-
-    Node n() {
-        return n(T, T, T);
-    }
-
-    private void assertIsFocused(Scene s, Node n) {
-        assertEquals(n, s.getFocusOwner());
-        assertTrue(n.isFocused());
-        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
-    }
-
-    private void assertNotFocused(Scene s, Node n) {
-        assertTrue(n != s.getFocusOwner());
-        assertFalse(n.isFocused());
-        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
-    }
-
-    private void assertNullFocus(Scene s) {
-        assertNull(s.getFocusOwner());
-    }
-
-    private void assertIsFocusVisible(Node n) {
-        assertTrue(n.isFocusVisible());
-        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
-    }
-
-    private void assertNotFocusVisible(Node n) {
-        assertFalse(n.isFocusVisible());
-        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
-    }
-
-    private void assertIsFocusWithin(Node n) {
-        assertTrue(n.isFocusWithin());
-        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-    }
-
-    private void assertNotFocusWithin(Node n) {
-        assertFalse(n.isFocusWithin());
-        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-    }
-
-    private void assertIsFocusWithinParents(Node n) {
-        do {
-            assertTrue(n.isFocusWithin());
-            assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-            n = n.getParent();
-        } while (n != null);
-    }
-
-    private void assertNotFocusWithinParents(Node n) {
-        do {
-            assertFalse(n.isFocusWithin());
-            assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
-            n = n.getParent();
-        } while (n != null);
-    }
-
-    /**
-     * Test setting of initial focus.
-     */
-    @Test
-    public void testInitial() {
-        assertNullFocus(scene);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * Test requestFocus() on eligible and ineligible nodes.
-     */
-    @Test
-    public void testRequest() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(
-                n(T, T, T), // 0 - focusable
-                n(F, T, T), // 1 - focusable
-                n(T, T, F), // 2 - not focusable
-                n(F, T, F), // 3 - not focusable
-                n(T, F, T), // 4 - not focusable
-                n(F, F, T), // 5 - not focusable
-                n(T, F, F), // 6 - not focusable
-                n(F, F, F) // 7 - not focusable
-                );
-        n(); // 8 - not focusable, because not in scene
-
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).requestFocus();
-        assertIsFocused(scene, nodes.get(1));
-        nodes.get(2).requestFocus();
-        assertNotFocused(scene, nodes.get(2));
-        nodes.get(3).requestFocus();
-        assertNotFocused(scene, nodes.get(3));
-        nodes.get(4).requestFocus();
-        assertNotFocused(scene, nodes.get(4));
-        nodes.get(5).requestFocus();
-        assertNotFocused(scene, nodes.get(5));
-        nodes.get(6).requestFocus();
-        assertNotFocused(scene, nodes.get(6));
-        nodes.get(7).requestFocus();
-        assertNotFocused(scene, nodes.get(7));
-        nodes.get(8).requestFocus();
-        assertNotFocused(scene, nodes.get(8));
-    }
-
-    /**
-     * Test removing the focus owner without another eligible node in the scene.
-     */
-    @Test
-    public void testRemove1() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test removing the focus owner with another eligible node in the scene.
-     */
-    @Test
-    public void testRemove2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test removing the focus owner without another eligible node in the scene.
-     */
-    @Test
-    public void testRemove_ClearsFocusOnRemovedNode1() {
-        Node n = n();
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n);
-        n.requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(n);
-        fireTestPulse();
-        assertNotFocused(scene, n);
-    }
-
-    /**
-     * Test removing the focus owner with another eligible node in the scene.
-     */
-    @Test
-    public void testRemove_ClearsFocusOnRemovedNode2() {
-        Node n = n();
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n, n());
-        n.requestFocus();
-        ParentShim.getChildren(scene.getRoot()).remove(n);
-        fireTestPulse();
-        assertNotFocused(scene, n);
-        assertIsFocused(scene, ParentShim.getChildren(scene.getRoot()).get(0));
-    }
-
-    /**
-     * Test removing the focus owner without another eligible node in the scene.
-     */
-    @Test
-    public void testRemoveChildOfGroup_ClearsFocusOnRemovedNode1() {
-        Node n = n();
-        Group g = new Group(n);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(g);
-        n.requestFocus();
-        ParentShim.getChildren(g).remove(n);
-        fireTestPulse();
-        assertNotFocused(scene, n);
-    }
-
-    /**
-     * Test making the focus owner invisible without another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testInvisible1() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(0).setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the focus owner invisible with another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testInvisible2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(0).setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test making the focus owner disabled without another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testDisable1() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        nodes.get(0).setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the focus owner disabled with another eligible
-     * node in the scene.
-     */
-    @Test
-    public void testDisable2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        nodes.get(0).setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * When focus null, test adding an eligible, traversable node.
-     */
-    @Test
-    public void testAddEligible() {
-        fireTestPulse(); // make sure focus is clean
-        assertNullFocus(scene);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus null, test making a node traversable.
-     */
-    @Test
-    public void testBecomeTraversable() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(F, T, T), n(F, T, T));
-        fireTestPulse();
-        assertNullFocus(scene);
-        toolkit.clearPulseRequested();
-        assertFalse(toolkit.isPulseRequested());
-        nodes.get(0).setFocusTraversable(true);
-        assertTrue(toolkit.isPulseRequested());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus null, test making a node visible.
-     */
-    @Test
-    public void testBecomeVisible() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n(T, F, T));
-        fireTestPulse();
-        assertNullFocus(scene);
-        nodes.get(0).setVisible(true);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus null, test making a node enabled.
-     */
-    @Test
-    public void testBecomeEnabled() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n(T, T, F));
-        fireTestPulse();
-        assertNullFocus(scene);
-        nodes.get(0).setDisable(false);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test adding an eligible, traversable node.
-     */
-    @Test
-    public void testAddEligible2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test making a node traversable.
-     */
-    @Test
-    public void testBecomeTraversable2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(F, T, T));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).setFocusTraversable(true);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test making a node visible.
-     */
-    @Test
-    public void testBecomeVisible2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, F, T));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).setVisible(true);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * When focus exists, test making a node enabled.
-     */
-    @Test
-    public void testBecomeEnabled2() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, T, F));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        nodes.get(1).setDisable(false);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * Test moving the focus within a scene.
-     */
-    @Test
-    public void testMoveWithinScene() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-    }
-
-    /**
-     * Test moving the focus into an invisible group, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMoveIntoInvisible() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test moving the focus into an invisible group, with another
-     * eligible node in the scene.
-     */
-    @Test
-    public void testMoveIntoInvisible2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test moving the focus into a disabled group, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMoveIntoDisabled() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setDisable(true);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test moving the focus into a disabled group, with another
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMoveIntoDisabled2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setDisable(true);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        ParentShim.getChildren(g2).add(nodes.get(0));
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test making the parent of focused node disabled, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentDisabled() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the parent of focused node disabled, with another
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentDisabled2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setDisable(true);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test making the parent of focused node invisible, with no other
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentInvisible() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertNullFocus(scene);
-    }
-
-    /**
-     * Test making the parent of focused node invisible, with another
-     * eligible nodes in the scene.
-     */
-    @Test
-    public void testMakeParentInvisible2() {
-        Group g1 = new Group(n());
-        Group g2 = new Group();
-        g2.setVisible(false);
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        g1.setVisible(false);
-        fireTestPulse();
-        assertNotFocused(scene, nodes.get(0));
-        assertIsFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Focus should not move if stacking order changes.
-     */
-    @Test
-    public void testToFront() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        assertNotFocused(scene, nodes.get(1));
-        nodes.get(0).toFront();
-        assertIsFocused(scene, nodes.get(0));
-        assertNotFocused(scene, nodes.get(1));
-        nodes.get(0).toBack();
-        assertIsFocused(scene, nodes.get(0));
-        assertNotFocused(scene, nodes.get(1));
-    }
-
-    /**
-     * Test moving focused node into scene which is not in active stage.
-     */
-    @Test
-    public void testMoveIntoInactiveScene() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        assertIsFocused(scene, nodes.get(0));
-        Scene scene2 = new Scene(new Group());
-        ParentShim.getChildren(scene2.getRoot()).add(nodes.get(0));
-        fireTestPulse();
-        assertNullFocus(scene);
-        assertNullFocus(scene2);
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertNullFocus(scene);
-        assertEquals(nodes.get(0), scene2.getFocusOwner());
-        assertFalse(nodes.get(0).isFocused());
-        stage.setScene(scene2);
-        fireTestPulse();
-        assertNullFocus(scene);
-        assertIsFocused(scene2, nodes.get(0));
-    }
-
-    /**
-     * Test making stage invisible.
-     */
-    @Test
-    public void testInvisibleStage() {
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        stage.show();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        stage.hide();
-        nodes.get(0).requestFocus();
-        fireTestPulse();
-        assertEquals(nodes.get(0), scene.getFocusOwner());
-        assertFalse(nodes.get(0).isFocused());
-    }
-
-    /**
-     * Test switching two scenes in one stage. Focus owner in scenes should
-     * remain the same while focused node should change.
-     */
-    @Test
-    public void testSwitchScenes(){
-        scene.setRoot(new Group());
-        ParentShim.getChildren(scene.getRoot()).add(n());
-        nodes.get(0).requestFocus();
-        Scene scene2 = new Scene(new Group());
-        ParentShim.getChildren(scene2.getRoot()).add(n());
-        nodes.get(1).requestFocus();
-        fireTestPulse();
-        assertIsFocused(scene, nodes.get(0));
-        assertFalse(nodes.get(1).isFocused());
-        assertEquals(nodes.get(1), scene2.getFocusOwner());
-        stage.setScene(scene2);
-        fireTestPulse();
-        assertFalse(nodes.get(0).isFocused());
-        assertEquals(nodes.get(0), scene.getFocusOwner());
-        assertIsFocused(scene2, nodes.get(1));
-    }
-
-    @Test public void nestedFocusRequestsShouldResultInOneFocusedNode() {
-        final Node n1 = n();
-        final Node n2 = n();
-        scene.setRoot(new Group(n1, n2));
-
-        n1.focusedProperty().addListener((ov, lostFocus, getFocus) -> {
-            if (lostFocus) {
-                n1.requestFocus();
-            }
-        });
-
-        n2.focusedProperty().addListener(o -> {
-            // n2 can be invalidated, but should not have focus
-            assertTrue(n1.isFocused());
-            assertFalse(n2.isFocused());
-        });
-
-        n2.focusedProperty().addListener((ov, lostFocus, getFocus) -> fail("n2 should never get focus"));
-
-        stage.show();
-        n1.requestFocus();
-        assertTrue(n1.isFocused());
-        assertFalse(n2.isFocused());
-
-        n2.requestFocus();
-        assertTrue(n1.isFocused());
-        assertFalse(n2.isFocused());
-    }
-
-    @Test public void shouldCancelInputMethodWhenLoosingFocus() {
-        final Node n1 = n();
-        final Node n2 = n();
-        scene.setRoot(new Group(n1, n2));
-
-        stage.show();
-
-        Toolkit.getToolkit().firePulse();
-
-        n1.requestFocus();
-        assertSame(n1, scene.getFocusOwner());
-        actionTaken = false;
-
-        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
-                () -> {
-                    assertSame(n1, scene.getFocusOwner());
-                    actionTaken = true;
-                }
-        );
-
-        n2.requestFocus();
-
-        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
-                null);
-
-        assertSame(n2, scene.getFocusOwner());
-        assertTrue(actionTaken);
-    }
-
-    private void fireTabKeyEvent(Node node) {
-        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_PRESSED, null, null, KeyCode.TAB, false, false, false, false));
-        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_RELEASED, null, null, KeyCode.TAB, false, false, false, false));
-    }
-
-    /**
-     * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
-     */
-    @Test public void testDefaultFocusTraversalDoesNotSetFocusVisible() {
-        Node node = n();
-        scene.setRoot(new Group(node));
-
-        assertNotFocused(scene, node);
-        assertNotFocusVisible(node);
-
-        node.requestFocus();
-
-        assertIsFocused(scene, node);
-        assertNotFocusVisible(node);
-    }
-
-    /**
-     * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
-     */
-    @Test public void testKeyFocusTraversalSetsFocusVisible() {
-        Node node = n();
-        Group g = new Group(node);
-        scene.setRoot(g);
-
-        assertNotFocused(scene, node);
-        assertNotFocusVisible(node);
-
-        fireTabKeyEvent(g);
-
-        assertIsFocused(scene, node);
-        assertIsFocusVisible(node);
-    }
-
-    /**
-     * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
-     * visible focus is removed from the node.
-     */
-    @Test public void testFocusVisibleIsRemovedByDefaultRequestFocus() {
-        Node node = n();
-        Group g = new Group(node);
-        scene.setRoot(g);
-        fireTabKeyEvent(g);
-
-        assertIsFocused(scene, node);
-        assertIsFocusVisible(node);
-
-        node.requestFocus();
-
-        assertIsFocused(scene, node);
-        assertNotFocusVisible(node);
-    }
-
-    /**
-     * When a node loses focus, it also loses visible focus.
-     */
-    @Test public void testVisibleFocusIsRemovedWhenFocusIsRemoved() {
-        Node node1 = n();
-        Node node2 = n();
-        Group g = new Group(node1, node2);
-        scene.setRoot(g);
-        fireTabKeyEvent(g);
-
-        assertIsFocused(scene, node1);
-        assertIsFocusVisible(node1);
-
-        node2.requestFocus();
-
-        assertNotFocused(scene, node1);
-        assertNotFocusVisible(node1);
-    }
-
-    /**
-     * When a node acquires focus, the focusWithin property is set on the node
-     * and all of its parents.
-     */
-    @Test public void testFocusWithinIsTrueOnAllParents() {
-        Node node1 = n();
-        Group g = new Group(new Group(new Group(node1)));
-        scene.setRoot(g);
-
-        assertNotFocusWithinParents(node1);
-
-        node1.requestFocus();
-
-        assertIsFocusWithinParents(node1);
-    }
-
-    /**
-     * When a node loses focus, the focusWithin property of its parents is cleared.
-     */
-    @Test public void testFocusWithinIsRemovedFromParentsAfterChangingFocusOwner() {
-        Node node1 = n(), node2 = n();
-        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
-        scene.setRoot(g);
-
-        assertNotFocusWithinParents(node1);
-        assertNotFocusWithinParents(node2);
-
-        node1.requestFocus();
-
-        assertIsFocusWithinParents(node1);
-        assertNotFocusWithin(node2);
-        assertNotFocusWithin(node2.getParent());
-        assertNotFocusWithin(node2.getParent().getParent());
-
-        node2.requestFocus();
-
-        assertIsFocusWithinParents(node2);
-        assertNotFocusWithin(node1);
-        assertNotFocusWithin(node1.getParent());
-        assertNotFocusWithin(node1.getParent().getParent());
-    }
-
-    /**
-     * When a node loses focus, all of its parents also lose focusWithin.
-     * However, if focus transitions to a new node, and the new node is also a child of the
-     * parent that just lost focusWithin, the parent will re-gain focusWithin.
-     *
-     * Since focus traversal is specified to be an atomic operation, the fact that
-     * the parent technically lost and re-gained focusWithin must not be observable.
-     */
-    @Test public void testFocusWithinListenerIsNotInvokedIfPropertyDidNotEffectivelyChange() {
-        Node node1 = n(), node2 = n();
-        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
-        scene.setRoot(g);
-
-        List<Boolean> focusWithinValues = new ArrayList<>();
-        g.focusWithinProperty().addListener((observable, oldValue, newValue) -> focusWithinValues.add(newValue));
-
-        node1.requestFocus();
-        assertEquals(1, focusWithinValues.size());
-        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
-
-        node2.requestFocus();
-        assertEquals(1, focusWithinValues.size());
-        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
-    }
-
-    // TODO: tests for moving nodes between scenes
-    // and active and inactive stages
-}
+/*
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package test.javafx.scene;
+
+
+import com.sun.javafx.scene.SceneHelper;
+import javafx.event.Event;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import test.com.sun.javafx.pgstub.StubScene;
+import test.com.sun.javafx.pgstub.StubToolkit;
+import com.sun.javafx.tk.Toolkit;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.ParentShim;
+import javafx.scene.Scene;
+import javafx.scene.SceneShim;
+
+import javafx.scene.shape.Rectangle;
+import javafx.stage.Stage;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class FocusTest {
+
+    private Stage stage;
+    private Scene scene;
+    private List<Node> nodes;
+    private int nodeIndex;
+    private StubToolkit toolkit;
+    private boolean actionTaken;
+
+    @Before
+    public void setUp() {
+        stage = new Stage();
+        scene = new Scene(new Group(), 500, 500);
+        stage.setScene(scene);
+        stage.show();
+        stage.requestFocus();
+        nodes = new ArrayList();
+        nodeIndex = 0;
+
+        toolkit = (StubToolkit) Toolkit.getToolkit();
+    }
+
+    @After
+    public void tearDown() {
+        stage.hide();
+        stage = null;
+        scene = null;
+    }
+
+    void fireTestPulse() {
+        // TODO: an actual pulse doesn't work in the stub environment.
+        // Just clean up focus instead.
+        SceneShim.focusCleanup(scene);
+    }
+
+    boolean T = true;
+    boolean F = false;
+
+    Node n(boolean trav, boolean vis, boolean enable) {
+        Rectangle node = new Rectangle();
+        node.setId("Rect-" + nodeIndex);
+        node.setFocusTraversable(trav);
+        node.setVisible(vis);
+        node.setDisable(!enable);
+        nodes.add(node);
+        nodeIndex++;
+
+        return node;
+    }
+
+    Node n() {
+        return n(T, T, T);
+    }
+
+    private void assertIsFocused(Scene s, Node n) {
+        assertEquals(n, s.getFocusOwner());
+        assertTrue(n.isFocused());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
+    }
+
+    private void assertNotFocused(Scene s, Node n) {
+        assertTrue(n != s.getFocusOwner());
+        assertFalse(n.isFocused());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focused")));
+    }
+
+    private void assertNullFocus(Scene s) {
+        assertNull(s.getFocusOwner());
+    }
+
+    private void assertIsFocusVisible(Node n) {
+        assertTrue(n.isFocusVisible());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertNotFocusVisible(Node n) {
+        assertFalse(n.isFocusVisible());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-visible")));
+    }
+
+    private void assertIsFocusWithin(Node n) {
+        assertTrue(n.isFocusWithin());
+        assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertNotFocusWithin(Node n) {
+        assertFalse(n.isFocusWithin());
+        assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+    }
+
+    private void assertIsFocusWithinParents(Node n) {
+        do {
+            assertTrue(n.isFocusWithin());
+            assertTrue(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
+    private void assertNotFocusWithinParents(Node n) {
+        do {
+            assertFalse(n.isFocusWithin());
+            assertFalse(n.getPseudoClassStates().stream().anyMatch(pc -> pc.getPseudoClassName().equals("focus-within")));
+            n = n.getParent();
+        } while (n != null);
+    }
+
+    /**
+     * Test setting of initial focus.
+     */
+    @Test
+    public void testInitial() {
+        assertNullFocus(scene);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * Test requestFocus() on eligible and ineligible nodes.
+     */
+    @Test
+    public void testRequest() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(
+                n(T, T, T), // 0 - focusable
+                n(F, T, T), // 1 - focusable
+                n(T, T, F), // 2 - not focusable
+                n(F, T, F), // 3 - not focusable
+                n(T, F, T), // 4 - not focusable
+                n(F, F, T), // 5 - not focusable
+                n(T, F, F), // 6 - not focusable
+                n(F, F, F) // 7 - not focusable
+                );
+        n(); // 8 - not focusable, because not in scene
+
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).requestFocus();
+        assertIsFocused(scene, nodes.get(1));
+        nodes.get(2).requestFocus();
+        assertNotFocused(scene, nodes.get(2));
+        nodes.get(3).requestFocus();
+        assertNotFocused(scene, nodes.get(3));
+        nodes.get(4).requestFocus();
+        assertNotFocused(scene, nodes.get(4));
+        nodes.get(5).requestFocus();
+        assertNotFocused(scene, nodes.get(5));
+        nodes.get(6).requestFocus();
+        assertNotFocused(scene, nodes.get(6));
+        nodes.get(7).requestFocus();
+        assertNotFocused(scene, nodes.get(7));
+        nodes.get(8).requestFocus();
+        assertNotFocused(scene, nodes.get(8));
+    }
+
+    /**
+     * Test removing the focus owner without another eligible node in the scene.
+     */
+    @Test
+    public void testRemove1() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test removing the focus owner with another eligible node in the scene.
+     */
+    @Test
+    public void testRemove2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(nodes.get(0));
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test removing the focus owner without another eligible node in the scene.
+     */
+    @Test
+    public void testRemove_ClearsFocusOnRemovedNode1() {
+        Node n = n();
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n);
+        n.requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(n);
+        fireTestPulse();
+        assertNotFocused(scene, n);
+    }
+
+    /**
+     * Test removing the focus owner with another eligible node in the scene.
+     */
+    @Test
+    public void testRemove_ClearsFocusOnRemovedNode2() {
+        Node n = n();
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n, n());
+        n.requestFocus();
+        ParentShim.getChildren(scene.getRoot()).remove(n);
+        fireTestPulse();
+        assertNotFocused(scene, n);
+        assertIsFocused(scene, ParentShim.getChildren(scene.getRoot()).get(0));
+    }
+
+    /**
+     * Test removing the focus owner without another eligible node in the scene.
+     */
+    @Test
+    public void testRemoveChildOfGroup_ClearsFocusOnRemovedNode1() {
+        Node n = n();
+        Group g = new Group(n);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(g);
+        n.requestFocus();
+        ParentShim.getChildren(g).remove(n);
+        fireTestPulse();
+        assertNotFocused(scene, n);
+    }
+
+    /**
+     * Test making the focus owner invisible without another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testInvisible1() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(0).setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the focus owner invisible with another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testInvisible2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(0).setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test making the focus owner disabled without another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testDisable1() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        nodes.get(0).setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the focus owner disabled with another eligible
+     * node in the scene.
+     */
+    @Test
+    public void testDisable2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        nodes.get(0).setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * When focus null, test adding an eligible, traversable node.
+     */
+    @Test
+    public void testAddEligible() {
+        fireTestPulse(); // make sure focus is clean
+        assertNullFocus(scene);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus null, test making a node traversable.
+     */
+    @Test
+    public void testBecomeTraversable() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(F, T, T), n(F, T, T));
+        fireTestPulse();
+        assertNullFocus(scene);
+        toolkit.clearPulseRequested();
+        assertFalse(toolkit.isPulseRequested());
+        nodes.get(0).setFocusTraversable(true);
+        assertTrue(toolkit.isPulseRequested());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus null, test making a node visible.
+     */
+    @Test
+    public void testBecomeVisible() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n(T, F, T));
+        fireTestPulse();
+        assertNullFocus(scene);
+        nodes.get(0).setVisible(true);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus null, test making a node enabled.
+     */
+    @Test
+    public void testBecomeEnabled() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n(T, T, F));
+        fireTestPulse();
+        assertNullFocus(scene);
+        nodes.get(0).setDisable(false);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test adding an eligible, traversable node.
+     */
+    @Test
+    public void testAddEligible2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test making a node traversable.
+     */
+    @Test
+    public void testBecomeTraversable2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(F, T, T));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).setFocusTraversable(true);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test making a node visible.
+     */
+    @Test
+    public void testBecomeVisible2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, F, T));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).setVisible(true);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * When focus exists, test making a node enabled.
+     */
+    @Test
+    public void testBecomeEnabled2() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n(T, T, F));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        nodes.get(1).setDisable(false);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * Test moving the focus within a scene.
+     */
+    @Test
+    public void testMoveWithinScene() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+    }
+
+    /**
+     * Test moving the focus into an invisible group, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMoveIntoInvisible() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test moving the focus into an invisible group, with another
+     * eligible node in the scene.
+     */
+    @Test
+    public void testMoveIntoInvisible2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test moving the focus into a disabled group, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMoveIntoDisabled() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setDisable(true);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test moving the focus into a disabled group, with another
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMoveIntoDisabled2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setDisable(true);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        ParentShim.getChildren(g2).add(nodes.get(0));
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test making the parent of focused node disabled, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentDisabled() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the parent of focused node disabled, with another
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentDisabled2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setDisable(true);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test making the parent of focused node invisible, with no other
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentInvisible() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2);
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertNullFocus(scene);
+    }
+
+    /**
+     * Test making the parent of focused node invisible, with another
+     * eligible nodes in the scene.
+     */
+    @Test
+    public void testMakeParentInvisible2() {
+        Group g1 = new Group(n());
+        Group g2 = new Group();
+        g2.setVisible(false);
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(g1, g2, n());
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        g1.setVisible(false);
+        fireTestPulse();
+        assertNotFocused(scene, nodes.get(0));
+        assertIsFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Focus should not move if stacking order changes.
+     */
+    @Test
+    public void testToFront() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).addAll(n(), n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        assertNotFocused(scene, nodes.get(1));
+        nodes.get(0).toFront();
+        assertIsFocused(scene, nodes.get(0));
+        assertNotFocused(scene, nodes.get(1));
+        nodes.get(0).toBack();
+        assertIsFocused(scene, nodes.get(0));
+        assertNotFocused(scene, nodes.get(1));
+    }
+
+    /**
+     * Test moving focused node into scene which is not in active stage.
+     */
+    @Test
+    public void testMoveIntoInactiveScene() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        assertIsFocused(scene, nodes.get(0));
+        Scene scene2 = new Scene(new Group());
+        ParentShim.getChildren(scene2.getRoot()).add(nodes.get(0));
+        fireTestPulse();
+        assertNullFocus(scene);
+        assertNullFocus(scene2);
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertNullFocus(scene);
+        assertEquals(nodes.get(0), scene2.getFocusOwner());
+        assertFalse(nodes.get(0).isFocused());
+        stage.setScene(scene2);
+        fireTestPulse();
+        assertNullFocus(scene);
+        assertIsFocused(scene2, nodes.get(0));
+    }
+
+    /**
+     * Test making stage invisible.
+     */
+    @Test
+    public void testInvisibleStage() {
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        stage.show();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        stage.hide();
+        nodes.get(0).requestFocus();
+        fireTestPulse();
+        assertEquals(nodes.get(0), scene.getFocusOwner());
+        assertFalse(nodes.get(0).isFocused());
+    }
+
+    /**
+     * Test switching two scenes in one stage. Focus owner in scenes should
+     * remain the same while focused node should change.
+     */
+    @Test
+    public void testSwitchScenes(){
+        scene.setRoot(new Group());
+        ParentShim.getChildren(scene.getRoot()).add(n());
+        nodes.get(0).requestFocus();
+        Scene scene2 = new Scene(new Group());
+        ParentShim.getChildren(scene2.getRoot()).add(n());
+        nodes.get(1).requestFocus();
+        fireTestPulse();
+        assertIsFocused(scene, nodes.get(0));
+        assertFalse(nodes.get(1).isFocused());
+        assertEquals(nodes.get(1), scene2.getFocusOwner());
+        stage.setScene(scene2);
+        fireTestPulse();
+        assertFalse(nodes.get(0).isFocused());
+        assertEquals(nodes.get(0), scene.getFocusOwner());
+        assertIsFocused(scene2, nodes.get(1));
+    }
+
+    @Test public void nestedFocusRequestsShouldResultInOneFocusedNode() {
+        final Node n1 = n();
+        final Node n2 = n();
+        scene.setRoot(new Group(n1, n2));
+
+        n1.focusedProperty().addListener((ov, lostFocus, getFocus) -> {
+            if (lostFocus) {
+                n1.requestFocus();
+            }
+        });
+
+        n2.focusedProperty().addListener(o -> {
+            // n2 can be invalidated, but should not have focus
+            assertTrue(n1.isFocused());
+            assertFalse(n2.isFocused());
+        });
+
+        n2.focusedProperty().addListener((ov, lostFocus, getFocus) -> fail("n2 should never get focus"));
+
+        stage.show();
+        n1.requestFocus();
+        assertTrue(n1.isFocused());
+        assertFalse(n2.isFocused());
+
+        n2.requestFocus();
+        assertTrue(n1.isFocused());
+        assertFalse(n2.isFocused());
+    }
+
+    @Test public void shouldCancelInputMethodWhenLoosingFocus() {
+        final Node n1 = n();
+        final Node n2 = n();
+        scene.setRoot(new Group(n1, n2));
+
+        stage.show();
+
+        Toolkit.getToolkit().firePulse();
+
+        n1.requestFocus();
+        assertSame(n1, scene.getFocusOwner());
+        actionTaken = false;
+
+        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
+                () -> {
+                    assertSame(n1, scene.getFocusOwner());
+                    actionTaken = true;
+                }
+        );
+
+        n2.requestFocus();
+
+        ((StubScene) SceneHelper.getPeer(scene)).setInputMethodCompositionFinishDelegate(
+                null);
+
+        assertSame(n2, scene.getFocusOwner());
+        assertTrue(actionTaken);
+    }
+
+    private void fireTabKeyEvent(Node node) {
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_PRESSED, null, null, KeyCode.TAB, false, false, false, false));
+        Event.fireEvent(node, new KeyEvent(KeyEvent.KEY_RELEASED, null, null, KeyCode.TAB, false, false, false, false));
+    }
+
+    /**
+     * If a node acquires focus by calling {@link Node#requestFocus()}, it does not acquire visible focus.
+     */
+    @Test public void testDefaultFocusTraversalDoesNotSetFocusVisible() {
+        Node node = n();
+        scene.setRoot(new Group(node));
+
+        assertNotFocused(scene, node);
+        assertNotFocusVisible(node);
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertNotFocusVisible(node);
+    }
+
+    /**
+     * If a node acquires focus when the TAB key is pressed, it also acquires visible focus.
+     */
+    @Test public void testKeyFocusTraversalSetsFocusVisible() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+
+        assertNotFocused(scene, node);
+        assertNotFocusVisible(node);
+
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node);
+        assertIsFocusVisible(node);
+    }
+
+    /**
+     * If {@link Node#requestFocus()} is called on a node that has acquired visible focus,
+     * visible focus is removed from the node.
+     */
+    @Test public void testFocusVisibleIsRemovedByDefaultRequestFocus() {
+        Node node = n();
+        Group g = new Group(node);
+        scene.setRoot(g);
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node);
+        assertIsFocusVisible(node);
+
+        node.requestFocus();
+
+        assertIsFocused(scene, node);
+        assertNotFocusVisible(node);
+    }
+
+    /**
+     * When a node loses focus, it also loses visible focus.
+     */
+    @Test public void testVisibleFocusIsRemovedWhenFocusIsRemoved() {
+        Node node1 = n();
+        Node node2 = n();
+        Group g = new Group(node1, node2);
+        scene.setRoot(g);
+        fireTabKeyEvent(g);
+
+        assertIsFocused(scene, node1);
+        assertIsFocusVisible(node1);
+
+        node2.requestFocus();
+
+        assertNotFocused(scene, node1);
+        assertNotFocusVisible(node1);
+    }
+
+    /**
+     * When a node acquires focus, the focusWithin property is set on the node
+     * and all of its parents.
+     */
+    @Test public void testFocusWithinIsTrueOnAllParents() {
+        Node node1 = n();
+        Group g = new Group(new Group(new Group(node1)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+    }
+
+    /**
+     * When a node loses focus, the focusWithin property of its parents is cleared.
+     */
+    @Test public void testFocusWithinIsRemovedFromParentsAfterChangingFocusOwner() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        assertNotFocusWithinParents(node1);
+        assertNotFocusWithinParents(node2);
+
+        node1.requestFocus();
+
+        assertIsFocusWithinParents(node1);
+        assertNotFocusWithin(node2);
+        assertNotFocusWithin(node2.getParent());
+        assertNotFocusWithin(node2.getParent().getParent());
+
+        node2.requestFocus();
+
+        assertIsFocusWithinParents(node2);
+        assertNotFocusWithin(node1);
+        assertNotFocusWithin(node1.getParent());
+        assertNotFocusWithin(node1.getParent().getParent());
+    }
+
+    /**
+     * When a node loses focus, all of its parents also lose focusWithin.
+     * However, if focus transitions to a new node, and the new node is also a child of the
+     * parent that just lost focusWithin, the parent will re-gain focusWithin.
+     *
+     * Since focus traversal is specified to be an atomic operation, the fact that
+     * the parent technically lost and re-gained focusWithin must not be observable.
+     */
+    @Test public void testFocusWithinListenerIsNotInvokedIfPropertyDidNotEffectivelyChange() {
+        Node node1 = n(), node2 = n();
+        Group g = new Group(new Group(new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g);
+
+        List<Boolean> focusWithinValues = new ArrayList<>();
+        g.focusWithinProperty().addListener((observable, oldValue, newValue) -> focusWithinValues.add(newValue));
+
+        node1.requestFocus();
+        assertEquals(1, focusWithinValues.size());
+        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
+
+        node2.requestFocus();
+        assertEquals(1, focusWithinValues.size());
+        assertEquals(Boolean.TRUE, focusWithinValues.get(0));
+    }
+
+    // TODO: tests for moving nodes between scenes
+    // and active and inactive stages
+}

From 7b3efd297fbb17826f429abdd5737c624f21a962 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 7 Jun 2021 22:21:31 +0200
Subject: [PATCH 11/21] remove code comment

---
 .../com/sun/javafx/scene/control/behavior/SliderBehavior.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
index d2a9040634a..63740aeb351 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
@@ -122,7 +122,6 @@ public void trackPress(MouseEvent e, double position) {
       *       track and 1.0 being the end
      */
     public void thumbPressed(MouseEvent e, double position) {
-        // If not already focused, request focus
         final Slider slider = getNode();
         slider.requestFocus();
         slider.setValueChanging(true);

From da576818ae61958ce69fdcd44a406719b37c9ec3 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:12:31 +0200
Subject: [PATCH 12/21] Re-ordered methods

---
 .../control/behavior/ButtonBehavior.java      |  1 -
 .../src/main/java/javafx/scene/Node.java      | 64 ++++++++++---------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
index d5777a13a03..1d9961e5764 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
@@ -178,7 +178,6 @@ protected void keyReleased(KeyEvent e) {
      * potentially arming the Button, this will transfer focus to the button
      */
     protected void mousePressed(MouseEvent e) {
-        // if the button is not already focused, then request the focus
         if (getNode().isFocusTraversable()) {
             getNode().requestFocus();
         }
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 08c865b8ec9..ba93cdbb95f 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8151,35 +8151,6 @@ protected boolean notifyListeners() {
         }
     }
 
-    /**
-     * Indicates whether this {@code Node} currently has the input focus.
-     * To have the input focus, a node must be the {@code Scene}'s focus
-     * owner, and the scene must be in a {@code Stage} that is visible
-     * and active. See {@link #requestFocus()} for more information.
-     *
-     * @see #requestFocus()
-     * @defaultValue false
-     */
-    private FocusPropertyBase focused;
-
-    /**
-     * Indicates whether this {@code Node} should visibly indicate focus.
-     * This flag is set when a node acquired input focus via keyboard navigation,
-     * and it is cleared when {@link #requestFocus()} is called.
-     */
-    private FocusPropertyBase focusVisible;
-
-    /**
-     * Indicates whether this {@code Node} or any of its children currently
-     * has the input focus.
-     */
-    private FocusPropertyBase focusWithin;
-
-    protected final void setFocused(boolean value) {
-        setFocusQuietly(value, false);
-        notifyFocusListeners();
-    }
-
     /**
      * Sets the value of the {@link #focused} and {@link #focusVisible} properties
      * without firing change events. The value of {@link #focusWithin} is set
@@ -8206,6 +8177,22 @@ final void notifyFocusListeners() {
         } while (node != null);
     }
 
+    /**
+     * Indicates whether this {@code Node} currently has the input focus.
+     * To have the input focus, a node must be the {@code Scene}'s focus
+     * owner, and the scene must be in a {@code Stage} that is visible
+     * and active. See {@link #requestFocus()} for more information.
+     *
+     * @see #requestFocus()
+     * @defaultValue false
+     */
+    private FocusPropertyBase focused;
+
+    protected final void setFocused(boolean value) {
+        setFocusQuietly(value, false);
+        notifyFocusListeners();
+    }
+
     public final boolean isFocused() {
         return focused != null && focused.get();
     }
@@ -8249,6 +8236,16 @@ public void set(boolean value) {
         return focused;
     }
 
+    /**
+     * Indicates whether this {@code Node} should visibly indicate focus.
+     * This flag is set when a node acquired input focus via keyboard navigation,
+     * and it is cleared when {@link #requestFocus()} is called.
+     *
+     * @defaultValue false
+     * @since 17
+     */
+    private FocusPropertyBase focusVisible;
+
     public final boolean isFocusVisible() {
         return focusVisible != null && focusVisible.get();
     }
@@ -8270,6 +8267,15 @@ public String getName() {
         return focusVisible;
     }
 
+    /**
+     * Indicates whether this {@code Node} or any of its children currently
+     * has the input focus.
+     *
+     * @defaultValue false
+     * @since 17
+     */
+    private FocusPropertyBase focusWithin;
+
     public final boolean isFocusWithin() {
         return focusWithin != null && focusWithin.get();
     }

From cf1daa2e9516c9be6cb6fb6e196e09e6f503594b Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:14:33 +0200
Subject: [PATCH 13/21] wording

---
 modules/javafx.graphics/src/main/java/javafx/scene/Node.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index ba93cdbb95f..b2c5521ca4a 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8238,7 +8238,7 @@ public void set(boolean value) {
 
     /**
      * Indicates whether this {@code Node} should visibly indicate focus.
-     * This flag is set when a node acquired input focus via keyboard navigation,
+     * This flag is set when a node acquires input focus via keyboard navigation,
      * and it is cleared when {@link #requestFocus()} is called.
      *
      * @defaultValue false

From 9d79df630613c8567b214a8ba93aee1b9dd80786 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 2 Aug 2021 15:17:12 +0200
Subject: [PATCH 14/21] changes per discussion, added test

---
 .../src/main/java/javafx/scene/Node.java      | 163 ++++++++++--------
 .../java/test/javafx/scene/FocusTest.java     |  21 ++-
 2 files changed, 106 insertions(+), 78 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index b2c5521ca4a..173f927e154 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -957,6 +957,7 @@ private ReadOnlyObjectWrapper<Parent> parentPropertyImpl() {
                 @Override
                 protected void invalidated() {
                     if (oldParent != null) {
+                        updateRemovedParentFocus(oldParent);
                         oldParent.disabledProperty().removeListener(parentDisabledChangedListener);
                         oldParent.treeVisibleProperty().removeListener(parentTreeVisibleChangedListener);
                         if (nodeTransformation != null && nodeTransformation.listenerReasons > 0) {
@@ -8157,8 +8158,8 @@ protected boolean notifyListeners() {
      * by the implementation of {@link #focused}.
      */
     final void setFocusQuietly(boolean focused, boolean focusVisible) {
-        ((FocusPropertyBase)focusedProperty()).set(focused);
-        ((FocusPropertyBase)focusVisibleProperty()).set(focused && focusVisible);
+        this.focused.set(focused);
+        this.focusVisible.set(focused && focusVisible);
     }
 
     /**
@@ -8167,16 +8168,34 @@ final void setFocusQuietly(boolean focused, boolean focusVisible) {
      * are fired on the current node and on all of its parents, if necessary.
      */
     final void notifyFocusListeners() {
-        ((FocusPropertyBase)focusedProperty()).notifyListeners();
-        ((FocusPropertyBase)focusVisibleProperty()).notifyListeners();
+        focused.notifyListeners();
+        focusVisible.notifyListeners();
 
         Node node = this;
         do {
-            ((FocusPropertyBase)node.focusWithinProperty()).notifyListeners();
+            node.focusWithin.notifyListeners();
             node = node.getParent();
         } while (node != null);
     }
 
+    /**
+     * Called when the current node was removed from the scene graph in order to clear
+     * the focus bits of the former parents.
+     */
+    private void updateRemovedParentFocus(Node oldParent) {
+        if (oldParent != null && focusWithin.get()) {
+            Node node = oldParent;
+            while (node != null) {
+                node.focused.set(false);
+                node.focusVisible.set(false);
+                node.focusWithin.set(false);
+                node = node.getParent();
+            }
+
+            oldParent.notifyFocusListeners();
+        }
+    }
+
     /**
      * Indicates whether this {@code Node} currently has the input focus.
      * To have the input focus, a node must be the {@code Scene}'s focus
@@ -8186,7 +8205,39 @@ final void notifyFocusListeners() {
      * @see #requestFocus()
      * @defaultValue false
      */
-    private FocusPropertyBase focused;
+    private final FocusPropertyBase focused = new FocusPropertyBase() {
+        @Override
+        protected PseudoClass getPseudoClass() {
+            return FOCUSED_PSEUDOCLASS_STATE;
+        }
+
+        @Override
+        public String getName() {
+            return "focused";
+        }
+
+        @Override
+        protected boolean notifyListeners() {
+            if (super.notifyListeners()) {
+                notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUSED);
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public void set(boolean value) {
+            if (get() != value) {
+                super.set(value);
+
+                Node node = Node.this;
+                do {
+                    node.focusWithin.set(value);
+                    node = node.getParent();
+                } while (node != null);
+            }
+        }
+    };
 
     protected final void setFocused(boolean value) {
         setFocusQuietly(value, false);
@@ -8194,76 +8245,39 @@ protected final void setFocused(boolean value) {
     }
 
     public final boolean isFocused() {
-        return focused != null && focused.get();
+        return focused.get();
     }
 
     public final ReadOnlyBooleanProperty focusedProperty() {
-        if (focused == null) {
-            focused = new FocusPropertyBase() {
-                @Override
-                protected PseudoClass getPseudoClass() {
-                    return FOCUSED_PSEUDOCLASS_STATE;
-                }
-
-                @Override
-                public String getName() {
-                    return "focused";
-                }
-
-                @Override
-                protected boolean notifyListeners() {
-                    if (super.notifyListeners()) {
-                        notifyAccessibleAttributeChanged(AccessibleAttribute.FOCUSED);
-                        return true;
-                    }
-                    return false;
-                }
-
-                @Override
-                public void set(boolean value) {
-                    if (get() != value) {
-                        super.set(value);
-
-                        Node node = Node.this;
-                        do {
-                            ((FocusPropertyBase)node.focusWithinProperty()).set(value);
-                            node = node.getParent();
-                        } while (node != null);
-                    }
-                }
-            };
-        }
         return focused;
     }
 
     /**
      * Indicates whether this {@code Node} should visibly indicate focus.
-     * This flag is set when a node acquires input focus via keyboard navigation,
-     * and it is cleared when {@link #requestFocus()} is called.
+     * This flag is set when the node acquires input focus via keyboard navigation,
+     * and it is cleared when the node loses focus, or when {@link #requestFocus()}
+     * is called.
      *
      * @defaultValue false
-     * @since 17
+     * @since 18
      */
-    private FocusPropertyBase focusVisible;
+    private final FocusPropertyBase focusVisible = new FocusPropertyBase() {
+        @Override
+        protected PseudoClass getPseudoClass() {
+            return FOCUS_VISIBLE_PSEUDOCLASS_STATE;
+        }
+
+        @Override
+        public String getName() {
+            return "focusVisible";
+        }
+    };
 
     public final boolean isFocusVisible() {
-        return focusVisible != null && focusVisible.get();
+        return focusVisible.get();
     }
 
     public final ReadOnlyBooleanProperty focusVisibleProperty() {
-        if (focusVisible == null) {
-            focusVisible = new FocusPropertyBase() {
-                @Override
-                protected PseudoClass getPseudoClass() {
-                    return FOCUS_VISIBLE_PSEUDOCLASS_STATE;
-                }
-
-                @Override
-                public String getName() {
-                    return "focusVisible";
-                }
-            };
-        }
         return focusVisible;
     }
 
@@ -8272,28 +8286,25 @@ public String getName() {
      * has the input focus.
      *
      * @defaultValue false
-     * @since 17
+     * @since 18
      */
-    private FocusPropertyBase focusWithin;
+    private final FocusPropertyBase focusWithin = new FocusPropertyBase() {
+        @Override
+        protected PseudoClass getPseudoClass() {
+            return FOCUS_WITHIN_PSEUDOCLASS_STATE;
+        }
+
+        @Override
+        public String getName() {
+            return "focusWithin";
+        }
+    };
 
     public final boolean isFocusWithin() {
-        return focusWithin != null && focusWithin.get();
+        return focusWithin.get();
     }
 
     public final ReadOnlyBooleanProperty focusWithinProperty() {
-        if (focusWithin == null) {
-            focusWithin = new FocusPropertyBase() {
-                @Override
-                protected PseudoClass getPseudoClass() {
-                    return FOCUS_WITHIN_PSEUDOCLASS_STATE;
-                }
-
-                @Override
-                public String getName() {
-                    return "focusWithin";
-                }
-            };
-        }
         return focusWithin;
     }
 
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index b2c3441dbcc..c377d86cf9b 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -913,6 +913,23 @@ private void fireTabKeyEvent(Node node) {
         assertEquals(Boolean.TRUE, focusWithinValues.get(0));
     }
 
-    // TODO: tests for moving nodes between scenes
-    // and active and inactive stages
+    /**
+     * When a focused node is removed from the scene graph, the focus states
+     * of its former parents are cleared.
+     */
+    @Test public void testFocusStatesAreClearedFromFormerParentsOfFocusedNode() {
+        Node node1 = n(), node2 = n();
+        Group g2, g3, g1 = new Group(g2 = new Group(g3 = new Group(node1)), new Group(new Group(node2)));
+        scene.setRoot(g1);
+
+        node1.requestFocus();
+        assertIsFocusWithin(g1);
+        assertIsFocusWithin(g2);
+        assertIsFocusWithin(g3);
+
+        g2.getChildren().remove(0);
+        assertNotFocusWithin(g1);
+        assertNotFocusWithin(g2);
+    }
+
 }

From e05910885f93775814643a948db30153e251a09d Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Mon, 2 Aug 2021 18:48:57 +0200
Subject: [PATCH 15/21] restart github actions


From a1da00b2d922dece5fbda133594911120c53b9be Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Tue, 17 Aug 2021 20:07:56 +0200
Subject: [PATCH 16/21] minor wording change

---
 modules/javafx.graphics/src/main/java/javafx/scene/Node.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 76a2d3974f4..ebeb1a9153e 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8255,7 +8255,7 @@ public final ReadOnlyBooleanProperty focusedProperty() {
     /**
      * Indicates whether this {@code Node} should visibly indicate focus.
      * This flag is set when the node acquires input focus via keyboard navigation,
-     * and it is cleared when the node loses focus, or when {@link #requestFocus()}
+     * and it is cleared when the node loses focus or when {@link #requestFocus()}
      * is called.
      *
      * @defaultValue false
@@ -8282,7 +8282,7 @@ public final ReadOnlyBooleanProperty focusVisibleProperty() {
     }
 
     /**
-     * Indicates whether this {@code Node} or any of its children currently
+     * Indicates whether this {@code Node} or any of its descendants currently
      * has the input focus.
      *
      * @defaultValue false

From d9a715e3f90ec1bc8c72b0e442f8df4d76838735 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Fri, 20 Aug 2021 07:12:04 +0200
Subject: [PATCH 17/21] fixed undeterministic test failures

---
 .../com/sun/javafx/css/PseudoClassTest.java   | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
index a356bcd5d42..a1ffec0dcaa 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,15 +29,20 @@
 import com.sun.javafx.css.PseudoClassState;
 import com.sun.javafx.css.PseudoClassStateShim;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
 import javafx.css.PseudoClass;
 import static org.junit.Assert.*;
+
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -46,7 +51,37 @@
  */
 public class PseudoClassTest {
 
-    public PseudoClassTest() {
+    private static Map<String, Integer> initialPseudoClassMap;
+    private static List<PseudoClass> initialPseudoClasses;
+
+    /**
+     * Before we run any of the tests in this class, we must store the current content
+     * of both the 'PseudoClassState.pseudoClassMap' and 'PseudoClassState.pseudoClasses'
+     * static fields, and restore the exact content after we have completed all tests.
+     *
+     * Once a pseudo-class has been loaded via 'PseudoClass.getPseudoClass(String)', the
+     * returned singleton 'PseudoClassImpl' instance will be stored in the static list
+     * 'PseudoClassState.pseudoClasses', and the instance will store the index of itself
+     * in this list.
+     *
+     * Clearing the content of 'pseudoClassMap' and 'pseudoClasses' will therefore break
+     * existing 'PseudoClass' instances, because their stored index will no longer refer
+     * to the correct instance in the 'pseudoClasses' list. This can cause other tests
+     * that happen to use a broken pseudo-class instance to fail undeterministically,
+     * depending on whether or not they are executed before or after this class.
+     */
+    @BeforeClass
+    public static void beforeClass() {
+        initialPseudoClassMap = new HashMap<>(PseudoClassStateShim.pseudoClassMap);
+        initialPseudoClasses = new ArrayList<>(PseudoClassStateShim.pseudoClasses);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        PseudoClassStateShim.pseudoClassMap.clear();
+        PseudoClassStateShim.pseudoClassMap.putAll(initialPseudoClassMap);
+        PseudoClassStateShim.pseudoClasses.clear();
+        PseudoClassStateShim.pseudoClasses.addAll(initialPseudoClasses);
     }
 
     @Before

From bd57bbac1beebf91ec5623e2f413eeb5b6ce627a Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Sun, 3 Apr 2022 17:10:03 +0200
Subject: [PATCH 18/21] Update copyright headers

---
 .../java/com/sun/javafx/scene/control/DatePickerContent.java    | 2 +-
 .../com/sun/javafx/scene/control/behavior/ButtonBehavior.java   | 2 +-
 .../javafx/scene/control/behavior/FocusTraversalInputMap.java   | 2 +-
 .../com/sun/javafx/scene/control/behavior/SliderBehavior.java   | 2 +-
 .../javafx/scene/control/behavior/TwoLevelFocusBehavior.java    | 2 +-
 .../scene/control/behavior/TwoLevelFocusComboBehavior.java      | 2 +-
 .../scene/control/behavior/TwoLevelFocusListBehavior.java       | 2 +-
 .../scene/control/behavior/TwoLevelFocusPopupBehavior.java      | 2 +-
 .../src/main/docs/javafx/scene/doc-files/cssref.html            | 2 +-
 .../java/com/sun/javafx/scene/KeyboardShortcutsHandler.java     | 2 +-
 .../src/main/java/com/sun/javafx/scene/NodeHelper.java          | 2 +-
 .../com/sun/javafx/scene/traversal/TopMostTraversalEngine.java  | 2 +-
 .../java/com/sun/javafx/scene/traversal/TraversalMethod.java    | 2 +-
 modules/javafx.graphics/src/main/java/javafx/scene/Node.java    | 2 +-
 modules/javafx.graphics/src/main/java/javafx/scene/Scene.java   | 2 +-
 .../javafx.graphics/src/main/java/javafx/scene/SubScene.java    | 2 +-
 .../src/test/java/test/com/sun/javafx/css/PseudoClassTest.java  | 2 +-
 .../sun/javafx/scene/traversal/TopMostTraversalEngineTest.java  | 2 +-
 .../java/test/com/sun/javafx/scene/traversal/TraversalTest.java | 2 +-
 .../com/sun/javafx/scene/traversal/TraverseInvisibleTest.java   | 2 +-
 .../src/test/java/test/javafx/scene/FocusTest.java              | 2 +-
 .../src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java  | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
index 83c432ed0af..a224319a80f 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/DatePickerContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
index 1d9961e5764..95898b157be 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/ButtonBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
index 1954d6a572c..93c6339b3d1 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
index 63740aeb351..45ecc5a763f 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/SliderBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
index e1007d9250c..d84b9141cbd 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
index c012789f168..11def1aaa90 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusComboBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
index d842d45d643..7ba7b82cf1f 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
index 772a6dd1640..aae8c731a72 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusPopupBehavior.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
index 4f26a621e05..77fa51a7425 100644
--- a/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
+++ b/modules/javafx.graphics/src/main/docs/javafx/scene/doc-files/cssref.html
@@ -2,7 +2,7 @@
 
 <!--
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
index 9ab9a7cd92f..6bb27e08983 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/KeyboardShortcutsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
index 617c98304b1..e6a6dfddabb 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/NodeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
index 205f3d49c9b..9d3b6d3f538 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TopMostTraversalEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
index d660d2b93f0..d00f12a6d48 100644
--- a/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
+++ b/modules/javafx.graphics/src/main/java/com/sun/javafx/scene/traversal/TraversalMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index f13ef850ddc..5dd7fe7145c 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 65e62ce26b2..73f63e9cee2 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java b/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
index a98f91dc02f..7bb95a0bed2 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/SubScene.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
index a1ffec0dcaa..174fc5eccb9 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/css/PseudoClassTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
index 8d6a579237b..80339284c61 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TopMostTraversalEngineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
index 60be4a1f58a..a3665a50ce6 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraversalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
index 59142ad3d8f..d31fa454b97 100644
--- a/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
+++ b/modules/javafx.graphics/src/test/java/test/com/sun/javafx/scene/traversal/TraverseInvisibleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index c377d86cf9b..ad91d32c469 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff --git a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
index e17409a9653..ab811b24aa2 100644
--- a/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
+++ b/modules/javafx.web/src/main/java/com/sun/javafx/webkit/WebPageClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it

From 313f01480aec8e207861ae0130eed69c6489afeb Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Thu, 19 May 2022 05:58:08 +0200
Subject: [PATCH 19/21] Updated since tag

---
 modules/javafx.graphics/src/main/java/javafx/scene/Node.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 5dd7fe7145c..54b03193587 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8264,7 +8264,7 @@ public final ReadOnlyBooleanProperty focusedProperty() {
      * is called.
      *
      * @defaultValue false
-     * @since 18
+     * @since 19
      */
     private final FocusPropertyBase focusVisible = new FocusPropertyBase() {
         @Override
@@ -8291,7 +8291,7 @@ public final ReadOnlyBooleanProperty focusVisibleProperty() {
      * has the input focus.
      *
      * @defaultValue false
-     * @since 18
+     * @since 19
      */
     private final FocusPropertyBase focusWithin = new FocusPropertyBase() {
         @Override

From 40522b8094cba2227ff5942a458ac1365d72bcaa Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Thu, 7 Jul 2022 01:31:05 +0200
Subject: [PATCH 20/21] address review comments

---
 modules/javafx.graphics/src/main/java/javafx/scene/Node.java | 2 +-
 .../javafx.graphics/src/main/java/javafx/scene/Scene.java    | 5 ++---
 .../src/test/java/test/javafx/scene/FocusTest.java           | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
index 54b03193587..c25e0df571b 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Node.java
@@ -8266,7 +8266,7 @@ public final ReadOnlyBooleanProperty focusedProperty() {
      * @defaultValue false
      * @since 19
      */
-    private final FocusPropertyBase focusVisible = new FocusPropertyBase() {
+    final FocusPropertyBase focusVisible = new FocusPropertyBase() {
         @Override
         protected PseudoClass getPseudoClass() {
             return FOCUS_VISIBLE_PSEUDOCLASS_STATE;
diff --git a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
index 73f63e9cee2..22cefa750d3 100644
--- a/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
+++ b/modules/javafx.graphics/src/main/java/javafx/scene/Scene.java
@@ -4053,9 +4053,8 @@ private void setFocusOwner(final Node value) {
         }
 
         private void setFocusVisible(Node node, boolean focusVisible) {
-            Node.FocusPropertyBase property = (Node.FocusPropertyBase)node.focusVisibleProperty();
-            property.set(focusVisible);
-            property.notifyListeners();
+            node.focusVisible.set(focusVisible);
+            node.focusVisible.notifyListeners();
         }
 
         private boolean windowFocused;
diff --git a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
index ad91d32c469..ff0057a3663 100644
--- a/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
+++ b/modules/javafx.graphics/src/test/java/test/javafx/scene/FocusTest.java
@@ -844,6 +844,8 @@ private void fireTabKeyEvent(Node node) {
 
         assertNotFocused(scene, node1);
         assertNotFocusVisible(node1);
+        assertIsFocused(scene, node2);
+        assertNotFocusVisible(node2);
     }
 
     /**

From 9a8a838e1fec880bfa0f3d2040d62a9ed00e27a3 Mon Sep 17 00:00:00 2001
From: mstr2 <43553916+mstr2@users.noreply.github.com>
Date: Fri, 8 Jul 2022 13:43:13 +0200
Subject: [PATCH 21/21] added javadoc param tag

---
 .../javafx/scene/control/behavior/FocusTraversalInputMap.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
index 93c6339b3d1..afbf06136b3 100644
--- a/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
+++ b/modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/behavior/FocusTraversalInputMap.java
@@ -87,6 +87,7 @@ public static <N extends Node> InputMap<N> createInputMap(N node) {
      *
      * @param node The node to traverse on
      * @param dir The direction to traverse
+     * @param method The focus traversal method
      */
     public static void traverse(final Node node, final Direction dir, TraversalMethod method) {
         if (node == null) {