From f38faf760e78de1a512433ce9be86950ca62ecfb Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Wed, 1 Jun 2022 03:35:15 +0200
Subject: [PATCH] Code cleanup

---
 .../MotorConfigurationPanel.java              | 21 +++++++------------
 .../RecoveryConfigurationPanel.java           | 16 +++++---------
 .../SeparationConfigurationPanel.java         | 20 +++++++-----------
 3 files changed, 19 insertions(+), 38 deletions(-)

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 f98cceaab..ca3f0c227 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
@@ -63,13 +63,6 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 	protected FlightConfigurableTableModel<MotorMount> configurationTableModel;
 
 	private final JPopupMenu popupMenuFull;		// popup menu containing all the options
-	private final AbstractAction selectMotorAction;
-	private final AbstractAction removeMotorAction;
-	private final AbstractAction selectIgnitionAction;
-	private final AbstractAction resetIgnitionAction;
-	private final AbstractAction renameConfigAction;
-	private final AbstractAction removeConfigAction;
-	private final AbstractAction duplicateConfigAction;
 
 
 	MotorConfigurationPanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
@@ -93,13 +86,13 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
 		this.add(cards, "pushy");
 
 		// Get all the actions
-		selectMotorAction = new SelectMotorAction();
-		removeMotorAction = new RemoveMotorAction();
-		selectIgnitionAction = new SelectIgnitionAction();
-		resetIgnitionAction = new ResetIgnitionAction();
-		renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
-		removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
-		duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
+		AbstractAction selectMotorAction = new SelectMotorAction();
+		AbstractAction removeMotorAction = new RemoveMotorAction();
+		AbstractAction selectIgnitionAction = new SelectIgnitionAction();
+		AbstractAction resetIgnitionAction = new ResetIgnitionAction();
+		AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
+		AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
+		AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
 
 		// Populate the popup menu
 		popupMenuFull = new JPopupMenu();
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 4011ca488..a6cdf3e01 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
@@ -35,13 +35,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 	private FlightConfigurableTableModel<RecoveryDevice> recoveryTableModel;
 	private final JButton selectDeploymentButton;
 	private final JButton resetDeploymentButton;
-
 	private final JPopupMenu popupMenuFull;		// popup menu containing all the options
-	private final AbstractAction selectDeploymentAction;
-	private final AbstractAction resetDeploymentAction;
-	private final AbstractAction renameConfigAction;
-	private final AbstractAction removeConfigAction;
-	private final AbstractAction duplicateConfigAction;
 
 
 	RecoveryConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
@@ -51,11 +45,11 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
 		this.add(scroll, "span, grow, pushy, wrap");
 
 		// Get all the actions
-		selectDeploymentAction = new SelectDeploymentAction();
-		resetDeploymentAction = new ResetDeploymentAction();
-		renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
-		removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
-		duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
+		AbstractAction selectDeploymentAction = new SelectDeploymentAction();
+		AbstractAction resetDeploymentAction = new ResetDeploymentAction();
+		AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
+		AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
+		AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
 
 		// Populate the popup menu
 		popupMenuFull = new JPopupMenu();
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 564c1446b..9d81bbf59 100644
--- a/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
@@ -39,15 +39,9 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 	private FlightConfigurableTableModel<AxialStage> separationTableModel;
 	private final JButton selectSeparationButton;
 	private final JButton resetDeploymentButton;
-
 	private final JPopupMenu popupMenuFull;		// popup menu containing all the options
-	private final AbstractAction selectSeparationAction;
-	private final AbstractAction resetSeparationAction;
-	private final AbstractAction renameConfigAction;
-	private final AbstractAction removeConfigAction;
-	private final AbstractAction duplicateConfigAction;
-	
-	
+
+
 	SeparationConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
 		super(flightConfigurationPanel,rocket);
 		
@@ -55,11 +49,11 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
 		this.add(scroll, "span, grow, pushy, wrap");
 
 		// Get all the actions
-		selectSeparationAction = new SelectSeparationAction();
-		resetSeparationAction = new ResetSeparationAction();
-		renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
-		removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
-		duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
+		AbstractAction selectSeparationAction = new SelectSeparationAction();
+		AbstractAction resetSeparationAction = new ResetSeparationAction();
+		AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
+		AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
+		AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
 
 		// Populate the popup menu
 		popupMenuFull = new JPopupMenu();