From: Bill Kuker <bkuker@billkuker.com>
Date: Tue, 23 Nov 2010 00:06:40 +0000 (+0000)
Subject: React better to fuels loading
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=8b4dbe9dd6e9f6ae0af06af57daabd40f1c3ccce;p=sw%2Fmotorsim

React better to fuels loading
---

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 2505dd7..f08c4f5 100644
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -82,16 +82,22 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
 		setLayout( new BorderLayout());
 		tabs = new JTabbedPane(JTabbedPane.TOP);
 		add(tabs, BorderLayout.CENTER);
-		setMotor(m);
+		availableFuels.addElement(m.getFuel());
+		availableFuels.setSelectedItem(m.getFuel());
+		FuelResolver.addFuelsChangeListener(this);
 		fuelsChanged();
+		setMotor(m);
 	}
 
 	@Override
 	public void fuelsChanged() {
-		availableFuels.removeAllElements();
-		availableFuels.addElement(motor.getFuel());
+		while ( availableFuels.getSize() > 0 && availableFuels.getIndexOf(availableFuels.getSelectedItem()) != 0 )
+			availableFuels.removeElementAt(0);
+		while ( availableFuels.getSize() > 1 )
+			availableFuels.removeElementAt(1);
 		for ( Fuel f : FuelResolver.getFuelMap().values() ){
-			availableFuels.addElement(f);
+			if ( f != availableFuels.getSelectedItem() )
+				availableFuels.addElement(f);
 		}
 	}