From 7484701e18d801914b85bf95fe020e85ebae40cc Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Mon, 16 Mar 2026 02:12:25 +0000
Subject: [PATCH] 8309041: Swingutilities2 methods requesting focus can have a
 Cause

Reviewed-by: tr, dnguyen
---
 .../share/classes/sun/swing/SwingUtilities2.java         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
index d552bc5c9f2..28b93ed1e2a 100644
--- a/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
+++ b/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java
@@ -44,6 +44,7 @@ import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.Toolkit;
+import java.awt.event.FocusEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
@@ -795,7 +796,7 @@ public class SwingUtilities2 {
      */
     public static void adjustFocus(JComponent c) {
         if (!c.hasFocus() && c.isRequestFocusEnabled()) {
-            c.requestFocus();
+            c.requestFocus(FocusEvent.Cause.MOUSE_EVENT);
         }
     }
 
@@ -1646,7 +1647,7 @@ public class SwingUtilities2 {
                 FocusTraversalPolicy policy = container.getFocusTraversalPolicy();
                 Component comp = policy.getDefaultComponent(container);
                 if (comp!=null) {
-                    comp.requestFocus();
+                    comp.requestFocus(FocusEvent.Cause.TRAVERSAL);
                     return comp;
                 }
             }
@@ -1656,13 +1657,13 @@ public class SwingUtilities2 {
                 Component comp = policy.getComponentAfter(rootAncestor, container);
 
                 if (comp!=null && SwingUtilities.isDescendingFrom(comp, container)) {
-                    comp.requestFocus();
+                    comp.requestFocus(FocusEvent.Cause.TRAVERSAL);
                     return comp;
                 }
             }
         }
         if (component.isFocusable()) {
-            component.requestFocus();
+            component.requestFocus(FocusEvent.Cause.TRAVERSAL);
             return component;
         }
         return null;