From 1bf2ed2a54d5c8317efe46ace97515a95bd1bf9c Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Wed, 31 Oct 2018 18:46:17 -0600
Subject: [PATCH] Show stage names instead of stage numbers

---
 swing/resources/datafiles/presets/system.ser  | Bin 386370 -> 386370 bytes
 .../gui/components/StageSelector.java         |  22 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/swing/resources/datafiles/presets/system.ser b/swing/resources/datafiles/presets/system.ser
index 33648114cadcbbf9a13720ed07e6b336e8074da7..28a7bbe93ec9cd910cf486a957c905b7296d84c6 100644
GIT binary patch
delta 381
zcmX?fO8n3%@ePyLOpaT7d~(2AzR8o<?43Mez2s)Qby8xCoYQ-(Syd<39a#lrUI=9I
znttIKi}3Ub?kvKSXC6&v<edEX=oO&UgG``QK^-ICWUb>hKz>0ki^}BF$JYay?<!fm
zCOe!Kp8g=0MQHM?6G=c#z9%mMNrh8af%0|MVEJw!Q{N6`$_Eyi$s2yLO}01#Qd;=a
zZ?Zr=Kgdd<$y{d>fI<NuAwmvOK%rY8q3H{gku6zu4k$LQ5Lu||JV@v5^XGwz8(V=g
z3O>A(nJ!iX1?w(e29nv~DwE4DZ3411F9V%5`9GMvdgUUJz5FUj+u6CSDwAhl1Nv#Q
z_w@@vfm$mj)#;tZjM9@048<q^yDBmLJqIuZX5I(|DtUhcsATein?SO8;;r_Hw-|w#
Q35c12m}UFKTdW(o0P0?!L;wH)

delta 381
zcmX?fO8n3%@ePyLOwL%lcd~*H@8n5qPE4M#UUIYDIw>(m;psirtg4gij;sPQF9fo9
zO~3GrMR@uIcNXEvGmj=S3Qzuf^a@bwK_*bDppKDmvexk$Aip4&MP>5o<LiOUca<z&
zlO0Y2)#S1WO@4JE38=~U<Ru`faOx^hzRnsf-wkBy+ks5^z#=nw!!NeU7H2?83xE1e
z7O3Y3St&G`>uds0DBvSR$RP?SbPFUjePJ@PC9BQ>#ikV^3ss#5>AZdZJWz3CD^LdH
zRi=y8K*73;mw{w<xXR?ROPhc!&C5V%P5uuiuU@$bWG}x8(sp((tIFir*MNSS?0x+L
zP@vX|Np*T>F{AY4fVC2n|6diK{+<IE0yA%f0+qbK0aP;iz)c|8Jn>fh#9NF&%ml>D
NK+Ljz;w{#VTmT8Fpm6{I

diff --git a/swing/src/net/sf/openrocket/gui/components/StageSelector.java b/swing/src/net/sf/openrocket/gui/components/StageSelector.java
index a1cbdaf5a..81accf8b8 100644
--- a/swing/src/net/sf/openrocket/gui/components/StageSelector.java
+++ b/swing/src/net/sf/openrocket/gui/components/StageSelector.java
@@ -15,6 +15,7 @@ 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;
 
@@ -36,15 +37,10 @@ public class StageSelector extends JPanel implements StateChangeListener {
 	}
 	
 	private void updateButtons( final FlightConfiguration configuration ) {
-		int stages = configuration.getStageCount();
-		if (buttons.size() == stages)
-			return;
-		
 		buttons.clear();
 		this.removeAll();
 		for(AxialStage stage : configuration.getRocket().getStageList()){
-			int stageNum = stage.getStageNumber(); 
-			JToggleButton button = new JToggleButton(new StageAction(stageNum));
+			JToggleButton button = new JToggleButton(new StageAction(stage));
 			button.setSelected(true);
 			this.add(button);
 			buttons.add(button);
@@ -56,31 +52,31 @@ public class StageSelector extends JPanel implements StateChangeListener {
 	@Override
 	public void stateChanged(EventObject eo) {
 		Object source = eo.getSource();
-		if( source instanceof Rocket ){
-			Rocket rkt = (Rocket) eo.getSource();
+		if ((source instanceof Rocket) || (source instanceof AxialStage)) {
+			Rocket rkt = (Rocket) ((RocketComponent) source).getRoot();
 			updateButtons( rkt.getSelectedConfiguration() );
 		}
 	}
 	
 	private class StageAction extends AbstractAction {
-		private final int stageNumber;
+		private final AxialStage stage;
 		
-		public StageAction(final int stage) {
-			this.stageNumber = stage;
+		public StageAction(final AxialStage stage) {
+			this.stage = stage;
 		}
 		
 		@Override
 		public Object getValue(String key) {
 			if (key.equals(NAME)) {
 				// Stage
-				return trans.get("StageAction.Stage") + " " + (stageNumber );
+				return stage.getName();
 			}
 			return super.getValue(key);
 		}
 		
 		@Override
 		public void actionPerformed(ActionEvent e) {
-			rocket.getSelectedConfiguration().toggleStage(stageNumber);
+			rocket.getSelectedConfiguration().toggleStage(stage.getStageNumber());
 			rocket.fireComponentChangeEvent(ComponentChangeEvent.AEROMASS_CHANGE | ComponentChangeEvent.MOTOR_CHANGE );
 		}