From 33e912833f15125688170991fd605a548fb28b85 Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Sun, 22 Mar 2020 20:46:13 -0700 Subject: [PATCH] Fix stage selection toggle display Fixes the stage selection buttons to only be active when the stage is active and properly reflect the displayed stage state. Signed-off-by: Billy Olsen --- .../src/net/sf/openrocket/gui/components/StageSelector.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/components/StageSelector.java b/swing/src/net/sf/openrocket/gui/components/StageSelector.java index 81accf8b8..f5972ad28 100644 --- a/swing/src/net/sf/openrocket/gui/components/StageSelector.java +++ b/swing/src/net/sf/openrocket/gui/components/StageSelector.java @@ -10,21 +10,17 @@ import javax.swing.JPanel; import javax.swing.JToggleButton; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.StateChangeListener; @SuppressWarnings("serial") public class StageSelector extends JPanel implements StateChangeListener { - private static final Translator trans = Application.getTranslator(); - private final Rocket rocket; private List buttons = new ArrayList(); @@ -41,7 +37,7 @@ public class StageSelector extends JPanel implements StateChangeListener { this.removeAll(); for(AxialStage stage : configuration.getRocket().getStageList()){ JToggleButton button = new JToggleButton(new StageAction(stage)); - button.setSelected(true); + button.setSelected(configuration.isStageActive(stage.getStageNumber())); this.add(button); buttons.add(button); }