From 49658600b77eee04d9abf98a49110ae307a7f52f Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Tue, 31 May 2022 23:05:26 +0200
Subject: [PATCH] Clean up code

---
 swing/src/net/sf/openrocket/gui/main/BasicFrame.java   |  4 +++-
 .../src/net/sf/openrocket/gui/main/RocketActions.java  | 10 ----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index 58f73b47d..5ead81809 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -351,7 +351,9 @@ public class BasicFrame extends JFrame {
 		button = new SelectColorButton(actions.getMoveDownAction());
 		panel.add(button, "sizegroup buttons, aligny 0%");
 
-		button = new SelectColorButton(actions.getEditActionNoIcon());
+		button = new SelectColorButton(actions.getEditAction());
+		button.setIcon(null);
+		button.setMnemonic(0);
 		panel.add(button, "sizegroup buttons");
 
 		button = new SelectColorButton(actions.getDeleteAction());
diff --git a/swing/src/net/sf/openrocket/gui/main/RocketActions.java b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
index 6e389d1b5..c976a3993 100644
--- a/swing/src/net/sf/openrocket/gui/main/RocketActions.java
+++ b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
@@ -72,7 +72,6 @@ public class RocketActions {
 	private final RocketAction pasteAction;
 	private final RocketAction duplicateAction;
 	private final RocketAction editAction;
-	private final RocketAction editActionNoIcon;
 	private final RocketAction scaleAction;
 	private final RocketAction newStageAction;
 	private final RocketAction moveUpAction;
@@ -98,11 +97,7 @@ public class RocketActions {
 		this.pasteAction = new PasteAction();
 		this.duplicateAction = new DuplicateAction();
 		this.editAction = new EditAction();
-		this.editActionNoIcon = new EditAction();
 		this.scaleAction = new ScaleAction();
-		this.editActionNoIcon.putValue(Action.SMALL_ICON, null);
-		this.editActionNoIcon.putValue(Action.MNEMONIC_KEY, null);
-		this.editActionNoIcon.putValue(Action.ACCELERATOR_KEY, null);
 		this.newStageAction = new NewStageAction();
 		this.moveUpAction = new MoveUpAction();
 		this.moveDownAction = new MoveDownAction();
@@ -136,7 +131,6 @@ public class RocketActions {
 		pasteAction.clipboardChanged();
 		duplicateAction.clipboardChanged();
 		editAction.clipboardChanged();
-		editActionNoIcon.clipboardChanged();
 		scaleAction.clipboardChanged();
 		newStageAction.clipboardChanged();
 		moveUpAction.clipboardChanged();
@@ -178,10 +172,6 @@ public class RocketActions {
 		return editAction;
 	}
 
-	public Action getEditActionNoIcon() {
-		return editActionNoIcon;
-	}
-
 	public Action getScaleAction() {
 		return scaleAction;
 	}