From e13c4baf25f79af76a824acad290d0a41e84c5c2 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Sun, 31 Jul 2022 11:05:52 +0200
Subject: [PATCH] Fix focus lost motors, recovery & stage

---
 .../gui/main/FlightConfigurationPanel.java    |  4 ++++
 .../FlightConfigurablePanel.java              | 23 ++++++-------------
 .../MotorConfigurationPanel.java              |  2 +-
 .../RecoveryConfigurationPanel.java           |  2 +-
 .../SeparationConfigurationPanel.java         |  2 +-
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
index 393a2f224..a2526dc40 100644
--- a/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
@@ -136,6 +136,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 				synchronizePanelSelection(previousPanel, panel);
 				panel.updateButtonState();
 				panel.takeTheSpotlight();
+				panel.updateRocketViewSelection();
 				previousPanel = panel;
 			}
 		});
@@ -397,12 +398,15 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 		switch (tabs.getSelectedIndex()) {
 			case MOTOR_TAB_INDEX:
 				motorConfigurationPanel.takeTheSpotlight();
+				motorConfigurationPanel.updateRocketViewSelection();
 				break;
 			case RECOVERY_TAB_INDEX:
 				recoveryConfigurationPanel.takeTheSpotlight();
+				recoveryConfigurationPanel.updateRocketViewSelection();
 				break;
 			case SEPARATION_TAB_INDEX:
 				separationConfigurationPanel.takeTheSpotlight();
+				separationConfigurationPanel.updateRocketViewSelection();
 				break;
 		}
 	}
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 9075a208f..5d3e23a62 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
@@ -3,8 +3,6 @@ package net.sf.openrocket.gui.main.flightconfigpanel;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Arrays;
@@ -186,19 +184,7 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 		table.getColumnModel().getSelectionModel().addListSelectionListener(new ListSelectionListener() {
 			@Override
 			public void valueChanged(ListSelectionEvent e) {
-				updateComponentSelection(e);
-			}
-		});
-
-		table.addFocusListener(new FocusListener() {
-			@Override
-			public void focusGained(FocusEvent e) {
-				updateComponentSelection(new ListSelectionEvent(this, 0, 0, false));
-			}
-
-			@Override
-			public void focusLost(FocusEvent e) {
-
+				updateRocketViewSelection(e);
 			}
 		});
 	}
@@ -214,10 +200,15 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
 		table.clearSelection();
 	}
 
+	public void updateRocketViewSelection() {
+		ListSelectionEvent e = new ListSelectionEvent(this, 0, 0, false);
+		updateRocketViewSelection(e);
+	}
+
 	/**
 	 * Update the selection in the rocket design view, based on the currently selected motor, recovery device, or stage.
 	 */
-	protected abstract void updateComponentSelection(ListSelectionEvent e);
+	public abstract void updateRocketViewSelection(ListSelectionEvent e);
 
 	protected T getSelectedComponent() {
 
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 c1e40eef0..52c15a1f9 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
@@ -253,7 +253,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 		popupMenuFull.show(e.getComponent(), e.getX(), e.getY());
 	}
 
-	public void updateComponentSelection(ListSelectionEvent e) {
+	public void updateRocketViewSelection(ListSelectionEvent e) {
 		if (e.getValueIsAdjusting()) {
 			return;
 		}
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 530d98f23..0ecbea16d 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
@@ -245,7 +245,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 		popupMenuFull.show(e.getComponent(), e.getX(), e.getY());
 	}
 
-	public void updateComponentSelection(ListSelectionEvent e) {
+	public void updateRocketViewSelection(ListSelectionEvent e) {
 		if (e.getValueIsAdjusting() || getSelectedComponents() == null) {
 			return;
 		}
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 8b8c31ab9..f7ce747d3 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
@@ -255,7 +255,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 		popupMenuFull.show(e.getComponent(), e.getX(), e.getY());
 	}
 
-	public void updateComponentSelection(ListSelectionEvent e) {
+	public void updateRocketViewSelection(ListSelectionEvent e) {
 		if (e.getValueIsAdjusting() || getSelectedComponents() == null) {
 			return;
 		}