From c66dd5eda9acded927ebbbfd997eeef95950e472 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Thu, 4 Nov 2010 17:14:51 +0000 Subject: [PATCH] Set correct fuel on open motor --- .../rocketry/motorsim/visual/workbench/MotorEditor.java | 3 +++ .../rocketry/motorsim/visual/workbench/MotorWorkbench.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java index ce404b6..690beb1 100644 --- 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 { }); nameAndFuel.add(new JLabel("Fuel:")); nameAndFuel.add( new JComboBox(availableFuels){ + { + this.setSelectedItem(motor.getFuel()); + } private static final long serialVersionUID = 1L; { setMinimumSize(new Dimension(200, 20)); diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorWorkbench.java index 1066146..a0320f5 100644 --- 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 { Motor m = MotorIO .readMotor(file); + addFuel(m.getFuel()); addMotor(m, file); + } catch (Exception e) { JOptionPane.showMessageDialog( MotorWorkbench.this, e @@ -344,6 +346,7 @@ public class MotorWorkbench extends JFrame implements TreeSelectionListener { } private void addFuel(Fuel f){ + fuels.addElement(f); FuelPanel fp = new FuelPanel(f); FuelNode fn = tm.new FuelNode(fp, f); -- 2.47.2