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

Clean up code

Browse Source
This commit is contained in:
SiboVG 2022-05-30 22:14:24 +02:00
parent 203d4e8b2a
commit c69455545c
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -167,7 +167,7 @@ public class BasicFrame extends JFrame {
selectionModel.attachComponentTreeSelectionModel(componentSelectionModel); selectionModel.attachComponentTreeSelectionModel(componentSelectionModel);
selectionModel.attachSimulationListSelectionModel(simulationSelectionModel); selectionModel.attachSimulationListSelectionModel(simulationSelectionModel);
actions = new RocketActions(document, selectionModel, this); actions = new RocketActions(document, selectionModel, this, simulationPanel);
// Populate the popup menu // Populate the popup menu
popupMenu = new JPopupMenu(); popupMenu = new JPopupMenu();
@ -708,7 +708,7 @@ public class BasicFrame extends JFrame {
menu.addSeparator(); menu.addSeparator();
item = new JMenuItem(actions.getEditAction(simulationPanel)); item = new JMenuItem(actions.getEditAction());
menu.add(item); menu.add(item);
item = new JMenuItem(actions.getCutAction()); item = new JMenuItem(actions.getCutAction());

13
swing/src/net/sf/openrocket/gui/main/RocketActions.java
View File

@ -61,6 +61,7 @@ public class RocketActions {
private final Rocket rocket; private final Rocket rocket;
private final BasicFrame parentFrame; private final BasicFrame parentFrame;
private final DocumentSelectionModel selectionModel; private final DocumentSelectionModel selectionModel;
private final SimulationPanel simulationPanel;
private final RocketAction deleteComponentAction; private final RocketAction deleteComponentAction;
@ -81,11 +82,12 @@ public class RocketActions {
public RocketActions(OpenRocketDocument document, DocumentSelectionModel selectionModel, public RocketActions(OpenRocketDocument document, DocumentSelectionModel selectionModel,
BasicFrame parentFrame) { BasicFrame parentFrame, SimulationPanel simulationPanel) {
this.document = document; this.document = document;
this.rocket = document.getRocket(); this.rocket = document.getRocket();
this.selectionModel = selectionModel; this.selectionModel = selectionModel;
this.parentFrame = parentFrame; this.parentFrame = parentFrame;
this.simulationPanel = simulationPanel;
// Add action also to updateActions() // Add action also to updateActions()
this.deleteAction = new DeleteAction(); this.deleteAction = new DeleteAction();
@ -175,10 +177,6 @@ public class RocketActions {
public Action getEditAction() { public Action getEditAction() {
return editAction; return editAction;
} }
public Action getEditAction(SimulationPanel simulationPanel) {
((EditAction) editAction).setSimulationPanel(simulationPanel);
return editAction;
}
public Action getEditActionNoIcon() { public Action getEditActionNoIcon() {
return editActionNoIcon; return editActionNoIcon;
@ -884,7 +882,6 @@ public class RocketActions {
*/ */
private class EditAction extends RocketAction { private class EditAction extends RocketAction {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private SimulationPanel simulationPanel = null;
public EditAction() { public EditAction() {
//// Edit //// Edit
@ -897,10 +894,6 @@ public class RocketActions {
clipboardChanged(); clipboardChanged();
} }
public void setSimulationPanel(SimulationPanel simulationPanel) {
this.simulationPanel = simulationPanel;
}
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
List<RocketComponent> components = selectionModel.getSelectedComponents(); List<RocketComponent> components = selectionModel.getSelectedComponents();