From d22d394ac9877ebfd2d2f369674c1d683fcb04be Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Thu, 5 Jan 2023 19:02:58 -0500
Subject: [PATCH] GP-366 - Fixed issue in tables where focus was not given to
 the cell editor when users pressed F2 to edit

---
 .../src/main/java/docking/widgets/table/GTable.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java
index 939c4d9e65..35335b9bdd 100644
--- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java
+++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java
@@ -30,6 +30,7 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.plaf.TableUI;
 import javax.swing.table.*;
+import javax.swing.text.JTextComponent;
 
 import docking.*;
 import docking.action.*;
@@ -933,14 +934,17 @@ public class GTable extends JTable {
 	 * displayed. However, the editor component will not have a focus. This method has been
 	 * overridden to request focus on the editor component.
 	 *
-	 * @see javax.swing.JTable#editCellAt(int, int)
+	 * @see javax.swing.JTable#editCellAt(int, int, EventObject)
 	 */
 	@Override
-	public boolean editCellAt(int row, int column) {
-		boolean editAtCell = super.editCellAt(row, column);
+	public boolean editCellAt(int row, int column, EventObject e) {
+		boolean editAtCell = super.editCellAt(row, column, e);
 		if (editAtCell) {
 			Component editor = getEditorComponent();
-			editor.requestFocus();
+			editor.requestFocusInWindow();
+			if (editor instanceof JTextComponent textComponent) {
+				textComponent.selectAll();
+			}
 		}
 		return editAtCell;
 	}