From 4ce1e8ef0dee710bdfe10f1086457a3befe71dcd Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sat, 14 Oct 2017 11:39:04 -0400 Subject: [PATCH] [resolves #367] Can no longer add Components to rocket directly (add buttons are greyed-out) --- .../openrocket/gui/main/ComponentAddButtons.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java index 57f6fe30a..2f4e41dfb 100644 --- a/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java +++ b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java @@ -512,14 +512,17 @@ public class ComponentAddButtons extends JPanel implements Scrollable { } @Override - public boolean isAddable(RocketComponent c) { - if (super.isAddable(c)) + public boolean isAddable(RocketComponent selectedComponent) { + if (super.isAddable(selectedComponent)) { return true; - // Handled separately: - if (c instanceof BodyComponent) - return true; - if (c == null || c instanceof Rocket) + }else if (selectedComponent instanceof BodyComponent) { + // Handled separately: return true; + }else if (selectedComponent == null) { + return false; + }else if( selectedComponent instanceof Rocket) { + return false; + } return false; }