hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
SiboVG 2022-06-01 03:35:15 +02:00
parent 9a572f5746
commit f38faf760e
3 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
View File

@ -63,13 +63,6 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
protected FlightConfigurableTableModel<MotorMount> configurationTableModel; protected FlightConfigurableTableModel<MotorMount> configurationTableModel;
private final JPopupMenu popupMenuFull; // popup menu containing all the options 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) { MotorConfigurationPanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
@ -93,13 +86,13 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
this.add(cards, "pushy"); this.add(cards, "pushy");
// Get all the actions // Get all the actions
selectMotorAction = new SelectMotorAction(); AbstractAction selectMotorAction = new SelectMotorAction();
removeMotorAction = new RemoveMotorAction(); AbstractAction removeMotorAction = new RemoveMotorAction();
selectIgnitionAction = new SelectIgnitionAction(); AbstractAction selectIgnitionAction = new SelectIgnitionAction();
resetIgnitionAction = new ResetIgnitionAction(); AbstractAction resetIgnitionAction = new ResetIgnitionAction();
renameConfigAction = flightConfigurationPanel.getRenameConfigAction(); AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
removeConfigAction = flightConfigurationPanel.getRemoveConfigAction(); AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction(); AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
// Populate the popup menu // Populate the popup menu
popupMenuFull = new JPopupMenu(); popupMenuFull = new JPopupMenu();

16
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java
View File

@ -35,13 +35,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
private FlightConfigurableTableModel<RecoveryDevice> recoveryTableModel; private FlightConfigurableTableModel<RecoveryDevice> recoveryTableModel;
private final JButton selectDeploymentButton; private final JButton selectDeploymentButton;
private final JButton resetDeploymentButton; private final JButton resetDeploymentButton;
private final JPopupMenu popupMenuFull; // popup menu containing all the options 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) { RecoveryConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
@ -51,11 +45,11 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel<Recovery
this.add(scroll, "span, grow, pushy, wrap"); this.add(scroll, "span, grow, pushy, wrap");
// Get all the actions // Get all the actions
selectDeploymentAction = new SelectDeploymentAction(); AbstractAction selectDeploymentAction = new SelectDeploymentAction();
resetDeploymentAction = new ResetDeploymentAction(); AbstractAction resetDeploymentAction = new ResetDeploymentAction();
renameConfigAction = flightConfigurationPanel.getRenameConfigAction(); AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
removeConfigAction = flightConfigurationPanel.getRemoveConfigAction(); AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction(); AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
// Populate the popup menu // Populate the popup menu
popupMenuFull = new JPopupMenu(); popupMenuFull = new JPopupMenu();

20
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/SeparationConfigurationPanel.java
View File

@ -39,15 +39,9 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
private FlightConfigurableTableModel<AxialStage> separationTableModel; private FlightConfigurableTableModel<AxialStage> separationTableModel;
private final JButton selectSeparationButton; private final JButton selectSeparationButton;
private final JButton resetDeploymentButton; private final JButton resetDeploymentButton;
private final JPopupMenu popupMenuFull; // popup menu containing all the options 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) { SeparationConfigurationPanel(FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
super(flightConfigurationPanel,rocket); super(flightConfigurationPanel,rocket);
@ -55,11 +49,11 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel<AxialS
this.add(scroll, "span, grow, pushy, wrap"); this.add(scroll, "span, grow, pushy, wrap");
// Get all the actions // Get all the actions
selectSeparationAction = new SelectSeparationAction(); AbstractAction selectSeparationAction = new SelectSeparationAction();
resetSeparationAction = new ResetSeparationAction(); AbstractAction resetSeparationAction = new ResetSeparationAction();
renameConfigAction = flightConfigurationPanel.getRenameConfigAction(); AbstractAction renameConfigAction = flightConfigurationPanel.getRenameConfigAction();
removeConfigAction = flightConfigurationPanel.getRemoveConfigAction(); AbstractAction removeConfigAction = flightConfigurationPanel.getRemoveConfigAction();
duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction(); AbstractAction duplicateConfigAction = flightConfigurationPanel.getDuplicateConfigAction();
// Populate the popup menu // Populate the popup menu
popupMenuFull = new JPopupMenu(); popupMenuFull = new JPopupMenu();