From 96f3e671b040ca7c60478b554d02827fc0587c83 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Thu, 28 Jul 2022 00:48:50 +0200
Subject: [PATCH] [#1558] Restore table focus

---
 swing/src/net/sf/openrocket/gui/main/SimulationPanel.java   | 1 +
 .../gui/main/flightconfigpanel/FlightConfigurablePanel.java | 1 +
 .../gui/main/flightconfigpanel/MotorConfigurationPanel.java | 6 ++++++
 .../main/flightconfigpanel/RecoveryConfigurationPanel.java  | 4 ++++
 .../flightconfigpanel/SeparationConfigurationPanel.java     | 4 ++++
 5 files changed, 16 insertions(+)

diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index f8ac84ec5..8c946d682 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -776,6 +776,7 @@ public class SimulationPanel extends JPanel {
 				break;
 			simulationTable.addRowSelectionInterval(row, row);
 		}
+		simulationTable.requestFocusInWindow();
 	}
 
 	class EditSimulationAction extends AbstractAction {
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
index 593cbdc8a..fb2856194 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
@@ -134,6 +134,7 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 			return;
 		}
 		table.changeSelection(row, col, true, false);
+		table.requestFocusInWindow();
 	}
 
 	protected void installTableListener() {
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
index f2e6a3f27..0974f9556 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
@@ -356,6 +356,8 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.MOTOR_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 	}
 
@@ -420,6 +422,8 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.MOTOR_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 	}
 
@@ -448,6 +452,8 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.MOTOR_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 	}
 
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
index 11c991e1f..768ccb057 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
@@ -235,6 +235,8 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.AERODYNAMIC_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 
 	}
@@ -259,6 +261,8 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 		}
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.AERODYNAMIC_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 	}
 
diff --git a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
index ccf27e1d1..ad43fd03c 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
@@ -245,6 +245,8 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.AEROMASS_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 	}
 	
@@ -269,6 +271,8 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 
 		if (update) {
 			fireTableDataChanged(ComponentChangeEvent.AEROMASS_CHANGE);
+		} else {
+			table.requestFocusInWindow();
 		}
 	}