Add Multiport option

[sw/motorsim] / gui / com / billkuker / rocketry / motorsim / visual / workbench / MotorEditor.java

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 6224d6a2f4d4975ce771fb72014f9c5001be5040..65febeb0bea93238b6be7df1b7f28de69ef8b205 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -55,6 +55,7 @@ import com.billkuker.rocketry.motorsim.grain.EndBurner;
 import com.billkuker.rocketry.motorsim.grain.Finocyl;\r
 import com.billkuker.rocketry.motorsim.grain.Moonburner;\r
 import com.billkuker.rocketry.motorsim.grain.MultiGrain;\r
+import com.billkuker.rocketry.motorsim.grain.MultiPort;\r
 import com.billkuker.rocketry.motorsim.grain.RodAndTubeGrain;\r
 import com.billkuker.rocketry.motorsim.grain.Star;\r
 import com.billkuker.rocketry.motorsim.visual.BurnPanel;\r
@@ -82,16 +83,24 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                setLayout( new BorderLayout());\r
                tabs = new JTabbedPane(JTabbedPane.TOP);\r
                add(tabs, BorderLayout.CENTER);\r
-               setMotor(m);\r
+               availableFuels.addElement(m.getFuel());\r
+               availableFuels.setSelectedItem(m.getFuel());\r
+               FuelResolver.addFuelsChangeListener(this);\r
                fuelsChanged();\r
+               setMotor(m);\r
+               \r
+               Burn.getBurnSettings().addPropertyChangeListener(this);\r
        }\r
 \r
        @Override\r
        public void fuelsChanged() {\r
-               availableFuels.removeAllElements();\r
-               availableFuels.addElement(motor.getFuel());\r
+               while ( availableFuels.getSize() > 0 && availableFuels.getIndexOf(availableFuels.getSelectedItem()) != 0 )\r
+                       availableFuels.removeElementAt(0);\r
+               while ( availableFuels.getSize() > 1 )\r
+                       availableFuels.removeElementAt(1);\r
                for ( Fuel f : FuelResolver.getFuelMap().values() ){\r
-                       availableFuels.addElement(f);\r
+                       if ( f != availableFuels.getSelectedItem() )\r
+                               availableFuels.addElement(f);\r
                }\r
        }\r
 \r
@@ -109,6 +118,7 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                grainTypes.add(RodAndTubeGrain.class);\r
                grainTypes.add(CSlot.class);\r
                grainTypes.add(EndBurner.class);\r
+               grainTypes.add(MultiPort.class);\r
        }\r
        \r
        private List<Class<? extends Chamber>> chamberTypes = new Vector<Class<? extends Chamber>>();\r
@@ -143,6 +153,10 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                                sp = null;\r
                        }\r
                        currentThread = new Thread() {\r
+                               {\r
+                                       setName("Burn " + motor.getName());\r
+                                       setDaemon(true);\r
+                               }\r
                                public void run() {\r
                                        final Thread me = this;\r
                                        try {                                           \r
@@ -299,6 +313,10 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                                ((ChangeListening.Subject) motor.getChamber())\r
                                                .addPropertyChangeListener(MotorEditor.this);\r
                        }\r
+                       if (motor.getFuel() instanceof ChangeListening.Subject ){\r
+                               ((ChangeListening.Subject) motor.getFuel())\r
+                                               .addPropertyChangeListener(MotorEditor.this);\r
+                       }\r
                }\r
 \r
                public CaseEditor() {\r
@@ -385,11 +403,9 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                                                }\r
                                                return motor.getChamber();\r
                                        } catch (InstantiationException e) {\r
-                                               // TODO Auto-generated catch block\r
-                                               e.printStackTrace();\r
+                                               log.error(e);\r
                                        } catch (IllegalAccessException e) {\r
-                                               // TODO Auto-generated catch block\r
-                                               e.printStackTrace();\r
+                                               log.error(e);\r
                                        }\r
                                        return null;\r
                                }\r
@@ -469,9 +485,10 @@ public class MotorEditor extends JPanel implements PropertyChangeListener, FuelR
                tabs.add(bt = new BurnTab(), BURN_TAB);\r
        }\r
 \r
+       private static int idx;\r
        public static Motor defaultMotor() {\r
                Motor m = new Motor();\r
-               m.setName("Example Motor");\r
+               m.setName("New Motor " + ++idx);\r
                try {\r
                        m.setFuel(FuelResolver.getFuel(new URI("motorsim:KNDX")));\r
                } catch (Exception e) {\r