Set correct fuel on open motor

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index ce404b694aa394564b8be0b72e591419305cb5be..690beb1e5245b2ef20a007b5cbe8fb97702a3f50 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -284,6 +284,9 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                        });\r
                        nameAndFuel.add(new JLabel("Fuel:"));\r
                        nameAndFuel.add( new JComboBox(availableFuels){\r
+                               {\r
+                                       this.setSelectedItem(motor.getFuel());\r
+                               }\r
                                private static final long serialVersionUID = 1L;\r
                                {\r
                                        setMinimumSize(new Dimension(200, 20));\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
index 1066146f52629c4a214ae75dd632a41a9430df9e..a0320f5fe688a4513f2bd576085e6e96eb760e45 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java
@@ -167,7 +167,9 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
                                                                                        try {\r
                                                                                                Motor m = MotorIO\r
                                                                                                                .readMotor(file);\r
+                                                                                               addFuel(m.getFuel());\r
                                                                                                addMotor(m, file);\r
+                                                                                               \r
                                                                                        } catch (Exception e) {\r
                                                                                                JOptionPane.showMessageDialog(\r
                                                                                                                MotorWorkbench.this, e\r
@@ -344,6 +346,7 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener {
        }\r
        \r
        private void addFuel(Fuel f){\r
+               \r
                fuels.addElement(f);\r
                FuelPanel fp = new FuelPanel(f);\r
                FuelNode fn = tm.new FuelNode(fp, f);\r