Test fixes

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorTableAction.java

@@ -82,16 +82,16 @@ abstract public class CompositeEditorTableAction extends DockingAction implement
 		}
 
 		JTable table = ((CompositeEditorPanel) provider.getComponent()).getTable();
-		if (table instanceof GTable gTable) {
-			gTable.requestTableFocus();
+		if (!table.isEditing()) {
+			table.requestFocus();
 			return;
 		}
 
-		if (table.isEditing()) {
-			table.getEditorComponent().requestFocus();
+		if (table instanceof GTable gTable) {
+			gTable.requestTableEditorFocus();
 		}
 		else {
-			table.requestFocus();
+			table.getEditorComponent().requestFocus();
 		}
 	}
 

Ghidra/Framework/Docking/src/main/java/docking/widgets/table/GTable.java

@@ -940,14 +940,18 @@ public class GTable extends JTable {
 	public boolean editCellAt(int row, int column, EventObject e) {
 		boolean editAtCell = super.editCellAt(row, column, e);
 		if (editAtCell) {
-			requestTableFocus();
+			requestTableEditorFocus();
 		}
 		return editAtCell;
 	}
 
-	public void requestTableFocus() {
+	public void requestTableEditorFocus() {
 		TableCellEditor currentEditor = getCellEditor();
 		Component editorComponent = getEditorComponent();
+		if (editorComponent == null) {
+			return; // not editing
+		}
+
 		if (currentEditor instanceof FocusableEditor focusable) {
 			focusable.focusEditor();
 		}